diff --git a/.bazelrc b/.bazelrc index 81972716..1b47d230 100644 --- a/.bazelrc +++ b/.bazelrc @@ -61,8 +61,6 @@ common --incompatible_disallow_empty_glob=false # Use the C linker to link Zig code common --@rules_zig//zig/settings:use_cc_common_link=true -# Zig self hosted backend is too fragile for now -common --@rules_zig//zig/settings:zigopt=-fllvm common --@rules_zig//zig/settings:use_standalone_translate_c=True @@ -109,6 +107,7 @@ common:release --compilation_mode=opt common:release --copt=-Ofast common:release --strip=always common:release --@rules_zig//zig/settings:mode=release_safe +common:release --@rules_zig//zig/settings:zigopt=-fllvm # --config=native builds everything optimized for the local CPU common:native --copt=-march=native diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c996de04..13d153b3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -118,7 +118,7 @@ jobs: - name: Setup Zig uses: mlugg/setup-zig@v2.2.1 with: - version: 0.16.0 + version: 0.17.0 mirror: https://mirror.zml.ai/zig - name: Zig Format diff --git a/MODULE.bazel b/MODULE.bazel index 900d84af..c0cddf52 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -49,7 +49,8 @@ bazel_dep(name = "rules_shell", version = "0.6.1") # repo_name = None prevents rules_swift from eagerly auto-registering toolchains. bazel_dep(name = "rules_swift", version = "3.6.1", repo_name = None) -bazel_dep(name = "rules_zig", version = "0.15.1") +bazel_dep(name = "rules_zig", version = "0.17.0") + bazel_dep(name = "tar.bzl", version = "0.10.4") bazel_dep(name = "llvm", version = "0.8.24") bazel_dep(name = "libxml2", version = "2.15.3") @@ -99,7 +100,7 @@ zig.index(file = "//bazel:zig_index.json") zig.toolchain( # Ensure Zig actions are run locally only extra_exec_compatible_with = ["//platforms:local_execution"], - zig_version = "0.16.0", + zig_version = "0.17.0", ) zig.mirrors(urls = [ "https://pkg.machengine.org/zig", @@ -134,15 +135,7 @@ register_toolchains("//:translate_c_toolchain") # build graph. register_execution_platforms("//platforms:local_execution_platform") -zls = use_extension("@rules_zig//zig/zls:extensions.bzl", "zls") -zls.index(file = "@rules_zig//zig/zls/private:versions.json") -zls.toolchain( - zig_version = "0.16.0", - zls_version = "0.16.0", -) -use_repo(zls, "zls_toolchains") - -register_toolchains("@zls_toolchains//:all") +register_toolchains("//third_party/zls:toolchain") ### @@ -328,6 +321,10 @@ use_repo( "xla", "zigimg", "zio", + "zls", + "zls_diffz", + "zls_known_folders", + "zls_lsp", ) xla = use_extension("//third_party/xla:xla.bzl", "xla") diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index b019f47e..b4bf3b82 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -431,8 +431,8 @@ "https://bcr.bazel.build/modules/rules_swift/3.1.2/MODULE.bazel": "72c8f5cf9d26427cee6c76c8e3853eb46ce6b0412a081b2b6db6e8ad56267400", "https://bcr.bazel.build/modules/rules_swift/3.6.1/MODULE.bazel": "5a68bb05b6b8044f8a7bd7184d56150189e7eca05522ce525517c234fed50ed8", "https://bcr.bazel.build/modules/rules_swift/3.6.1/source.json": "9af2e521ffdb41961b6b9ac05293bd6519ee2fb52849a2be658a20b0221cb8db", - "https://bcr.bazel.build/modules/rules_zig/0.15.1/MODULE.bazel": "f0b813d9191c8d201e0b3ecbe5c5220ddedb717a15009fc711a78b3e1db8710d", - "https://bcr.bazel.build/modules/rules_zig/0.15.1/source.json": "0bd91d7459f504196dfdc90cd0fffbf1f0df2667c9cd5eb708feb3fd27578e6a", + "https://bcr.bazel.build/modules/rules_zig/0.17.0/MODULE.bazel": "2c1c08adc986cfdb5fee97e21982cac846f8a20a6a8054ae9cab8b02721c2011", + "https://bcr.bazel.build/modules/rules_zig/0.17.0/source.json": "488f71f57c596ed9b7635ebeb28066b23c6fc1802c30749d06bdad261d7b04a2", "https://bcr.bazel.build/modules/stardoc/0.5.0/MODULE.bazel": "f9f1f46ba8d9c3362648eea571c6f9100680efc44913618811b58cc9c02cd678", "https://bcr.bazel.build/modules/stardoc/0.5.1/MODULE.bazel": "1a05d92974d0c122f5ccf09291442580317cdd859f07a8655f1db9a60374f9f8", "https://bcr.bazel.build/modules/stardoc/0.5.3/MODULE.bazel": "c7f6948dae6999bf0db32c1858ae345f112cacf98f174c7a8bb707e41b974f1c", @@ -1516,19 +1516,19 @@ }, "@@rules_zig+//zig:extensions.bzl%zig": { "general": { - "bzlTransitiveDigest": "VGLOg2kVw+STO9R5OrQnLFbv7Vl5TPdtIebIs324IpU=", - "usagesDigest": "4xBoe2eIScx2QI0jVieHWXdflezUUDIApwMqS+SWGbw=", + "bzlTransitiveDigest": "VY2CKW7wm6B3wCpZq7W6z3hCnHiiJlXtB4JpuB3OPD8=", + "usagesDigest": "FDLiNUluzC0WBatQ/5WFpxzyQP4ubA/DUgTwOzYLGw4=", "recordedInputs": [ "REPO_MAPPING:rules_zig+,bazel_skylib bazel_skylib+", "REPO_MAPPING:rules_zig+,bazel_tools bazel_tools", - "FILE:@@//bazel/zig_index.json 2e3b4b83f1add5d3ca12fd05797c04c38af21d86c7fc7c1a9b356560141a4797", - "FILE:@@rules_zig+//zig/private/versions.json 3e4e370dee9c3f3fdc8bfc7a600e76743278fde40815eead5d0bcda3aec3e2bd" + "FILE:@@//bazel/zig_index.json 387d1ab130896456fb092fb08bfaf0c57ccba854121955c752052600d1643d37", + "FILE:@@rules_zig+//zig/private/versions.json a33370258a702099b35362d4220fe8f02c869c2b845abcbf0aa78200abab097a" ], "generatedRepoSpecs": { - "zig_0.16.0_aarch64-linux": { + "zig_0.17.0_aarch64-linux": { "repoRuleId": "@@rules_zig+//zig/private/repo:zig_repository.bzl%zig_repository", "attributes": { - "url": "https://ziglang.org/download/0.16.0/zig-aarch64-linux-0.16.0.tar.xz", + "url": "https://ziglang.org/download/0.17.0/zig-aarch64-linux-0.17.0.tar.xz", "mirrors": [ "https://pkg.machengine.org/zig", "https://zigmirror.hryx.net/zig", @@ -1558,15 +1558,15 @@ "https://pkg.earth/zig", "https://fs.liujiacai.net/zigbuilds" ], - "sha256": "ea4b09bfb22ec6f6c6ceac57ab63efb6b46e17ab08d21f69f3a48b38e1534f17", - "zig_version": "0.16.0", + "sha256": "9e8d11661d4ae3bd57702a3832781e23ad151dde5798e16a5ccd503f65234ff8", + "zig_version": "0.17.0", "platform": "aarch64-linux" } }, - "zig_0.16.0_aarch64-macos": { + "zig_0.17.0_aarch64-macos": { "repoRuleId": "@@rules_zig+//zig/private/repo:zig_repository.bzl%zig_repository", "attributes": { - "url": "https://ziglang.org/download/0.16.0/zig-aarch64-macos-0.16.0.tar.xz", + "url": "https://ziglang.org/download/0.17.0/zig-aarch64-macos-0.17.0.tar.xz", "mirrors": [ "https://pkg.machengine.org/zig", "https://zigmirror.hryx.net/zig", @@ -1596,15 +1596,15 @@ "https://pkg.earth/zig", "https://fs.liujiacai.net/zigbuilds" ], - "sha256": "b23d70deaa879b5c2d486ed3316f7eaa53e84acf6fc9cc747de152450d401489", - "zig_version": "0.16.0", + "sha256": "b607e9b9234790a008116ae5bdb71c6243b84b9fb42a53a9e70fde41c06c536a", + "zig_version": "0.17.0", "platform": "aarch64-macos" } }, - "zig_0.16.0_aarch64-windows": { + "zig_0.17.0_aarch64-windows": { "repoRuleId": "@@rules_zig+//zig/private/repo:zig_repository.bzl%zig_repository", "attributes": { - "url": "https://ziglang.org/download/0.16.0/zig-aarch64-windows-0.16.0.zip", + "url": "https://ziglang.org/download/0.17.0/zig-aarch64-windows-0.17.0.zip", "mirrors": [ "https://pkg.machengine.org/zig", "https://zigmirror.hryx.net/zig", @@ -1634,15 +1634,15 @@ "https://pkg.earth/zig", "https://fs.liujiacai.net/zigbuilds" ], - "sha256": "aee38316ee4111717900f45dd3130145c39289e105541d737eb8c5ed653c78ef", - "zig_version": "0.16.0", + "sha256": "0a59d91fa1cb40cf068e9b0954434ce973500c7a2ea749f1e01af62cdab52d26", + "zig_version": "0.17.0", "platform": "aarch64-windows" } }, - "zig_0.16.0_x86_64-linux": { + "zig_0.17.0_x86_64-linux": { "repoRuleId": "@@rules_zig+//zig/private/repo:zig_repository.bzl%zig_repository", "attributes": { - "url": "https://ziglang.org/download/0.16.0/zig-x86_64-linux-0.16.0.tar.xz", + "url": "https://ziglang.org/download/0.17.0/zig-x86_64-linux-0.17.0.tar.xz", "mirrors": [ "https://pkg.machengine.org/zig", "https://zigmirror.hryx.net/zig", @@ -1672,15 +1672,15 @@ "https://pkg.earth/zig", "https://fs.liujiacai.net/zigbuilds" ], - "sha256": "70e49664a74374b48b51e6f3fdfbf437f6395d42509050588bd49abe52ba3d00", - "zig_version": "0.16.0", + "sha256": "1cbe9df9f27e6b78d14ccbca43b6703a404ef79ef1c463de901d7f088d4e2026", + "zig_version": "0.17.0", "platform": "x86_64-linux" } }, - "zig_0.16.0_x86_64-macos": { + "zig_0.17.0_x86_64-macos": { "repoRuleId": "@@rules_zig+//zig/private/repo:zig_repository.bzl%zig_repository", "attributes": { - "url": "https://ziglang.org/download/0.16.0/zig-x86_64-macos-0.16.0.tar.xz", + "url": "https://ziglang.org/download/0.17.0/zig-x86_64-macos-0.17.0.tar.xz", "mirrors": [ "https://pkg.machengine.org/zig", "https://zigmirror.hryx.net/zig", @@ -1710,15 +1710,15 @@ "https://pkg.earth/zig", "https://fs.liujiacai.net/zigbuilds" ], - "sha256": "0387557ed1877bc6a2e1802c8391953baddba76081876301c522f52977b52ba7", - "zig_version": "0.16.0", + "sha256": "4f9a1c5269aa17ebda5e6d3c2b89d6cbf36f7d2b22a0306e9ab98f25f95529c6", + "zig_version": "0.17.0", "platform": "x86_64-macos" } }, - "zig_0.16.0_x86_64-windows": { + "zig_0.17.0_x86_64-windows": { "repoRuleId": "@@rules_zig+//zig/private/repo:zig_repository.bzl%zig_repository", "attributes": { - "url": "https://ziglang.org/download/0.16.0/zig-x86_64-windows-0.16.0.zip", + "url": "https://ziglang.org/download/0.17.0/zig-x86_64-windows-0.17.0.zip", "mirrors": [ "https://pkg.machengine.org/zig", "https://zigmirror.hryx.net/zig", @@ -1748,8 +1748,8 @@ "https://pkg.earth/zig", "https://fs.liujiacai.net/zigbuilds" ], - "sha256": "68659eb5f1e4eb1437a722f1dd889c5a322c9954607f5edcf337bc3684a75a7e", - "zig_version": "0.16.0", + "sha256": "b5663f69581dcf391293fbf16c06cb80d81d806545ce618b4d0bab7f0eb8c428", + "zig_version": "0.17.0", "platform": "x86_64-windows" } }, @@ -1757,28 +1757,28 @@ "repoRuleId": "@@rules_zig+//zig/private/repo:toolchains_repo.bzl%toolchains_repo", "attributes": { "names": [ - "zig_0.16.0_aarch64-linux", - "zig_0.16.0_aarch64-macos", - "zig_0.16.0_aarch64-windows", - "zig_0.16.0_x86_64-linux", - "zig_0.16.0_x86_64-macos", - "zig_0.16.0_x86_64-windows" + "zig_0.17.0_aarch64-linux", + "zig_0.17.0_aarch64-macos", + "zig_0.17.0_aarch64-windows", + "zig_0.17.0_x86_64-linux", + "zig_0.17.0_x86_64-macos", + "zig_0.17.0_x86_64-windows" ], "labels": [ - "@zig_0.16.0_aarch64-linux//:zig_toolchain", - "@zig_0.16.0_aarch64-macos//:zig_toolchain", - "@zig_0.16.0_aarch64-windows//:zig_toolchain", - "@zig_0.16.0_x86_64-linux//:zig_toolchain", - "@zig_0.16.0_x86_64-macos//:zig_toolchain", - "@zig_0.16.0_x86_64-windows//:zig_toolchain" + "@zig_0.17.0_aarch64-linux//:zig_toolchain", + "@zig_0.17.0_aarch64-macos//:zig_toolchain", + "@zig_0.17.0_aarch64-windows//:zig_toolchain", + "@zig_0.17.0_x86_64-linux//:zig_toolchain", + "@zig_0.17.0_x86_64-macos//:zig_toolchain", + "@zig_0.17.0_x86_64-windows//:zig_toolchain" ], "zig_versions": [ - "0.16.0", - "0.16.0", - "0.16.0", - "0.16.0", - "0.16.0", - "0.16.0" + "0.17.0", + "0.17.0", + "0.17.0", + "0.17.0", + "0.17.0", + "0.17.0" ], "exec_lengths": [ 3, @@ -1834,123 +1834,21 @@ "@@rules_zig+//zig/zls:extensions.bzl%zls": { "general": { "bzlTransitiveDigest": "ZuceGxE17jROQ+kQkaPqIcK7gMKGb56I97Aq1/Dubdc=", - "usagesDigest": "b/ERjMTWazfa8VFWuTc0PTtQQzLDuloWSHlzXj6Zb5w=", + "usagesDigest": "kOrP52crJGijpHNzo4S7msXvbGpfmzvkE4tuhpRWTsI=", "recordedInputs": [ - "REPO_MAPPING:,rules_zig rules_zig+", "REPO_MAPPING:rules_zig+,bazel_skylib bazel_skylib+", "REPO_MAPPING:rules_zig+,bazel_tools bazel_tools", "FILE:@@rules_zig+//zig/zls/private/versions.json 127803289dfd79b5255db5f74be1d9a2f790f03292d6147009af702d888aba69" ], "generatedRepoSpecs": { - "zls_0.16.0_aarch64-linux": { - "repoRuleId": "@@rules_zig+//zig/zls/private/repo:zls_repository.bzl%zls_repository", - "attributes": { - "url": "https://builds.zigtools.org/zls-aarch64-linux-0.16.0.tar.xz", - "mirrors": [], - "sha256": "430cd293d201eb70ae2519dbc96c854bf8791b8df7fc9392e8d2dc9680a2bed7", - "zls_version": "0.16.0", - "platform": "aarch64-linux" - } - }, - "zls_0.16.0_aarch64-macos": { - "repoRuleId": "@@rules_zig+//zig/zls/private/repo:zls_repository.bzl%zls_repository", - "attributes": { - "url": "https://builds.zigtools.org/zls-aarch64-macos-0.16.0.tar.xz", - "mirrors": [], - "sha256": "b93ec549f8558a7e85984a840e9276d274f1059b54ade4254296ef4982958359", - "zls_version": "0.16.0", - "platform": "aarch64-macos" - } - }, - "zls_0.16.0_aarch64-windows": { - "repoRuleId": "@@rules_zig+//zig/zls/private/repo:zls_repository.bzl%zls_repository", - "attributes": { - "url": "https://builds.zigtools.org/zls-aarch64-windows-0.16.0.zip", - "mirrors": [], - "sha256": "ef4c5ccb93c80c9f023105c5f558ae8774ac6668d560ba6f92a2f87d95df2311", - "zls_version": "0.16.0", - "platform": "aarch64-windows" - } - }, - "zls_0.16.0_x86_64-linux": { - "repoRuleId": "@@rules_zig+//zig/zls/private/repo:zls_repository.bzl%zls_repository", - "attributes": { - "url": "https://builds.zigtools.org/zls-x86_64-linux-0.16.0.tar.xz", - "mirrors": [], - "sha256": "ded6d562a0b86ee878b1ddf70ffab2797ce3cdca3b02d6077548f9d56dff96b6", - "zls_version": "0.16.0", - "platform": "x86_64-linux" - } - }, - "zls_0.16.0_x86_64-macos": { - "repoRuleId": "@@rules_zig+//zig/zls/private/repo:zls_repository.bzl%zls_repository", - "attributes": { - "url": "https://builds.zigtools.org/zls-x86_64-macos-0.16.0.tar.xz", - "mirrors": [], - "sha256": "49f716ea96c1aadaecaa5d9c0a50874cbcf443dc42b825f1e7ee35499ad3eb96", - "zls_version": "0.16.0", - "platform": "x86_64-macos" - } - }, - "zls_0.16.0_x86_64-windows": { - "repoRuleId": "@@rules_zig+//zig/zls/private/repo:zls_repository.bzl%zls_repository", - "attributes": { - "url": "https://builds.zigtools.org/zls-x86_64-windows-0.16.0.zip", - "mirrors": [], - "sha256": "35cbb7163224e8cf92d21099c1b1391f2aba927f25d389f021b13a21d40b96dd", - "zls_version": "0.16.0", - "platform": "x86_64-windows" - } - }, "zls_toolchains": { "repoRuleId": "@@rules_zig+//zig/zls/private/repo:toolchains_repo.bzl%toolchains_repo", "attributes": { - "names": [ - "0.16.0_for_0.16.0_aarch64-linux", - "0.16.0_for_0.16.0_aarch64-macos", - "0.16.0_for_0.16.0_aarch64-windows", - "0.16.0_for_0.16.0_x86_64-linux", - "0.16.0_for_0.16.0_x86_64-macos", - "0.16.0_for_0.16.0_x86_64-windows" - ], - "labels": [ - "@zls_0.16.0_aarch64-linux//:zls_toolchain", - "@zls_0.16.0_aarch64-macos//:zls_toolchain", - "@zls_0.16.0_aarch64-windows//:zls_toolchain", - "@zls_0.16.0_x86_64-linux//:zls_toolchain", - "@zls_0.16.0_x86_64-macos//:zls_toolchain", - "@zls_0.16.0_x86_64-windows//:zls_toolchain" - ], - "zig_versions": [ - "0.16.0", - "0.16.0", - "0.16.0", - "0.16.0", - "0.16.0", - "0.16.0" - ], - "exec_lengths": [ - 2, - 2, - 2, - 2, - 2, - 2 - ], - "exec_constraints": [ - "@platforms//os:linux", - "@platforms//cpu:aarch64", - "@platforms//os:macos", - "@platforms//cpu:aarch64", - "@platforms//os:windows", - "@platforms//cpu:aarch64", - "@platforms//os:linux", - "@platforms//cpu:x86_64", - "@platforms//os:macos", - "@platforms//cpu:x86_64", - "@platforms//os:windows", - "@platforms//cpu:x86_64" - ] + "names": [], + "labels": [], + "zig_versions": [], + "exec_lengths": [], + "exec_constraints": [] } } } diff --git a/bazel/bazel.zig b/bazel/bazel.zig index 0cf23580..2ae3324a 100644 --- a/bazel/bazel.zig +++ b/bazel/bazel.zig @@ -12,7 +12,7 @@ const init_array_section = switch (builtin.object_format) { else => "", }; -export const _bazel_runfiles_init linksection(init_array_section) = &struct { +export const _bazel_runfiles_init align(@alignOf(usize)) linksection(init_array_section) = &struct { fn call(argc: c_int, argv: [*c][*:0]u8, envp: [*:null]?[*:0]u8) callconv(.c) void { _ = argc; _ = envp; diff --git a/bazel/zig_index.json b/bazel/zig_index.json index 8b39b699..b8cf9b9e 100644 --- a/bazel/zig_index.json +++ b/bazel/zig_index.json @@ -1,4 +1,227 @@ { + "0.17.0": { + "version": "0.17.0", + "date": "2026-10-01", + "docs": "https://ziglang.org/documentation/0.17.0/", + "stdDocs": "https://ziglang.org/documentation/0.17.0/std/", + "notes": "https://ziglang.org/download/0.17.0/release-notes.html", + "src": { + "tarball": "https://ziglang.org/download/0.17.0/zig-0.17.0.tar.xz", + "shasum": "b6c7f1728f043700d6529bac980800792f824256a9d2f1839b3d62beed0b8abd", + "size": "23049960" + }, + "bootstrap": { + "tarball": "https://ziglang.org/download/0.17.0/zig-bootstrap-0.17.0.tar.xz", + "shasum": "1e9e9b8e3c753b35dfb1d9ea48f097579fadbd3e5c1e724ab3fc5bce05477b71", + "size": "57030388" + }, + "x86_64-macos": { + "tarball": "https://ziglang.org/download/0.17.0/zig-x86_64-macos-0.17.0.tar.xz", + "shasum": "4f9a1c5269aa17ebda5e6d3c2b89d6cbf36f7d2b22a0306e9ab98f25f95529c6", + "size": "59317572" + }, + "aarch64-macos": { + "tarball": "https://ziglang.org/download/0.17.0/zig-aarch64-macos-0.17.0.tar.xz", + "shasum": "b607e9b9234790a008116ae5bdb71c6243b84b9fb42a53a9e70fde41c06c536a", + "size": "53985220" + }, + "x86_64-linux": { + "tarball": "https://ziglang.org/download/0.17.0/zig-x86_64-linux-0.17.0.tar.xz", + "shasum": "1cbe9df9f27e6b78d14ccbca43b6703a404ef79ef1c463de901d7f088d4e2026", + "size": "57332648" + }, + "aarch64-linux": { + "tarball": "https://ziglang.org/download/0.17.0/zig-aarch64-linux-0.17.0.tar.xz", + "shasum": "9e8d11661d4ae3bd57702a3832781e23ad151dde5798e16a5ccd503f65234ff8", + "size": "52877280" + }, + "arm-linux": { + "tarball": "https://ziglang.org/download/0.17.0/zig-arm-linux-0.17.0.tar.xz", + "shasum": "53f0045cdef7ba06da70a12b2ef654e4c5283b0139bc441aa7d84f364b46de43", + "size": "53841896" + }, + "riscv64-linux": { + "tarball": "https://ziglang.org/download/0.17.0/zig-riscv64-linux-0.17.0.tar.xz", + "shasum": "18ff032ac6cecf746a84259f6463264f13160ff88bc3b80722ce06f9479b82ed", + "size": "57116976" + }, + "powerpc64le-linux": { + "tarball": "https://ziglang.org/download/0.17.0/zig-powerpc64le-linux-0.17.0.tar.xz", + "shasum": "731e2887e66fff41fdc34f7fd9d8afa814d86d7426f5827805f8854b2977684b", + "size": "56990076" + }, + "x86-linux": { + "tarball": "https://ziglang.org/download/0.17.0/zig-x86-linux-0.17.0.tar.xz", + "shasum": "55e39e175cd5b3098afc29ec47b2590134f5b874175369fb9ae7b8e836d7531a", + "size": "59823964" + }, + "loongarch64-linux": { + "tarball": "https://ziglang.org/download/0.17.0/zig-loongarch64-linux-0.17.0.tar.xz", + "shasum": "5a6000b866201c3b3820b563fcfd29641185393e7d35039e50235db418d8367c", + "size": "54257324" + }, + "s390x-linux": { + "tarball": "https://ziglang.org/download/0.17.0/zig-s390x-linux-0.17.0.tar.xz", + "shasum": "13905f11989b65566c544d191d4bc5bd5d6f858e303208cf1d2f090e5d91b512", + "size": "57136832" + }, + "x86_64-windows": { + "tarball": "https://ziglang.org/download/0.17.0/zig-x86_64-windows-0.17.0.zip", + "shasum": "b5663f69581dcf391293fbf16c06cb80d81d806545ce618b4d0bab7f0eb8c428", + "size": "100268137" + }, + "aarch64-windows": { + "tarball": "https://ziglang.org/download/0.17.0/zig-aarch64-windows-0.17.0.zip", + "shasum": "0a59d91fa1cb40cf068e9b0954434ce973500c7a2ea749f1e01af62cdab52d26", + "size": "95992853" + }, + "x86-windows": { + "tarball": "https://ziglang.org/download/0.17.0/zig-x86-windows-0.17.0.zip", + "shasum": "c7b83507549c7bcd42cd58c4910b47037f4150ed7778e11b3684f130620969d1", + "size": "101891323" + }, + "aarch64-freebsd": { + "tarball": "https://ziglang.org/download/0.17.0/zig-aarch64-freebsd-0.17.0.tar.xz", + "shasum": "3cf53d07b3587a26727b196a6eb7918704b907d951520daa68e4e1820fc6f48e", + "size": "52860244" + }, + "arm-freebsd": { + "tarball": "https://ziglang.org/download/0.17.0/zig-arm-freebsd-0.17.0.tar.xz", + "shasum": "e0c3ecf21c186a48d3b8e8d0b4459f9dc67ff8024445401506a7e970782da5f8", + "size": "54273908" + }, + "powerpc64le-freebsd": { + "tarball": "https://ziglang.org/download/0.17.0/zig-powerpc64le-freebsd-0.17.0.tar.xz", + "shasum": "94e127c2a4beb5151a8c58e8af4b82dc3649ed95f343ffbbfa381e2afba50234", + "size": "57027652" + }, + "riscv64-freebsd": { + "tarball": "https://ziglang.org/download/0.17.0/zig-riscv64-freebsd-0.17.0.tar.xz", + "shasum": "4ab73eb01a0cb910dfa23d8efc88d38dcdd5ebb2174537cf531738ba520354f1", + "size": "57199160" + }, + "x86_64-freebsd": { + "tarball": "https://ziglang.org/download/0.17.0/zig-x86_64-freebsd-0.17.0.tar.xz", + "shasum": "a314f1cc92d098bd39caf9e5607a0de2a8fd0d00064776cb3fd5b3bee38a67c9", + "size": "57468884" + }, + "aarch64-netbsd": { + "tarball": "https://ziglang.org/download/0.17.0/zig-aarch64-netbsd-0.17.0.tar.xz", + "shasum": "421fefe3910dedc8b8a6ae9a8905ea9200ecb0760499bcf0f56af7a5ba4930b5", + "size": "52769844" + }, + "arm-netbsd": { + "tarball": "https://ziglang.org/download/0.17.0/zig-arm-netbsd-0.17.0.tar.xz", + "shasum": "2537d66f6dbd57438355d100180d09f19640c98895d4052e4e2994a02cac320a", + "size": "55345456" + }, + "riscv64-netbsd": { + "tarball": "https://ziglang.org/download/0.17.0/zig-riscv64-netbsd-0.17.0.tar.xz", + "shasum": "687c92430ab3e7a5329e941e95f0ec4368d8d8ac0a4048f61c2dd714e675ca12", + "size": "57157568" + }, + "x86-netbsd": { + "tarball": "https://ziglang.org/download/0.17.0/zig-x86-netbsd-0.17.0.tar.xz", + "shasum": "2025c508390cc78d9c469675d2a0602f2a975c92ec197af51faf09a565b27ee3", + "size": "60380332" + }, + "x86_64-netbsd": { + "tarball": "https://ziglang.org/download/0.17.0/zig-x86_64-netbsd-0.17.0.tar.xz", + "shasum": "10f71cc89efbafc6e22447f23c44047d53c5d2061c82b1c32efd1ef55ea2d9b6", + "size": "57363300" + }, + "aarch64-openbsd": { + "tarball": "https://ziglang.org/download/0.17.0/zig-aarch64-openbsd-0.17.0.tar.xz", + "shasum": "1cf6c33a0cdd9a58a0b40c7ee86d8de9c190ed7bd8d47ad61687908955ecac10", + "size": "53265892" + }, + "arm-openbsd": { + "tarball": "https://ziglang.org/download/0.17.0/zig-arm-openbsd-0.17.0.tar.xz", + "shasum": "068d5200b027541c2b0a2e16efc3fb367f1fae78f9c3954e57512868c9a0ecc2", + "size": "54024240" + }, + "riscv64-openbsd": { + "tarball": "https://ziglang.org/download/0.17.0/zig-riscv64-openbsd-0.17.0.tar.xz", + "shasum": "4858839a9e4d96fb50d6e4894d10270f5377a087b2929d238b1a12b8293e274a", + "size": "57490512" + }, + "x86_64-openbsd": { + "tarball": "https://ziglang.org/download/0.17.0/zig-x86_64-openbsd-0.17.0.tar.xz", + "shasum": "5e9606fc322ef4c346c199e162d26e4c293358a36ea3ca72e877d42ef71e24be", + "size": "58612444" + } + }, + "0.17.0-dev.1936+5a625d5f3": { + "version": "0.17.0-dev.1936+5a625d5f3", + "docs": "https://ziglang.org/documentation/master/", + "stdDocs": "https://ziglang.org/documentation/master/std/", + "x86_64-macos": { + "tarball": "https://ziglang.org/builds/zig-x86_64-macos-0.17.0-dev.1936+5a625d5f3.tar.xz", + "shasum": "8ab9f0d015abb75c0c9c039f7191711a7a2fc72c984458f553926725794791dd", + "size": "59162280" + }, + "aarch64-macos": { + "tarball": "https://ziglang.org/builds/zig-aarch64-macos-0.17.0-dev.1936+5a625d5f3.tar.xz", + "shasum": "e08d4485c96d2d31a8ce3ae80a58badec202920b675149ad6b0c3b974ec7c005", + "size": "53867184" + }, + "x86_64-linux": { + "tarball": "https://ziglang.org/builds/zig-x86_64-linux-0.17.0-dev.1936+5a625d5f3.tar.xz", + "shasum": "38620c06ca57b175f7dab8f65c8001f9a67b0ff1987c344d4e64ccb72b57174f", + "size": "57180268" + }, + "aarch64-linux": { + "tarball": "https://ziglang.org/builds/zig-aarch64-linux-0.17.0-dev.1936+5a625d5f3.tar.xz", + "shasum": "6c559ff4bca3e84fbbf7b6ad8521ce70bb3e460371b3d8803112353fb8ce70cc", + "size": "52741876" + }, + "x86_64-windows": { + "tarball": "https://ziglang.org/builds/zig-x86_64-windows-0.17.0-dev.1936+5a625d5f3.zip", + "shasum": "e0d62a00e067de41a0a34af2af73694e00692e045ca244748965a7b3729633a1", + "size": "100793891" + }, + "aarch64-windows": { + "tarball": "https://ziglang.org/builds/zig-aarch64-windows-0.17.0-dev.1936+5a625d5f3.zip", + "shasum": "e75f340afee0772fe4daed61d92b999534c8460601175b66fe890703cf752850", + "size": "96526396" + } + }, + "0.17.0-dev.1509+bb296ab9b": { + "version": "0.17.0-dev.1509+bb296ab9b", + "date": "2026-07-29", + "docs": "https://ziglang.org/documentation/master/", + "stdDocs": "https://ziglang.org/documentation/master/std/", + "x86_64-macos": { + "tarball": "https://ziglang.org/builds/zig-x86_64-macos-0.17.0-dev.1509+bb296ab9b.tar.xz", + "shasum": "087aad38fead6c0ba7a52b5db3c405e63708c4765eda643d4144b9e4933d45e5", + "size": "59064872" + }, + "aarch64-macos": { + "tarball": "https://ziglang.org/builds/zig-aarch64-macos-0.17.0-dev.1509+bb296ab9b.tar.xz", + "shasum": "24bd83c1d435b8ab6192f58afcc22f4e5252077a938ffbc35eaa4ca97c5be709", + "size": "53773824" + }, + "x86_64-linux": { + "tarball": "https://ziglang.org/builds/zig-x86_64-linux-0.17.0-dev.1509+bb296ab9b.tar.xz", + "shasum": "48cc865b8b410ec84eaa97e50c2bd7a657871802ce3aaaf04dd1da2294d4b28a", + "size": "57056988" + }, + "aarch64-linux": { + "tarball": "https://ziglang.org/builds/zig-aarch64-linux-0.17.0-dev.1509+bb296ab9b.tar.xz", + "shasum": "7f17e09b675cfe39805c5b551b251151f7750b9df8a168538007890c1c00dc8e", + "size": "52649416" + }, + "x86_64-windows": { + "tarball": "https://ziglang.org/builds/zig-x86_64-windows-0.17.0-dev.1509+bb296ab9b.zip", + "shasum": "a4f537761ca1f5274c9bb0e7da598c6e82205a4ea78f329690a26eade555d7e8", + "size": "100743514" + }, + "aarch64-windows": { + "tarball": "https://ziglang.org/builds/zig-aarch64-windows-0.17.0-dev.1509+bb296ab9b.zip", + "shasum": "1fa7a2b5f5442628287fead0f7451b8cb93ed2ca5dd6c79f8026fc8ca83580d2", + "size": "96467368" + } + }, "master": { "version": "0.16.0-dev.3153+d6f43caad", "date": "2026-04-12", diff --git a/bin/zml-smi/api/client.zig b/bin/zml-smi/api/client.zig index 17e49917..ddec6d2d 100644 --- a/bin/zml-smi/api/client.zig +++ b/bin/zml-smi/api/client.zig @@ -6,10 +6,10 @@ const ProcessDoubleBuffer = @import("zml-smi/double_buffer").DoubleBuffer(std.Ar const Collector = @import("zml-smi/collector").Collector; fn setRemote(device: *DeviceInfo) void { - inline for (@typeInfo(DeviceInfo).@"union".fields) |field| { - if (device.* == @field(smi_info.device_info.Target, field.name)) { - @field(device, field.name).values[0].remote = true; - @field(device, field.name).values[1].remote = true; + inline for (@typeInfo(DeviceInfo).@"union".field_names) |field_name| { + if (device.* == @field(smi_info.device_info.Target, field_name)) { + @field(device, field_name).values[0].remote = true; + @field(device, field_name).values[1].remote = true; } } } @@ -86,10 +86,10 @@ fn pollOnce(poll_arena: *std.heap.ArenaAllocator, gpa: std.mem.Allocator, io: st var device = std.json.parseFromValueLeaky(DeviceInfo, poll_arena.allocator(), item, .{ .ignore_unknown_fields = true }) catch continue; setRemote(&device); - inline for (@typeInfo(DeviceInfo).@"union".fields) |field| { - if (devices[i].* == @field(smi_info.device_info.Target, field.name)) { - @field(devices[i], field.name).back().* = @field(device, field.name).front().*; - @field(devices[i], field.name).swap(); + inline for (@typeInfo(DeviceInfo).@"union".field_names) |field_name| { + if (devices[i].* == @field(smi_info.device_info.Target, field_name)) { + @field(devices[i], field_name).back().* = @field(device, field_name).front().*; + @field(devices[i], field_name).swap(); } } } diff --git a/bin/zml-smi/csv/csv.zig b/bin/zml-smi/csv/csv.zig index a05c5a4f..dbd80dd9 100644 --- a/bin/zml-smi/csv/csv.zig +++ b/bin/zml-smi/csv/csv.zig @@ -3,8 +3,9 @@ const smi_info = @import("zml-smi/info"); const DeviceInfo = smi_info.device_info.DeviceInfo; pub fn write(writer: *std.Io.Writer, devices: []const *DeviceInfo) !void { - inline for (@typeInfo(DeviceInfo).@"union".fields) |tp| { - const tag = @field(smi_info.Target, tp.name); + const info = @typeInfo(DeviceInfo).@"union"; + inline for (info.field_names, info.field_types) |type_name, DeviceType| { + const tag = @field(smi_info.Target, type_name); var header_printed = false; for (devices, 0..) |dev, i| { @@ -12,8 +13,8 @@ pub fn write(writer: *std.Io.Writer, devices: []const *DeviceInfo) !void { tag => |*db| { if (!header_printed) { try writer.writeAll("index,type"); - inline for (@typeInfo(tp.type.Value).@"struct".fields) |f| { - try writer.writeAll("," ++ f.name); + inline for (@typeInfo(DeviceType.Value).@"struct".field_names) |field_name| { + try writer.writeAll("," ++ field_name); } try writer.writeAll("\n"); @@ -22,10 +23,10 @@ pub fn write(writer: *std.Io.Writer, devices: []const *DeviceInfo) !void { const val = db.front().*; - try writer.print("{d},{s}", .{ i, tp.name }); - inline for (@typeInfo(tp.type.Value).@"struct".fields) |f| { + try writer.print("{d},{s}", .{ i, type_name }); + inline for (@typeInfo(DeviceType.Value).@"struct".field_names) |field_name| { try writer.writeAll(","); - try writeValue(writer, @field(val, f.name)); + try writeValue(writer, @field(val, field_name)); } try writer.writeAll("\n"); }, diff --git a/bin/zml-smi/main.zig b/bin/zml-smi/main.zig index 47c861ff..f066dd34 100644 --- a/bin/zml-smi/main.zig +++ b/bin/zml-smi/main.zig @@ -163,9 +163,9 @@ pub fn main(init: std.process.Init) !void { try json.write(&json_writer.interface, collector.device_infos.items, procs.items); try json_writer.flush(); } else if (args.top) { - try tui.run(gpa, io, &state); + try tui.run(gpa, io, init.environ_map, &state); } else { - try static_print.run(arena, io, &state); + try static_print.run(arena, io, init.environ_map, &state); } } diff --git a/bin/zml-smi/platforms/neuron/nrt.zig b/bin/zml-smi/platforms/neuron/nrt.zig index 8fe21a27..cd77b3c0 100644 --- a/bin/zml-smi/platforms/neuron/nrt.zig +++ b/bin/zml-smi/platforms/neuron/nrt.zig @@ -151,11 +151,11 @@ pub fn hbmSize(dev: *c.ndl_device_t) usize { } pub fn deviceType(dev: *c.ndl_device_t) DeviceType { - return @enumFromInt(dev.device_type); + return @fromBackingInt(@intCast(dev.device_type)); } fn resolveFromElf(handle: *anyopaque, io: std.Io, comptime known_sym: [:0]const u8) !PrivateFns { - const fields = std.meta.fields(PrivateFns); + const field_names = comptime std.meta.fieldNames(PrivateFns); const sym_addr = std.c.dlsym(handle, known_sym) orelse return error.SymbolNotFound; @@ -181,7 +181,7 @@ fn resolveFromElf(handle: *anyopaque, io: std.Io, comptime known_sym: [:0]const defer std.posix.munmap(mmap); var result: PrivateFns = undefined; - var remaining: usize = fields.len; + var remaining: usize = field_names.len; const ehdr: *const elf.ElfN.Ehdr = @ptrCast(@alignCast(mmap)); const shdrs: []const elf.ElfN.Shdr = @as([*]const elf.ElfN.Shdr, @ptrCast(@alignCast(mmap[ehdr.shoff..])))[0..ehdr.shnum]; @@ -201,9 +201,9 @@ fn resolveFromElf(handle: *anyopaque, io: std.Io, comptime known_sym: [:0]const const sym_name = std.mem.span(@as([*c]const u8, @ptrCast(strtab[@as(usize, s.name)..]))); - inline for (fields) |field| { - if (std.mem.eql(u8, sym_name, field.name)) { - @field(result, field.name) = @ptrFromInt(elf_base + @as(usize, s.value)); + inline for (field_names) |field_name| { + if (std.mem.eql(u8, sym_name, field_name)) { + @field(result, field_name) = @ptrFromInt(elf_base + @as(usize, s.value)); remaining -= 1; } } diff --git a/bin/zml-smi/platforms/oneapi/monitor.zig b/bin/zml-smi/platforms/oneapi/monitor.zig index 503ae0df..dd5f97a9 100644 --- a/bin/zml-smi/platforms/oneapi/monitor.zig +++ b/bin/zml-smi/platforms/oneapi/monitor.zig @@ -149,7 +149,7 @@ inline fn openDevice(allocator: std.mem.Allocator, io: std.Io, render_idx: usize } pub fn device(self: *const Monitor, handle: Handle) !*const Device { - const idx = @intFromEnum(handle); + const idx = @backingInt(handle); if (idx >= self.devices.len) return error.NotFound; return &self.devices[idx]; } diff --git a/bin/zml-smi/platforms/oneapi/oneapi.zig b/bin/zml-smi/platforms/oneapi/oneapi.zig index 0e89a6a2..2e1e5deb 100644 --- a/bin/zml-smi/platforms/oneapi/oneapi.zig +++ b/bin/zml-smi/platforms/oneapi/oneapi.zig @@ -18,7 +18,7 @@ pub fn init(allocator: std.mem.Allocator, io: std.Io) !OneApi { pub fn handleByIndex(self: *const OneApi, device_id: usize) !Handle { if (device_id >= self.monitor.devices.len) return error.NotFound; - return @enumFromInt(@as(u32, @intCast(device_id))); + return @fromBackingInt(@intCast(@as(u32, @intCast(device_id)))); } pub fn name(self: *const OneApi, allocator: std.mem.Allocator, handle: Handle) ![]const u8 { @@ -111,7 +111,7 @@ pub fn driverVersion(self: *const OneApi, allocator: std.mem.Allocator) ![]const pub fn powerUsage(self: *OneApi, allocator: std.mem.Allocator, handle: Handle) !u64 { const dev = block: { - const idx = @intFromEnum(handle); + const idx = @backingInt(handle); if (idx >= self.monitor.devices.len) return error.NotFound; break :block &self.monitor.devices[idx]; }; @@ -144,7 +144,7 @@ pub fn fanSpeed(self: *OneApi, allocator: std.mem.Allocator, handle: Handle) !u6 pub fn gpuUtil(self: *OneApi, allocator: std.mem.Allocator, handle: Handle) !u64 { const dev = block: { - const idx = @intFromEnum(handle); + const idx = @backingInt(handle); if (idx >= self.monitor.devices.len) return error.NotFound; break :block &self.monitor.devices[idx]; }; @@ -155,7 +155,7 @@ pub fn gpuUtil(self: *OneApi, allocator: std.mem.Allocator, handle: Handle) !u64 }; defer usage.deinit(allocator); - const dev_idx: u16 = @intCast(@intFromEnum(handle)); + const dev_idx: u16 = @intCast(@backingInt(handle)); const current = if (usage.get(dev_idx)) |sample| sample.engine else null; const util = Monitor.processUtil(dev.activity_prev, current) orelse 0; dev.activity_prev = current; @@ -164,7 +164,7 @@ pub fn gpuUtil(self: *OneApi, allocator: std.mem.Allocator, handle: Handle) !u64 pub fn encoderUtil(self: *OneApi, allocator: std.mem.Allocator, handle: Handle) !u64 { const dev = block: { - const idx = @intFromEnum(handle); + const idx = @backingInt(handle); if (idx >= self.monitor.devices.len) return error.NotFound; break :block &self.monitor.devices[idx]; }; @@ -175,7 +175,7 @@ pub fn encoderUtil(self: *OneApi, allocator: std.mem.Allocator, handle: Handle) }; defer usage.deinit(allocator); - const dev_idx: u16 = @intCast(@intFromEnum(handle)); + const dev_idx: u16 = @intCast(@backingInt(handle)); const current = if (usage.get(dev_idx)) |sample| sample.encoder else null; const util = Monitor.processUtil(dev.encoder_prev, current) orelse { dev.encoder_prev = current; @@ -187,7 +187,7 @@ pub fn encoderUtil(self: *OneApi, allocator: std.mem.Allocator, handle: Handle) pub fn decoderUtil(self: *OneApi, allocator: std.mem.Allocator, handle: Handle) !u64 { const dev = block: { - const idx = @intFromEnum(handle); + const idx = @backingInt(handle); if (idx >= self.monitor.devices.len) return error.NotFound; break :block &self.monitor.devices[idx]; }; @@ -198,7 +198,7 @@ pub fn decoderUtil(self: *OneApi, allocator: std.mem.Allocator, handle: Handle) }; defer usage.deinit(allocator); - const dev_idx: u16 = @intCast(@intFromEnum(handle)); + const dev_idx: u16 = @intCast(@backingInt(handle)); const current = if (usage.get(dev_idx)) |sample| sample.decoder else null; const util = Monitor.processUtil(dev.decoder_prev, current) orelse { dev.decoder_prev = current; @@ -219,7 +219,7 @@ pub fn maxClockGraphics(self: *OneApi, allocator: std.mem.Allocator, handle: Han } pub fn memUsed(self: *OneApi, allocator: std.mem.Allocator, handle: Handle) !u64 { - const dev_idx: u16 = @intCast(@intFromEnum(handle)); + const dev_idx: u16 = @intCast(@backingInt(handle)); var usage = Monitor.collectDeviceUsage(allocator, self.io, self.monitor.devices) catch return 0; defer usage.deinit(allocator); diff --git a/bin/zml-smi/prometheus/exposition.zig b/bin/zml-smi/prometheus/exposition.zig index c955226f..54d48cb6 100644 --- a/bin/zml-smi/prometheus/exposition.zig +++ b/bin/zml-smi/prometheus/exposition.zig @@ -48,14 +48,14 @@ pub fn write(writer: *std.Io.Writer, devices: []const *DeviceInfo, host: *const try writer.writeAll("# HELP zml_device_info Device metadata\n"); try writer.writeAll("# TYPE zml_device_info gauge\n"); for (devices, 0..) |dev, i| { - inline for (@typeInfo(DeviceInfo).@"union".fields) |tp| { - const tag = @field(smi_info.device_info.Target, tp.name); + inline for (@typeInfo(DeviceInfo).@"union".field_names) |type_name| { + const tag = @field(smi_info.device_info.Target, type_name); switch (dev.*) { tag => |*db| { const val = db.front().*; - try writer.print("zml_device_info{{device=\"{d}\",type=\"{s}\"", .{ i, tp.name }); + try writer.print("zml_device_info{{device=\"{d}\",type=\"{s}\"", .{ i, type_name }); inline for (.{ .{ "name", "name" }, diff --git a/bin/zml-smi/tui/image_cache.zig b/bin/zml-smi/tui/image_cache.zig index cc841691..1aea4778 100644 --- a/bin/zml-smi/tui/image_cache.zig +++ b/bin/zml-smi/tui/image_cache.zig @@ -19,7 +19,7 @@ pub fn load( key: []const u8, data: []const u8, ) void { - const image = vx.loadImage(allocator, undefined, writer, .{ .mem = data }) catch return; + const image = vx.loadImage(allocator, writer, .{ .mem = data }) catch return; self.map.put(allocator, key, image) catch return; } diff --git a/bin/zml-smi/tui/print.zig b/bin/zml-smi/tui/print.zig index 7338d20e..238534cd 100644 --- a/bin/zml-smi/tui/print.zig +++ b/bin/zml-smi/tui/print.zig @@ -14,11 +14,12 @@ fn silentResize(vx: *vaxis.Vaxis, allocator: std.mem.Allocator, winsize: vaxis.W vx.screen_last = try vaxis.AllocatingScreen.init(allocator, winsize.cols, winsize.rows); } -pub fn run(allocator: std.mem.Allocator, io: std.Io, state: *data.SystemState) !void { - var tty = try vaxis.Tty.init(io); +pub fn run(allocator: std.mem.Allocator, io: std.Io, env_map: *std.process.Environ.Map, state: *data.SystemState) !void { + var tty_buffer: [4096]u8 = undefined; + var tty = try vaxis.Tty.init(io, &tty_buffer); defer tty.deinit(); - var vx = try vaxis.init(allocator, .{}); + var vx = try vaxis.init(io, allocator, env_map, .{}); defer { // Reset terminal modes without clearing screen content. vx.resetModes(tty.writer()) catch {}; @@ -27,12 +28,12 @@ pub fn run(allocator: std.mem.Allocator, io: std.Io, state: *data.SystemState) ! vx.deinit(allocator, &discarding.writer); } - const ws = try vaxis.Tty.getWinsize(tty.fd); + const ws = try tty.getWinsize(); try silentResize(&vx, allocator, ws); { const EventLoop = vaxis.Loop(vxfw.Event); - var loop: EventLoop = .{ .tty = &tty, .vaxis = &vx, .io = io, .queue = .{ .io = io } }; + var loop: EventLoop = .init(io, &tty, &vx); try loop.start(); defer loop.stop(); @@ -41,7 +42,7 @@ pub fn run(allocator: std.mem.Allocator, io: std.Io, state: *data.SystemState) ! const writer = tty.writer(); try writer.writeAll("\x1b7"); // DECSC: save cursor try writer.flush(); - try vx.queryTerminal(writer, io, 1 * std.time.ns_per_s); + try vx.queryTerminal(writer, .fromSeconds(1)); try writer.writeAll("\x1b8"); // DECRC: restore cursor try writer.flush(); } diff --git a/bin/zml-smi/tui/top.zig b/bin/zml-smi/tui/top.zig index 9a5b8624..74b3796b 100644 --- a/bin/zml-smi/tui/top.zig +++ b/bin/zml-smi/tui/top.zig @@ -151,8 +151,9 @@ const Model = struct { } }; -pub fn run(allocator: std.mem.Allocator, io: std.Io, state: *data.SystemState) !void { - var app = try vxfw.App.init(allocator, io); +pub fn run(allocator: std.mem.Allocator, io: std.Io, env_map: *std.process.Environ.Map, state: *data.SystemState) !void { + var tty_buffer: [4096]u8 = undefined; + var app = try vxfw.App.init(io, allocator, env_map, &tty_buffer); defer app.deinit(); var model: Model = .{ diff --git a/bin/zml-smi/utils/dynlib.zig b/bin/zml-smi/utils/dynlib.zig index 730b495d..4a478107 100644 --- a/bin/zml-smi/utils/dynlib.zig +++ b/bin/zml-smi/utils/dynlib.zig @@ -2,8 +2,8 @@ const std = @import("std"); pub fn lookupStruct(dynlib: *std.DynLib, comptime VTable: type) !VTable { var result: VTable = undefined; - inline for (std.meta.fields(VTable)) |field| { - @field(result, field.name) = dynlib.lookup(field.type, field.name) orelse return error.SymbolResolutionFailed; + inline for (comptime std.meta.fieldNames(VTable), comptime std.meta.fieldTypes(VTable)) |field_name, Field| { + @field(result, field_name) = dynlib.lookup(Field, field_name) orelse return error.SymbolResolutionFailed; } return result; diff --git a/bin/zml-smi/utils/sandbox.zig b/bin/zml-smi/utils/sandbox.zig index 1b53c9ea..d4e268bd 100644 --- a/bin/zml-smi/utils/sandbox.zig +++ b/bin/zml-smi/utils/sandbox.zig @@ -11,7 +11,7 @@ const init_array_section = switch (builtin.object_format) { else => "", }; -export const _ linksection(init_array_section) = &struct { +export const _ align(@alignOf(usize)) linksection(init_array_section) = &struct { fn call(argc: c_int, argv: [*c][*:0]u8, envp: [*:null]?[*:0]u8) callconv(.c) void { _ = argc; _ = argv; diff --git a/kernels/common/args.zig b/kernels/common/args.zig index 6d89de34..84d57d49 100644 --- a/kernels/common/args.zig +++ b/kernels/common/args.zig @@ -1,6 +1,4 @@ pub fn NamedArgs(comptime Spec: type, comptime ValueT: type) type { - const in = @typeInfo(Spec).@"struct".fields; - comptime var names: [in.len][]const u8 = undefined; - for (in, 0..) |f, i| names[i] = f.name; - return @Struct(.auto, null, &names, &@splat(ValueT), &@splat(.{})); + const field_names = @typeInfo(Spec).@"struct".field_names; + return @Struct(.auto, null, field_names, &@splat(ValueT), &@splat(.{})); } diff --git a/kernels/common/control_flow.zig b/kernels/common/control_flow.zig index 252184f3..afd79e8f 100644 --- a/kernels/common/control_flow.zig +++ b/kernels/common/control_flow.zig @@ -13,7 +13,7 @@ pub fn tupleArity(comptime T: type, comptime what: []const u8) comptime_int { const info = @typeInfo(T); if (info != .@"struct" or !info.@"struct".is_tuple) @compileError(what ++ " must be a tuple literal like `.{ v1, v2 }`"); - return info.@"struct".fields.len; + return info.@"struct".field_names.len; } pub fn emitScfYield( @@ -27,13 +27,13 @@ pub fn emitScfYield( const info = @typeInfo(@TypeOf(values)); if (info != .@"struct" or !info.@"struct".is_tuple) @compileError(what ++ " expects a tuple literal"); - if (info.@"struct".fields.len != N) + if (info.@"struct".field_names.len != N) @compileError(what ++ ": yield arity must match the scope's declared arity"); var buf: [N]*const mlir.Value = undefined; - inline for (info.@"struct".fields, 0..) |f, i| { - if (f.type != ValueT) + inline for (info.@"struct".field_names, info.@"struct".field_types, 0..) |field_name, Field, i| { + if (Field != ValueT) @compileError(what ++ ": every tuple element must be a Value"); - buf[i] = @field(values, f.name).inner; + buf[i] = @field(values, field_name).inner; } _ = scf.yield(kernel.ctx, &buf, kernel.loc()).appendTo(block); } @@ -151,14 +151,14 @@ pub fn WhileScope(comptime BuilderT: type, comptime ValueT: type, comptime N: us const info = @typeInfo(@TypeOf(forwarded)); if (info != .@"struct" or !info.@"struct".is_tuple) @compileError("WhileScope.yieldBefore: forwarded must be a tuple literal"); - if (info.@"struct".fields.len != M) + if (info.@"struct".field_names.len != M) @compileError("WhileScope.yieldBefore: forwarded arity must match after_types arity"); const k = self.kernel; var buf: [M]*const mlir.Value = undefined; - inline for (info.@"struct".fields, 0..) |f, i| { - if (f.type != ValueT) + inline for (info.@"struct".field_names, info.@"struct".field_types, 0..) |field_name, Field, i| { + if (Field != ValueT) @compileError("WhileScope.yieldBefore: every forwarded element must be a Value"); - buf[i] = @field(forwarded, f.name).inner; + buf[i] = @field(forwarded, field_name).inner; } _ = scf.condition(k.ctx, cond.inner, &buf, k.loc()).appendTo(self.before_block); k.popBlock(); diff --git a/kernels/cuda_tile/builder.zig b/kernels/cuda_tile/builder.zig index d73742a1..6067ed4b 100644 --- a/kernels/cuda_tile/builder.zig +++ b/kernels/cuda_tile/builder.zig @@ -84,8 +84,8 @@ pub const Value = struct { pub fn isFloatElem(self: Value) bool { const et = self.elemType(); - inline for (std.meta.fields(mlir.FloatTypes)) |f| { - if (et.isA(mlir.FloatType(@field(mlir.FloatTypes, f.name))) != null) return true; + inline for (comptime std.meta.fieldNames(mlir.FloatTypes)) |f_name| { + if (et.isA(mlir.FloatType(@field(mlir.FloatTypes, f_name))) != null) return true; } return false; } @@ -509,13 +509,13 @@ pub const Builder = struct { pub fn declareArgsOpts(self: *Builder, spec: anytype, opts: Opts) !dsl.NamedArgs(@TypeOf(spec), Value) { const Spec = @TypeOf(spec); - const fields = @typeInfo(Spec).@"struct".fields; + const field_names = @typeInfo(Spec).@"struct".field_names; - var arg_specs: [fields.len]ArgSpec = undefined; - inline for (fields, 0..) |f, i| { - const raw = @field(spec, f.name); + var arg_specs: [field_names.len]ArgSpec = undefined; + inline for (0.., field_names) |i, field_name| { + const raw = @field(spec, field_name); const kind: ArgSpec.Kind = if (@TypeOf(raw) == ArgSpec.Kind) raw else blk: { - const variant = @typeInfo(@TypeOf(raw)).@"struct".fields[0].name; + const variant = @typeInfo(@TypeOf(raw)).@"struct".field_names[0]; const tag = @field(std.meta.Tag(ArgSpec.Kind), variant); const inner = @field(raw, variant); break :blk switch (tag) { @@ -526,14 +526,14 @@ pub const Builder = struct { } }, }; }; - arg_specs[i] = .{ .name = f.name, .kind = kind }; + arg_specs[i] = .{ .name = field_name, .kind = kind }; } try self.declareArgsLowOpts(&arg_specs, opts); var named: dsl.NamedArgs(Spec, Value) = undefined; - inline for (fields, 0..) |f, i| { - @field(named, f.name) = self.arg(i); + inline for (0.., field_names) |i, field_name| { + @field(named, field_name) = self.arg(i); } return named; } @@ -643,12 +643,12 @@ pub const Builder = struct { const info = @typeInfo(T); if (info != .@"struct" or !info.@"struct".is_tuple) @compileError("Builder.yield expects a tuple literal like `.{ v1, v2 }`"); - const n = info.@"struct".fields.len; + const n = info.@"struct".field_names.len; const out = self.arena.allocator().alloc(Value, n) catch @panic("Builder.yield OOM"); - inline for (info.@"struct".fields, 0..) |f, i| { - if (f.type != Value) - @compileError("Builder.yield: every tuple element must be a Value; got " ++ @typeName(f.type)); - out[i] = @field(values, f.name); + inline for (info.@"struct".field_names, 0..) |f, i| { + if (@FieldType(T, f) != Value) + @compileError("Builder.yield: every tuple element must be a Value; got " ++ @typeName(@FieldType(T, f))); + out[i] = @field(values, f); } return out; } @@ -1633,7 +1633,7 @@ pub const Builder = struct { inits: anytype, ) ForScope(tupleArity(@TypeOf(inits), "openFor: inits")) { const N = comptime tupleArity(@TypeOf(inits), "openFor: inits"); - const fields = @typeInfo(@TypeOf(inits)).@"struct".fields; + const fields = @typeInfo(@TypeOf(inits)).@"struct".field_names; // Literals take the type of the first bound that is a Value; all // three must agree (`AllTypesMatch` on the op). @@ -1651,8 +1651,8 @@ pub const Builder = struct { block_locs[0] = self.loc(); var inits_inner: [N]*const mlir.Value = undefined; inline for (fields, 0..) |f, i| { - const raw = @field(inits, f.name); - const v: Value = if (f.type == Value) raw else self.lift(raw); + const raw = @field(inits, f); + const v: Value = if (@FieldType(@TypeOf(inits), f) == Value) raw else self.lift(raw); block_types[i + 1] = v.type_(); block_locs[i + 1] = self.loc(); inits_inner[i] = v.inner; @@ -1692,13 +1692,13 @@ pub const Builder = struct { result_types: anytype, ) IfScope(tupleArity(@TypeOf(result_types), "openIfElse: result_types")) { const N = comptime tupleArity(@TypeOf(result_types), "openIfElse: result_types"); - const fields = @typeInfo(@TypeOf(result_types)).@"struct".fields; + const fields = @typeInfo(@TypeOf(result_types)).@"struct".field_names; var types: [N]*const mlir.Type = undefined; inline for (fields, 0..) |f, i| { - if (f.type != *const mlir.Type) + if (@FieldType(@TypeOf(result_types), f) != *const mlir.Type) @compileError("openIfElse: every result_type must be *const mlir.Type (use b.scalarTy/tileTy)"); - types[i] = @field(result_types, f.name); + types[i] = @field(result_types, f); } const then_block = mlir.Block.init(&.{}, &.{}); @@ -1718,14 +1718,14 @@ pub const Builder = struct { /// inside an `if`, and close the body with `scope.yield`. pub fn openLoop(self: *Builder, inits: anytype) LoopScope(tupleArity(@TypeOf(inits), "openLoop: inits")) { const N = comptime tupleArity(@TypeOf(inits), "openLoop: inits"); - const fields = @typeInfo(@TypeOf(inits)).@"struct".fields; + const fields = @typeInfo(@TypeOf(inits)).@"struct".field_names; var block_types: [N]*const mlir.Type = undefined; var block_locs: [N]*const mlir.Location = undefined; var inits_inner: [N]*const mlir.Value = undefined; inline for (fields, 0..) |f, i| { - const raw = @field(inits, f.name); - const v: Value = if (f.type == Value) raw else self.lift(raw); + const raw = @field(inits, f); + const v: Value = if (@FieldType(@TypeOf(inits), f) == Value) raw else self.lift(raw); block_types[i] = v.type_(); block_locs[i] = self.loc(); inits_inner[i] = v.inner; @@ -1769,7 +1769,7 @@ pub const Builder = struct { try al.writer.print("{f}", .{self.module.operation()}); - return try self.allocator.dupeZ(u8, al.written()); + return try self.allocator.dupeSentinel(u8, al.written(), 0); } }; @@ -1799,12 +1799,12 @@ test "empty entry round-trips" { const ir = try b.finish(&.{}); defer std.testing.allocator.free(ir); - try std.testing.expect(std.mem.indexOf(u8, ir, "cuda_tile.module @empty") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "entry @empty(") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "assume") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "div_by<16>") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "cuda_tile.entry") == null); - try std.testing.expect(std.mem.indexOf(u8, ir, "return") != null); + try std.testing.expect(std.mem.find(u8, ir, "cuda_tile.module @empty") != null); + try std.testing.expect(std.mem.find(u8, ir, "entry @empty(") != null); + try std.testing.expect(std.mem.find(u8, ir, "assume") != null); + try std.testing.expect(std.mem.find(u8, ir, "div_by<16>") != null); + try std.testing.expect(std.mem.find(u8, ir, "cuda_tile.entry") == null); + try std.testing.expect(std.mem.find(u8, ir, "return") != null); try expectRoundTrip(ctx, ir); } @@ -1827,14 +1827,14 @@ test "add_one over pointer tiles matches the XLA milestone kernel" { const ir = try b.finish(&.{}); defer std.testing.allocator.free(ir); - try std.testing.expect(std.mem.indexOf(u8, ir, "iota : tile<128xi32>") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "reshape") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "broadcast") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "offset") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "load_ptr_tko weak") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "addf") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "store_ptr_tko weak") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "token = ") != null); + try std.testing.expect(std.mem.find(u8, ir, "iota : tile<128xi32>") != null); + try std.testing.expect(std.mem.find(u8, ir, "reshape") != null); + try std.testing.expect(std.mem.find(u8, ir, "broadcast") != null); + try std.testing.expect(std.mem.find(u8, ir, "offset") != null); + try std.testing.expect(std.mem.find(u8, ir, "load_ptr_tko weak") != null); + try std.testing.expect(std.mem.find(u8, ir, "addf") != null); + try std.testing.expect(std.mem.find(u8, ir, "store_ptr_tko weak") != null); + try std.testing.expect(std.mem.find(u8, ir, "token = ") != null); try expectRoundTrip(ctx, ir); } @@ -1866,13 +1866,13 @@ test "vector_add over partition views" { const ir = try b.finish(&.{}); defer std.testing.allocator.free(ir); - try std.testing.expect(std.mem.indexOf(u8, ir, "optimization_hints=") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "make_tensor_view") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "partition_view") != null or std.mem.indexOf(u8, ir, "addf") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "store_view_tko weak") != null); + try std.testing.expect(std.mem.find(u8, ir, "optimization_hints=") != null); + try std.testing.expect(std.mem.find(u8, ir, "make_tensor_view") != null); + try std.testing.expect(std.mem.find(u8, ir, "partition_view") != null or std.mem.find(u8, ir, "addf") != null); + try std.testing.expect(std.mem.find(u8, ir, "store_view_tko weak") != null); try expectRoundTrip(ctx, ir); } @@ -1907,10 +1907,10 @@ test "gemm with a for loop and mmaf" { const ir = try b.finish(&.{}); defer std.testing.allocator.free(ir); - try std.testing.expect(std.mem.indexOf(u8, ir, "for ") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "iter_values") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "mmaf") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "continue ") != null); + try std.testing.expect(std.mem.find(u8, ir, "for ") != null); + try std.testing.expect(std.mem.find(u8, ir, "iter_values") != null); + try std.testing.expect(std.mem.find(u8, ir, "mmaf") != null); + try std.testing.expect(std.mem.find(u8, ir, "continue ") != null); try expectRoundTrip(ctx, ir); } @@ -1997,14 +1997,14 @@ test "if, if-else, loop with break, reduce, scan, cast, select" { const ir = try b.finish(&.{}); defer std.testing.allocator.free(ir); - try std.testing.expect(std.mem.indexOf(u8, ir, "reduce ") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "scan ") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "ftoi") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "itof") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "select") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "loop ") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "break ") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "yield") != null); + try std.testing.expect(std.mem.find(u8, ir, "reduce ") != null); + try std.testing.expect(std.mem.find(u8, ir, "scan ") != null); + try std.testing.expect(std.mem.find(u8, ir, "ftoi") != null); + try std.testing.expect(std.mem.find(u8, ir, "itof") != null); + try std.testing.expect(std.mem.find(u8, ir, "select") != null); + try std.testing.expect(std.mem.find(u8, ir, "loop ") != null); + try std.testing.expect(std.mem.find(u8, ir, "break ") != null); + try std.testing.expect(std.mem.find(u8, ir, "yield") != null); try expectRoundTrip(ctx, ir); } @@ -2055,20 +2055,20 @@ test "atomics, print, globals, alloca, dynamic views, strided view, tokens" { const ir = try b.finish(&.{}); defer std.testing.allocator.free(ir); - try std.testing.expect(std.mem.indexOf(u8, ir, "global @lut") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "get_global @lut") != null); - try std.testing.expect(std.mem.indexOf(u8, ir, "tensor_view") != null); + try std.testing.expect(std.mem.find(u8, ir, "rounding") != null); try expectRoundTrip(ctx, ir); } diff --git a/kernels/cuda_tile/control_flow.zig b/kernels/cuda_tile/control_flow.zig index 2f971f1d..f51e8571 100644 --- a/kernels/cuda_tile/control_flow.zig +++ b/kernels/cuda_tile/control_flow.zig @@ -13,13 +13,13 @@ fn collect(comptime ValueT: type, comptime N: usize, values: anytype, comptime w const info = @typeInfo(@TypeOf(values)); if (info != .@"struct" or !info.@"struct".is_tuple) @compileError(what ++ " expects a tuple literal"); - if (info.@"struct".fields.len != N) + if (info.@"struct".field_names.len != N) @compileError(what ++ ": arity must match the scope's declared arity"); var buf: [N]*const mlir.Value = undefined; - inline for (info.@"struct".fields, 0..) |f, i| { - if (f.type != ValueT) + inline for (info.@"struct".field_names, 0..) |f, i| { + if (@FieldType(@TypeOf(values), f) != ValueT) @compileError(what ++ ": every tuple element must be a Value"); - buf[i] = @field(values, f.name).inner; + buf[i] = @field(values, f).inner; } return buf; } diff --git a/kernels/cuda_tile/dtype.zig b/kernels/cuda_tile/dtype.zig index 4552e662..a9193839 100644 --- a/kernels/cuda_tile/dtype.zig +++ b/kernels/cuda_tile/dtype.zig @@ -73,8 +73,8 @@ pub fn intBitwidth(dt: DType) u32 { } pub fn mlirElemToDType(ctx: *mlir.Context, elem: *const mlir.Type) DType { - inline for (std.meta.fields(DType)) |f| { - const dt = @field(DType, f.name); + inline for (comptime std.meta.fieldNames(DType)) |f_name| { + const dt = @field(DType, f_name); if (elem.eql(dt.toMlir(ctx))) return dt; } @panic("element type not a recognized CUDA Tile IR DType"); diff --git a/kernels/cute/builder.zig b/kernels/cute/builder.zig index d012b222..286b92aa 100644 --- a/kernels/cute/builder.zig +++ b/kernels/cute/builder.zig @@ -98,8 +98,8 @@ pub const Value = struct { pub fn isFloat(self: Value) bool { const t = self.type_(); - inline for (std.meta.fields(mlir.FloatTypes)) |f| { - if (t.isA(mlir.FloatType(@field(mlir.FloatTypes, f.name))) != null) return true; + inline for (@typeInfo(mlir.FloatTypes).@"enum".field_names) |f| { + if (t.isA(mlir.FloatType(@field(mlir.FloatTypes, f))) != null) return true; } return false; } @@ -670,14 +670,14 @@ pub const Builder = struct { /// yields a `Tensor`, `.{ .p = .{ .ptr = .f32 } }` a pointer `Value`. pub fn declareArgs(self: *Builder, spec: anytype) FinishError!ArgsOf(@TypeOf(spec)) { const Spec = @TypeOf(spec); - const fields = @typeInfo(Spec).@"struct".fields; + const fields = @typeInfo(Spec).@"struct".field_names; const arg_specs = try self.arena.allocator().alloc(ArgSpec, fields.len); inline for (fields, 0..) |f, i| { - const raw = @field(spec, f.name); - const variant = @typeInfo(@TypeOf(raw)).@"struct".fields[0].name; + const raw = @field(spec, f); + const variant = @typeInfo(@TypeOf(raw)).@"struct".field_names[0]; const inner = @field(raw, variant); - arg_specs[i] = .{ .name = f.name, .kind = switch (@field(std.meta.Tag(ArgSpec.Kind), variant)) { + arg_specs[i] = .{ .name = f, .kind = switch (@field(std.meta.Tag(ArgSpec.Kind), variant)) { .ptr => .{ .ptr = inner }, .tensor => .{ .tensor = .{ .dtype = inner.dtype, @@ -699,7 +699,7 @@ pub const Builder = struct { var named: ArgsOf(Spec) = undefined; inline for (fields, 0..) |f, i| { - @field(named, f.name) = switch (@FieldType(ArgsOf(Spec), f.name)) { + @field(named, f) = switch (@FieldType(ArgsOf(Spec), f)) { Tensor => self.tensors[i].?, else => self.arg(i), }; @@ -708,12 +708,12 @@ pub const Builder = struct { } fn ArgsOf(comptime Spec: type) type { - const in = @typeInfo(Spec).@"struct".fields; + const in = @typeInfo(Spec).@"struct".field_names; comptime var names: [in.len][]const u8 = undefined; comptime var types: [in.len]type = undefined; inline for (in, 0..) |f, i| { - names[i] = f.name; - types[i] = if (@hasField(f.type, "tensor")) Tensor else Value; + names[i] = f; + types[i] = if (@hasField(@FieldType(Spec, f), "tensor")) Tensor else Value; } return @Struct(.auto, null, &names, &types, &@splat(.{})); } @@ -998,7 +998,7 @@ pub const Builder = struct { // `cute.make_composed_layout`, or `llvm.load`/`llvm.store` printing // their alignment as a `` property). try printed.writer.print("{f}", .{self.module.operation().fmt(.{ .print_generic_op_form = true })}); - return try self.allocator.dupeZ(u8, printed.written()); + return try self.allocator.dupeSentinel(u8, printed.written(), 0); } // ==================== types ==================== @@ -1097,9 +1097,9 @@ pub const Builder = struct { .comptime_int, .int => writer.print("{d}", .{value}) catch @panic("OOM"), .@"struct" => |info| { writer.writeByte('(') catch @panic("OOM"); - inline for (info.fields, 0..) |field, i| { + inline for (info.field_names, 0..) |field, i| { if (i != 0) writer.writeByte(',') catch @panic("OOM"); - self.writeAlgebra(writer, @field(value, field.name)); + self.writeAlgebra(writer, @field(value, field)); } writer.writeByte(')') catch @panic("OOM"); }, @@ -1120,10 +1120,10 @@ pub const Builder = struct { pub fn basis(self: *Builder, numerator: i64, denominator: i64, modes: anytype) ScaledBasis { _ = self; if (denominator <= 0) @panic("CuTe scaled-basis denominator must be positive"); - const fields = @typeInfo(@TypeOf(modes)).@"struct".fields; + const fields = @typeInfo(@TypeOf(modes)).@"struct".field_names; if (fields.len == 0 or fields.len > MAX_RANK) @panic("CuTe scaled basis needs 1..MAX_RANK modes"); var result: ScaledBasis = .{ .numerator = numerator, .denominator = denominator, .mode_count = fields.len }; - inline for (fields, 0..) |field, i| result.modes[i] = @intCast(@field(modes, field.name)); + inline for (fields, 0..) |field, i| result.modes[i] = @intCast(@field(modes, field)); return result; } @@ -1312,13 +1312,13 @@ pub const Builder = struct { switch (@typeInfo(T)) { .comptime_int, .int => writer.print("{d}", .{coord}) catch @panic("OOM"), .@"struct" => |info| { - if (info.fields.len == 0) @compileError("makeCoord: empty tuple"); - if (info.fields.len > 1) writer.writeByte('(') catch @panic("OOM"); - inline for (info.fields, 0..) |field, i| { + if (info.field_names.len == 0) @compileError("makeCoord: empty tuple"); + if (info.field_names.len > 1) writer.writeByte('(') catch @panic("OOM"); + inline for (info.field_names, 0..) |field, i| { if (i != 0) writer.writeByte(',') catch @panic("OOM"); - self.writeCoord(writer, dyn, @field(coord, field.name)); + self.writeCoord(writer, dyn, @field(coord, field)); } - if (info.fields.len > 1) writer.writeByte(')') catch @panic("OOM"); + if (info.field_names.len > 1) writer.writeByte(')') catch @panic("OOM"); }, else => @compileError("makeCoord: unsupported coordinate leaf " ++ @typeName(T)), } @@ -2973,8 +2973,8 @@ pub const Builder = struct { pub fn openIfElse(self: *Builder, cond: Value, result_types: anytype) IfScope(tupleArity(@TypeOf(result_types), "openIfElse: result_types")) { const N = comptime tupleArity(@TypeOf(result_types), "openIfElse: result_types"); var types: [N]*const mlir.Type = undefined; - inline for (@typeInfo(@TypeOf(result_types)).@"struct".fields, 0..) |f, i| { - types[i] = @field(result_types, f.name); + inline for (@typeInfo(@TypeOf(result_types)).@"struct".field_names, 0..) |f, i| { + types[i] = @field(result_types, f); } const then_block = mlir.Block.init(&.{}, &.{}); const else_block = mlir.Block.init(&.{}, &.{}); @@ -2994,8 +2994,8 @@ pub const Builder = struct { block_types[0] = lb.type_(); block_locs[0] = self.loc(); var inits_inner: [N]*const mlir.Value = undefined; - inline for (@typeInfo(@TypeOf(inits)).@"struct".fields, 0..) |f, i| { - const v = self.lift(@field(inits, f.name)); + inline for (@typeInfo(@TypeOf(inits)).@"struct".field_names, 0..) |f, i| { + const v = self.lift(@field(inits, f)); block_types[i + 1] = v.type_(); block_locs[i + 1] = self.loc(); inits_inner[i] = v.inner; @@ -3034,8 +3034,8 @@ pub const Builder = struct { var init_types: [N]*const mlir.Type = undefined; var init_locs: [N]*const mlir.Location = undefined; var inits_inner: [N]*const mlir.Value = undefined; - inline for (@typeInfo(@TypeOf(inits)).@"struct".fields, 0..) |f, i| { - const v = self.lift(@field(inits, f.name)); + inline for (@typeInfo(@TypeOf(inits)).@"struct".field_names, 0..) |f, i| { + const v = self.lift(@field(inits, f)); init_types[i] = v.type_(); init_locs[i] = self.loc(); inits_inner[i] = v.inner; @@ -3043,8 +3043,8 @@ pub const Builder = struct { var result_types: [M]*const mlir.Type = undefined; var result_locs: [M]*const mlir.Location = undefined; - inline for (@typeInfo(@TypeOf(after_types)).@"struct".fields, 0..) |f, i| { - result_types[i] = @field(after_types, f.name); + inline for (@typeInfo(@TypeOf(after_types)).@"struct".field_names, 0..) |f, i| { + result_types[i] = @field(after_types, f); result_locs[i] = self.loc(); } diff --git a/kernels/cute/dtype.zig b/kernels/cute/dtype.zig index 6dc9cc14..ae98cb08 100644 --- a/kernels/cute/dtype.zig +++ b/kernels/cute/dtype.zig @@ -55,8 +55,8 @@ pub fn dtypeBitwidth(dt: DType) usize { } pub fn mlirToDType(ctx: *mlir.Context, t: *const mlir.Type) DType { - inline for (std.meta.fields(DType)) |f| { - const dt = @field(DType, f.name); + inline for (@typeInfo(DType).@"enum".field_names) |f| { + const dt = @field(DType, f); if (t.eql(dt.toMlir(ctx))) return dt; } std.debug.panic("type {f} is not a CuTe DType", .{t}); diff --git a/kernels/fly/builder.zig b/kernels/fly/builder.zig index c7c087dc..ed3b18f9 100644 --- a/kernels/fly/builder.zig +++ b/kernels/fly/builder.zig @@ -727,22 +727,22 @@ pub const Builder = struct { /// `.{ .tensor = .{ .dtype = ..., .dims = &.{ ... } } }`. pub fn declareArgs(self: *Builder, spec: anytype) !dsl.NamedArgs(@TypeOf(spec), Value) { const Spec = @TypeOf(spec); - const fields = @typeInfo(Spec).@"struct".fields; + const fields = @typeInfo(Spec).@"struct".field_names; var specs: [fields.len]ArgSpec = undefined; inline for (fields, 0..) |f, i| { - const raw = @field(spec, f.name); - const variant = @typeInfo(@TypeOf(raw)).@"struct".fields[0].name; + const raw = @field(spec, f); + const variant = @typeInfo(@TypeOf(raw)).@"struct".field_names[0]; const inner = @field(raw, variant); specs[i] = if (comptime std.mem.eql(u8, variant, "ptr")) - .{ .name = f.name, .dtype = inner } + .{ .name = f, .dtype = inner } else if (comptime std.mem.eql(u8, variant, "tensor")) - .{ .name = f.name, .dtype = inner.dtype, .dims = inner.dims, .space = if (@hasField(@TypeOf(inner), "space")) inner.space else .global } + .{ .name = f, .dtype = inner.dtype, .dims = inner.dims, .space = if (@hasField(@TypeOf(inner), "space")) inner.space else .global } else - @compileError("fly.declareArgs: argument `" ++ f.name ++ "` must be `.{ .ptr = dtype }` or `.{ .tensor = .{ .dtype, .dims } }`"); + @compileError("fly.declareArgs: argument `" ++ f ++ "` must be `.{ .ptr = dtype }` or `.{ .tensor = .{ .dtype, .dims } }`"); } try self.declareArgsLow(&specs); var named: dsl.NamedArgs(Spec, Value) = undefined; - inline for (fields, 0..) |f, i| @field(named, f.name) = self.arg(i); + inline for (fields, 0..) |f, i| @field(named, f) = self.arg(i); return named; } @@ -960,8 +960,8 @@ pub const Builder = struct { .comptime_int, .int => return .static(@intCast(v)), .@"struct" => |s| { if (!s.is_tuple) @compileError("fly.intTuple: expected an integer, null, Value, IntTuple or tuple, got " ++ @typeName(T)); - const elems = self.alloc(IntTuple, s.fields.len); - inline for (s.fields, 0..) |f, i| elems[i] = self.intTupleSpec(operands, @field(v, f.name)); + const elems = self.alloc(IntTuple, s.field_names.len); + inline for (s.field_names, 0..) |f, i| elems[i] = self.intTupleSpec(operands, @field(v, f)); return .{ .tup = elems }; }, else => @compileError("fly.intTuple: expected an integer, null, Value, IntTuple or tuple, got " ++ @typeName(T)), @@ -1335,7 +1335,7 @@ pub const Builder = struct { inits: anytype, ) ForScope(tupleArity(@TypeOf(inits), "openFor: inits")) { const N = comptime tupleArity(@TypeOf(inits), "openFor: inits"); - const fields = @typeInfo(@TypeOf(inits)).@"struct".fields; + const fields = @typeInfo(@TypeOf(inits)).@"struct".field_names; const lb_v: Value = if (@TypeOf(lower) == Value) lower else self.constIndex(lower); const ub_v: Value = if (@TypeOf(upper) == Value) upper else self.constLike(upper, lb_v); @@ -1347,8 +1347,8 @@ pub const Builder = struct { block_locs[0] = self.loc(); var inits_inner: [N]*const mlir.Value = undefined; inline for (fields, 0..) |f, i| { - if (f.type != Value) @compileError("openFor: every init must be a Value"); - const v: Value = @field(inits, f.name); + if (@TypeOf(@field(inits, f)) != Value) @compileError("openFor: every init must be a Value"); + const v: Value = @field(inits, f); block_types[i + 1] = v.type_(); block_locs[i + 1] = self.loc(); inits_inner[i] = v.inner; @@ -1391,11 +1391,11 @@ pub const Builder = struct { pub fn openIfElse(self: *Builder, cond: Value, result_types: anytype) IfScope(tupleArity(@TypeOf(result_types), "openIfElse: result_types")) { const N = comptime tupleArity(@TypeOf(result_types), "openIfElse: result_types"); - const fields = @typeInfo(@TypeOf(result_types)).@"struct".fields; + const fields = @typeInfo(@TypeOf(result_types)).@"struct".field_names; var types: [N]*const mlir.Type = undefined; inline for (fields, 0..) |f, i| { - if (f.type != *const mlir.Type) @compileError("openIfElse: every result_type must be *const mlir.Type"); - types[i] = @field(result_types, f.name); + if (@TypeOf(@field(result_types, f)) != *const mlir.Type) @compileError("openIfElse: every result_type must be *const mlir.Type"); + types[i] = @field(result_types, f); } const then_block = mlir.Block.init(&.{}, &.{}); const else_block = mlir.Block.init(&.{}, &.{}); @@ -1413,16 +1413,16 @@ pub const Builder = struct { ) { const N = comptime tupleArity(@TypeOf(inits), "openWhile: inits"); const M = comptime tupleArity(@TypeOf(after_types), "openWhile: after_types"); - const init_fields = @typeInfo(@TypeOf(inits)).@"struct".fields; - const type_fields = @typeInfo(@TypeOf(after_types)).@"struct".fields; + const init_fields = @typeInfo(@TypeOf(inits)).@"struct".field_names; + const type_fields = @typeInfo(@TypeOf(after_types)).@"struct".field_names; var before_types: [N]*const mlir.Type = undefined; var before_locs: [N]*const mlir.Location = undefined; var inits_inner: [N]*const mlir.Value = undefined; inline for (init_fields, 0..) |f, i| { - if (f.type != Value) + if (@TypeOf(@field(inits, f)) != Value) @compileError("openWhile: every init must be a Value"); - const v: Value = @field(inits, f.name); + const v: Value = @field(inits, f); before_types[i] = v.type_(); before_locs[i] = self.loc(); inits_inner[i] = v.inner; @@ -1432,9 +1432,9 @@ pub const Builder = struct { var after_tys: [M]*const mlir.Type = undefined; var after_locs: [M]*const mlir.Location = undefined; inline for (type_fields, 0..) |f, i| { - if (f.type != *const mlir.Type) + if (@TypeOf(@field(after_types, f)) != *const mlir.Type) @compileError("openWhile: every after_type must be *const mlir.Type"); - after_tys[i] = @field(after_types, f.name); + after_tys[i] = @field(after_types, f); after_locs[i] = self.loc(); } const after_block = mlir.Block.init(&after_tys, &after_locs); @@ -1468,7 +1468,7 @@ pub const Builder = struct { var al: std.Io.Writer.Allocating = .init(self.allocator); defer al.deinit(); try al.writer.print("{f}", .{self.module.operation().fmt(.{ .debug_info = false })}); - return try self.allocator.dupeZ(u8, al.written()); + return try self.allocator.dupeSentinel(u8, al.written(), 0); } }; @@ -1752,8 +1752,7 @@ test "tiledMma builds, verifies and re-parses" { test "MmaFlavor.atomThreads matches the dialect" { const ctx = try testContext(); defer ctx.deinit(); - inline for (std.meta.fields(MmaFlavor)) |field| { - const flavor: MmaFlavor = @enumFromInt(field.value); + inline for (comptime std.enums.values(MmaFlavor)) |flavor| { const atom = try fly.types.MmaAtomType.get(ctx, .{ .mmaOp = flavor.atomType(ctx) }); // `mma_atom.thr_layout` is the wavefront an atom occupies; the launch // geometry is derived from it, so a wrong table silently corrupts C. diff --git a/kernels/fly/dtype.zig b/kernels/fly/dtype.zig index 6962a898..ecc9f070 100644 --- a/kernels/fly/dtype.zig +++ b/kernels/fly/dtype.zig @@ -65,8 +65,7 @@ pub const DType = enum { /// Inverse of `toMlir`. pub fn fromMlir(ctx: *mlir.Context, ty: *const mlir.Type) ?DType { - inline for (std.meta.fields(DType)) |f| { - const dt: DType = @enumFromInt(f.value); + inline for (comptime std.enums.values(DType)) |dt| { if (ty.eql(dt.toMlir(ctx))) return dt; } return null; @@ -77,8 +76,7 @@ test "dtype types round-trip" { defer registry.deinit(); const ctx = try mlir.Context.init(.{ .registry = registry, .threading = false }); defer ctx.deinit(); - inline for (std.meta.fields(DType)) |f| { - const dt: DType = @enumFromInt(f.value); + inline for (comptime std.enums.values(DType)) |dt| { try std.testing.expectEqual(dt, fromMlir(ctx, dt.toMlir(ctx)).?); } try std.testing.expectEqual(DType.i8, DType.i1.storageElem()); diff --git a/kernels/fly/layout.zig b/kernels/fly/layout.zig index 85495ed4..e70e0e00 100644 --- a/kernels/fly/layout.zig +++ b/kernels/fly/layout.zig @@ -189,8 +189,8 @@ fn itImpl(comptime v: anytype) IntTuple { .comptime_int, .int => return IntTuple.static(v), .@"struct" => |s| { if (!s.is_tuple) @compileError("fly.it: expected an integer, null, IntTuple or tuple, got " ++ @typeName(T)); - var elems: [s.fields.len]IntTuple = undefined; - for (s.fields, 0..) |f, i| elems[i] = itImpl(@field(v, f.name)); + var elems: [s.field_names.len]IntTuple = undefined; + for (s.field_names, 0..) |f, i| elems[i] = itImpl(@field(v, f)); const frozen = elems; return .{ .tup = &frozen }; }, @@ -413,8 +413,8 @@ fn tileImpl(comptime v: anytype) Tile { .comptime_int, .int => return .{ .leaf = .{ .s = v } }, .@"struct" => |s| { if (!s.is_tuple) @compileError("fly.tile: expected an integer, null, Layout, Tile or tuple, got " ++ @typeName(T)); - var elems: [s.fields.len]Tile = undefined; - for (s.fields, 0..) |f, i| elems[i] = tileImpl(@field(v, f.name)); + var elems: [s.field_names.len]Tile = undefined; + for (s.field_names, 0..) |f, i| elems[i] = tileImpl(@field(v, f)); const frozen = elems; return .{ .modes = &frozen }; }, diff --git a/kernels/mosaic_tpu/builder.zig b/kernels/mosaic_tpu/builder.zig index 52307bca..d88fd6e5 100644 --- a/kernels/mosaic_tpu/builder.zig +++ b/kernels/mosaic_tpu/builder.zig @@ -106,8 +106,8 @@ pub const Value = struct { /// True if the element type is a floating-point type (f16/bf16/f32/f64/fp8/…). pub fn isFloatElem(self: Value) bool { const et = self.elemType(); - inline for (std.meta.fields(mlir.FloatTypes)) |f| { - if (et.isA(mlir.FloatType(@field(mlir.FloatTypes, f.name))) != null) return true; + inline for (comptime std.meta.fieldNames(mlir.FloatTypes)) |field_name| { + if (et.isA(mlir.FloatType(@field(mlir.FloatTypes, field_name))) != null) return true; } return false; } @@ -603,13 +603,13 @@ pub const Builder = struct { opts: Opts, ) !dsl.NamedArgs(@TypeOf(spec), Value) { const Spec = @TypeOf(spec); - const fields = @typeInfo(Spec).@"struct".fields; + const field_names = @typeInfo(Spec).@"struct".field_names; - var arg_specs: [fields.len]ArgSpec = undefined; - inline for (fields, 0..) |f, i| { - const raw = @field(spec, f.name); + var arg_specs: [field_names.len]ArgSpec = undefined; + inline for (field_names, 0..) |field_name, i| { + const raw = @field(spec, field_name); const kind: ArgSpec.Kind = if (@TypeOf(raw) == ArgSpec.Kind) raw else blk: { - const variant = @typeInfo(@TypeOf(raw)).@"struct".fields[0].name; + const variant = @typeInfo(@TypeOf(raw)).@"struct".field_names[0]; const tag = @field(std.meta.Tag(ArgSpec.Kind), variant); const inner = @field(raw, variant); break :blk switch (tag) { @@ -632,14 +632,14 @@ pub const Builder = struct { .sem => .{ .sem = inner }, }; }; - arg_specs[i] = .{ .name = f.name, .kind = kind }; + arg_specs[i] = .{ .name = field_name, .kind = kind }; } try self.declareArgsLowOpts(&arg_specs, result_types, opts); var named: dsl.NamedArgs(Spec, Value) = undefined; - inline for (fields, 0..) |f, i| { - @field(named, f.name) = self.arg(i); + inline for (field_names, 0..) |field_name, i| { + @field(named, field_name) = self.arg(i); } return named; } @@ -899,12 +899,12 @@ pub const Builder = struct { const info = @typeInfo(T); if (info != .@"struct" or !info.@"struct".is_tuple) @compileError("Builder.yield expects a tuple literal like `.{ v1, v2 }`"); - const n = info.@"struct".fields.len; + const n = info.@"struct".field_names.len; const out = self.arena.allocator().alloc(Value, n) catch @panic("Builder.yield OOM"); - inline for (info.@"struct".fields, 0..) |f, i| { - if (f.type != Value) - @compileError("Builder.yield: every tuple element must be a Value; got " ++ @typeName(f.type)); - out[i] = @field(values, f.name); + inline for (info.@"struct".field_names, info.@"struct".field_types, 0..) |field_name, Field, i| { + if (Field != Value) + @compileError("Builder.yield: every tuple element must be a Value; got " ++ @typeName(Field)); + out[i] = @field(values, field_name); } return out; } @@ -2057,7 +2057,7 @@ pub const Builder = struct { inits: anytype, ) dsl.ForScope(Builder, Value, dsl.tupleArity(@TypeOf(inits), "openFor: inits")) { const N = comptime dsl.tupleArity(@TypeOf(inits), "openFor: inits"); - const fields = @typeInfo(@TypeOf(inits)).@"struct".fields; + const info = @typeInfo(@TypeOf(inits)).@"struct"; // scf.for bounds default to `index`. const lb_v: Value = if (@TypeOf(lower) == Value) lower else self.cIndex(@intCast(lower)); @@ -2069,9 +2069,9 @@ pub const Builder = struct { block_types[0] = lb_v.type_(); block_locs[0] = self.loc(); var inits_inner: [N]*const mlir.Value = undefined; - inline for (fields, 0..) |f, i| { - const raw = @field(inits, f.name); - const v: Value = if (f.type == Value) raw else self.lift(raw); + inline for (info.field_names, info.field_types, 0..) |field_name, Field, i| { + const raw = @field(inits, field_name); + const v: Value = if (Field == Value) raw else self.lift(raw); block_types[i + 1] = v.type_(); block_locs[i + 1] = self.loc(); inits_inner[i] = v.inner; @@ -2111,13 +2111,13 @@ pub const Builder = struct { result_types: anytype, ) dsl.IfScope(Builder, Value, dsl.tupleArity(@TypeOf(result_types), "openIfElse: result_types")) { const N = comptime dsl.tupleArity(@TypeOf(result_types), "openIfElse: result_types"); - const fields = @typeInfo(@TypeOf(result_types)).@"struct".fields; + const info = @typeInfo(@TypeOf(result_types)).@"struct"; var types: [N]*const mlir.Type = undefined; - inline for (fields, 0..) |f, i| { - if (f.type != *const mlir.Type) + inline for (info.field_names, info.field_types, 0..) |field_name, Field, i| { + if (Field != *const mlir.Type) @compileError("openIfElse: every result_type must be *const mlir.Type (use k.scalarTy/vectorTy)"); - types[i] = @field(result_types, f.name); + types[i] = @field(result_types, field_name); } const then_block = mlir.Block.init(&.{}, &.{}); @@ -2145,16 +2145,16 @@ pub const Builder = struct { ) { const N = comptime dsl.tupleArity(@TypeOf(inits), "openWhile: inits"); const M = comptime dsl.tupleArity(@TypeOf(after_types), "openWhile: after_types"); - const init_fields = @typeInfo(@TypeOf(inits)).@"struct".fields; - const type_fields = @typeInfo(@TypeOf(after_types)).@"struct".fields; + const init_info = @typeInfo(@TypeOf(inits)).@"struct"; + const type_info = @typeInfo(@TypeOf(after_types)).@"struct"; var before_types: [N]*const mlir.Type = undefined; var before_locs: [N]*const mlir.Location = undefined; var inits_inner: [N]*const mlir.Value = undefined; - inline for (init_fields, 0..) |f, i| { - if (f.type != Value) + inline for (init_info.field_names, init_info.field_types, 0..) |field_name, Field, i| { + if (Field != Value) @compileError("openWhile: every init must be a Value"); - const v: Value = @field(inits, f.name); + const v: Value = @field(inits, field_name); before_types[i] = v.type_(); before_locs[i] = self.loc(); inits_inner[i] = v.inner; @@ -2163,10 +2163,10 @@ pub const Builder = struct { var after_tys: [M]*const mlir.Type = undefined; var after_locs: [M]*const mlir.Location = undefined; - inline for (type_fields, 0..) |f, i| { - if (f.type != *const mlir.Type) + inline for (type_info.field_names, type_info.field_types, 0..) |field_name, Field, i| { + if (Field != *const mlir.Type) @compileError("openWhile: every after_type must be *const mlir.Type"); - after_tys[i] = @field(after_types, f.name); + after_tys[i] = @field(after_types, field_name); after_locs[i] = self.loc(); } const after_block = mlir.Block.init(&after_tys, &after_locs); @@ -2232,7 +2232,7 @@ pub const Builder = struct { .debug_info = false, })}); - return try self.allocator.dupeZ(u8, al.written()); + return try self.allocator.dupeSentinel(u8, al.written(), 0); } /// Emit `transform_N` stub funcs — one per non-skipped i/o ref-arg. diff --git a/kernels/mosaic_tpu/dtype.zig b/kernels/mosaic_tpu/dtype.zig index d22370f6..549c69da 100644 --- a/kernels/mosaic_tpu/dtype.zig +++ b/kernels/mosaic_tpu/dtype.zig @@ -60,8 +60,8 @@ pub fn intBitwidth(dt: DType) u32 { } pub fn mlirElemToDType(ctx: *mlir.Context, elem: *const mlir.Type) DType { - inline for (std.meta.fields(DType)) |f| { - const dt = @field(DType, f.name); + inline for (comptime std.meta.fieldNames(DType)) |field_name| { + const dt = @field(DType, field_name); if (elem.eql(dt.toMlir(ctx))) return dt; } @panic("element type not a recognized Mosaic-TPU DType"); diff --git a/kernels/triton/builder.zig b/kernels/triton/builder.zig index 702fba0d..d585e8c1 100644 --- a/kernels/triton/builder.zig +++ b/kernels/triton/builder.zig @@ -66,8 +66,8 @@ pub const Value = struct { pub fn isFloatElem(self: Value) bool { const et = self.elemType(); - inline for (std.meta.fields(mlir.FloatTypes)) |f| { - if (et.isA(mlir.FloatType(@field(mlir.FloatTypes, f.name))) != null) return true; + inline for (comptime std.meta.fieldNames(mlir.FloatTypes)) |field_name| { + if (et.isA(mlir.FloatType(@field(mlir.FloatTypes, field_name))) != null) return true; } return false; } @@ -391,25 +391,25 @@ pub const ReturnIfScope = struct { pub fn yieldReturn(self: *ReturnIfScope, values: anytype) void { const k = self.kernel; - const fields = @typeInfo(@TypeOf(values)).@"struct".fields; + const info = @typeInfo(@TypeOf(values)).@"struct"; if (self.inline_return) { - var ret_operands: [fields.len]*const mlir.Value = undefined; - inline for (fields, 0..) |f, i| { - if (f.type != Value) + var ret_operands: [info.field_names.len]*const mlir.Value = undefined; + inline for (info.field_names, info.field_types, 0..) |field_name, Field, i| { + if (Field != Value) @compileError("ReturnIfScope.yieldReturn: every value must be a Value"); - ret_operands[i] = @field(values, f.name).inner; + ret_operands[i] = @field(values, field_name).inner; } _ = ttir.return_(k.ctx, &ret_operands, k.loc()).appendTo(self.ret_block); } else { if (k.exit_block == null) { k.exit_block = mlir.Block.init(&.{}, &.{}); - var ret_operands: [fields.len]*const mlir.Value = undefined; - inline for (fields, 0..) |f, i| { - if (f.type != Value) + var ret_operands: [info.field_names.len]*const mlir.Value = undefined; + inline for (info.field_names, info.field_types, 0..) |field_name, Field, i| { + if (Field != Value) @compileError("ReturnIfScope.yieldReturn: every value must be a Value"); - ret_operands[i] = @field(values, f.name).inner; + ret_operands[i] = @field(values, field_name).inner; } _ = ttir.return_(k.ctx, &ret_operands, k.loc()).appendTo(k.exit_block.?); } @@ -533,13 +533,13 @@ pub const Builder = struct { opts: Opts, ) !dsl.NamedArgs(@TypeOf(spec), Value) { const Spec = @TypeOf(spec); - const fields = @typeInfo(Spec).@"struct".fields; + const field_names = @typeInfo(Spec).@"struct".field_names; - var arg_specs: [fields.len]ArgSpec = undefined; - inline for (fields, 0..) |f, i| { - const raw = @field(spec, f.name); + var arg_specs: [field_names.len]ArgSpec = undefined; + inline for (field_names, 0..) |field_name, i| { + const raw = @field(spec, field_name); const kind: ArgSpec.Kind = if (@TypeOf(raw) == ArgSpec.Kind) raw else blk: { - const variant = @typeInfo(@TypeOf(raw)).@"struct".fields[0].name; + const variant = @typeInfo(@TypeOf(raw)).@"struct".field_names[0]; const tag = @field(std.meta.Tag(ArgSpec.Kind), variant); const inner = @field(raw, variant); break :blk switch (tag) { @@ -557,14 +557,14 @@ pub const Builder = struct { } }, }; }; - arg_specs[i] = .{ .name = f.name, .kind = kind }; + arg_specs[i] = .{ .name = field_name, .kind = kind }; } try self.declareArgsLowOpts(&arg_specs, result_types, opts); var named: dsl.NamedArgs(Spec, Value) = undefined; - inline for (fields, 0..) |f, i| { - @field(named, f.name) = self.arg(i); + inline for (field_names, 0..) |field_name, i| { + @field(named, field_name) = self.arg(i); } return named; } @@ -679,12 +679,12 @@ pub const Builder = struct { const info = @typeInfo(T); if (info != .@"struct" or !info.@"struct".is_tuple) @compileError("Builder.yield expects a tuple literal like `.{ v1, v2 }`"); - const n = info.@"struct".fields.len; + const n = info.@"struct".field_names.len; const out = self.arena.allocator().alloc(Value, n) catch @panic("Builder.yield OOM"); - inline for (info.@"struct".fields, 0..) |f, i| { - if (f.type != Value) - @compileError("Builder.yield: every tuple element must be a Value; got " ++ @typeName(f.type)); - out[i] = @field(values, f.name); + inline for (info.@"struct".field_names, info.@"struct".field_types, 0..) |field_name, Field, i| { + if (Field != Value) + @compileError("Builder.yield: every tuple element must be a Value; got " ++ @typeName(Field)); + out[i] = @field(values, field_name); } return out; } @@ -898,8 +898,8 @@ pub const Builder = struct { } fn mlirElemToDType(self: *const Builder, elem: *const mlir.Type) DType { - inline for (std.meta.fields(DType)) |f| { - const dt = @field(DType, f.name); + inline for (comptime std.meta.fieldNames(DType)) |field_name| { + const dt = @field(DType, field_name); if (elem.eql(dt.toMlir(self.ctx))) return dt; } @panic("element type not a recognized DSL DType"); @@ -2012,7 +2012,7 @@ pub const Builder = struct { inits: anytype, ) ForScope(tupleArity(@TypeOf(inits), "openFor: inits")) { const N = comptime tupleArity(@TypeOf(inits), "openFor: inits"); - const fields = @typeInfo(@TypeOf(inits)).@"struct".fields; + const info = @typeInfo(@TypeOf(inits)).@"struct"; const lb_v: Value = if (@TypeOf(lower) == Value) lower else self.lift(lower); const ub_v: Value = if (@TypeOf(upper) == Value) upper else self.constMatching(upper, lb_v.type_()); @@ -2023,9 +2023,9 @@ pub const Builder = struct { block_types[0] = lb_v.type_(); block_locs[0] = self.loc(); var inits_inner: [N]*const mlir.Value = undefined; - inline for (fields, 0..) |f, i| { - const raw = @field(inits, f.name); - const v: Value = if (f.type == Value) raw else self.lift(raw); + inline for (info.field_names, info.field_types, 0..) |field_name, Field, i| { + const raw = @field(inits, field_name); + const v: Value = if (Field == Value) raw else self.lift(raw); block_types[i + 1] = v.type_(); block_locs[i + 1] = self.loc(); inits_inner[i] = v.inner; @@ -2058,12 +2058,12 @@ pub const Builder = struct { const region = current.parentRegion(); const cont_block = mlir.Block.init(&.{}, &.{}); - const fields = @typeInfo(@TypeOf(values)).@"struct".fields; - var ret_operands: [fields.len]*const mlir.Value = undefined; - inline for (fields, 0..) |f, i| { - if (f.type != Value) + const info = @typeInfo(@TypeOf(values)).@"struct"; + var ret_operands: [info.field_names.len]*const mlir.Value = undefined; + inline for (info.field_names, info.field_types, 0..) |field_name, Field, i| { + if (Field != Value) @compileError("returnIfOpts: every value must be a Value"); - ret_operands[i] = @field(values, f.name).inner; + ret_operands[i] = @field(values, field_name).inner; } const ret_target: *mlir.Block = if (opts.inline_return) blk: { @@ -2144,13 +2144,13 @@ pub const Builder = struct { result_types: anytype, ) IfScope(tupleArity(@TypeOf(result_types), "openIfElse: result_types")) { const N = comptime tupleArity(@TypeOf(result_types), "openIfElse: result_types"); - const fields = @typeInfo(@TypeOf(result_types)).@"struct".fields; + const info = @typeInfo(@TypeOf(result_types)).@"struct"; var types: [N]*const mlir.Type = undefined; - inline for (fields, 0..) |f, i| { - if (f.type != *const mlir.Type) + inline for (info.field_names, info.field_types, 0..) |field_name, Field, i| { + if (Field != *const mlir.Type) @compileError("openIfElse: every result_type must be *const mlir.Type (use k.scalarTy/tensorTy)"); - types[i] = @field(result_types, f.name); + types[i] = @field(result_types, field_name); } const then_block = mlir.Block.init(&.{}, &.{}); @@ -2176,16 +2176,16 @@ pub const Builder = struct { ) { const N = comptime tupleArity(@TypeOf(inits), "openWhile: inits"); const M = comptime tupleArity(@TypeOf(after_types), "openWhile: after_types"); - const init_fields = @typeInfo(@TypeOf(inits)).@"struct".fields; - const type_fields = @typeInfo(@TypeOf(after_types)).@"struct".fields; + const init_info = @typeInfo(@TypeOf(inits)).@"struct"; + const type_info = @typeInfo(@TypeOf(after_types)).@"struct"; var before_types: [N]*const mlir.Type = undefined; var before_locs: [N]*const mlir.Location = undefined; var inits_inner: [N]*const mlir.Value = undefined; - inline for (init_fields, 0..) |f, i| { - if (f.type != Value) + inline for (init_info.field_names, init_info.field_types, 0..) |field_name, Field, i| { + if (Field != Value) @compileError("openWhile: every init must be a Value"); - const v: Value = @field(inits, f.name); + const v: Value = @field(inits, field_name); before_types[i] = v.type_(); before_locs[i] = self.loc(); inits_inner[i] = v.inner; @@ -2194,10 +2194,10 @@ pub const Builder = struct { var after_tys: [M]*const mlir.Type = undefined; var after_locs: [M]*const mlir.Location = undefined; - inline for (type_fields, 0..) |f, i| { - if (f.type != *const mlir.Type) + inline for (type_info.field_names, type_info.field_types, 0..) |field_name, Field, i| { + if (Field != *const mlir.Type) @compileError("openWhile: every after_type must be *const mlir.Type"); - after_tys[i] = @field(after_types, f.name); + after_tys[i] = @field(after_types, field_name); after_locs[i] = self.loc(); } const after_block = mlir.Block.init(&after_tys, &after_locs); @@ -2249,6 +2249,6 @@ pub const Builder = struct { .print_name_loc_as_prefix = true, })}); - return try self.allocator.dupeZ(u8, al.written()); + return try self.allocator.dupeSentinel(u8, al.written(), 0); } }; diff --git a/kernels/triton/dtype.zig b/kernels/triton/dtype.zig index c8c1d623..45018e67 100644 --- a/kernels/triton/dtype.zig +++ b/kernels/triton/dtype.zig @@ -62,8 +62,8 @@ pub fn intBitwidth(dt: DType) u32 { } pub fn mlirElemToDType(ctx: *mlir.Context, elem: *const mlir.Type) DType { - inline for (std.meta.fields(DType)) |f| { - const dt = @field(DType, f.name); + inline for (comptime std.meta.fieldNames(DType)) |field_name| { + const dt = @field(DType, field_name); if (elem.eql(dt.toMlir(ctx))) return dt; } @panic("element type not a recognized Triton DType"); diff --git a/mlir/dialects/arith.zig b/mlir/dialects/arith.zig index aee1c869..70c30574 100644 --- a/mlir/dialects/arith.zig +++ b/mlir/dialects/arith.zig @@ -360,7 +360,7 @@ pub fn convertf( ) *mlir.Operation { var attrs: stdx.BoundedArray(mlir.NamedAttribute, 1) = .empty; if (opts.rounding) |rm| { - attrs.appendAssumeCapacity(.named(ctx, "roundingmode", .int(ctx, .i32, @intFromEnum(rm)))); + attrs.appendAssumeCapacity(.named(ctx, "roundingmode", .int(ctx, .i32, @backingInt(rm)))); } return mlir.Operation.make(ctx, "arith.convertf", .{ .operands = .{ .flat = &.{src} }, @@ -381,7 +381,7 @@ pub fn scaling_truncf( ) *mlir.Operation { var attrs: stdx.BoundedArray(mlir.NamedAttribute, 1) = .empty; if (opts.rounding) |rm| { - attrs.appendAssumeCapacity(.named(ctx, "roundingmode", .int(ctx, .i32, @intFromEnum(rm)))); + attrs.appendAssumeCapacity(.named(ctx, "roundingmode", .int(ctx, .i32, @backingInt(rm)))); } return mlir.Operation.make(ctx, "arith.scaling_truncf", .{ .operands = .{ .flat = &.{ src, scale } }, @@ -406,7 +406,7 @@ pub fn cmpi( .operands = .{ .flat = &.{ lhs, rhs } }, .result_type_inference = true, .attributes = &.{ - .named(ctx, "predicate", .int(ctx, .i64, @intFromEnum(predicate))), + .named(ctx, "predicate", .int(ctx, .i64, @backingInt(predicate))), }, .location = location, }); @@ -423,7 +423,7 @@ pub fn cmpf( .operands = .{ .flat = &.{ lhs, rhs } }, .result_type_inference = true, .attributes = &.{ - .named(ctx, "predicate", .int(ctx, .i64, @intFromEnum(predicate))), + .named(ctx, "predicate", .int(ctx, .i64, @backingInt(predicate))), }, .location = location, }); diff --git a/mlir/dialects/cuda_tile/cuda_tile.zig b/mlir/dialects/cuda_tile/cuda_tile.zig index e32ddc26..d4975fd4 100644 --- a/mlir/dialects/cuda_tile/cuda_tile.zig +++ b/mlir/dialects/cuda_tile/cuda_tile.zig @@ -506,16 +506,16 @@ pub const OptimizationHintsAttr = opaque { /// The hint dictionary of one architecture: the non-null fields of `hint` /// but `arch`, integers as `i64` like the textual form. fn hintDictionary(ctx: *mlir.Context, hint: anytype) *const mlir.Attribute { - const fields = @typeInfo(@TypeOf(hint)).@"struct".fields; - var entries: stdx.BoundedArray(mlir.NamedAttribute, fields.len) = .empty; - inline for (fields) |f| { - if (comptime std.mem.eql(u8, f.name, "arch")) continue; - if (@field(hint, f.name)) |v| { + const field_names = @typeInfo(@TypeOf(hint)).@"struct".field_names; + var entries: stdx.BoundedArray(mlir.NamedAttribute, field_names.len) = .empty; + inline for (field_names) |field_name| { + if (comptime std.mem.eql(u8, field_name, "arch")) continue; + if (@field(hint, field_name)) |v| { const value: *const mlir.Attribute = switch (@TypeOf(v)) { bool => .boolean(ctx, v), else => .int(ctx, .i64, v), }; - entries.appendAssumeCapacity(.named(ctx, f.name, value)); + entries.appendAssumeCapacity(.named(ctx, field_name, value)); } } return .dict(ctx, entries.constSlice()); @@ -524,7 +524,7 @@ fn hintDictionary(ctx: *mlir.Context, hint: anytype) *const mlir.Attribute { /// `#cuda_tile.optimization_hints` from a slice of `EntryHint`, /// `LoadStoreHint` or `PtrLoadStoreHint`. pub fn optimizationHints(ctx: *mlir.Context, hints: anytype) *const mlir.Attribute { - var entries: stdx.BoundedArray(mlir.NamedAttribute, @typeInfo(Arch).@"enum".fields.len) = .empty; + var entries: stdx.BoundedArray(mlir.NamedAttribute, std.meta.fieldNames(Arch).len) = .empty; for (hints) |h| entries.appendAssumeCapacity(.named(ctx, @tagName(h.arch), hintDictionary(ctx, h))); const value: *const mlir.DictionaryAttribute = @ptrCast(mlir.Attribute.dict(ctx, entries.constSlice())); const attr = OptimizationHintsAttr.get(ctx, .{ .value = value }) catch @@ -1430,7 +1430,7 @@ pub fn load_view_tko(ctx: *mlir.Context, view: *const mlir.Value, index: []const segs.add(tok.slice()); var attrs = memAttrs(ctx, opts); // Preserve bounds checks unless the caller has proved a coordinate in bounds. - const inbounds = [_]i32{0} ** mlir.ShapedType.MAX_RANK; + const inbounds: [mlir.ShapedType.MAX_RANK]i32 = @splat(0); attrs.appendAssumeCapacity(.named(ctx, "inbounds", .denseArray(ctx, .bool, inbounds[0..index.len]))); attrs.appendAssumeCapacity(segs.attr(ctx)); return mlir.Operation.make(ctx, opName("load_view_tko"), .{ @@ -1450,7 +1450,7 @@ pub fn store_view_tko(ctx: *mlir.Context, tile: *const mlir.Value, view: *const segs.add(index); segs.add(tok.slice()); var attrs = memAttrs(ctx, opts); - const inbounds = [_]i32{0} ** mlir.ShapedType.MAX_RANK; + const inbounds: [mlir.ShapedType.MAX_RANK]i32 = @splat(0); attrs.appendAssumeCapacity(.named(ctx, "inbounds", .denseArray(ctx, .bool, inbounds[0..index.len]))); attrs.appendAssumeCapacity(segs.attr(ctx)); return mlir.Operation.make(ctx, opName("store_view_tko"), .{ diff --git a/mlir/dialects/cute_ir/cuda.zig b/mlir/dialects/cute_ir/cuda.zig index 6c546113..f3cfcc01 100644 --- a/mlir/dialects/cute_ir/cuda.zig +++ b/mlir/dialects/cute_ir/cuda.zig @@ -353,20 +353,20 @@ pub const ComputeTargetAttr = opaque { archs: []const GpuArchitecture, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCudaComputeTargetAttrGet(ctx.ptr(), @intFromEnum(args.representation), @intFromEnum(args.portability), @intCast(args.archs.len), @ptrCast(args.archs.ptr)); + const result = c.mlirCudaComputeTargetAttrGet(ctx.ptr(), @backingInt(args.representation), @backingInt(args.portability), @intCast(args.archs.len), @ptrCast(args.archs.ptr)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getRepresentation(self: *const Self) ExecutableRepresentation { - return @enumFromInt(c.mlirCudaComputeTargetAttrGetRepresentation(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCudaComputeTargetAttrGetRepresentation(self.ptr()))); } pub fn getPortability(self: *const Self) ArchPortability { - return @enumFromInt(c.mlirCudaComputeTargetAttrGetPortability(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCudaComputeTargetAttrGetPortability(self.ptr()))); } pub fn getNumArchs(self: *const Self) usize { return @intCast(c.mlirCudaComputeTargetAttrGetNumArchs(self.ptr())); } pub fn getArch(self: *const Self, pos: usize) GpuArchitecture { - return @enumFromInt(c.mlirCudaComputeTargetAttrGetArchs(self.ptr(), @intCast(pos))); + return @fromBackingInt(@intCast(c.mlirCudaComputeTargetAttrGetArchs(self.ptr(), @intCast(pos)))); } }; @@ -439,11 +439,11 @@ pub const ExecutableAttr = opaque { format: ExecutableFormat, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCudaExecutableAttrGet(ctx.ptr(), @intFromEnum(args.format)); + const result = c.mlirCudaExecutableAttrGet(ctx.ptr(), @backingInt(args.format)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getFormat(self: *const Self) ExecutableFormat { - return @enumFromInt(c.mlirCudaExecutableAttrGetFormat(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCudaExecutableAttrGetFormat(self.ptr()))); } }; diff --git a/mlir/dialects/cute_ir/cute_ir.zig b/mlir/dialects/cute_ir/cute_ir.zig index 8420bcbf..b36565ac 100644 --- a/mlir/dialects/cute_ir/cute_ir.zig +++ b/mlir/dialects/cute_ir/cute_ir.zig @@ -641,14 +641,14 @@ pub const PtrType = opaque { bitlayout: ?*const mlir.Attribute = null, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCutePtrTypeGet(ctx.ptr(), if (args.valueType) |v| v.ptr() else c.MlirType{ .ptr = null }, @intFromEnum(args.addressSpace), args.alignment, if (args.swizzle) |v| v.ptr() else c.MlirAttribute{ .ptr = null }, if (args.bitlayout) |v| v.ptr() else c.MlirAttribute{ .ptr = null }); + const result = c.mlirCutePtrTypeGet(ctx.ptr(), if (args.valueType) |v| v.ptr() else c.MlirType{ .ptr = null }, @backingInt(args.addressSpace), args.alignment, if (args.swizzle) |v| v.ptr() else c.MlirAttribute{ .ptr = null }, if (args.bitlayout) |v| v.ptr() else c.MlirAttribute{ .ptr = null }); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValueType(self: *const Self) ?*const mlir.Type { return @ptrCast(c.mlirCutePtrTypeGetValueType(self.ptr()).ptr); } pub fn getAddressSpace(self: *const Self) AddressSpace { - return @enumFromInt(c.mlirCutePtrTypeGetAddressSpace(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCutePtrTypeGetAddressSpace(self.ptr()))); } pub fn getAlignment(self: *const Self) u64 { return c.mlirCutePtrTypeGetAlignment(self.ptr()); @@ -1225,11 +1225,11 @@ pub const ReductionOpAttr = opaque { value: ReductionOp, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteReductionOpAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteReductionOpAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) ReductionOp { - return @enumFromInt(c.mlirCuteReductionOpAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteReductionOpAttrGetValue(self.ptr()))); } }; @@ -2861,16 +2861,16 @@ test { std.testing.refAllDecls(cuda); inline for (.{ nvvm, cuda }) |namespace| { inline for (comptime std.meta.declarations(namespace)) |decl| { - const T = @field(namespace, decl.name); + const T = @field(namespace, decl); if (@TypeOf(T) == type) std.testing.refAllDecls(T); } } inline for (comptime std.meta.declarations(@This())) |decl| { - const T = @field(@This(), decl.name); + const T = @field(@This(), decl); if (@TypeOf(T) == type) std.testing.refAllDecls(T); } inline for (comptime std.meta.declarations(nvgpu)) |decl| { - const T = @field(nvgpu, decl.name); + const T = @field(nvgpu, decl); if (@TypeOf(T) == type) std.testing.refAllDecls(T); } } @@ -2994,13 +2994,14 @@ test "generated types and attributes rebuild from their getters" { // Every case of every enum attribute. inline for (.{ cute, nvgpu }) |namespace| { inline for (comptime std.meta.declarations(namespace)) |decl| { - const T = @field(namespace, decl.name); + const T = @field(namespace, decl); if (@TypeOf(T) == type and @typeInfo(T) == .@"opaque" and @hasDecl(T, "InitArgs")) { - const fields = @typeInfo(T.InitArgs).@"struct".fields; - if (fields.len == 1 and comptime std.mem.eql(u8, fields[0].name, "value")) { - inline for (@typeInfo(fields[0].type).@"enum".fields) |case| { - const attr = try T.get(ctx, .{ .value = @enumFromInt(case.value) }); - try std.testing.expectEqual(case.value, @intFromEnum(attr.getValue())); + const fields = @typeInfo(T.InitArgs).@"struct".field_names; + if (fields.len == 1 and comptime std.mem.eql(u8, fields[0], "value")) { + inline for (@typeInfo(@FieldType(T.InitArgs, fields[0])).@"enum".field_names) |case| { + const case_value = @field(@FieldType(T.InitArgs, fields[0]), case); + const attr = try T.get(ctx, .{ .value = case_value }); + try std.testing.expectEqual(@backingInt(case_value), @backingInt(attr.getValue())); try std.testing.expect((try rebuild(T, ctx, attr)).eql(attr)); } } @@ -3070,17 +3071,17 @@ test "nvvm target rejects what the compiler rejects" { fn rebuildEnums(comptime T: type, ctx: *mlir.Context, value: *const T) !*const T { var args: T.InitArgs = undefined; var buffers: [4][16]u32 = undefined; - inline for (@typeInfo(T.InitArgs).@"struct".fields, 0..) |field, i| { - const name = [_]u8{comptime std.ascii.toUpper(field.name[0])} ++ field.name[1..]; - const info = @typeInfo(field.type); + inline for (@typeInfo(T.InitArgs).@"struct".field_names, 0..) |field, i| { + const name = [_]u8{comptime std.ascii.toUpper(field[0])} ++ field[1..]; + const info = @typeInfo(@FieldType(T.InitArgs, field)); if (info == .pointer and info.pointer.size == .slice and @typeInfo(info.pointer.child) == .@"enum") { const E = info.pointer.child; const count = @field(T, "getNum" ++ name)(value); const elements: []E = @ptrCast(buffers[i][0..count]); for (elements, 0..) |*element, pos| element.* = @field(T, "get" ++ name[0 .. name.len - 1])(value, pos); - @field(args, field.name) = elements; + @field(args, field) = elements; } else { - @field(args, field.name) = @field(T, "get" ++ name)(value); + @field(args, field) = @field(T, "get" ++ name)(value); } } return T.get(ctx, args); @@ -3089,14 +3090,14 @@ fn rebuildEnums(comptime T: type, ctx: *mlir.Context, value: *const T) !*const T fn rebuild(comptime T: type, ctx: *mlir.Context, value: *const T) !*const T { var args: T.InitArgs = undefined; var elements: [8]*const mlir.Type = undefined; - inline for (@typeInfo(T.InitArgs).@"struct".fields) |field| { - const name = [_]u8{comptime std.ascii.toUpper(field.name[0])} ++ field.name[1..]; - if (field.type == []const *const mlir.Type) { + inline for (@typeInfo(T.InitArgs).@"struct".field_names) |field| { + const name = [_]u8{comptime std.ascii.toUpper(field[0])} ++ field[1..]; + if (@FieldType(T.InitArgs, field) == []const *const mlir.Type) { const count = @field(T, "getNum" ++ name)(value); for (elements[0..count], 0..) |*element, i| element.* = @field(T, "get" ++ name[0 .. name.len - 1])(value, i); - @field(args, field.name) = elements[0..count]; + @field(args, field) = elements[0..count]; } else { - @field(args, field.name) = @field(T, "get" ++ name)(value); + @field(args, field) = @field(T, "get" ++ name)(value); } } return T.get(ctx, args); diff --git a/mlir/dialects/cute_ir/cute_nvgpu.zig b/mlir/dialects/cute_ir/cute_nvgpu.zig index 7d7ac63d..652ff9e1 100644 --- a/mlir/dialects/cute_ir/cute_nvgpu.zig +++ b/mlir/dialects/cute_ir/cute_nvgpu.zig @@ -564,7 +564,7 @@ pub const CopyAtomG2RType = opaque { invariant: bool = false, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUCopyAtomG2RTypeGet(ctx.ptr(), args.valType.ptr(), args.copyBits, @intFromEnum(args.memOrder), @intFromEnum(args.memScope), @intFromEnum(args.l2PrefetchSize), @intFromEnum(args.l1CacheEvictPriority), @intFromEnum(args.loadCacheMode), @intFromEnum(args.sharedSpace), args.invariant); + const result = c.mlirCuteNVGPUCopyAtomG2RTypeGet(ctx.ptr(), args.valType.ptr(), args.copyBits, @backingInt(args.memOrder), @backingInt(args.memScope), @backingInt(args.l2PrefetchSize), @backingInt(args.l1CacheEvictPriority), @backingInt(args.loadCacheMode), @backingInt(args.sharedSpace), args.invariant); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValType(self: *const Self) *const mlir.Type { @@ -574,22 +574,22 @@ pub const CopyAtomG2RType = opaque { return c.mlirCuteNVGPUCopyAtomG2RTypeGetCopyBits(self.ptr()); } pub fn getMemOrder(self: *const Self) MemOrderKind { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomG2RTypeGetMemOrder(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomG2RTypeGetMemOrder(self.ptr()))); } pub fn getMemScope(self: *const Self) MemScopeKind { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomG2RTypeGetMemScope(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomG2RTypeGetMemScope(self.ptr()))); } pub fn getL2PrefetchSize(self: *const Self) L2PrefetchSize { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomG2RTypeGetL2PrefetchSize(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomG2RTypeGetL2PrefetchSize(self.ptr()))); } pub fn getL1CacheEvictPriority(self: *const Self) CacheEvictionPriority { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomG2RTypeGetL1CacheEvictPriority(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomG2RTypeGetL1CacheEvictPriority(self.ptr()))); } pub fn getLoadCacheMode(self: *const Self) LoadCacheMode { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomG2RTypeGetLoadCacheMode(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomG2RTypeGetLoadCacheMode(self.ptr()))); } pub fn getSharedSpace(self: *const Self) SharedSpace { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomG2RTypeGetSharedSpace(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomG2RTypeGetSharedSpace(self.ptr()))); } pub fn getInvariant(self: *const Self) bool { return c.mlirCuteNVGPUCopyAtomG2RTypeGetInvariant(self.ptr()); @@ -705,7 +705,7 @@ pub const CopyAtomLdsmType = opaque { transpose: bool = false, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUCopyAtomLdsmTypeGet(ctx.ptr(), args.valType.ptr(), args.mode.ptr(), @intFromEnum(args.szPattern), args.numMatrices, args.transpose); + const result = c.mlirCuteNVGPUCopyAtomLdsmTypeGet(ctx.ptr(), args.valType.ptr(), args.mode.ptr(), @backingInt(args.szPattern), args.numMatrices, args.transpose); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValType(self: *const Self) *const mlir.Type { @@ -715,7 +715,7 @@ pub const CopyAtomLdsmType = opaque { return @ptrCast(c.mlirCuteNVGPUCopyAtomLdsmTypeGetMode(self.ptr()).ptr.?); } pub fn getSzPattern(self: *const Self) LdsmSzPattern { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomLdsmTypeGetSzPattern(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomLdsmTypeGetSzPattern(self.ptr()))); } pub fn getNumMatrices(self: *const Self) c_int { return c.mlirCuteNVGPUCopyAtomLdsmTypeGetNumMatrices(self.ptr()); @@ -748,11 +748,11 @@ pub const CopyAtomNonExec2DGather4TmaLoadType = opaque { tmaFormat: ?TmaDataFormat = null, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUCopyAtomNonExec2DGather4TmaLoadTypeGet(ctx.ptr(), @intFromEnum(args.kind), args.valType.ptr(), args.copyBits, args.tmaGbasis.ptr(), if (args.tmaFormat) |v| @intFromEnum(v) else -1); + const result = c.mlirCuteNVGPUCopyAtomNonExec2DGather4TmaLoadTypeGet(ctx.ptr(), @backingInt(args.kind), args.valType.ptr(), args.copyBits, args.tmaGbasis.ptr(), if (args.tmaFormat) |v| @backingInt(v) else -1); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getKind(self: *const Self) GatherScatterTmaLoad { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomNonExec2DGather4TmaLoadTypeGetKind(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomNonExec2DGather4TmaLoadTypeGetKind(self.ptr()))); } pub fn getValType(self: *const Self) *const mlir.Type { return @ptrCast(c.mlirCuteNVGPUCopyAtomNonExec2DGather4TmaLoadTypeGetValType(self.ptr()).ptr.?); @@ -765,7 +765,7 @@ pub const CopyAtomNonExec2DGather4TmaLoadType = opaque { } pub fn getTmaFormat(self: *const Self) ?TmaDataFormat { const value = c.mlirCuteNVGPUCopyAtomNonExec2DGather4TmaLoadTypeGetTmaFormat(self.ptr()); - return if (value < 0) null else @enumFromInt(value); + return if (value < 0) null else @fromBackingInt(@intCast(value)); } }; @@ -791,7 +791,7 @@ pub const CopyAtomNonExec2DScatter4TmaStoreType = opaque { tmaFormat: ?TmaDataFormat = null, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUCopyAtomNonExec2DScatter4TmaStoreTypeGet(ctx.ptr(), args.valType.ptr(), args.copyBits, args.tmaGbasis.ptr(), if (args.tmaFormat) |v| @intFromEnum(v) else -1); + const result = c.mlirCuteNVGPUCopyAtomNonExec2DScatter4TmaStoreTypeGet(ctx.ptr(), args.valType.ptr(), args.copyBits, args.tmaGbasis.ptr(), if (args.tmaFormat) |v| @backingInt(v) else -1); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValType(self: *const Self) *const mlir.Type { @@ -805,7 +805,7 @@ pub const CopyAtomNonExec2DScatter4TmaStoreType = opaque { } pub fn getTmaFormat(self: *const Self) ?TmaDataFormat { const value = c.mlirCuteNVGPUCopyAtomNonExec2DScatter4TmaStoreTypeGetTmaFormat(self.ptr()); - return if (value < 0) null else @enumFromInt(value); + return if (value < 0) null else @fromBackingInt(@intCast(value)); } }; @@ -832,11 +832,11 @@ pub const CopyAtomNonExecIm2ColTmaLoadType = opaque { tmaFormat: ?TmaDataFormat = null, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUCopyAtomNonExecIm2ColTmaLoadTypeGet(ctx.ptr(), @intFromEnum(args.kind), args.valType.ptr(), args.copyBits, args.tmaGbasis.ptr(), if (args.tmaFormat) |v| @intFromEnum(v) else -1); + const result = c.mlirCuteNVGPUCopyAtomNonExecIm2ColTmaLoadTypeGet(ctx.ptr(), @backingInt(args.kind), args.valType.ptr(), args.copyBits, args.tmaGbasis.ptr(), if (args.tmaFormat) |v| @backingInt(v) else -1); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getKind(self: *const Self) Im2ColTmaLoad { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomNonExecIm2ColTmaLoadTypeGetKind(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomNonExecIm2ColTmaLoadTypeGetKind(self.ptr()))); } pub fn getValType(self: *const Self) *const mlir.Type { return @ptrCast(c.mlirCuteNVGPUCopyAtomNonExecIm2ColTmaLoadTypeGetValType(self.ptr()).ptr.?); @@ -849,7 +849,7 @@ pub const CopyAtomNonExecIm2ColTmaLoadType = opaque { } pub fn getTmaFormat(self: *const Self) ?TmaDataFormat { const value = c.mlirCuteNVGPUCopyAtomNonExecIm2ColTmaLoadTypeGetTmaFormat(self.ptr()); - return if (value < 0) null else @enumFromInt(value); + return if (value < 0) null else @fromBackingInt(@intCast(value)); } }; @@ -875,7 +875,7 @@ pub const CopyAtomNonExecIm2ColTmaStoreType = opaque { tmaFormat: ?TmaDataFormat = null, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUCopyAtomNonExecIm2ColTmaStoreTypeGet(ctx.ptr(), args.valType.ptr(), args.copyBits, args.tmaGbasis.ptr(), if (args.tmaFormat) |v| @intFromEnum(v) else -1); + const result = c.mlirCuteNVGPUCopyAtomNonExecIm2ColTmaStoreTypeGet(ctx.ptr(), args.valType.ptr(), args.copyBits, args.tmaGbasis.ptr(), if (args.tmaFormat) |v| @backingInt(v) else -1); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValType(self: *const Self) *const mlir.Type { @@ -889,7 +889,7 @@ pub const CopyAtomNonExecIm2ColTmaStoreType = opaque { } pub fn getTmaFormat(self: *const Self) ?TmaDataFormat { const value = c.mlirCuteNVGPUCopyAtomNonExecIm2ColTmaStoreTypeGetTmaFormat(self.ptr()); - return if (value < 0) null else @enumFromInt(value); + return if (value < 0) null else @fromBackingInt(@intCast(value)); } }; @@ -916,11 +916,11 @@ pub const CopyAtomNonExecTiledTmaLoadType = opaque { tmaFormat: ?TmaDataFormat = null, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUCopyAtomNonExecTiledTmaLoadTypeGet(ctx.ptr(), @intFromEnum(args.kind), args.valType.ptr(), args.copyBits, args.tmaGbasis.ptr(), if (args.tmaFormat) |v| @intFromEnum(v) else -1); + const result = c.mlirCuteNVGPUCopyAtomNonExecTiledTmaLoadTypeGet(ctx.ptr(), @backingInt(args.kind), args.valType.ptr(), args.copyBits, args.tmaGbasis.ptr(), if (args.tmaFormat) |v| @backingInt(v) else -1); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getKind(self: *const Self) TiledTmaLoad { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomNonExecTiledTmaLoadTypeGetKind(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomNonExecTiledTmaLoadTypeGetKind(self.ptr()))); } pub fn getValType(self: *const Self) *const mlir.Type { return @ptrCast(c.mlirCuteNVGPUCopyAtomNonExecTiledTmaLoadTypeGetValType(self.ptr()).ptr.?); @@ -933,7 +933,7 @@ pub const CopyAtomNonExecTiledTmaLoadType = opaque { } pub fn getTmaFormat(self: *const Self) ?TmaDataFormat { const value = c.mlirCuteNVGPUCopyAtomNonExecTiledTmaLoadTypeGetTmaFormat(self.ptr()); - return if (value < 0) null else @enumFromInt(value); + return if (value < 0) null else @fromBackingInt(@intCast(value)); } }; @@ -960,11 +960,11 @@ pub const CopyAtomNonExecTiledTmaReduceType = opaque { tmaFormat: ?TmaDataFormat = null, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUCopyAtomNonExecTiledTmaReduceTypeGet(ctx.ptr(), @intFromEnum(args.kind), args.valType.ptr(), args.copyBits, args.tmaGbasis.ptr(), if (args.tmaFormat) |v| @intFromEnum(v) else -1); + const result = c.mlirCuteNVGPUCopyAtomNonExecTiledTmaReduceTypeGet(ctx.ptr(), @backingInt(args.kind), args.valType.ptr(), args.copyBits, args.tmaGbasis.ptr(), if (args.tmaFormat) |v| @backingInt(v) else -1); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getKind(self: *const Self) ReductionKind { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomNonExecTiledTmaReduceTypeGetKind(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomNonExecTiledTmaReduceTypeGetKind(self.ptr()))); } pub fn getValType(self: *const Self) *const mlir.Type { return @ptrCast(c.mlirCuteNVGPUCopyAtomNonExecTiledTmaReduceTypeGetValType(self.ptr()).ptr.?); @@ -977,7 +977,7 @@ pub const CopyAtomNonExecTiledTmaReduceType = opaque { } pub fn getTmaFormat(self: *const Self) ?TmaDataFormat { const value = c.mlirCuteNVGPUCopyAtomNonExecTiledTmaReduceTypeGetTmaFormat(self.ptr()); - return if (value < 0) null else @enumFromInt(value); + return if (value < 0) null else @fromBackingInt(@intCast(value)); } }; @@ -1003,7 +1003,7 @@ pub const CopyAtomNonExecTiledTmaStoreType = opaque { tmaFormat: ?TmaDataFormat = null, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUCopyAtomNonExecTiledTmaStoreTypeGet(ctx.ptr(), args.valType.ptr(), args.copyBits, args.tmaGbasis.ptr(), if (args.tmaFormat) |v| @intFromEnum(v) else -1); + const result = c.mlirCuteNVGPUCopyAtomNonExecTiledTmaStoreTypeGet(ctx.ptr(), args.valType.ptr(), args.copyBits, args.tmaGbasis.ptr(), if (args.tmaFormat) |v| @backingInt(v) else -1); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValType(self: *const Self) *const mlir.Type { @@ -1017,7 +1017,7 @@ pub const CopyAtomNonExecTiledTmaStoreType = opaque { } pub fn getTmaFormat(self: *const Self) ?TmaDataFormat { const value = c.mlirCuteNVGPUCopyAtomNonExecTiledTmaStoreTypeGetTmaFormat(self.ptr()); - return if (value < 0) null else @enumFromInt(value); + return if (value < 0) null else @fromBackingInt(@intCast(value)); } }; @@ -1046,7 +1046,7 @@ pub const CopyAtomR2GType = opaque { sharedSpace: SharedSpace = .CTA, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUCopyAtomR2GTypeGet(ctx.ptr(), args.valType.ptr(), args.copyBits, @intFromEnum(args.memOrder), @intFromEnum(args.memScope), @intFromEnum(args.l1CacheEvictPriority), @intFromEnum(args.storeCacheMode), @intFromEnum(args.sharedSpace)); + const result = c.mlirCuteNVGPUCopyAtomR2GTypeGet(ctx.ptr(), args.valType.ptr(), args.copyBits, @backingInt(args.memOrder), @backingInt(args.memScope), @backingInt(args.l1CacheEvictPriority), @backingInt(args.storeCacheMode), @backingInt(args.sharedSpace)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValType(self: *const Self) *const mlir.Type { @@ -1056,19 +1056,19 @@ pub const CopyAtomR2GType = opaque { return c.mlirCuteNVGPUCopyAtomR2GTypeGetCopyBits(self.ptr()); } pub fn getMemOrder(self: *const Self) MemOrderKind { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomR2GTypeGetMemOrder(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomR2GTypeGetMemOrder(self.ptr()))); } pub fn getMemScope(self: *const Self) MemScopeKind { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomR2GTypeGetMemScope(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomR2GTypeGetMemScope(self.ptr()))); } pub fn getL1CacheEvictPriority(self: *const Self) CacheEvictionPriority { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomR2GTypeGetL1CacheEvictPriority(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomR2GTypeGetL1CacheEvictPriority(self.ptr()))); } pub fn getStoreCacheMode(self: *const Self) StoreCacheMode { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomR2GTypeGetStoreCacheMode(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomR2GTypeGetStoreCacheMode(self.ptr()))); } pub fn getSharedSpace(self: *const Self) SharedSpace { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomR2GTypeGetSharedSpace(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomR2GTypeGetSharedSpace(self.ptr()))); } }; @@ -1095,7 +1095,7 @@ pub const CopyAtomR2SType = opaque { sharedSpace: SharedSpace = .CTA, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUCopyAtomR2STypeGet(ctx.ptr(), args.valType.ptr(), args.copyBits, @intFromEnum(args.memOrder), @intFromEnum(args.memScope), @intFromEnum(args.sharedSpace)); + const result = c.mlirCuteNVGPUCopyAtomR2STypeGet(ctx.ptr(), args.valType.ptr(), args.copyBits, @backingInt(args.memOrder), @backingInt(args.memScope), @backingInt(args.sharedSpace)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValType(self: *const Self) *const mlir.Type { @@ -1105,13 +1105,13 @@ pub const CopyAtomR2SType = opaque { return c.mlirCuteNVGPUCopyAtomR2STypeGetCopyBits(self.ptr()); } pub fn getMemOrder(self: *const Self) MemOrderKind { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomR2STypeGetMemOrder(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomR2STypeGetMemOrder(self.ptr()))); } pub fn getMemScope(self: *const Self) MemScopeKind { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomR2STypeGetMemScope(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomR2STypeGetMemScope(self.ptr()))); } pub fn getSharedSpace(self: *const Self) SharedSpace { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomR2STypeGetSharedSpace(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomR2STypeGetSharedSpace(self.ptr()))); } }; @@ -1138,7 +1138,7 @@ pub const CopyAtomS2RType = opaque { sharedSpace: SharedSpace = .CTA, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUCopyAtomS2RTypeGet(ctx.ptr(), args.valType.ptr(), args.copyBits, @intFromEnum(args.memOrder), @intFromEnum(args.memScope), @intFromEnum(args.sharedSpace)); + const result = c.mlirCuteNVGPUCopyAtomS2RTypeGet(ctx.ptr(), args.valType.ptr(), args.copyBits, @backingInt(args.memOrder), @backingInt(args.memScope), @backingInt(args.sharedSpace)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValType(self: *const Self) *const mlir.Type { @@ -1148,13 +1148,13 @@ pub const CopyAtomS2RType = opaque { return c.mlirCuteNVGPUCopyAtomS2RTypeGetCopyBits(self.ptr()); } pub fn getMemOrder(self: *const Self) MemOrderKind { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomS2RTypeGetMemOrder(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomS2RTypeGetMemOrder(self.ptr()))); } pub fn getMemScope(self: *const Self) MemScopeKind { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomS2RTypeGetMemScope(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomS2RTypeGetMemScope(self.ptr()))); } pub fn getSharedSpace(self: *const Self) SharedSpace { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomS2RTypeGetSharedSpace(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomS2RTypeGetSharedSpace(self.ptr()))); } }; @@ -1179,14 +1179,14 @@ pub const CopyAtomSIMTAsyncCopyType = opaque { copyBits: c_int, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUCopyAtomSIMTAsyncCopyTypeGet(ctx.ptr(), args.valType.ptr(), @intFromEnum(args.cache), args.copyBits); + const result = c.mlirCuteNVGPUCopyAtomSIMTAsyncCopyTypeGet(ctx.ptr(), args.valType.ptr(), @backingInt(args.cache), args.copyBits); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValType(self: *const Self) *const mlir.Type { return @ptrCast(c.mlirCuteNVGPUCopyAtomSIMTAsyncCopyTypeGetValType(self.ptr()).ptr.?); } pub fn getCache(self: *const Self) LoadCacheMode { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomSIMTAsyncCopyTypeGetCache(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomSIMTAsyncCopyTypeGetCache(self.ptr()))); } pub fn getCopyBits(self: *const Self) c_int { return c.mlirCuteNVGPUCopyAtomSIMTAsyncCopyTypeGetCopyBits(self.ptr()); @@ -1217,7 +1217,7 @@ pub const CopyAtomSIMTMultimemLdReduceType = opaque { memScope: MemScopeKind = .SYS, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUCopyAtomSIMTMultimemLdReduceTypeGet(ctx.ptr(), args.valType.ptr(), args.copyBits, @intFromEnum(args.reduction), if (args.ldReduceAccPrecision) |v| v.ptr() else c.MlirAttribute{ .ptr = null }, @intFromEnum(args.memOrder), @intFromEnum(args.memScope)); + const result = c.mlirCuteNVGPUCopyAtomSIMTMultimemLdReduceTypeGet(ctx.ptr(), args.valType.ptr(), args.copyBits, @backingInt(args.reduction), if (args.ldReduceAccPrecision) |v| v.ptr() else c.MlirAttribute{ .ptr = null }, @backingInt(args.memOrder), @backingInt(args.memScope)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValType(self: *const Self) *const mlir.Type { @@ -1227,16 +1227,16 @@ pub const CopyAtomSIMTMultimemLdReduceType = opaque { return c.mlirCuteNVGPUCopyAtomSIMTMultimemLdReduceTypeGetCopyBits(self.ptr()); } pub fn getReduction(self: *const Self) ReductionKind { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomSIMTMultimemLdReduceTypeGetReduction(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomSIMTMultimemLdReduceTypeGetReduction(self.ptr()))); } pub fn getLdReduceAccPrecision(self: *const Self) ?*const mlir.Attribute { return @ptrCast(c.mlirCuteNVGPUCopyAtomSIMTMultimemLdReduceTypeGetLdReduceAccPrecision(self.ptr()).ptr); } pub fn getMemOrder(self: *const Self) MemOrderKind { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomSIMTMultimemLdReduceTypeGetMemOrder(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomSIMTMultimemLdReduceTypeGetMemOrder(self.ptr()))); } pub fn getMemScope(self: *const Self) MemScopeKind { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomSIMTMultimemLdReduceTypeGetMemScope(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomSIMTMultimemLdReduceTypeGetMemScope(self.ptr()))); } }; @@ -1263,7 +1263,7 @@ pub const CopyAtomSIMTMultimemRedType = opaque { memScope: MemScopeKind = .SYS, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUCopyAtomSIMTMultimemRedTypeGet(ctx.ptr(), args.valType.ptr(), args.copyBits, @intFromEnum(args.reduction), @intFromEnum(args.memOrder), @intFromEnum(args.memScope)); + const result = c.mlirCuteNVGPUCopyAtomSIMTMultimemRedTypeGet(ctx.ptr(), args.valType.ptr(), args.copyBits, @backingInt(args.reduction), @backingInt(args.memOrder), @backingInt(args.memScope)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValType(self: *const Self) *const mlir.Type { @@ -1273,13 +1273,13 @@ pub const CopyAtomSIMTMultimemRedType = opaque { return c.mlirCuteNVGPUCopyAtomSIMTMultimemRedTypeGetCopyBits(self.ptr()); } pub fn getReduction(self: *const Self) ReductionKind { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomSIMTMultimemRedTypeGetReduction(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomSIMTMultimemRedTypeGetReduction(self.ptr()))); } pub fn getMemOrder(self: *const Self) MemOrderKind { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomSIMTMultimemRedTypeGetMemOrder(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomSIMTMultimemRedTypeGetMemOrder(self.ptr()))); } pub fn getMemScope(self: *const Self) MemScopeKind { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomSIMTMultimemRedTypeGetMemScope(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomSIMTMultimemRedTypeGetMemScope(self.ptr()))); } }; @@ -1305,7 +1305,7 @@ pub const CopyAtomSIMTMultimemStType = opaque { memScope: MemScopeKind = .SYS, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUCopyAtomSIMTMultimemStTypeGet(ctx.ptr(), args.valType.ptr(), args.copyBits, @intFromEnum(args.memOrder), @intFromEnum(args.memScope)); + const result = c.mlirCuteNVGPUCopyAtomSIMTMultimemStTypeGet(ctx.ptr(), args.valType.ptr(), args.copyBits, @backingInt(args.memOrder), @backingInt(args.memScope)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValType(self: *const Self) *const mlir.Type { @@ -1315,10 +1315,10 @@ pub const CopyAtomSIMTMultimemStType = opaque { return c.mlirCuteNVGPUCopyAtomSIMTMultimemStTypeGetCopyBits(self.ptr()); } pub fn getMemOrder(self: *const Self) MemOrderKind { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomSIMTMultimemStTypeGetMemOrder(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomSIMTMultimemStTypeGetMemOrder(self.ptr()))); } pub fn getMemScope(self: *const Self) MemScopeKind { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomSIMTMultimemStTypeGetMemScope(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomSIMTMultimemStTypeGetMemScope(self.ptr()))); } }; @@ -1344,7 +1344,7 @@ pub const CopyAtomSIMTSyncCopyType = opaque { dstSpace: cute.AddressSpace = .generic, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUCopyAtomSIMTSyncCopyTypeGet(ctx.ptr(), args.valType.ptr(), args.copyBits, @intFromEnum(args.srcSpace), @intFromEnum(args.dstSpace)); + const result = c.mlirCuteNVGPUCopyAtomSIMTSyncCopyTypeGet(ctx.ptr(), args.valType.ptr(), args.copyBits, @backingInt(args.srcSpace), @backingInt(args.dstSpace)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValType(self: *const Self) *const mlir.Type { @@ -1354,10 +1354,10 @@ pub const CopyAtomSIMTSyncCopyType = opaque { return c.mlirCuteNVGPUCopyAtomSIMTSyncCopyTypeGetCopyBits(self.ptr()); } pub fn getSrcSpace(self: *const Self) cute.AddressSpace { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomSIMTSyncCopyTypeGetSrcSpace(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomSIMTSyncCopyTypeGetSrcSpace(self.ptr()))); } pub fn getDstSpace(self: *const Self) cute.AddressSpace { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomSIMTSyncCopyTypeGetDstSpace(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomSIMTSyncCopyTypeGetDstSpace(self.ptr()))); } }; @@ -1384,7 +1384,7 @@ pub const CopyAtomSM100CopyS2TType = opaque { broadcast: CopyS2TBroadcast = .none, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUCopyAtomSM100CopyS2TTypeGet(ctx.ptr(), args.valType.ptr(), args.numDp, args.numBit, args.numCta, @intFromEnum(args.broadcast)); + const result = c.mlirCuteNVGPUCopyAtomSM100CopyS2TTypeGet(ctx.ptr(), args.valType.ptr(), args.numDp, args.numBit, args.numCta, @backingInt(args.broadcast)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValType(self: *const Self) *const mlir.Type { @@ -1400,7 +1400,7 @@ pub const CopyAtomSM100CopyS2TType = opaque { return c.mlirCuteNVGPUCopyAtomSM100CopyS2TTypeGetNumCta(self.ptr()); } pub fn getBroadcast(self: *const Self) CopyS2TBroadcast { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomSM100CopyS2TTypeGetBroadcast(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomSM100CopyS2TTypeGetBroadcast(self.ptr()))); } }; @@ -1428,7 +1428,7 @@ pub const CopyAtomSM100S2TCopyV2Type = opaque { broadcast: CopyS2TBroadcast = .none, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUCopyAtomSM100S2TCopyV2TypeGet(ctx.ptr(), args.valType.ptr(), args.numDp, args.numBit, args.numCta, @intFromEnum(args.smemMajor), @intFromEnum(args.broadcast)); + const result = c.mlirCuteNVGPUCopyAtomSM100S2TCopyV2TypeGet(ctx.ptr(), args.valType.ptr(), args.numDp, args.numBit, args.numCta, @backingInt(args.smemMajor), @backingInt(args.broadcast)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValType(self: *const Self) *const mlir.Type { @@ -1444,10 +1444,10 @@ pub const CopyAtomSM100S2TCopyV2Type = opaque { return c.mlirCuteNVGPUCopyAtomSM100S2TCopyV2TypeGetNumCta(self.ptr()); } pub fn getSmemMajor(self: *const Self) cute.MajorMode { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomSM100S2TCopyV2TypeGetSmemMajor(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomSM100S2TCopyV2TypeGetSmemMajor(self.ptr()))); } pub fn getBroadcast(self: *const Self) CopyS2TBroadcast { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomSM100S2TCopyV2TypeGetBroadcast(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomSM100S2TCopyV2TypeGetBroadcast(self.ptr()))); } }; @@ -1562,7 +1562,7 @@ pub const CopyAtomSM107TmemLoadSPCompressType = opaque { nan: bool = false, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUCopyAtomSM107TmemLoadSPCompressTypeGet(ctx.ptr(), args.valType.ptr(), args.numDp, args.numBit, args.numRep, @intFromEnum(args.redOp), args.red, args.nan); + const result = c.mlirCuteNVGPUCopyAtomSM107TmemLoadSPCompressTypeGet(ctx.ptr(), args.valType.ptr(), args.numDp, args.numBit, args.numRep, @backingInt(args.redOp), args.red, args.nan); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValType(self: *const Self) *const mlir.Type { @@ -1578,7 +1578,7 @@ pub const CopyAtomSM107TmemLoadSPCompressType = opaque { return c.mlirCuteNVGPUCopyAtomSM107TmemLoadSPCompressTypeGetNumRep(self.ptr()); } pub fn getRedOp(self: *const Self) TmemLoadRedOp { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomSM107TmemLoadSPCompressTypeGetRedOp(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomSM107TmemLoadSPCompressTypeGetRedOp(self.ptr()))); } pub fn getRed(self: *const Self) bool { return c.mlirCuteNVGPUCopyAtomSM107TmemLoadSPCompressTypeGetRed(self.ptr()); @@ -1613,7 +1613,7 @@ pub const CopyAtomSM10xTmemLoadRedType = opaque { halfSplitOff: ?*const mlir.Attribute = null, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUCopyAtomSM10xTmemLoadRedTypeGet(ctx.ptr(), args.valType.ptr(), args.numDp, args.numBit, args.numRep, @intFromEnum(args.redOp), args.nan, if (args.halfSplitOff) |v| v.ptr() else c.MlirAttribute{ .ptr = null }); + const result = c.mlirCuteNVGPUCopyAtomSM10xTmemLoadRedTypeGet(ctx.ptr(), args.valType.ptr(), args.numDp, args.numBit, args.numRep, @backingInt(args.redOp), args.nan, if (args.halfSplitOff) |v| v.ptr() else c.MlirAttribute{ .ptr = null }); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValType(self: *const Self) *const mlir.Type { @@ -1629,7 +1629,7 @@ pub const CopyAtomSM10xTmemLoadRedType = opaque { return c.mlirCuteNVGPUCopyAtomSM10xTmemLoadRedTypeGetNumRep(self.ptr()); } pub fn getRedOp(self: *const Self) TmemLoadRedOp { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomSM10xTmemLoadRedTypeGetRedOp(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomSM10xTmemLoadRedTypeGetRedOp(self.ptr()))); } pub fn getNan(self: *const Self) bool { return c.mlirCuteNVGPUCopyAtomSM10xTmemLoadRedTypeGetNan(self.ptr()); @@ -1706,7 +1706,7 @@ pub const CopyAtomTmaLoadType = opaque { noFullyOobTile: bool = false, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUCopyAtomTmaLoadTypeGet(ctx.ptr(), args.valType.ptr(), args.sparsity, args.copyBits, @intFromEnum(args.mode), args.numCta, args.gStride.ptr(), args.mcast, if (args.tmaGbasis) |v| v.ptr() else c.MlirType{ .ptr = null }, args.override, args.noFullyOobTile); + const result = c.mlirCuteNVGPUCopyAtomTmaLoadTypeGet(ctx.ptr(), args.valType.ptr(), args.sparsity, args.copyBits, @backingInt(args.mode), args.numCta, args.gStride.ptr(), args.mcast, if (args.tmaGbasis) |v| v.ptr() else c.MlirType{ .ptr = null }, args.override, args.noFullyOobTile); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValType(self: *const Self) *const mlir.Type { @@ -1719,7 +1719,7 @@ pub const CopyAtomTmaLoadType = opaque { return c.mlirCuteNVGPUCopyAtomTmaLoadTypeGetCopyBits(self.ptr()); } pub fn getMode(self: *const Self) TmaLoadMode { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomTmaLoadTypeGetMode(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomTmaLoadTypeGetMode(self.ptr()))); } pub fn getNumCta(self: *const Self) c_int { return c.mlirCuteNVGPUCopyAtomTmaLoadTypeGetNumCta(self.ptr()); @@ -1765,7 +1765,7 @@ pub const CopyAtomTmaReduceType = opaque { tmaGbasis: ?*const mlir.Type = null, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUCopyAtomTmaReduceTypeGet(ctx.ptr(), args.valType.ptr(), args.copyBits, @intFromEnum(args.mode), @intFromEnum(args.kind), args.gStride.ptr(), if (args.tmaGbasis) |v| v.ptr() else c.MlirType{ .ptr = null }); + const result = c.mlirCuteNVGPUCopyAtomTmaReduceTypeGet(ctx.ptr(), args.valType.ptr(), args.copyBits, @backingInt(args.mode), @backingInt(args.kind), args.gStride.ptr(), if (args.tmaGbasis) |v| v.ptr() else c.MlirType{ .ptr = null }); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValType(self: *const Self) *const mlir.Type { @@ -1775,10 +1775,10 @@ pub const CopyAtomTmaReduceType = opaque { return c.mlirCuteNVGPUCopyAtomTmaReduceTypeGetCopyBits(self.ptr()); } pub fn getMode(self: *const Self) TmaStoreMode { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomTmaReduceTypeGetMode(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomTmaReduceTypeGetMode(self.ptr()))); } pub fn getKind(self: *const Self) ReductionKind { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomTmaReduceTypeGetKind(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomTmaReduceTypeGetKind(self.ptr()))); } pub fn getGStride(self: *const Self) *const mlir.Type { return @ptrCast(c.mlirCuteNVGPUCopyAtomTmaReduceTypeGetGStride(self.ptr()).ptr.?); @@ -1814,7 +1814,7 @@ pub const CopyAtomTmaStoreType = opaque { noFullyOobTile: bool = false, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUCopyAtomTmaStoreTypeGet(ctx.ptr(), args.valType.ptr(), args.sparsity, args.copyBits, @intFromEnum(args.mode), args.gStride.ptr(), if (args.tmaGbasis) |v| v.ptr() else c.MlirType{ .ptr = null }, args.override, args.noFullyOobTile); + const result = c.mlirCuteNVGPUCopyAtomTmaStoreTypeGet(ctx.ptr(), args.valType.ptr(), args.sparsity, args.copyBits, @backingInt(args.mode), args.gStride.ptr(), if (args.tmaGbasis) |v| v.ptr() else c.MlirType{ .ptr = null }, args.override, args.noFullyOobTile); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValType(self: *const Self) *const mlir.Type { @@ -1827,7 +1827,7 @@ pub const CopyAtomTmaStoreType = opaque { return c.mlirCuteNVGPUCopyAtomTmaStoreTypeGetCopyBits(self.ptr()); } pub fn getMode(self: *const Self) TmaStoreMode { - return @enumFromInt(c.mlirCuteNVGPUCopyAtomTmaStoreTypeGetMode(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyAtomTmaStoreTypeGetMode(self.ptr()))); } pub fn getGStride(self: *const Self) *const mlir.Type { return @ptrCast(c.mlirCuteNVGPUCopyAtomTmaStoreTypeGetGStride(self.ptr()).ptr.?); @@ -1874,7 +1874,7 @@ pub const MmaAtomSM100UMMABlockScaledSparseType = opaque { intOverflow: ?*const mlir.Attribute = null, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledSparseTypeGet(ctx.ptr(), args.shapeMnk.ptr(), args.numCta, @intFromEnum(args.aMajor), @intFromEnum(args.bMajor), args.aType.ptr(), args.bType.ptr(), args.cType.ptr(), args.sfType.ptr(), @intFromEnum(args.sparseMetadataFormat), @intFromEnum(args.aFragKind), args.vecSize, @intFromEnum(args.archPromote), if (args.intOverflow) |v| v.ptr() else c.MlirAttribute{ .ptr = null }); + const result = c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledSparseTypeGet(ctx.ptr(), args.shapeMnk.ptr(), args.numCta, @backingInt(args.aMajor), @backingInt(args.bMajor), args.aType.ptr(), args.bType.ptr(), args.cType.ptr(), args.sfType.ptr(), @backingInt(args.sparseMetadataFormat), @backingInt(args.aFragKind), args.vecSize, @backingInt(args.archPromote), if (args.intOverflow) |v| v.ptr() else c.MlirAttribute{ .ptr = null }); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getShapeMnk(self: *const Self) *const mlir.Attribute { @@ -1884,10 +1884,10 @@ pub const MmaAtomSM100UMMABlockScaledSparseType = opaque { return c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledSparseTypeGetNumCta(self.ptr()); } pub fn getAMajor(self: *const Self) cute.MajorMode { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledSparseTypeGetAMajor(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledSparseTypeGetAMajor(self.ptr()))); } pub fn getBMajor(self: *const Self) cute.MajorMode { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledSparseTypeGetBMajor(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledSparseTypeGetBMajor(self.ptr()))); } pub fn getAType(self: *const Self) *const mlir.Type { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledSparseTypeGetAType(self.ptr()).ptr.?); @@ -1902,16 +1902,16 @@ pub const MmaAtomSM100UMMABlockScaledSparseType = opaque { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledSparseTypeGetSfType(self.ptr()).ptr.?); } pub fn getSparseMetadataFormat(self: *const Self) SparseMetadataFormat { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledSparseTypeGetSparseMetadataFormat(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledSparseTypeGetSparseMetadataFormat(self.ptr()))); } pub fn getAFragKind(self: *const Self) MmaFragKind { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledSparseTypeGetAFragKind(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledSparseTypeGetAFragKind(self.ptr()))); } pub fn getVecSize(self: *const Self) c_int { return c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledSparseTypeGetVecSize(self.ptr()); } pub fn getArchPromote(self: *const Self) Arch { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledSparseTypeGetArchPromote(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledSparseTypeGetArchPromote(self.ptr()))); } pub fn getIntOverflow(self: *const Self) ?*const mlir.Attribute { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledSparseTypeGetIntOverflow(self.ptr()).ptr); @@ -1948,7 +1948,7 @@ pub const MmaAtomSM100UMMABlockScaledType = opaque { intOverflow: ?*const mlir.Attribute = null, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledTypeGet(ctx.ptr(), args.shapeMnk.ptr(), args.numCta, @intFromEnum(args.aMajor), @intFromEnum(args.bMajor), args.aType.ptr(), args.bType.ptr(), args.cType.ptr(), args.sfType.ptr(), @intFromEnum(args.aFragKind), args.vecSize, @intFromEnum(args.archPromote), if (args.intOverflow) |v| v.ptr() else c.MlirAttribute{ .ptr = null }); + const result = c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledTypeGet(ctx.ptr(), args.shapeMnk.ptr(), args.numCta, @backingInt(args.aMajor), @backingInt(args.bMajor), args.aType.ptr(), args.bType.ptr(), args.cType.ptr(), args.sfType.ptr(), @backingInt(args.aFragKind), args.vecSize, @backingInt(args.archPromote), if (args.intOverflow) |v| v.ptr() else c.MlirAttribute{ .ptr = null }); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getShapeMnk(self: *const Self) *const mlir.Attribute { @@ -1958,10 +1958,10 @@ pub const MmaAtomSM100UMMABlockScaledType = opaque { return c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledTypeGetNumCta(self.ptr()); } pub fn getAMajor(self: *const Self) cute.MajorMode { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledTypeGetAMajor(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledTypeGetAMajor(self.ptr()))); } pub fn getBMajor(self: *const Self) cute.MajorMode { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledTypeGetBMajor(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledTypeGetBMajor(self.ptr()))); } pub fn getAType(self: *const Self) *const mlir.Type { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledTypeGetAType(self.ptr()).ptr.?); @@ -1976,13 +1976,13 @@ pub const MmaAtomSM100UMMABlockScaledType = opaque { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledTypeGetSfType(self.ptr()).ptr.?); } pub fn getAFragKind(self: *const Self) MmaFragKind { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledTypeGetAFragKind(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledTypeGetAFragKind(self.ptr()))); } pub fn getVecSize(self: *const Self) c_int { return c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledTypeGetVecSize(self.ptr()); } pub fn getArchPromote(self: *const Self) Arch { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledTypeGetArchPromote(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledTypeGetArchPromote(self.ptr()))); } pub fn getIntOverflow(self: *const Self) ?*const mlir.Attribute { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM100UMMABlockScaledTypeGetIntOverflow(self.ptr()).ptr); @@ -2019,7 +2019,7 @@ pub const MmaAtomSM100UMMASparseType = opaque { intOverflow: ?*const mlir.Attribute = null, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUMmaAtomSM100UMMASparseTypeGet(ctx.ptr(), args.shapeMnk.ptr(), args.numCta, @intFromEnum(args.aMajor), @intFromEnum(args.bMajor), args.aType.ptr(), args.bType.ptr(), args.cType.ptr(), args.eType.ptr(), @intFromEnum(args.sparseMetadataFormat), @intFromEnum(args.aFragKind), args.cScaleExp, if (args.intOverflow) |v| v.ptr() else c.MlirAttribute{ .ptr = null }); + const result = c.mlirCuteNVGPUMmaAtomSM100UMMASparseTypeGet(ctx.ptr(), args.shapeMnk.ptr(), args.numCta, @backingInt(args.aMajor), @backingInt(args.bMajor), args.aType.ptr(), args.bType.ptr(), args.cType.ptr(), args.eType.ptr(), @backingInt(args.sparseMetadataFormat), @backingInt(args.aFragKind), args.cScaleExp, if (args.intOverflow) |v| v.ptr() else c.MlirAttribute{ .ptr = null }); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getShapeMnk(self: *const Self) *const mlir.Attribute { @@ -2029,10 +2029,10 @@ pub const MmaAtomSM100UMMASparseType = opaque { return c.mlirCuteNVGPUMmaAtomSM100UMMASparseTypeGetNumCta(self.ptr()); } pub fn getAMajor(self: *const Self) cute.MajorMode { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM100UMMASparseTypeGetAMajor(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM100UMMASparseTypeGetAMajor(self.ptr()))); } pub fn getBMajor(self: *const Self) cute.MajorMode { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM100UMMASparseTypeGetBMajor(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM100UMMASparseTypeGetBMajor(self.ptr()))); } pub fn getAType(self: *const Self) *const mlir.Type { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM100UMMASparseTypeGetAType(self.ptr()).ptr.?); @@ -2047,10 +2047,10 @@ pub const MmaAtomSM100UMMASparseType = opaque { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM100UMMASparseTypeGetEType(self.ptr()).ptr.?); } pub fn getSparseMetadataFormat(self: *const Self) SparseMetadataFormat { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM100UMMASparseTypeGetSparseMetadataFormat(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM100UMMASparseTypeGetSparseMetadataFormat(self.ptr()))); } pub fn getAFragKind(self: *const Self) MmaFragKind { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM100UMMASparseTypeGetAFragKind(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM100UMMASparseTypeGetAFragKind(self.ptr()))); } pub fn getCScaleExp(self: *const Self) c_int { return c.mlirCuteNVGPUMmaAtomSM100UMMASparseTypeGetCScaleExp(self.ptr()); @@ -2088,7 +2088,7 @@ pub const MmaAtomSM100UMMAType = opaque { intOverflow: ?*const mlir.Attribute = null, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUMmaAtomSM100UMMATypeGet(ctx.ptr(), args.shapeMnk.ptr(), args.numCta, @intFromEnum(args.aMajor), @intFromEnum(args.bMajor), args.aType.ptr(), args.bType.ptr(), args.cType.ptr(), @intFromEnum(args.aFragKind), args.cScaleExp, if (args.intOverflow) |v| v.ptr() else c.MlirAttribute{ .ptr = null }); + const result = c.mlirCuteNVGPUMmaAtomSM100UMMATypeGet(ctx.ptr(), args.shapeMnk.ptr(), args.numCta, @backingInt(args.aMajor), @backingInt(args.bMajor), args.aType.ptr(), args.bType.ptr(), args.cType.ptr(), @backingInt(args.aFragKind), args.cScaleExp, if (args.intOverflow) |v| v.ptr() else c.MlirAttribute{ .ptr = null }); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getShapeMnk(self: *const Self) *const mlir.Attribute { @@ -2098,10 +2098,10 @@ pub const MmaAtomSM100UMMAType = opaque { return c.mlirCuteNVGPUMmaAtomSM100UMMATypeGetNumCta(self.ptr()); } pub fn getAMajor(self: *const Self) cute.MajorMode { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM100UMMATypeGetAMajor(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM100UMMATypeGetAMajor(self.ptr()))); } pub fn getBMajor(self: *const Self) cute.MajorMode { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM100UMMATypeGetBMajor(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM100UMMATypeGetBMajor(self.ptr()))); } pub fn getAType(self: *const Self) *const mlir.Type { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM100UMMATypeGetAType(self.ptr()).ptr.?); @@ -2113,7 +2113,7 @@ pub const MmaAtomSM100UMMAType = opaque { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM100UMMATypeGetCType(self.ptr()).ptr.?); } pub fn getAFragKind(self: *const Self) MmaFragKind { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM100UMMATypeGetAFragKind(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM100UMMATypeGetAFragKind(self.ptr()))); } pub fn getCScaleExp(self: *const Self) c_int { return c.mlirCuteNVGPUMmaAtomSM100UMMATypeGetCScaleExp(self.ptr()); @@ -2155,7 +2155,7 @@ pub const MmaAtomSM107UMMABlockScaledSparseType = opaque { intOverflow: ?*const mlir.Attribute = null, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledSparseTypeGet(ctx.ptr(), args.shapeMnk.ptr(), args.numCta, @intFromEnum(args.aMajor), @intFromEnum(args.bMajor), args.aType.ptr(), args.bType.ptr(), args.cType.ptr(), args.sfType.ptr(), @intFromEnum(args.sparseMetadataFormat), @intFromEnum(args.aFragKind), args.vecSize, @intFromEnum(args.aCollectorOp), @intFromEnum(args.bCollectorOp), if (args.intOverflow) |v| v.ptr() else c.MlirAttribute{ .ptr = null }); + const result = c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledSparseTypeGet(ctx.ptr(), args.shapeMnk.ptr(), args.numCta, @backingInt(args.aMajor), @backingInt(args.bMajor), args.aType.ptr(), args.bType.ptr(), args.cType.ptr(), args.sfType.ptr(), @backingInt(args.sparseMetadataFormat), @backingInt(args.aFragKind), args.vecSize, @backingInt(args.aCollectorOp), @backingInt(args.bCollectorOp), if (args.intOverflow) |v| v.ptr() else c.MlirAttribute{ .ptr = null }); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getShapeMnk(self: *const Self) *const mlir.Attribute { @@ -2165,10 +2165,10 @@ pub const MmaAtomSM107UMMABlockScaledSparseType = opaque { return c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledSparseTypeGetNumCta(self.ptr()); } pub fn getAMajor(self: *const Self) cute.MajorMode { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledSparseTypeGetAMajor(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledSparseTypeGetAMajor(self.ptr()))); } pub fn getBMajor(self: *const Self) cute.MajorMode { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledSparseTypeGetBMajor(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledSparseTypeGetBMajor(self.ptr()))); } pub fn getAType(self: *const Self) *const mlir.Type { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledSparseTypeGetAType(self.ptr()).ptr.?); @@ -2183,19 +2183,19 @@ pub const MmaAtomSM107UMMABlockScaledSparseType = opaque { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledSparseTypeGetSfType(self.ptr()).ptr.?); } pub fn getSparseMetadataFormat(self: *const Self) SparseMetadataFormat { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledSparseTypeGetSparseMetadataFormat(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledSparseTypeGetSparseMetadataFormat(self.ptr()))); } pub fn getAFragKind(self: *const Self) MmaFragKind { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledSparseTypeGetAFragKind(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledSparseTypeGetAFragKind(self.ptr()))); } pub fn getVecSize(self: *const Self) c_int { return c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledSparseTypeGetVecSize(self.ptr()); } pub fn getACollectorOp(self: *const Self) MmaCollectorOp { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledSparseTypeGetACollectorOp(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledSparseTypeGetACollectorOp(self.ptr()))); } pub fn getBCollectorOp(self: *const Self) MmaCollectorOp { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledSparseTypeGetBCollectorOp(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledSparseTypeGetBCollectorOp(self.ptr()))); } pub fn getIntOverflow(self: *const Self) ?*const mlir.Attribute { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledSparseTypeGetIntOverflow(self.ptr()).ptr); @@ -2233,7 +2233,7 @@ pub const MmaAtomSM107UMMABlockScaledType = opaque { intOverflow: ?*const mlir.Attribute = null, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledTypeGet(ctx.ptr(), args.shapeMnk.ptr(), args.numCta, @intFromEnum(args.aMajor), @intFromEnum(args.bMajor), args.aType.ptr(), args.bType.ptr(), args.cType.ptr(), args.sfType.ptr(), @intFromEnum(args.aFragKind), args.vecSize, @intFromEnum(args.aCollectorOp), @intFromEnum(args.bCollectorOp), if (args.intOverflow) |v| v.ptr() else c.MlirAttribute{ .ptr = null }); + const result = c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledTypeGet(ctx.ptr(), args.shapeMnk.ptr(), args.numCta, @backingInt(args.aMajor), @backingInt(args.bMajor), args.aType.ptr(), args.bType.ptr(), args.cType.ptr(), args.sfType.ptr(), @backingInt(args.aFragKind), args.vecSize, @backingInt(args.aCollectorOp), @backingInt(args.bCollectorOp), if (args.intOverflow) |v| v.ptr() else c.MlirAttribute{ .ptr = null }); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getShapeMnk(self: *const Self) *const mlir.Attribute { @@ -2243,10 +2243,10 @@ pub const MmaAtomSM107UMMABlockScaledType = opaque { return c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledTypeGetNumCta(self.ptr()); } pub fn getAMajor(self: *const Self) cute.MajorMode { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledTypeGetAMajor(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledTypeGetAMajor(self.ptr()))); } pub fn getBMajor(self: *const Self) cute.MajorMode { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledTypeGetBMajor(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledTypeGetBMajor(self.ptr()))); } pub fn getAType(self: *const Self) *const mlir.Type { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledTypeGetAType(self.ptr()).ptr.?); @@ -2261,16 +2261,16 @@ pub const MmaAtomSM107UMMABlockScaledType = opaque { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledTypeGetSfType(self.ptr()).ptr.?); } pub fn getAFragKind(self: *const Self) MmaFragKind { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledTypeGetAFragKind(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledTypeGetAFragKind(self.ptr()))); } pub fn getVecSize(self: *const Self) c_int { return c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledTypeGetVecSize(self.ptr()); } pub fn getACollectorOp(self: *const Self) MmaCollectorOp { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledTypeGetACollectorOp(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledTypeGetACollectorOp(self.ptr()))); } pub fn getBCollectorOp(self: *const Self) MmaCollectorOp { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledTypeGetBCollectorOp(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledTypeGetBCollectorOp(self.ptr()))); } pub fn getIntOverflow(self: *const Self) ?*const mlir.Attribute { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM107UMMABlockScaledTypeGetIntOverflow(self.ptr()).ptr); @@ -2309,7 +2309,7 @@ pub const MmaAtomSM107UMMASparseType = opaque { intOverflow: ?*const mlir.Attribute = null, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUMmaAtomSM107UMMASparseTypeGet(ctx.ptr(), args.shapeMnk.ptr(), args.numCta, @intFromEnum(args.aMajor), @intFromEnum(args.bMajor), args.aType.ptr(), args.bType.ptr(), args.cType.ptr(), args.eType.ptr(), @intFromEnum(args.sparseMetadataFormat), @intFromEnum(args.aFragKind), args.cScaleExp, @intFromEnum(args.aCollectorOp), @intFromEnum(args.bCollectorOp), if (args.intOverflow) |v| v.ptr() else c.MlirAttribute{ .ptr = null }); + const result = c.mlirCuteNVGPUMmaAtomSM107UMMASparseTypeGet(ctx.ptr(), args.shapeMnk.ptr(), args.numCta, @backingInt(args.aMajor), @backingInt(args.bMajor), args.aType.ptr(), args.bType.ptr(), args.cType.ptr(), args.eType.ptr(), @backingInt(args.sparseMetadataFormat), @backingInt(args.aFragKind), args.cScaleExp, @backingInt(args.aCollectorOp), @backingInt(args.bCollectorOp), if (args.intOverflow) |v| v.ptr() else c.MlirAttribute{ .ptr = null }); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getShapeMnk(self: *const Self) *const mlir.Attribute { @@ -2319,10 +2319,10 @@ pub const MmaAtomSM107UMMASparseType = opaque { return c.mlirCuteNVGPUMmaAtomSM107UMMASparseTypeGetNumCta(self.ptr()); } pub fn getAMajor(self: *const Self) cute.MajorMode { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM107UMMASparseTypeGetAMajor(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM107UMMASparseTypeGetAMajor(self.ptr()))); } pub fn getBMajor(self: *const Self) cute.MajorMode { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM107UMMASparseTypeGetBMajor(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM107UMMASparseTypeGetBMajor(self.ptr()))); } pub fn getAType(self: *const Self) *const mlir.Type { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM107UMMASparseTypeGetAType(self.ptr()).ptr.?); @@ -2337,19 +2337,19 @@ pub const MmaAtomSM107UMMASparseType = opaque { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM107UMMASparseTypeGetEType(self.ptr()).ptr.?); } pub fn getSparseMetadataFormat(self: *const Self) SparseMetadataFormat { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM107UMMASparseTypeGetSparseMetadataFormat(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM107UMMASparseTypeGetSparseMetadataFormat(self.ptr()))); } pub fn getAFragKind(self: *const Self) MmaFragKind { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM107UMMASparseTypeGetAFragKind(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM107UMMASparseTypeGetAFragKind(self.ptr()))); } pub fn getCScaleExp(self: *const Self) c_int { return c.mlirCuteNVGPUMmaAtomSM107UMMASparseTypeGetCScaleExp(self.ptr()); } pub fn getACollectorOp(self: *const Self) MmaCollectorOp { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM107UMMASparseTypeGetACollectorOp(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM107UMMASparseTypeGetACollectorOp(self.ptr()))); } pub fn getBCollectorOp(self: *const Self) MmaCollectorOp { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM107UMMASparseTypeGetBCollectorOp(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM107UMMASparseTypeGetBCollectorOp(self.ptr()))); } pub fn getIntOverflow(self: *const Self) ?*const mlir.Attribute { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM107UMMASparseTypeGetIntOverflow(self.ptr()).ptr); @@ -2386,7 +2386,7 @@ pub const MmaAtomSM107UMMAType = opaque { intOverflow: ?*const mlir.Attribute = null, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUMmaAtomSM107UMMATypeGet(ctx.ptr(), args.shapeMnk.ptr(), args.numCta, @intFromEnum(args.aMajor), @intFromEnum(args.bMajor), args.aType.ptr(), args.bType.ptr(), args.cType.ptr(), @intFromEnum(args.aFragKind), args.cScaleExp, @intFromEnum(args.aCollectorOp), @intFromEnum(args.bCollectorOp), if (args.intOverflow) |v| v.ptr() else c.MlirAttribute{ .ptr = null }); + const result = c.mlirCuteNVGPUMmaAtomSM107UMMATypeGet(ctx.ptr(), args.shapeMnk.ptr(), args.numCta, @backingInt(args.aMajor), @backingInt(args.bMajor), args.aType.ptr(), args.bType.ptr(), args.cType.ptr(), @backingInt(args.aFragKind), args.cScaleExp, @backingInt(args.aCollectorOp), @backingInt(args.bCollectorOp), if (args.intOverflow) |v| v.ptr() else c.MlirAttribute{ .ptr = null }); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getShapeMnk(self: *const Self) *const mlir.Attribute { @@ -2396,10 +2396,10 @@ pub const MmaAtomSM107UMMAType = opaque { return c.mlirCuteNVGPUMmaAtomSM107UMMATypeGetNumCta(self.ptr()); } pub fn getAMajor(self: *const Self) cute.MajorMode { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM107UMMATypeGetAMajor(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM107UMMATypeGetAMajor(self.ptr()))); } pub fn getBMajor(self: *const Self) cute.MajorMode { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM107UMMATypeGetBMajor(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM107UMMATypeGetBMajor(self.ptr()))); } pub fn getAType(self: *const Self) *const mlir.Type { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM107UMMATypeGetAType(self.ptr()).ptr.?); @@ -2411,16 +2411,16 @@ pub const MmaAtomSM107UMMAType = opaque { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM107UMMATypeGetCType(self.ptr()).ptr.?); } pub fn getAFragKind(self: *const Self) MmaFragKind { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM107UMMATypeGetAFragKind(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM107UMMATypeGetAFragKind(self.ptr()))); } pub fn getCScaleExp(self: *const Self) c_int { return c.mlirCuteNVGPUMmaAtomSM107UMMATypeGetCScaleExp(self.ptr()); } pub fn getACollectorOp(self: *const Self) MmaCollectorOp { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM107UMMATypeGetACollectorOp(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM107UMMATypeGetACollectorOp(self.ptr()))); } pub fn getBCollectorOp(self: *const Self) MmaCollectorOp { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM107UMMATypeGetBCollectorOp(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM107UMMATypeGetBCollectorOp(self.ptr()))); } pub fn getIntOverflow(self: *const Self) ?*const mlir.Attribute { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM107UMMATypeGetIntOverflow(self.ptr()).ptr); @@ -2502,7 +2502,7 @@ pub const MmaAtomSM80SparseType = opaque { intOverflow: ?*const mlir.Attribute = null, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUMmaAtomSM80SparseTypeGet(ctx.ptr(), args.shapeMnk.ptr(), args.aType.ptr(), args.bType.ptr(), args.cType.ptr(), @intFromEnum(args.sparseMetadataFormat), if (args.intOverflow) |v| v.ptr() else c.MlirAttribute{ .ptr = null }); + const result = c.mlirCuteNVGPUMmaAtomSM80SparseTypeGet(ctx.ptr(), args.shapeMnk.ptr(), args.aType.ptr(), args.bType.ptr(), args.cType.ptr(), @backingInt(args.sparseMetadataFormat), if (args.intOverflow) |v| v.ptr() else c.MlirAttribute{ .ptr = null }); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getShapeMnk(self: *const Self) *const mlir.Attribute { @@ -2518,7 +2518,7 @@ pub const MmaAtomSM80SparseType = opaque { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM80SparseTypeGetCType(self.ptr()).ptr.?); } pub fn getSparseMetadataFormat(self: *const Self) SparseMetadataFormat { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM80SparseTypeGetSparseMetadataFormat(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM80SparseTypeGetSparseMetadataFormat(self.ptr()))); } pub fn getIntOverflow(self: *const Self) ?*const mlir.Attribute { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM80SparseTypeGetIntOverflow(self.ptr()).ptr); @@ -2639,17 +2639,17 @@ pub const MmaAtomSM90Type = opaque { bNeg: bool = false, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUMmaAtomSM90TypeGet(ctx.ptr(), args.shapeMnk.ptr(), @intFromEnum(args.aMajor), @intFromEnum(args.bMajor), args.aType.ptr(), args.bType.ptr(), args.cType.ptr(), @intFromEnum(args.aFragKind), if (args.intOverflow) |v| v.ptr() else c.MlirAttribute{ .ptr = null }, args.aNeg, args.bNeg); + const result = c.mlirCuteNVGPUMmaAtomSM90TypeGet(ctx.ptr(), args.shapeMnk.ptr(), @backingInt(args.aMajor), @backingInt(args.bMajor), args.aType.ptr(), args.bType.ptr(), args.cType.ptr(), @backingInt(args.aFragKind), if (args.intOverflow) |v| v.ptr() else c.MlirAttribute{ .ptr = null }, args.aNeg, args.bNeg); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getShapeMnk(self: *const Self) *const mlir.Attribute { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM90TypeGetShapeMnk(self.ptr()).ptr.?); } pub fn getAMajor(self: *const Self) cute.MajorMode { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM90TypeGetAMajor(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM90TypeGetAMajor(self.ptr()))); } pub fn getBMajor(self: *const Self) cute.MajorMode { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM90TypeGetBMajor(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM90TypeGetBMajor(self.ptr()))); } pub fn getAType(self: *const Self) *const mlir.Type { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM90TypeGetAType(self.ptr()).ptr.?); @@ -2661,7 +2661,7 @@ pub const MmaAtomSM90Type = opaque { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM90TypeGetCType(self.ptr()).ptr.?); } pub fn getAFragKind(self: *const Self) MmaFragKind { - return @enumFromInt(c.mlirCuteNVGPUMmaAtomSM90TypeGetAFragKind(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaAtomSM90TypeGetAFragKind(self.ptr()))); } pub fn getIntOverflow(self: *const Self) ?*const mlir.Attribute { return @ptrCast(c.mlirCuteNVGPUMmaAtomSM90TypeGetIntOverflow(self.ptr()).ptr); @@ -2932,11 +2932,11 @@ pub const AtomCopyFieldBulkCopyG2SAttr = opaque { value: AtomCopyFieldBulkCopyG2S, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUAtomCopyFieldBulkCopyG2SAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUAtomCopyFieldBulkCopyG2SAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) AtomCopyFieldBulkCopyG2S { - return @enumFromInt(c.mlirCuteNVGPUAtomCopyFieldBulkCopyG2SAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUAtomCopyFieldBulkCopyG2SAttrGetValue(self.ptr()))); } }; @@ -2959,11 +2959,11 @@ pub const AtomCopyFieldBulkCopyS2GAttr = opaque { value: AtomCopyFieldBulkCopyS2G, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUAtomCopyFieldBulkCopyS2GAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUAtomCopyFieldBulkCopyS2GAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) AtomCopyFieldBulkCopyS2G { - return @enumFromInt(c.mlirCuteNVGPUAtomCopyFieldBulkCopyS2GAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUAtomCopyFieldBulkCopyS2GAttrGetValue(self.ptr()))); } }; @@ -2986,11 +2986,11 @@ pub const AtomCopyFieldBulkCopyS2SAttr = opaque { value: AtomCopyFieldBulkCopyS2S, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUAtomCopyFieldBulkCopyS2SAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUAtomCopyFieldBulkCopyS2SAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) AtomCopyFieldBulkCopyS2S { - return @enumFromInt(c.mlirCuteNVGPUAtomCopyFieldBulkCopyS2SAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUAtomCopyFieldBulkCopyS2SAttrGetValue(self.ptr()))); } }; @@ -3013,11 +3013,11 @@ pub const AtomCopyFieldDsmemStoreAttr = opaque { value: AtomCopyFieldDsmemStore, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUAtomCopyFieldDsmemStoreAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUAtomCopyFieldDsmemStoreAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) AtomCopyFieldDsmemStore { - return @enumFromInt(c.mlirCuteNVGPUAtomCopyFieldDsmemStoreAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUAtomCopyFieldDsmemStoreAttrGetValue(self.ptr()))); } }; @@ -3040,11 +3040,11 @@ pub const AtomCopyFieldLoadGlobalAttr = opaque { value: AtomCopyFieldLoadGlobal, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUAtomCopyFieldLoadGlobalAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUAtomCopyFieldLoadGlobalAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) AtomCopyFieldLoadGlobal { - return @enumFromInt(c.mlirCuteNVGPUAtomCopyFieldLoadGlobalAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUAtomCopyFieldLoadGlobalAttrGetValue(self.ptr()))); } }; @@ -3067,11 +3067,11 @@ pub const AtomCopyFieldNonExec2DGather4TmaLoadAttr = opaque { value: AtomCopyFieldNonExec2DGather4TmaLoad, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUAtomCopyFieldNonExec2DGather4TmaLoadAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUAtomCopyFieldNonExec2DGather4TmaLoadAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) AtomCopyFieldNonExec2DGather4TmaLoad { - return @enumFromInt(c.mlirCuteNVGPUAtomCopyFieldNonExec2DGather4TmaLoadAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUAtomCopyFieldNonExec2DGather4TmaLoadAttrGetValue(self.ptr()))); } }; @@ -3094,11 +3094,11 @@ pub const AtomCopyFieldNonExec2DScatter4TmaStoreAttr = opaque { value: AtomCopyFieldNonExec2DScatter4TmaStore, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUAtomCopyFieldNonExec2DScatter4TmaStoreAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUAtomCopyFieldNonExec2DScatter4TmaStoreAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) AtomCopyFieldNonExec2DScatter4TmaStore { - return @enumFromInt(c.mlirCuteNVGPUAtomCopyFieldNonExec2DScatter4TmaStoreAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUAtomCopyFieldNonExec2DScatter4TmaStoreAttrGetValue(self.ptr()))); } }; @@ -3121,11 +3121,11 @@ pub const AtomCopyFieldNonExecIm2ColTmaLoadAttr = opaque { value: AtomCopyFieldNonExecIm2ColTmaLoad, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUAtomCopyFieldNonExecIm2ColTmaLoadAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUAtomCopyFieldNonExecIm2ColTmaLoadAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) AtomCopyFieldNonExecIm2ColTmaLoad { - return @enumFromInt(c.mlirCuteNVGPUAtomCopyFieldNonExecIm2ColTmaLoadAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUAtomCopyFieldNonExecIm2ColTmaLoadAttrGetValue(self.ptr()))); } }; @@ -3148,11 +3148,11 @@ pub const AtomCopyFieldNonExecIm2ColTmaStoreAttr = opaque { value: AtomCopyFieldNonExecIm2ColTmaStore, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUAtomCopyFieldNonExecIm2ColTmaStoreAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUAtomCopyFieldNonExecIm2ColTmaStoreAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) AtomCopyFieldNonExecIm2ColTmaStore { - return @enumFromInt(c.mlirCuteNVGPUAtomCopyFieldNonExecIm2ColTmaStoreAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUAtomCopyFieldNonExecIm2ColTmaStoreAttrGetValue(self.ptr()))); } }; @@ -3175,11 +3175,11 @@ pub const AtomCopyFieldNonExecTiledTmaLoadAttr = opaque { value: AtomCopyFieldNonExecTiledTmaLoad, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUAtomCopyFieldNonExecTiledTmaLoadAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUAtomCopyFieldNonExecTiledTmaLoadAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) AtomCopyFieldNonExecTiledTmaLoad { - return @enumFromInt(c.mlirCuteNVGPUAtomCopyFieldNonExecTiledTmaLoadAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUAtomCopyFieldNonExecTiledTmaLoadAttrGetValue(self.ptr()))); } }; @@ -3202,11 +3202,11 @@ pub const AtomCopyFieldNonExecTiledTmaReduceAttr = opaque { value: AtomCopyFieldNonExecTiledTmaReduce, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUAtomCopyFieldNonExecTiledTmaReduceAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUAtomCopyFieldNonExecTiledTmaReduceAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) AtomCopyFieldNonExecTiledTmaReduce { - return @enumFromInt(c.mlirCuteNVGPUAtomCopyFieldNonExecTiledTmaReduceAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUAtomCopyFieldNonExecTiledTmaReduceAttrGetValue(self.ptr()))); } }; @@ -3229,11 +3229,11 @@ pub const AtomCopyFieldNonExecTiledTmaStoreAttr = opaque { value: AtomCopyFieldNonExecTiledTmaStore, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUAtomCopyFieldNonExecTiledTmaStoreAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUAtomCopyFieldNonExecTiledTmaStoreAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) AtomCopyFieldNonExecTiledTmaStore { - return @enumFromInt(c.mlirCuteNVGPUAtomCopyFieldNonExecTiledTmaStoreAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUAtomCopyFieldNonExecTiledTmaStoreAttrGetValue(self.ptr()))); } }; @@ -3256,11 +3256,11 @@ pub const AtomCopyFieldStoreGlobalAttr = opaque { value: AtomCopyFieldStoreGlobal, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUAtomCopyFieldStoreGlobalAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUAtomCopyFieldStoreGlobalAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) AtomCopyFieldStoreGlobal { - return @enumFromInt(c.mlirCuteNVGPUAtomCopyFieldStoreGlobalAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUAtomCopyFieldStoreGlobalAttrGetValue(self.ptr()))); } }; @@ -3283,11 +3283,11 @@ pub const AtomCopyFieldTmaLoadAttr = opaque { value: AtomCopyFieldTmaLoad, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUAtomCopyFieldTmaLoadAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUAtomCopyFieldTmaLoadAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) AtomCopyFieldTmaLoad { - return @enumFromInt(c.mlirCuteNVGPUAtomCopyFieldTmaLoadAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUAtomCopyFieldTmaLoadAttrGetValue(self.ptr()))); } }; @@ -3310,11 +3310,11 @@ pub const AtomCopyFieldTmaReduceAttr = opaque { value: AtomCopyFieldTmaReduce, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUAtomCopyFieldTmaReduceAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUAtomCopyFieldTmaReduceAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) AtomCopyFieldTmaReduce { - return @enumFromInt(c.mlirCuteNVGPUAtomCopyFieldTmaReduceAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUAtomCopyFieldTmaReduceAttrGetValue(self.ptr()))); } }; @@ -3337,11 +3337,11 @@ pub const AtomCopyFieldTmaStoreAttr = opaque { value: AtomCopyFieldTmaStore, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUAtomCopyFieldTmaStoreAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUAtomCopyFieldTmaStoreAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) AtomCopyFieldTmaStore { - return @enumFromInt(c.mlirCuteNVGPUAtomCopyFieldTmaStoreAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUAtomCopyFieldTmaStoreAttrGetValue(self.ptr()))); } }; @@ -3364,11 +3364,11 @@ pub const AtomMmaFieldSM100Attr = opaque { value: AtomMmaFieldSM100, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUAtomMmaFieldSM100AttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUAtomMmaFieldSM100AttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) AtomMmaFieldSM100 { - return @enumFromInt(c.mlirCuteNVGPUAtomMmaFieldSM100AttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUAtomMmaFieldSM100AttrGetValue(self.ptr()))); } }; @@ -3391,11 +3391,11 @@ pub const AtomMmaFieldSM100BlockScaledAttr = opaque { value: AtomMmaFieldSM100BlockScaled, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUAtomMmaFieldSM100BlockScaledAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUAtomMmaFieldSM100BlockScaledAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) AtomMmaFieldSM100BlockScaled { - return @enumFromInt(c.mlirCuteNVGPUAtomMmaFieldSM100BlockScaledAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUAtomMmaFieldSM100BlockScaledAttrGetValue(self.ptr()))); } }; @@ -3418,11 +3418,11 @@ pub const AtomMmaFieldSM100BlockScaledSparseAttr = opaque { value: AtomMmaFieldSM100BlockScaledSparse, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUAtomMmaFieldSM100BlockScaledSparseAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUAtomMmaFieldSM100BlockScaledSparseAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) AtomMmaFieldSM100BlockScaledSparse { - return @enumFromInt(c.mlirCuteNVGPUAtomMmaFieldSM100BlockScaledSparseAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUAtomMmaFieldSM100BlockScaledSparseAttrGetValue(self.ptr()))); } }; @@ -3445,11 +3445,11 @@ pub const AtomMmaFieldSM100SparseAttr = opaque { value: AtomMmaFieldSM100Sparse, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUAtomMmaFieldSM100SparseAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUAtomMmaFieldSM100SparseAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) AtomMmaFieldSM100Sparse { - return @enumFromInt(c.mlirCuteNVGPUAtomMmaFieldSM100SparseAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUAtomMmaFieldSM100SparseAttrGetValue(self.ptr()))); } }; @@ -3472,11 +3472,11 @@ pub const AtomMmaFieldSM120BlockScaledAttr = opaque { value: AtomMmaFieldSM120BlockScaled, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUAtomMmaFieldSM120BlockScaledAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUAtomMmaFieldSM120BlockScaledAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) AtomMmaFieldSM120BlockScaled { - return @enumFromInt(c.mlirCuteNVGPUAtomMmaFieldSM120BlockScaledAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUAtomMmaFieldSM120BlockScaledAttrGetValue(self.ptr()))); } }; @@ -3499,11 +3499,11 @@ pub const AtomMmaFieldSM80SparseAttr = opaque { value: AtomMmaFieldSM80Sparse, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUAtomMmaFieldSM80SparseAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUAtomMmaFieldSM80SparseAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) AtomMmaFieldSM80Sparse { - return @enumFromInt(c.mlirCuteNVGPUAtomMmaFieldSM80SparseAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUAtomMmaFieldSM80SparseAttrGetValue(self.ptr()))); } }; @@ -3526,11 +3526,11 @@ pub const AtomMmaFieldSM90Attr = opaque { value: AtomMmaFieldSM90, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUAtomMmaFieldSM90AttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUAtomMmaFieldSM90AttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) AtomMmaFieldSM90 { - return @enumFromInt(c.mlirCuteNVGPUAtomMmaFieldSM90AttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUAtomMmaFieldSM90AttrGetValue(self.ptr()))); } }; @@ -3553,11 +3553,11 @@ pub const BinaryOpAttr = opaque { value: BinaryOp, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUBinaryOpAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUBinaryOpAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) BinaryOp { - return @enumFromInt(c.mlirCuteNVGPUBinaryOpAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUBinaryOpAttrGetValue(self.ptr()))); } }; @@ -3580,11 +3580,11 @@ pub const CopyS2TBroadcastAttr = opaque { value: CopyS2TBroadcast, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUCopyS2TBroadcastAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUCopyS2TBroadcastAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) CopyS2TBroadcast { - return @enumFromInt(c.mlirCuteNVGPUCopyS2TBroadcastAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUCopyS2TBroadcastAttrGetValue(self.ptr()))); } }; @@ -3607,11 +3607,11 @@ pub const GatherScatterTmaLoadAttr = opaque { value: GatherScatterTmaLoad, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUGatherScatterTmaLoadAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUGatherScatterTmaLoadAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) GatherScatterTmaLoad { - return @enumFromInt(c.mlirCuteNVGPUGatherScatterTmaLoadAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUGatherScatterTmaLoadAttrGetValue(self.ptr()))); } }; @@ -3634,11 +3634,11 @@ pub const Im2ColTmaLoadAttr = opaque { value: Im2ColTmaLoad, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUIm2ColTmaLoadAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUIm2ColTmaLoadAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) Im2ColTmaLoad { - return @enumFromInt(c.mlirCuteNVGPUIm2ColTmaLoadAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUIm2ColTmaLoadAttrGetValue(self.ptr()))); } }; @@ -3661,11 +3661,11 @@ pub const LdReduceAccPrecisionKindAttr = opaque { value: LdReduceAccPrecisionKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPULdReduceAccPrecisionKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPULdReduceAccPrecisionKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) LdReduceAccPrecisionKind { - return @enumFromInt(c.mlirCuteNVGPULdReduceAccPrecisionKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPULdReduceAccPrecisionKindAttrGetValue(self.ptr()))); } }; @@ -3688,11 +3688,11 @@ pub const LdsmSzPatternAttr = opaque { value: LdsmSzPattern, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPULdsmSzPatternAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPULdsmSzPatternAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) LdsmSzPattern { - return @enumFromInt(c.mlirCuteNVGPULdsmSzPatternAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPULdsmSzPatternAttrGetValue(self.ptr()))); } }; @@ -3715,11 +3715,11 @@ pub const LoadCacheModeAttr = opaque { value: LoadCacheMode, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPULoadCacheModeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPULoadCacheModeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) LoadCacheMode { - return @enumFromInt(c.mlirCuteNVGPULoadCacheModeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPULoadCacheModeAttrGetValue(self.ptr()))); } }; @@ -3742,11 +3742,11 @@ pub const MMAIntOverflowAttr = opaque { value: MMAIntOverflow, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUMMAIntOverflowAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUMMAIntOverflowAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) MMAIntOverflow { - return @enumFromInt(c.mlirCuteNVGPUMMAIntOverflowAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMMAIntOverflowAttrGetValue(self.ptr()))); } }; @@ -3769,11 +3769,11 @@ pub const MajorModeAttr = opaque { value: cute.MajorMode, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUMajorModeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUMajorModeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) cute.MajorMode { - return @enumFromInt(c.mlirCuteNVGPUMajorModeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMajorModeAttrGetValue(self.ptr()))); } }; @@ -3796,11 +3796,11 @@ pub const MmaCollectorOpAttr = opaque { value: MmaCollectorOp, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUMmaCollectorOpAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUMmaCollectorOpAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) MmaCollectorOp { - return @enumFromInt(c.mlirCuteNVGPUMmaCollectorOpAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaCollectorOpAttrGetValue(self.ptr()))); } }; @@ -3823,11 +3823,11 @@ pub const MmaFragKindAttr = opaque { value: MmaFragKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUMmaFragKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUMmaFragKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) MmaFragKind { - return @enumFromInt(c.mlirCuteNVGPUMmaFragKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUMmaFragKindAttrGetValue(self.ptr()))); } }; @@ -3873,11 +3873,11 @@ pub const ReductionKindAttr = opaque { value: ReductionKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUReductionKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUReductionKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) ReductionKind { - return @enumFromInt(c.mlirCuteNVGPUReductionKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUReductionKindAttrGetValue(self.ptr()))); } }; @@ -3902,14 +3902,14 @@ pub const RmemFrgAttr = opaque { deriveElemType: bool = false, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPURmemFrgAttrGet(ctx.ptr(), args.valueType.ptr(), @intFromEnum(args.operand), args.deriveElemType); + const result = c.mlirCuteNVGPURmemFrgAttrGet(ctx.ptr(), args.valueType.ptr(), @backingInt(args.operand), args.deriveElemType); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValueType(self: *const Self) *const mlir.Type { return @ptrCast(c.mlirCuteNVGPURmemFrgAttrGetValueType(self.ptr()).ptr.?); } pub fn getOperand(self: *const Self) cute.MmaOperand { - return @enumFromInt(c.mlirCuteNVGPURmemFrgAttrGetOperand(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPURmemFrgAttrGetOperand(self.ptr()))); } pub fn getDeriveElemType(self: *const Self) bool { return c.mlirCuteNVGPURmemFrgAttrGetDeriveElemType(self.ptr()); @@ -3935,11 +3935,11 @@ pub const SM100CircularSmemFrgAttr = opaque { majorMode: cute.MajorMode, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUSM100CircularSmemFrgAttrGet(ctx.ptr(), @intFromEnum(args.majorMode)); + const result = c.mlirCuteNVGPUSM100CircularSmemFrgAttrGet(ctx.ptr(), @backingInt(args.majorMode)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getMajorMode(self: *const Self) cute.MajorMode { - return @enumFromInt(c.mlirCuteNVGPUSM100CircularSmemFrgAttrGetMajorMode(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUSM100CircularSmemFrgAttrGetMajorMode(self.ptr()))); } }; @@ -3962,11 +3962,11 @@ pub const SM100SmemFrgAttr = opaque { majorMode: cute.MajorMode, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUSM100SmemFrgAttrGet(ctx.ptr(), @intFromEnum(args.majorMode)); + const result = c.mlirCuteNVGPUSM100SmemFrgAttrGet(ctx.ptr(), @backingInt(args.majorMode)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getMajorMode(self: *const Self) cute.MajorMode { - return @enumFromInt(c.mlirCuteNVGPUSM100SmemFrgAttrGetMajorMode(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUSM100SmemFrgAttrGetMajorMode(self.ptr()))); } }; @@ -4023,7 +4023,7 @@ pub const SM100TmemFrgAttr = opaque { tmemAllocMode: TmemAllocMode, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUSM100TmemFrgAttrGet(ctx.ptr(), args.dataType.ptr(), args.storageType.ptr(), args.ctaGroup, @intFromEnum(args.tmemAllocMode)); + const result = c.mlirCuteNVGPUSM100TmemFrgAttrGet(ctx.ptr(), args.dataType.ptr(), args.storageType.ptr(), args.ctaGroup, @backingInt(args.tmemAllocMode)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getDataType(self: *const Self) *const mlir.Type { @@ -4036,7 +4036,7 @@ pub const SM100TmemFrgAttr = opaque { return c.mlirCuteNVGPUSM100TmemFrgAttrGetCtaGroup(self.ptr()); } pub fn getTmemAllocMode(self: *const Self) TmemAllocMode { - return @enumFromInt(c.mlirCuteNVGPUSM100TmemFrgAttrGetTmemAllocMode(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUSM100TmemFrgAttrGetTmemAllocMode(self.ptr()))); } }; @@ -4063,7 +4063,7 @@ pub const SM100TmemSfFrgAttr = opaque { tmemAllocMode: TmemAllocMode, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUSM100TmemSfFrgAttrGet(ctx.ptr(), args.sfType.ptr(), args.sfVecSize, args.ctaGroup, args.isSfa, @intFromEnum(args.tmemAllocMode)); + const result = c.mlirCuteNVGPUSM100TmemSfFrgAttrGet(ctx.ptr(), args.sfType.ptr(), args.sfVecSize, args.ctaGroup, args.isSfa, @backingInt(args.tmemAllocMode)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getSfType(self: *const Self) *const mlir.Type { @@ -4079,7 +4079,7 @@ pub const SM100TmemSfFrgAttr = opaque { return c.mlirCuteNVGPUSM100TmemSfFrgAttrGetIsSfa(self.ptr()); } pub fn getTmemAllocMode(self: *const Self) TmemAllocMode { - return @enumFromInt(c.mlirCuteNVGPUSM100TmemSfFrgAttrGetTmemAllocMode(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUSM100TmemSfFrgAttrGetTmemAllocMode(self.ptr()))); } }; @@ -4102,11 +4102,11 @@ pub const SM107SmemFrgAttr = opaque { majorMode: cute.MajorMode, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUSM107SmemFrgAttrGet(ctx.ptr(), @intFromEnum(args.majorMode)); + const result = c.mlirCuteNVGPUSM107SmemFrgAttrGet(ctx.ptr(), @backingInt(args.majorMode)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getMajorMode(self: *const Self) cute.MajorMode { - return @enumFromInt(c.mlirCuteNVGPUSM107SmemFrgAttrGetMajorMode(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUSM107SmemFrgAttrGetMajorMode(self.ptr()))); } }; @@ -4129,11 +4129,11 @@ pub const SM90SmemFrgAttr = opaque { majorMode: cute.MajorMode, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUSM90SmemFrgAttrGet(ctx.ptr(), @intFromEnum(args.majorMode)); + const result = c.mlirCuteNVGPUSM90SmemFrgAttrGet(ctx.ptr(), @backingInt(args.majorMode)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getMajorMode(self: *const Self) cute.MajorMode { - return @enumFromInt(c.mlirCuteNVGPUSM90SmemFrgAttrGetMajorMode(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUSM90SmemFrgAttrGetMajorMode(self.ptr()))); } }; @@ -4156,11 +4156,11 @@ pub const TiledTmaLoadAttr = opaque { value: TiledTmaLoad, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUTiledTmaLoadAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUTiledTmaLoadAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) TiledTmaLoad { - return @enumFromInt(c.mlirCuteNVGPUTiledTmaLoadAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUTiledTmaLoadAttrGetValue(self.ptr()))); } }; @@ -4183,11 +4183,11 @@ pub const TmaDataFormatAttr = opaque { value: TmaDataFormat, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUTmaDataFormatAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUTmaDataFormatAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) TmaDataFormat { - return @enumFromInt(c.mlirCuteNVGPUTmaDataFormatAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUTmaDataFormatAttrGetValue(self.ptr()))); } }; @@ -4210,11 +4210,11 @@ pub const TmaLoadModeAttr = opaque { value: TmaLoadMode, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUTmaLoadModeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUTmaLoadModeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) TmaLoadMode { - return @enumFromInt(c.mlirCuteNVGPUTmaLoadModeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUTmaLoadModeAttrGetValue(self.ptr()))); } }; @@ -4237,11 +4237,11 @@ pub const TmaStoreModeAttr = opaque { value: TmaStoreMode, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUTmaStoreModeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUTmaStoreModeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) TmaStoreMode { - return @enumFromInt(c.mlirCuteNVGPUTmaStoreModeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUTmaStoreModeAttrGetValue(self.ptr()))); } }; @@ -4264,11 +4264,11 @@ pub const TmemAllocModeAttr = opaque { value: TmemAllocMode, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUTmemAllocModeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUTmemAllocModeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) TmemAllocMode { - return @enumFromInt(c.mlirCuteNVGPUTmemAllocModeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUTmemAllocModeAttrGetValue(self.ptr()))); } }; @@ -4291,11 +4291,11 @@ pub const TmemLoadRedOpAttr = opaque { value: TmemLoadRedOp, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVGPUTmemLoadRedOpAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVGPUTmemLoadRedOpAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) TmemLoadRedOp { - return @enumFromInt(c.mlirCuteNVGPUTmemLoadRedOpAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVGPUTmemLoadRedOpAttrGetValue(self.ptr()))); } }; diff --git a/mlir/dialects/cute_ir/nvvm.zig b/mlir/dialects/cute_ir/nvvm.zig index 75cfcae3..bfcd16b5 100644 --- a/mlir/dialects/cute_ir/nvvm.zig +++ b/mlir/dialects/cute_ir/nvvm.zig @@ -835,11 +835,11 @@ pub const AtomicOpKindAttr = opaque { value: AtomicOpKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMAtomicOpKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMAtomicOpKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) AtomicOpKind { - return @enumFromInt(c.mlirCuteNVVMAtomicOpKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMAtomicOpKindAttrGetValue(self.ptr()))); } }; @@ -862,11 +862,11 @@ pub const BarrierReductionAttr = opaque { value: BarrierReduction, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMBarrierReductionAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMBarrierReductionAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) BarrierReduction { - return @enumFromInt(c.mlirCuteNVVMBarrierReductionAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMBarrierReductionAttrGetValue(self.ptr()))); } }; @@ -889,11 +889,11 @@ pub const BarrierReduxKindAttr = opaque { value: BarrierReduxKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMBarrierReduxKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMBarrierReduxKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) BarrierReduxKind { - return @enumFromInt(c.mlirCuteNVVMBarrierReduxKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMBarrierReduxKindAttrGetValue(self.ptr()))); } }; @@ -916,11 +916,11 @@ pub const BlockScaleFormatAttr = opaque { value: BlockScaleFormat, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMBlockScaleFormatAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMBlockScaleFormatAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) BlockScaleFormat { - return @enumFromInt(c.mlirCuteNVVMBlockScaleFormatAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMBlockScaleFormatAttrGetValue(self.ptr()))); } }; @@ -943,11 +943,11 @@ pub const CTAGroupKindAttr = opaque { value: CTAGroupKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMCTAGroupKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMCTAGroupKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) CTAGroupKind { - return @enumFromInt(c.mlirCuteNVVMCTAGroupKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMCTAGroupKindAttrGetValue(self.ptr()))); } }; @@ -970,11 +970,11 @@ pub const CVTPackFloatKindAttr = opaque { value: CVTPackFloatKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMCVTPackFloatKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMCVTPackFloatKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) CVTPackFloatKind { - return @enumFromInt(c.mlirCuteNVVMCVTPackFloatKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMCVTPackFloatKindAttrGetValue(self.ptr()))); } }; @@ -997,11 +997,11 @@ pub const CacheEvictionPriorityAttr = opaque { value: CacheEvictionPriority, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMCacheEvictionPriorityAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMCacheEvictionPriorityAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) CacheEvictionPriority { - return @enumFromInt(c.mlirCuteNVVMCacheEvictionPriorityAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMCacheEvictionPriorityAttrGetValue(self.ptr()))); } }; @@ -1024,11 +1024,11 @@ pub const ClusterLaunchControlQueryTypeAttr = opaque { value: ClusterLaunchControlQueryType, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMClusterLaunchControlQueryTypeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMClusterLaunchControlQueryTypeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) ClusterLaunchControlQueryType { - return @enumFromInt(c.mlirCuteNVVMClusterLaunchControlQueryTypeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMClusterLaunchControlQueryTypeAttrGetValue(self.ptr()))); } }; @@ -1051,11 +1051,11 @@ pub const CompareOpKindAttr = opaque { value: CompareOpKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMCompareOpKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMCompareOpKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) CompareOpKind { - return @enumFromInt(c.mlirCuteNVVMCompareOpKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMCompareOpKindAttrGetValue(self.ptr()))); } }; @@ -1078,11 +1078,11 @@ pub const ConvertFP4TypeAttr = opaque { value: ConvertFP4Type, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMConvertFP4TypeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMConvertFP4TypeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) ConvertFP4Type { - return @enumFromInt(c.mlirCuteNVVMConvertFP4TypeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMConvertFP4TypeAttrGetValue(self.ptr()))); } }; @@ -1105,11 +1105,11 @@ pub const ConvertFP8TypeAttr = opaque { value: ConvertFP8Type, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMConvertFP8TypeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMConvertFP8TypeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) ConvertFP8Type { - return @enumFromInt(c.mlirCuteNVVMConvertFP8TypeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMConvertFP8TypeAttrGetValue(self.ptr()))); } }; @@ -1132,11 +1132,11 @@ pub const ConvertScaleKindAttr = opaque { value: ConvertScaleKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMConvertScaleKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMConvertScaleKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) ConvertScaleKind { - return @enumFromInt(c.mlirCuteNVVMConvertScaleKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMConvertScaleKindAttrGetValue(self.ptr()))); } }; @@ -1159,11 +1159,11 @@ pub const DotAccumulateTypeAttr = opaque { value: DotAccumulateType, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMDotAccumulateTypeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMDotAccumulateTypeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) DotAccumulateType { - return @enumFromInt(c.mlirCuteNVVMDotAccumulateTypeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMDotAccumulateTypeAttrGetValue(self.ptr()))); } }; @@ -1186,11 +1186,11 @@ pub const EvictKindAttr = opaque { value: EvictKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMEvictKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMEvictKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) EvictKind { - return @enumFromInt(c.mlirCuteNVVMEvictKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMEvictKindAttrGetValue(self.ptr()))); } }; @@ -1213,11 +1213,11 @@ pub const FPRoundingModeAttr = opaque { value: FPRoundingMode, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMFPRoundingModeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMFPRoundingModeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) FPRoundingMode { - return @enumFromInt(c.mlirCuteNVVMFPRoundingModeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMFPRoundingModeAttrGetValue(self.ptr()))); } }; @@ -1240,11 +1240,11 @@ pub const GridDepActionKindAttr = opaque { value: GridDepActionKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMGridDepActionKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMGridDepActionKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) GridDepActionKind { - return @enumFromInt(c.mlirCuteNVVMGridDepActionKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMGridDepActionKindAttrGetValue(self.ptr()))); } }; @@ -1267,11 +1267,11 @@ pub const IntegerRoundingModeAttr = opaque { value: IntegerRoundingMode, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMIntegerRoundingModeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMIntegerRoundingModeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) IntegerRoundingMode { - return @enumFromInt(c.mlirCuteNVVMIntegerRoundingModeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMIntegerRoundingModeAttrGetValue(self.ptr()))); } }; @@ -1294,11 +1294,11 @@ pub const L2PrefetchSizeAttr = opaque { value: L2PrefetchSize, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVML2PrefetchSizeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVML2PrefetchSizeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) L2PrefetchSize { - return @enumFromInt(c.mlirCuteNVVML2PrefetchSizeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVML2PrefetchSizeAttrGetValue(self.ptr()))); } }; @@ -1321,11 +1321,11 @@ pub const LdStMatrixEltTypeAttr = opaque { value: LdStMatrixEltType, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMLdStMatrixEltTypeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMLdStMatrixEltTypeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) LdStMatrixEltType { - return @enumFromInt(c.mlirCuteNVVMLdStMatrixEltTypeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMLdStMatrixEltTypeAttrGetValue(self.ptr()))); } }; @@ -1348,11 +1348,11 @@ pub const LoadCacheModifierExtKindAttr = opaque { value: LoadCacheModifierExtKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMLoadCacheModifierExtKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMLoadCacheModifierExtKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) LoadCacheModifierExtKind { - return @enumFromInt(c.mlirCuteNVVMLoadCacheModifierExtKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMLoadCacheModifierExtKindAttrGetValue(self.ptr()))); } }; @@ -1375,11 +1375,11 @@ pub const LoadCacheModifierKindAttr = opaque { value: LoadCacheModifierKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMLoadCacheModifierKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMLoadCacheModifierKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) LoadCacheModifierKind { - return @enumFromInt(c.mlirCuteNVVMLoadCacheModifierKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMLoadCacheModifierKindAttrGetValue(self.ptr()))); } }; @@ -1402,11 +1402,11 @@ pub const LoadShapeAttr = opaque { value: LoadShape, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMLoadShapeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMLoadShapeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) LoadShape { - return @enumFromInt(c.mlirCuteNVVMLoadShapeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMLoadShapeAttrGetValue(self.ptr()))); } }; @@ -1429,11 +1429,11 @@ pub const LoadSrcFormatAttr = opaque { value: LoadSrcFormat, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMLoadSrcFormatAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMLoadSrcFormatAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) LoadSrcFormat { - return @enumFromInt(c.mlirCuteNVVMLoadSrcFormatAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMLoadSrcFormatAttrGetValue(self.ptr()))); } }; @@ -1456,11 +1456,11 @@ pub const MBarrierLayoutAttr = opaque { value: MBarrierLayout, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMMBarrierLayoutAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMMBarrierLayoutAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) MBarrierLayout { - return @enumFromInt(c.mlirCuteNVVMMBarrierLayoutAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMMBarrierLayoutAttrGetValue(self.ptr()))); } }; @@ -1483,11 +1483,11 @@ pub const MBarrierPhaseAttr = opaque { value: MBarrierPhase, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMMBarrierPhaseAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMMBarrierPhaseAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) MBarrierPhase { - return @enumFromInt(c.mlirCuteNVVMMBarrierPhaseAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMMBarrierPhaseAttrGetValue(self.ptr()))); } }; @@ -1510,11 +1510,11 @@ pub const MBarrierScopeKindAttr = opaque { value: MBarrierScopeKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMMBarrierScopeKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMMBarrierScopeKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) MBarrierScopeKind { - return @enumFromInt(c.mlirCuteNVVMMBarrierScopeKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMMBarrierScopeKindAttrGetValue(self.ptr()))); } }; @@ -1537,11 +1537,11 @@ pub const MBarrierSpaceKindAttr = opaque { value: MBarrierSpaceKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMMBarrierSpaceKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMMBarrierSpaceKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) MBarrierSpaceKind { - return @enumFromInt(c.mlirCuteNVVMMBarrierSpaceKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMMBarrierSpaceKindAttrGetValue(self.ptr()))); } }; @@ -1564,11 +1564,11 @@ pub const MBarrierTxnKindAttr = opaque { value: MBarrierTxnKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMMBarrierTxnKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMMBarrierTxnKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) MBarrierTxnKind { - return @enumFromInt(c.mlirCuteNVVMMBarrierTxnKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMMBarrierTxnKindAttrGetValue(self.ptr()))); } }; @@ -1591,11 +1591,11 @@ pub const MBarrierWaitKindAttr = opaque { value: MBarrierWaitKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMMBarrierWaitKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMMBarrierWaitKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) MBarrierWaitKind { - return @enumFromInt(c.mlirCuteNVVMMBarrierWaitKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMMBarrierWaitKindAttrGetValue(self.ptr()))); } }; @@ -1618,11 +1618,11 @@ pub const MMAB1OpAttr = opaque { value: MMAB1Op, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMMMAB1OpAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMMMAB1OpAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) MMAB1Op { - return @enumFromInt(c.mlirCuteNVVMMMAB1OpAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMMMAB1OpAttrGetValue(self.ptr()))); } }; @@ -1645,11 +1645,11 @@ pub const MMABlockScaleKindAttr = opaque { value: MMABlockScaleKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMMMABlockScaleKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMMMABlockScaleKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) MMABlockScaleKind { - return @enumFromInt(c.mlirCuteNVVMMMABlockScaleKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMMMABlockScaleKindAttrGetValue(self.ptr()))); } }; @@ -1672,11 +1672,11 @@ pub const MMACtaCountAttr = opaque { value: MMACtaCount, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMMMACtaCountAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMMMACtaCountAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) MMACtaCount { - return @enumFromInt(c.mlirCuteNVVMMMACtaCountAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMMMACtaCountAttrGetValue(self.ptr()))); } }; @@ -1699,11 +1699,11 @@ pub const MMAFragAttr = opaque { value: MMAFrag, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMMMAFragAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMMMAFragAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) MMAFrag { - return @enumFromInt(c.mlirCuteNVVMMMAFragAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMMMAFragAttrGetValue(self.ptr()))); } }; @@ -1726,11 +1726,11 @@ pub const MMAIntOverflowAttr = opaque { value: MMAIntOverflow, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMMMAIntOverflowAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMMMAIntOverflowAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) MMAIntOverflow { - return @enumFromInt(c.mlirCuteNVVMMMAIntOverflowAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMMMAIntOverflowAttrGetValue(self.ptr()))); } }; @@ -1753,11 +1753,11 @@ pub const MMAKindAttr = opaque { value: MMAKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMMMAKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMMMAKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) MMAKind { - return @enumFromInt(c.mlirCuteNVVMMMAKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMMMAKindAttrGetValue(self.ptr()))); } }; @@ -1780,11 +1780,11 @@ pub const MMALayoutAttr = opaque { value: MMALayout, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMMMALayoutAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMMMALayoutAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) MMALayout { - return @enumFromInt(c.mlirCuteNVVMMMALayoutAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMMMALayoutAttrGetValue(self.ptr()))); } }; @@ -1807,11 +1807,11 @@ pub const MMATypesAttr = opaque { value: MMATypes, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMMMATypesAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMMMATypesAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) MMATypes { - return @enumFromInt(c.mlirCuteNVVMMMATypesAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMMMATypesAttrGetValue(self.ptr()))); } }; @@ -1834,11 +1834,11 @@ pub const MatchSyncKindAttr = opaque { value: MatchSyncKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMMatchSyncKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMMatchSyncKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) MatchSyncKind { - return @enumFromInt(c.mlirCuteNVVMMatchSyncKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMMatchSyncKindAttrGetValue(self.ptr()))); } }; @@ -1861,11 +1861,11 @@ pub const MemOrderKindAttr = opaque { value: MemOrderKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMMemOrderKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMMemOrderKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) MemOrderKind { - return @enumFromInt(c.mlirCuteNVVMMemOrderKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMMemOrderKindAttrGetValue(self.ptr()))); } }; @@ -1888,11 +1888,11 @@ pub const MemScopeKindAttr = opaque { value: MemScopeKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMMemScopeKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMMemScopeKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) MemScopeKind { - return @enumFromInt(c.mlirCuteNVVMMemScopeKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMMemScopeKindAttrGetValue(self.ptr()))); } }; @@ -1915,11 +1915,11 @@ pub const MulModeAttr = opaque { value: MulMode, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMMulModeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMMulModeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) MulMode { - return @enumFromInt(c.mlirCuteNVVMMulModeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMMulModeAttrGetValue(self.ptr()))); } }; @@ -1942,11 +1942,11 @@ pub const NVVMMemorySpaceAttr = opaque { value: NVVMMemorySpace, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMNVVMMemorySpaceAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMNVVMMemorySpaceAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) NVVMMemorySpace { - return @enumFromInt(c.mlirCuteNVVMNVVMMemorySpaceAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMNVVMMemorySpaceAttrGetValue(self.ptr()))); } }; @@ -1969,11 +1969,11 @@ pub const PermuteModeAttr = opaque { value: PermuteMode, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMPermuteModeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMPermuteModeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) PermuteMode { - return @enumFromInt(c.mlirCuteNVVMPermuteModeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMPermuteModeAttrGetValue(self.ptr()))); } }; @@ -1996,11 +1996,11 @@ pub const PrefetchCacheLevelAttr = opaque { value: PrefetchCacheLevel, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMPrefetchCacheLevelAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMPrefetchCacheLevelAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) PrefetchCacheLevel { - return @enumFromInt(c.mlirCuteNVVMPrefetchCacheLevelAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMPrefetchCacheLevelAttrGetValue(self.ptr()))); } }; @@ -2023,11 +2023,11 @@ pub const ProxyKindAttr = opaque { value: ProxyKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMProxyKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMProxyKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) ProxyKind { - return @enumFromInt(c.mlirCuteNVVMProxyKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMProxyKindAttrGetValue(self.ptr()))); } }; @@ -2050,11 +2050,11 @@ pub const ReductionKindAttr = opaque { value: ReductionKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMReductionKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMReductionKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) ReductionKind { - return @enumFromInt(c.mlirCuteNVVMReductionKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMReductionKindAttrGetValue(self.ptr()))); } }; @@ -2077,11 +2077,11 @@ pub const ReductionOpAttr = opaque { value: ReductionOp, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMReductionOpAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMReductionOpAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) ReductionOp { - return @enumFromInt(c.mlirCuteNVVMReductionOpAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMReductionOpAttrGetValue(self.ptr()))); } }; @@ -2104,11 +2104,11 @@ pub const ReductionTypeAttr = opaque { value: ReductionType, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMReductionTypeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMReductionTypeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) ReductionType { - return @enumFromInt(c.mlirCuteNVVMReductionTypeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMReductionTypeAttrGetValue(self.ptr()))); } }; @@ -2131,11 +2131,11 @@ pub const SPCompressElemSizeAttr = opaque { value: SPCompressElemSize, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMSPCompressElemSizeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMSPCompressElemSizeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) SPCompressElemSize { - return @enumFromInt(c.mlirCuteNVVMSPCompressElemSizeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMSPCompressElemSizeAttrGetValue(self.ptr()))); } }; @@ -2158,11 +2158,11 @@ pub const SPCompressFactorTypeAttr = opaque { value: SPCompressFactorType, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMSPCompressFactorTypeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMSPCompressFactorTypeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) SPCompressFactorType { - return @enumFromInt(c.mlirCuteNVVMSPCompressFactorTypeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMSPCompressFactorTypeAttrGetValue(self.ptr()))); } }; @@ -2185,11 +2185,11 @@ pub const SPCompressIndexSizeAttr = opaque { value: SPCompressIndexSize, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMSPCompressIndexSizeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMSPCompressIndexSizeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) SPCompressIndexSize { - return @enumFromInt(c.mlirCuteNVVMSPCompressIndexSizeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMSPCompressIndexSizeAttrGetValue(self.ptr()))); } }; @@ -2212,11 +2212,11 @@ pub const SPCompressOpKindAttr = opaque { value: SPCompressOpKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMSPCompressOpKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMSPCompressOpKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) SPCompressOpKind { - return @enumFromInt(c.mlirCuteNVVMSPCompressOpKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMSPCompressOpKindAttrGetValue(self.ptr()))); } }; @@ -2239,11 +2239,11 @@ pub const SPCompressRepFactorAttr = opaque { value: SPCompressRepFactor, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMSPCompressRepFactorAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMSPCompressRepFactorAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) SPCompressRepFactor { - return @enumFromInt(c.mlirCuteNVVMSPCompressRepFactorAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMSPCompressRepFactorAttrGetValue(self.ptr()))); } }; @@ -2266,11 +2266,11 @@ pub const SPDecompressElemSizeAttr = opaque { value: SPDecompressElemSize, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMSPDecompressElemSizeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMSPDecompressElemSizeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) SPDecompressElemSize { - return @enumFromInt(c.mlirCuteNVVMSPDecompressElemSizeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMSPDecompressElemSizeAttrGetValue(self.ptr()))); } }; @@ -2293,11 +2293,11 @@ pub const SPDecompressFactorTypeAttr = opaque { value: SPDecompressFactorType, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMSPDecompressFactorTypeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMSPDecompressFactorTypeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) SPDecompressFactorType { - return @enumFromInt(c.mlirCuteNVVMSPDecompressFactorTypeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMSPDecompressFactorTypeAttrGetValue(self.ptr()))); } }; @@ -2320,11 +2320,11 @@ pub const SPDecompressIndexSizeAttr = opaque { value: SPDecompressIndexSize, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMSPDecompressIndexSizeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMSPDecompressIndexSizeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) SPDecompressIndexSize { - return @enumFromInt(c.mlirCuteNVVMSPDecompressIndexSizeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMSPDecompressIndexSizeAttrGetValue(self.ptr()))); } }; @@ -2347,11 +2347,11 @@ pub const SPDecompressRepFactorAttr = opaque { value: SPDecompressRepFactor, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMSPDecompressRepFactorAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMSPDecompressRepFactorAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) SPDecompressRepFactor { - return @enumFromInt(c.mlirCuteNVVMSPDecompressRepFactorAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMSPDecompressRepFactorAttrGetValue(self.ptr()))); } }; @@ -2374,11 +2374,11 @@ pub const SaturationModeAttr = opaque { value: SaturationMode, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMSaturationModeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMSaturationModeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) SaturationMode { - return @enumFromInt(c.mlirCuteNVVMSaturationModeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMSaturationModeAttrGetValue(self.ptr()))); } }; @@ -2401,11 +2401,11 @@ pub const SaturationModeKindAttr = opaque { value: SaturationModeKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMSaturationModeKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMSaturationModeKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) SaturationModeKind { - return @enumFromInt(c.mlirCuteNVVMSaturationModeKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMSaturationModeKindAttrGetValue(self.ptr()))); } }; @@ -2428,11 +2428,11 @@ pub const ScaleVecSizeAttr = opaque { value: ScaleVecSize, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMScaleVecSizeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMScaleVecSizeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) ScaleVecSize { - return @enumFromInt(c.mlirCuteNVVMScaleVecSizeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMScaleVecSizeAttrGetValue(self.ptr()))); } }; @@ -2455,11 +2455,11 @@ pub const SetMaxRegisterActionAttr = opaque { value: SetMaxRegisterAction, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMSetMaxRegisterActionAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMSetMaxRegisterActionAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) SetMaxRegisterAction { - return @enumFromInt(c.mlirCuteNVVMSetMaxRegisterActionAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMSetMaxRegisterActionAttrGetValue(self.ptr()))); } }; @@ -2482,11 +2482,11 @@ pub const SharedSpaceAttr = opaque { value: SharedSpace, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMSharedSpaceAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMSharedSpaceAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) SharedSpace { - return @enumFromInt(c.mlirCuteNVVMSharedSpaceAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMSharedSpaceAttrGetValue(self.ptr()))); } }; @@ -2509,11 +2509,11 @@ pub const ShflKindAttr = opaque { value: ShflKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMShflKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMShflKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) ShflKind { - return @enumFromInt(c.mlirCuteNVVMShflKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMShflKindAttrGetValue(self.ptr()))); } }; @@ -2536,11 +2536,11 @@ pub const SparsityFormatAttr = opaque { value: SparsityFormat, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMSparsityFormatAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMSparsityFormatAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) SparsityFormat { - return @enumFromInt(c.mlirCuteNVVMSparsityFormatAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMSparsityFormatAttrGetValue(self.ptr()))); } }; @@ -2563,11 +2563,11 @@ pub const StateSpaceAttr = opaque { value: StateSpace, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMStateSpaceAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMStateSpaceAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) StateSpace { - return @enumFromInt(c.mlirCuteNVVMStateSpaceAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMStateSpaceAttrGetValue(self.ptr()))); } }; @@ -2590,11 +2590,11 @@ pub const StoreCacheModifierKindAttr = opaque { value: StoreCacheModifierKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMStoreCacheModifierKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMStoreCacheModifierKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) StoreCacheModifierKind { - return @enumFromInt(c.mlirCuteNVVMStoreCacheModifierKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMStoreCacheModifierKindAttrGetValue(self.ptr()))); } }; @@ -2617,11 +2617,11 @@ pub const StoreShapeAttr = opaque { value: StoreShape, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMStoreShapeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMStoreShapeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) StoreShape { - return @enumFromInt(c.mlirCuteNVVMStoreShapeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMStoreShapeAttrGetValue(self.ptr()))); } }; @@ -2644,11 +2644,11 @@ pub const TCBarParamAttr = opaque { value: TCBarParam, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMTCBarParamAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMTCBarParamAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) TCBarParam { - return @enumFromInt(c.mlirCuteNVVMTCBarParamAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMTCBarParamAttrGetValue(self.ptr()))); } }; @@ -2671,11 +2671,11 @@ pub const TMALoadModeAttr = opaque { value: TMALoadMode, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMTMALoadModeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMTMALoadModeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) TMALoadMode { - return @enumFromInt(c.mlirCuteNVVMTMALoadModeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMTMALoadModeAttrGetValue(self.ptr()))); } }; @@ -2698,11 +2698,11 @@ pub const TMAReduxKindAttr = opaque { value: TMAReduxKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMTMAReduxKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMTMAReduxKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) TMAReduxKind { - return @enumFromInt(c.mlirCuteNVVMTMAReduxKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMTMAReduxKindAttrGetValue(self.ptr()))); } }; @@ -2725,11 +2725,11 @@ pub const TMAStoreModeAttr = opaque { value: TMAStoreMode, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMTMAStoreModeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMTMAStoreModeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) TMAStoreMode { - return @enumFromInt(c.mlirCuteNVVMTMAStoreModeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMTMAStoreModeAttrGetValue(self.ptr()))); } }; @@ -2752,11 +2752,11 @@ pub const Tcgen05CpMulticastAttr = opaque { value: Tcgen05CpMulticast, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMTcgen05CpMulticastAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMTcgen05CpMulticastAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) Tcgen05CpMulticast { - return @enumFromInt(c.mlirCuteNVVMTcgen05CpMulticastAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMTcgen05CpMulticastAttrGetValue(self.ptr()))); } }; @@ -2779,11 +2779,11 @@ pub const Tcgen05CpShapeAttr = opaque { value: Tcgen05CpShape, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMTcgen05CpShapeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMTcgen05CpShapeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) Tcgen05CpShape { - return @enumFromInt(c.mlirCuteNVVMTcgen05CpShapeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMTcgen05CpShapeAttrGetValue(self.ptr()))); } }; @@ -2806,11 +2806,11 @@ pub const Tcgen05CpSrcFormatAttr = opaque { value: Tcgen05CpSrcFormat, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMTcgen05CpSrcFormatAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMTcgen05CpSrcFormatAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) Tcgen05CpSrcFormat { - return @enumFromInt(c.mlirCuteNVVMTcgen05CpSrcFormatAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMTcgen05CpSrcFormatAttrGetValue(self.ptr()))); } }; @@ -2833,11 +2833,11 @@ pub const Tcgen05FenceKindAttr = opaque { value: Tcgen05FenceKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMTcgen05FenceKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMTcgen05FenceKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) Tcgen05FenceKind { - return @enumFromInt(c.mlirCuteNVVMTcgen05FenceKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMTcgen05FenceKindAttrGetValue(self.ptr()))); } }; @@ -2860,11 +2860,11 @@ pub const Tcgen05LdStShapeAttr = opaque { value: Tcgen05LdStShape, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMTcgen05LdStShapeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMTcgen05LdStShapeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) Tcgen05LdStShape { - return @enumFromInt(c.mlirCuteNVVMTcgen05LdStShapeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMTcgen05LdStShapeAttrGetValue(self.ptr()))); } }; @@ -2887,11 +2887,11 @@ pub const Tcgen05MMABlockScaleAttr = opaque { value: Tcgen05MMABlockScale, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMTcgen05MMABlockScaleAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMTcgen05MMABlockScaleAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) Tcgen05MMABlockScale { - return @enumFromInt(c.mlirCuteNVVMTcgen05MMABlockScaleAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMTcgen05MMABlockScaleAttrGetValue(self.ptr()))); } }; @@ -2914,11 +2914,11 @@ pub const Tcgen05MMACollectorBBufferAttr = opaque { value: Tcgen05MMACollectorBBuffer, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMTcgen05MMACollectorBBufferAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMTcgen05MMACollectorBBufferAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) Tcgen05MMACollectorBBuffer { - return @enumFromInt(c.mlirCuteNVVMTcgen05MMACollectorBBufferAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMTcgen05MMACollectorBBufferAttrGetValue(self.ptr()))); } }; @@ -2941,11 +2941,11 @@ pub const Tcgen05MMACollectorOpAttr = opaque { value: Tcgen05MMACollectorOp, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMTcgen05MMACollectorOpAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMTcgen05MMACollectorOpAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) Tcgen05MMACollectorOp { - return @enumFromInt(c.mlirCuteNVVMTcgen05MMACollectorOpAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMTcgen05MMACollectorOpAttrGetValue(self.ptr()))); } }; @@ -2968,11 +2968,11 @@ pub const Tcgen05MMAKindAttr = opaque { value: Tcgen05MMAKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMTcgen05MMAKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMTcgen05MMAKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) Tcgen05MMAKind { - return @enumFromInt(c.mlirCuteNVVMTcgen05MMAKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMTcgen05MMAKindAttrGetValue(self.ptr()))); } }; @@ -2995,11 +2995,11 @@ pub const Tcgen05WaitKindAttr = opaque { value: Tcgen05WaitKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMTcgen05WaitKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMTcgen05WaitKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) Tcgen05WaitKind { - return @enumFromInt(c.mlirCuteNVVMTcgen05WaitKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMTcgen05WaitKindAttrGetValue(self.ptr()))); } }; @@ -3022,11 +3022,11 @@ pub const TensormapElemtypeAttr = opaque { value: TensormapElemtype, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMTensormapElemtypeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMTensormapElemtypeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) TensormapElemtype { - return @enumFromInt(c.mlirCuteNVVMTensormapElemtypeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMTensormapElemtypeAttrGetValue(self.ptr()))); } }; @@ -3049,11 +3049,11 @@ pub const TensormapFieldAttr = opaque { value: TensormapField, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMTensormapFieldAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMTensormapFieldAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) TensormapField { - return @enumFromInt(c.mlirCuteNVVMTensormapFieldAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMTensormapFieldAttrGetValue(self.ptr()))); } }; @@ -3076,11 +3076,11 @@ pub const TensormapFillModeAttr = opaque { value: TensormapFillMode, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMTensormapFillModeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMTensormapFillModeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) TensormapFillMode { - return @enumFromInt(c.mlirCuteNVVMTensormapFillModeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMTensormapFillModeAttrGetValue(self.ptr()))); } }; @@ -3103,11 +3103,11 @@ pub const TensormapInterleaveLayoutAttr = opaque { value: TensormapInterleaveLayout, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMTensormapInterleaveLayoutAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMTensormapInterleaveLayoutAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) TensormapInterleaveLayout { - return @enumFromInt(c.mlirCuteNVVMTensormapInterleaveLayoutAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMTensormapInterleaveLayoutAttrGetValue(self.ptr()))); } }; @@ -3130,11 +3130,11 @@ pub const TensormapSwizzleAtomicityAttr = opaque { value: TensormapSwizzleAtomicity, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMTensormapSwizzleAtomicityAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMTensormapSwizzleAtomicityAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) TensormapSwizzleAtomicity { - return @enumFromInt(c.mlirCuteNVVMTensormapSwizzleAtomicityAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMTensormapSwizzleAtomicityAttrGetValue(self.ptr()))); } }; @@ -3157,11 +3157,11 @@ pub const TensormapSwizzleModeAttr = opaque { value: TensormapSwizzleMode, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMTensormapSwizzleModeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMTensormapSwizzleModeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) TensormapSwizzleMode { - return @enumFromInt(c.mlirCuteNVVMTensormapSwizzleModeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMTensormapSwizzleModeAttrGetValue(self.ptr()))); } }; @@ -3184,11 +3184,11 @@ pub const TmemLayoutAttr = opaque { value: TmemLayout, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMTmemLayoutAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMTmemLayoutAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) TmemLayout { - return @enumFromInt(c.mlirCuteNVVMTmemLayoutAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMTmemLayoutAttrGetValue(self.ptr()))); } }; @@ -3211,11 +3211,11 @@ pub const ValidatePatternAttr = opaque { value: ValidatePattern, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMValidatePatternAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMValidatePatternAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) ValidatePattern { - return @enumFromInt(c.mlirCuteNVVMValidatePatternAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMValidatePatternAttrGetValue(self.ptr()))); } }; @@ -3238,11 +3238,11 @@ pub const VoteSyncKindAttr = opaque { value: VoteSyncKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMVoteSyncKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMVoteSyncKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) VoteSyncKind { - return @enumFromInt(c.mlirCuteNVVMVoteSyncKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMVoteSyncKindAttrGetValue(self.ptr()))); } }; @@ -3265,11 +3265,11 @@ pub const WGMMAScaleInAttr = opaque { value: WGMMAScaleIn, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMWGMMAScaleInAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMWGMMAScaleInAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) WGMMAScaleIn { - return @enumFromInt(c.mlirCuteNVVMWGMMAScaleInAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMWGMMAScaleInAttrGetValue(self.ptr()))); } }; @@ -3292,11 +3292,11 @@ pub const WGMMAScaleOutAttr = opaque { value: WGMMAScaleOut, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMWGMMAScaleOutAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMWGMMAScaleOutAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) WGMMAScaleOut { - return @enumFromInt(c.mlirCuteNVVMWGMMAScaleOutAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMWGMMAScaleOutAttrGetValue(self.ptr()))); } }; @@ -3319,11 +3319,11 @@ pub const WGMMATypesAttr = opaque { value: WGMMATypes, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirCuteNVVMWGMMATypesAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirCuteNVVMWGMMATypesAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) WGMMATypes { - return @enumFromInt(c.mlirCuteNVVMWGMMATypesAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirCuteNVVMWGMMATypesAttrGetValue(self.ptr()))); } }; @@ -6844,13 +6844,14 @@ test "every enum attribute prints as the compiler does" { .{ WGMMATypesAttr, "#nvvm.wgmma_type<{s}>" }, }) |example| { const T = example[0]; - inline for (@typeInfo(@FieldType(T.InitArgs, "value")).@"enum".fields) |case| { - const attr = try T.get(ctx, .{ .value = @enumFromInt(case.value) }); - try std.testing.expectEqual(case.value, @intFromEnum(attr.getValue())); + const E = @FieldType(T.InitArgs, "value"); + inline for (@typeInfo(E).@"enum".field_names) |name| { + const attr = try T.get(ctx, .{ .value = @field(E, name) }); + try std.testing.expectEqual(@field(E, name), attr.getValue()); var buf: [256]u8 = undefined; var w: std.Io.Writer = .fixed(&buf); try w.print("{f}", .{attr}); - try std.testing.expectEqualStrings(std.fmt.comptimePrint(example[1], .{case.name}), w.buffered()); + try std.testing.expectEqualStrings(std.fmt.comptimePrint(example[1], .{name}), w.buffered()); } } } diff --git a/mlir/dialects/fly/attributes.zig b/mlir/dialects/fly/attributes.zig index eceb8b0f..a30336fc 100644 --- a/mlir/dialects/fly/attributes.zig +++ b/mlir/dialects/fly/attributes.zig @@ -206,7 +206,7 @@ pub const AddressSpaceAttr = opaque { }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirFlyAddressSpaceAttrGet(ctx.ptr(), @intFromEnum(args.addressSpace)); + const result = c.mlirFlyAddressSpaceAttrGet(ctx.ptr(), @backingInt(args.addressSpace)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } }; @@ -214,7 +214,7 @@ pub const AddressSpaceAttr = opaque { pub const MmaOperand = enum(i32) { a = 0, b = 1, c = 2, d = 3 }; pub fn mmaOperandAttr(ctx: *mlir.Context, operand: MmaOperand) mlir.Error!*const mlir.Attribute { - const result = c.mlirFlyMmaOperandAttrGet(ctx.ptr(), @intFromEnum(operand)); + const result = c.mlirFlyMmaOperandAttrGet(ctx.ptr(), @backingInt(operand)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } @@ -234,6 +234,6 @@ pub const GemmTraversalOrder = enum(i32) { }; pub fn gemmTraversalOrderAttr(ctx: *mlir.Context, order: GemmTraversalOrder) mlir.Error!*const mlir.Attribute { - const result = c.mlirFlyGemmTraversalOrderAttrGet(ctx.ptr(), @intFromEnum(order)); + const result = c.mlirFlyGemmTraversalOrderAttrGet(ctx.ptr(), @backingInt(order)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } diff --git a/mlir/dialects/fly/fly.zig b/mlir/dialects/fly/fly.zig index 97571450..8bfafbce 100644 --- a/mlir/dialects/fly/fly.zig +++ b/mlir/dialects/fly/fly.zig @@ -132,7 +132,7 @@ test { inline for (.{ types, attributes, ops, rocdl, rocdl.ops }) |module| { std.testing.refAllDecls(module); inline for (comptime std.meta.declarations(module)) |decl| { - const value = @field(module, decl.name); + const value = @field(module, decl); if (@TypeOf(value) == type and @typeInfo(value) == .@"opaque") std.testing.refAllDecls(value); } } diff --git a/mlir/dialects/gpu.zig b/mlir/dialects/gpu.zig index d43687fc..a6e16ebf 100644 --- a/mlir/dialects/gpu.zig +++ b/mlir/dialects/gpu.zig @@ -38,11 +38,11 @@ pub const DimensionAttr = opaque { value: Dim, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirGPUDimensionAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirGPUDimensionAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) Dim { - return @enumFromInt(c.mlirGPUDimensionAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirGPUDimensionAttrGetValue(self.ptr()))); } }; @@ -65,11 +65,11 @@ pub const ShuffleModeAttr = opaque { value: ShuffleMode, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirGPUShuffleModeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirGPUShuffleModeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) ShuffleMode { - return @enumFromInt(c.mlirGPUShuffleModeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirGPUShuffleModeAttrGetValue(self.ptr()))); } }; @@ -174,17 +174,17 @@ test "gpu enum attributes are built through the C API" { const ctx = try mlir.Context.init(.{}); defer ctx.deinit(); - inline for (std.meta.fields(Dim)) |field| { - const value: Dim = @enumFromInt(field.value); + inline for (@typeInfo(Dim).@"enum".field_names) |name| { + const value: Dim = @field(Dim, name); const attr = try DimensionAttr.get(ctx, .{ .value = value }); try std.testing.expectEqual(value, attr.getValue()); try std.testing.expect(attr.attribute().isA(DimensionAttr) != null); - try expectPrints("#gpu.dim<" ++ field.name ++ ">", attr); + try expectPrints("#gpu.dim<" ++ name ++ ">", attr); } - inline for (std.meta.fields(ShuffleMode)) |field| { - const value: ShuffleMode = @enumFromInt(field.value); + inline for (@typeInfo(ShuffleMode).@"enum".field_names) |name| { + const value: ShuffleMode = @field(ShuffleMode, name); const attr = try ShuffleModeAttr.get(ctx, .{ .value = value }); try std.testing.expectEqual(value, attr.getValue()); - try expectPrints("#gpu.shuffle_mode<" ++ field.name ++ ">", attr); + try expectPrints("#gpu.shuffle_mode<" ++ name ++ ">", attr); } } diff --git a/mlir/dialects/llvm_dialect.zig b/mlir/dialects/llvm_dialect.zig index 2b7e904d..541c1373 100644 --- a/mlir/dialects/llvm_dialect.zig +++ b/mlir/dialects/llvm_dialect.zig @@ -23,7 +23,7 @@ pub const NVPTXAddressSpace = enum(u32) { /// `!llvm.ptr`, an opaque pointer. Loads the LLVM dialect into `ctx`. pub fn pointerType(ctx: *mlir.Context, space: anytype) *const mlir.Type { _ = c.mlirContextGetOrLoadDialect(ctx.ptr(), mlir.stringRef("llvm")); - return @ptrCast(c.mlirLLVMPointerTypeGet(ctx.ptr(), @intCast(@intFromEnum(space))).ptr); + return @ptrCast(c.mlirLLVMPointerTypeGet(ctx.ptr(), @intCast(@backingInt(space))).ptr); } // ============================================================================= diff --git a/mlir/dialects/memref.zig b/mlir/dialects/memref.zig index 77acbc5d..338d1732 100644 --- a/mlir/dialects/memref.zig +++ b/mlir/dialects/memref.zig @@ -216,7 +216,7 @@ pub fn atomic_rmw( .operands = .{ .flat = buf.constSlice() }, .results = .{ .flat = &.{value.type_()} }, .attributes = &.{ - .named(ctx, "kind", .int(ctx, .i64, @intFromEnum(kind))), + .named(ctx, "kind", .int(ctx, .i64, @backingInt(kind))), }, .location = location, }); diff --git a/mlir/dialects/mosaic_tpu/mosaic_tpu.zig b/mlir/dialects/mosaic_tpu/mosaic_tpu.zig index 3cd164c0..b70e3c3e 100644 --- a/mlir/dialects/mosaic_tpu/mosaic_tpu.zig +++ b/mlir/dialects/mosaic_tpu/mosaic_tpu.zig @@ -158,11 +158,11 @@ pub const ReductionKindAttr = opaque { value: ReductionKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirTpuReductionKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirTpuReductionKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) ReductionKind { - return @enumFromInt(c.mlirTpuReductionKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirTpuReductionKindAttrGetValue(self.ptr()))); } }; @@ -197,11 +197,11 @@ pub const ContractPrecisionAttr = opaque { value: ContractPrecision, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirTpuContractPrecisionAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirTpuContractPrecisionAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) ContractPrecision { - return @enumFromInt(c.mlirTpuContractPrecisionAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirTpuContractPrecisionAttrGetValue(self.ptr()))); } }; @@ -235,11 +235,11 @@ pub const RoundingModeAttr = opaque { value: RoundingMode, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirTpuRoundingModeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirTpuRoundingModeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) RoundingMode { - return @enumFromInt(c.mlirTpuRoundingModeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirTpuRoundingModeAttrGetValue(self.ptr()))); } }; @@ -274,11 +274,11 @@ pub const CoreTypeAttr = opaque { value: CoreType, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirTpuCoreTypeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirTpuCoreTypeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) CoreType { - return @enumFromInt(c.mlirTpuCoreTypeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirTpuCoreTypeAttrGetValue(self.ptr()))); } }; @@ -314,11 +314,11 @@ pub const DimensionSemanticsAttr = opaque { value: DimensionSemantics, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirTpuDimensionSemanticsAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirTpuDimensionSemanticsAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) DimensionSemantics { - return @enumFromInt(c.mlirTpuDimensionSemanticsAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirTpuDimensionSemanticsAttrGetValue(self.ptr()))); } }; @@ -352,11 +352,11 @@ pub const PipelineModeAttr = opaque { value: PipelineMode, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirTpuPipelineModeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirTpuPipelineModeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) PipelineMode { - return @enumFromInt(c.mlirTpuPipelineModeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirTpuPipelineModeAttrGetValue(self.ptr()))); } }; @@ -390,11 +390,11 @@ pub const RevisitModeAttr = opaque { value: RevisitMode, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirTpuRevisitModeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirTpuRevisitModeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) RevisitMode { - return @enumFromInt(c.mlirTpuRevisitModeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirTpuRevisitModeAttrGetValue(self.ptr()))); } }; @@ -435,16 +435,16 @@ pub const MemorySpaceAttr = opaque { coreType: ?CoreType = null, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const core_type: i64 = if (args.coreType) |ct| @intFromEnum(ct) else -1; - const result = c.mlirTpuMemorySpaceAttrGet(ctx.ptr(), @intFromEnum(args.value), core_type); + const core_type: i64 = if (args.coreType) |ct| @backingInt(ct) else -1; + const result = c.mlirTpuMemorySpaceAttrGet(ctx.ptr(), @backingInt(args.value), core_type); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) MemorySpace { - return @enumFromInt(c.mlirTpuMemorySpaceAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirTpuMemorySpaceAttrGetValue(self.ptr()))); } pub fn getCoreType(self: *const Self) ?CoreType { const core_type = c.mlirTpuMemorySpaceAttrGetCoreType(self.ptr()); - return if (core_type < 0) null else @enumFromInt(core_type); + return if (core_type < 0) null else @fromBackingInt(@intCast(core_type)); } }; @@ -1682,13 +1682,13 @@ fn expectPrints(expected: []const u8, value: anytype) !void { fn expectEnumAttr(comptime Attr: type, ctx: *mlir.Context) !void { const Enum = @FieldType(Attr.InitArgs, "value"); - inline for (std.meta.fields(Enum)) |field| { - const value: Enum = @enumFromInt(field.value); + inline for (@typeInfo(Enum).@"enum".field_names) |name| { + const value: Enum = @field(Enum, name); const attr = try Attr.get(ctx, .{ .value = value }); try std.testing.expectEqual(value, attr.getValue()); try std.testing.expect(attr.attribute().isA(Attr) != null); try std.testing.expect(value.attribute(ctx).eql(attr.attribute())); - try expectPrints("#tpu." ++ Attr.mnemonic ++ "<" ++ field.name ++ ">", attr); + try expectPrints("#tpu." ++ Attr.mnemonic ++ "<" ++ name ++ ">", attr); } } diff --git a/mlir/dialects/stablehlo/stablehlo.zig b/mlir/dialects/stablehlo/stablehlo.zig index efae3018..f9ea1e7e 100644 --- a/mlir/dialects/stablehlo/stablehlo.zig +++ b/mlir/dialects/stablehlo/stablehlo.zig @@ -805,7 +805,7 @@ pub fn custom_call(ctx: *mlir.Context, inputs: []const *const mlir.Value, result const backend_config_api_version: ?CustomCallOpts.ApiVersion = if (opts.backend_config) |bc| bc else null; if (opts.api_version orelse backend_config_api_version) |v| { attrs.appendAssumeCapacity( - .named(ctx, "api_version", .int(ctx, .i32, @intFromEnum(v))), + .named(ctx, "api_version", .int(ctx, .i32, @backingInt(v))), ); } if (opts.backend_config) |backend_config| { @@ -1463,7 +1463,7 @@ pub fn channelHandle( return @ptrCast(c.stablehloChannelHandleGet( ctx.ptr(), handle, - @intFromEnum(channel_type), + @backingInt(channel_type), ).ptr); } diff --git a/mlir/dialects/ttir/ttir.zig b/mlir/dialects/ttir/ttir.zig index 81d926dc..ee302f92 100644 --- a/mlir/dialects/ttir/ttir.zig +++ b/mlir/dialects/ttir/ttir.zig @@ -142,51 +142,51 @@ pub const DescriptorReduceKind = enum(i32) { }; pub fn programDim(ctx: *mlir.Context, v: ProgramIDDim) *const mlir.Attribute { - return @ptrCast(c.mlirTritonProgramDimGet(ctx.ptr(), @intFromEnum(v)).ptr); + return @ptrCast(c.mlirTritonProgramDimGet(ctx.ptr(), @backingInt(v)).ptr); } pub fn cacheModifier(ctx: *mlir.Context, v: CacheModifier) *const mlir.Attribute { - return @ptrCast(c.mlirTritonCacheModifierGet(ctx.ptr(), @intFromEnum(v)).ptr); + return @ptrCast(c.mlirTritonCacheModifierGet(ctx.ptr(), @backingInt(v)).ptr); } pub fn evictionPolicy(ctx: *mlir.Context, v: EvictionPolicy) *const mlir.Attribute { - return @ptrCast(c.mlirTritonEvictionPolicyGet(ctx.ptr(), @intFromEnum(v)).ptr); + return @ptrCast(c.mlirTritonEvictionPolicyGet(ctx.ptr(), @backingInt(v)).ptr); } pub fn paddingOption(ctx: *mlir.Context, v: PaddingOption) *const mlir.Attribute { - return @ptrCast(c.mlirTritonPaddingOptionGet(ctx.ptr(), @intFromEnum(v)).ptr); + return @ptrCast(c.mlirTritonPaddingOptionGet(ctx.ptr(), @backingInt(v)).ptr); } pub fn roundingMode(ctx: *mlir.Context, v: RoundingMode) *const mlir.Attribute { - return @ptrCast(c.mlirTritonRoundingModeGet(ctx.ptr(), @intFromEnum(v)).ptr); + return @ptrCast(c.mlirTritonRoundingModeGet(ctx.ptr(), @backingInt(v)).ptr); } pub fn inputPrecision(ctx: *mlir.Context, v: InputPrecision) *const mlir.Attribute { - return @ptrCast(c.mlirTritonInputPrecisionGet(ctx.ptr(), @intFromEnum(v)).ptr); + return @ptrCast(c.mlirTritonInputPrecisionGet(ctx.ptr(), @backingInt(v)).ptr); } pub fn rmwOp(ctx: *mlir.Context, v: RMWOp) *const mlir.Attribute { - return @ptrCast(c.mlirTritonRMWOpGet(ctx.ptr(), @intFromEnum(v)).ptr); + return @ptrCast(c.mlirTritonRMWOpGet(ctx.ptr(), @backingInt(v)).ptr); } pub fn memSemantic(ctx: *mlir.Context, v: MemSemantic) *const mlir.Attribute { - return @ptrCast(c.mlirTritonMemSemanticGet(ctx.ptr(), @intFromEnum(v)).ptr); + return @ptrCast(c.mlirTritonMemSemanticGet(ctx.ptr(), @backingInt(v)).ptr); } pub fn memSyncScope(ctx: *mlir.Context, v: MemSyncScope) *const mlir.Attribute { - return @ptrCast(c.mlirTritonMemSyncScopeGet(ctx.ptr(), @intFromEnum(v)).ptr); + return @ptrCast(c.mlirTritonMemSyncScopeGet(ctx.ptr(), @backingInt(v)).ptr); } pub fn propagateNan(ctx: *mlir.Context, v: PropagateNan) *const mlir.Attribute { - return @ptrCast(c.mlirTritonPropagateNanGet(ctx.ptr(), @intFromEnum(v)).ptr); + return @ptrCast(c.mlirTritonPropagateNanGet(ctx.ptr(), @backingInt(v)).ptr); } pub fn scaleDotElemType(ctx: *mlir.Context, v: ScaleDotElemType) *const mlir.Attribute { - return @ptrCast(c.mlirTritonScaleDotElemTypeGet(ctx.ptr(), @intFromEnum(v)).ptr); + return @ptrCast(c.mlirTritonScaleDotElemTypeGet(ctx.ptr(), @backingInt(v)).ptr); } pub fn descriptorReduceKind(ctx: *mlir.Context, v: DescriptorReduceKind) *const mlir.Attribute { - return @ptrCast(c.mlirTritonDescriptorReduceKindGet(ctx.ptr(), @intFromEnum(v)).ptr); + return @ptrCast(c.mlirTritonDescriptorReduceKindGet(ctx.ptr(), @backingInt(v)).ptr); } // ============================================================================= diff --git a/mlir/dialects/vector.zig b/mlir/dialects/vector.zig index 04e2384f..d2cca4f2 100644 --- a/mlir/dialects/vector.zig +++ b/mlir/dialects/vector.zig @@ -60,11 +60,11 @@ pub const CombiningKindAttr = opaque { value: CombiningKind, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirVectorCombiningKindAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirVectorCombiningKindAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) CombiningKind { - return @enumFromInt(c.mlirVectorCombiningKindAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirVectorCombiningKindAttrGetValue(self.ptr()))); } }; @@ -87,11 +87,11 @@ pub const IteratorTypeAttr = opaque { value: IteratorType, }; pub fn get(ctx: *mlir.Context, args: InitArgs) mlir.Error!*const Self { - const result = c.mlirVectorIteratorTypeAttrGet(ctx.ptr(), @intFromEnum(args.value)); + const result = c.mlirVectorIteratorTypeAttrGet(ctx.ptr(), @backingInt(args.value)); return @ptrCast(result.ptr orelse return error.InvalidMlir); } pub fn getValue(self: *const Self) IteratorType { - return @enumFromInt(c.mlirVectorIteratorTypeAttrGetValue(self.ptr())); + return @fromBackingInt(@intCast(c.mlirVectorIteratorTypeAttrGetValue(self.ptr()))); } }; @@ -834,17 +834,17 @@ test "vector enum attributes are built through the C API" { const ctx = try mlir.Context.init(.{}); defer ctx.deinit(); - inline for (std.meta.fields(CombiningKind)) |field| { - const value: CombiningKind = @enumFromInt(field.value); + inline for (@typeInfo(CombiningKind).@"enum".field_names) |name| { + const value: CombiningKind = @field(CombiningKind, name); const attr = try CombiningKindAttr.get(ctx, .{ .value = value }); try std.testing.expectEqual(value, attr.getValue()); try std.testing.expect(value.attribute(ctx).isA(CombiningKindAttr) != null); - try expectPrints("#vector.kind<" ++ field.name ++ ">", attr); + try expectPrints("#vector.kind<" ++ name ++ ">", attr); } - inline for (std.meta.fields(IteratorType)) |field| { - const value: IteratorType = @enumFromInt(field.value); + inline for (@typeInfo(IteratorType).@"enum".field_names) |name| { + const value: IteratorType = @field(IteratorType, name); const attr = try IteratorTypeAttr.get(ctx, .{ .value = value }); try std.testing.expectEqual(value, attr.getValue()); - try expectPrints("#vector.iterator_type<" ++ field.name ++ ">", attr); + try expectPrints("#vector.iterator_type<" ++ name ++ ">", attr); } } diff --git a/mlir/mlir.zig b/mlir/mlir.zig index d759dbfa..83bec2f5 100644 --- a/mlir/mlir.zig +++ b/mlir/mlir.zig @@ -88,16 +88,16 @@ pub fn registerFuncExtensions(registry: *DialectRegistry) void { } fn isPtrConst(comptime T: type) bool { - return @typeInfo(T).pointer.is_const; + return @typeInfo(T).pointer.attrs.@"const"; } fn CastedPtr(comptime T1: type, comptime T2: type) type { - return if (@typeInfo(T1).pointer.is_const) *const T2 else *T2; + return if (@typeInfo(T1).pointer.attrs.@"const") *const T2 else *T2; } pub fn Methods(comptime T: type, comptime NativeT: type) type { return struct { - pub const IsPtrConst = @typeInfo(@typeInfo(@FieldType(NativeT, "ptr")).optional.child).pointer.is_const; + pub const IsPtrConst = @typeInfo(@typeInfo(@FieldType(NativeT, "ptr")).optional.child).pointer.attrs.@"const"; pub const Ptr = if (IsPtrConst) *const T else *T; pub fn ptr(self: anytype) NativeT { @@ -1467,11 +1467,11 @@ pub const Operation = opaque { (struct { pub fn callback(op: c.MlirOperation, ctx_: ?*anyopaque) callconv(.c) c.MlirWalkResult { const inner_ctx_: *ContextType = @ptrCast(@alignCast(ctx_)); - return @intFromEnum(walkfn(inner_ctx_.ctx, @ptrCast(op.ptr))); + return @backingInt(walkfn(inner_ctx_.ctx, @ptrCast(op.ptr))); } }).callback, &inner_ctx, - @intFromEnum(order), + @backingInt(order), ); } diff --git a/pjrt/ffi.zig b/pjrt/ffi.zig index 7c7ed2f6..cebec841 100644 --- a/pjrt/ffi.zig +++ b/pjrt/ffi.zig @@ -11,7 +11,7 @@ const Stream = @import("pjrt.zig").Stream; const log = std.log.scoped(.pjrt); comptime { - if (@typeInfo(TypeId).@"struct".fields.len != 1) @compileError("TypeId has changed"); + if (@typeInfo(TypeId).@"struct".field_names.len != 1) @compileError("TypeId has changed"); } /// The signature of a generic custom call. @@ -450,7 +450,7 @@ pub const Error = opaque { pub fn create(api: *const Api, error_code: ErrorCode, message: []const u8) *Error { var ret: pjrt.meta.Struct(c.XLA_FFI_Error_Create_Args) = .{ .message = message.ptr, - .errc = @intFromEnum(error_code), + .errc = @backingInt(error_code), }; return fromInner(api.inner().XLA_FFI_Error_Create.?(@ptrCast(&ret)).?); } diff --git a/pjrt/pjrt.zig b/pjrt/pjrt.zig index 44a72aca..73cadf44 100644 --- a/pjrt/pjrt.zig +++ b/pjrt/pjrt.zig @@ -31,18 +31,18 @@ pub const meta = struct { } pub fn Struct(comptime T: type) type { - const fields = std.meta.fields(T); - var names: [fields.len][]const u8 = undefined; - var types: [fields.len]type = undefined; - var attributes: [fields.len]std.builtin.Type.StructField.Attributes = undefined; - for (fields, &names, &types, &attributes) |field, *name, *type_, *attr| { - name.* = field.name; - type_.* = field.type; + const info = @typeInfo(T).@"struct"; + var names: [info.field_names.len][]const u8 = undefined; + var types: [info.field_names.len]type = undefined; + var attributes: [info.field_names.len]std.builtin.Type.Struct.FieldAttributes = undefined; + for (info.field_names, info.field_types, &names, &types, &attributes) |field_name, Field, *name, *type_, *attr| { + name.* = field_name; + type_.* = Field; attr.* = .{ - .default_value_ptr = @ptrCast(if (std.mem.eql(u8, field.name, "struct_size")) + .default_value_ptr = @ptrCast(if (std.mem.eql(u8, field_name, "struct_size")) &structSize(T) else - &std.mem.zeroes(field.type)), + &std.mem.zeroes(Field)), }; } return @Struct( @@ -153,7 +153,7 @@ pub const Api = struct { const fti = @typeInfo(@FieldType(c.PJRT_Api, @tagName(func))); const fn_ptr = @typeInfo(fti.optional.child); const fn_type_info = @typeInfo(fn_ptr.pointer.child); - const arg_array_type_info = @typeInfo(fn_type_info.@"fn".params[0].type.?); + const arg_array_type_info = @typeInfo(fn_type_info.@"fn".param_types[0].?); return arg_array_type_info.pointer.child; } @@ -255,7 +255,7 @@ pub const Api = struct { pub fn stablehloCurrentVersion(self: *const Api) ?[]const u8 { const state = struct { var buf: [32]u8 = undefined; - var str: ?[:0]const u8 = null; + var str: ?[]const u8 = null; }; if (state.str) |str| { return str; @@ -263,7 +263,7 @@ pub const Api = struct { if (self.pluginAttribute("stablehlo_current_version")) |nv| { switch (nv.value()) { .int64list => |v| { - state.str = std.fmt.bufPrintZ(&state.buf, "{d}.{d}.{d}", .{ v[0], v[1], v[2] }) catch unreachable; + state.str = std.mem.print(&state.buf, "{d}.{d}.{d}", .{ v[0], v[1], v[2] }) catch unreachable; }, else => unreachable, } @@ -365,7 +365,7 @@ pub const Error = opaque { const ret = api.call(.PJRT_Error_GetCode, .{ .@"error" = self.inner(), }) catch unreachable; - return @enumFromInt(ret.code); + return @fromBackingInt(@intCast(ret.code)); } pub fn getMessage(self: *Error, api: *const Api) []const u8 { @@ -390,7 +390,7 @@ pub const ShapeSpec = extern struct { .inner = .{ .dims = @ptrCast(@constCast(dims_)), .num_dims = dims_.len, - .element_type = @intFromEnum(bt), + .element_type = @backingInt(bt), }, }; } @@ -400,7 +400,7 @@ pub const ShapeSpec = extern struct { } pub fn bufferType(self: ShapeSpec) BufferType { - return @enumFromInt(self.inner.element_type); + return @fromBackingInt(@intCast(self.inner.element_type)); } }; @@ -494,13 +494,13 @@ pub const Client = opaque { const ret = try api.call(.PJRT_Client_BufferFromHostBuffer, .{ .client = self.inner(), .data = @constCast(args.data), - .type = @intFromEnum(args.buffer_type), + .type = @backingInt(args.buffer_type), .dims = @ptrCast(@constCast(args.dims)), .num_dims = args.dims.len, .byte_strides = if (args.byte_strides) |bs| @ptrCast(@constCast(bs)) else null, .num_byte_strides = if (args.byte_strides) |bs| bs.len else 0, .device_layout = @ptrCast(@constCast(&args.layout.toCStruct())), - .host_buffer_semantics = @intFromEnum(args.host_buffer_semantics), + .host_buffer_semantics = @backingInt(args.host_buffer_semantics), .device = if (args.dst == .device) @ptrCast(@constCast(args.dst.device)) else null, .memory = if (args.dst == .memory) args.dst.memory.inner() else null, }); @@ -543,7 +543,7 @@ pub const Client = opaque { .device_buffer_ptr = @constCast(args.device_buffer_ptr), .dims = args.dims.ptr, .num_dims = args.dims.len, - .element_type = @intFromEnum(args.element_type), + .element_type = @backingInt(args.element_type), .layout = @ptrCast(@constCast(&layout)), .device = @ptrCast(@constCast(args.device)), .on_delete_callback = args.on_delete_callback, @@ -609,7 +609,7 @@ pub const Client = opaque { .struct_size = c.PJRT_Layouts_PJRT_Client_GetDefaultLayout_Args_STRUCT_SIZE, .extension_start = null, .client = self.inner(), - .type = @intFromEnum(element_type), + .type = @backingInt(element_type), .dims = dims.ptr, .num_dims = dims.len, .layout = null, @@ -670,7 +670,7 @@ pub const Client = opaque { .client = self.inner(), .shape_dims = args.dims.ptr, .shape_num_dims = args.dims.len, - .shape_element_type = @intFromEnum(args.element_type), + .shape_element_type = @backingInt(args.element_type), .shape_layout = @ptrCast(&layout), .device = if (args.dst == .device) @ptrCast(@constCast(args.dst.device)) else null, .memory = if (args.dst == .memory) args.dst.memory.inner() else null, @@ -808,7 +808,7 @@ pub const Device = opaque { const ret = try api.call(.PJRT_Device_MemoryStats, .{ .device = self.inner(), }); - return .fromCStruct(@bitCast(ret)); + return .fromCStruct(ret); } }; @@ -1287,7 +1287,7 @@ pub const Buffer = opaque { const ret = api.call(.PJRT_Buffer_ElementType, .{ .buffer = self.inner(), }) catch unreachable; - return @enumFromInt(ret.type); + return @fromBackingInt(@intCast(ret.type)); } pub fn dimensions(self: *const Buffer, api: *const Api) []const i64 { @@ -1617,7 +1617,7 @@ pub const NamedValue = extern struct { }; pub fn kind(self: NamedValue) Kind { - return @enumFromInt(self.inner.type); + return @fromBackingInt(@intCast(self.inner.type)); } pub fn name(self: NamedValue) []const u8 { @@ -1634,14 +1634,14 @@ pub const NamedValue = extern struct { }; } - pub fn init(comptime kind_: Kind, name_: []const u8, value_: std.meta.fieldInfo(Value, kind_).type) NamedValue { + pub fn init(comptime kind_: Kind, name_: []const u8, value_: @FieldType(Value, @tagName(kind_))) NamedValue { return .{ .inner = .{ .struct_size = c.PJRT_NamedValue_STRUCT_SIZE, .extension_start = null, .name = @ptrCast(name_), .name_size = name_.len, - .type = @intFromEnum(kind_), + .type = @backingInt(kind_), .unnamed_0 = switch (kind_) { .string => .{ .string_value = @ptrCast(@constCast(value_)) }, .int64 => .{ .int64_value = value_ }, diff --git a/platforms/cuda/compat_probe.zig b/platforms/cuda/compat_probe.zig index 9e962577..3f890c6a 100644 --- a/platforms/cuda/compat_probe.zig +++ b/platforms/cuda/compat_probe.zig @@ -22,7 +22,7 @@ pub fn main(init: std.process.Init) !u8 { const cuInit = libcuda.lookup(*const fn (c_uint) callconv(.c) c_int, "cuInit").?; const cuGetErrorString = libcuda.lookup(*const fn (c_int, *[*c]const u8) callconv(.c) c_int, "cuGetErrorString").?; - return @intFromEnum(switch (cuInit(0)) { + return @backingInt(switch (cuInit(0)) { CUDA_SUCCESS => ExitCode.Success, CUDA_ERROR_SYSTEM_DRIVER_MISMATCH => ExitCode.SystemDriverMismatch, CUDA_ERROR_COMPAT_NOT_SUPPORTED_ON_DEVICE => ExitCode.CompatNotSupportedOnDevice, diff --git a/platforms/cuda/cuda.zig b/platforms/cuda/cuda.zig index 562fdc56..692ea226 100644 --- a/platforms/cuda/cuda.zig +++ b/platforms/cuda/cuda.zig @@ -47,7 +47,7 @@ pub fn needsCudaCompat(io: std.Io, sandbox_path: []const u8) !bool { log.err("Failed to run CUDA compatibility probe: {any}", .{err}); return err; }; - const result: compat_probe.ExitCode = @enumFromInt(res.exited); + const result: compat_probe.ExitCode = @fromBackingInt(@intCast(res.exited)); return switch (result) { .Success => true, @@ -69,7 +69,7 @@ fn hasNvidiaDevice(io: std.Io) bool { fn hasCudaPathInLDPath() bool { const ldLibraryPath = std.c.getenv("LD_LIBRARY_PATH") orelse return false; - return std.ascii.indexOfIgnoreCase(std.mem.span(ldLibraryPath), nvidiaLibsPath) != null; + return std.ascii.findIgnoreCase(std.mem.span(ldLibraryPath), nvidiaLibsPath) != null; } fn setupXlaGpuCudaDirFlag(allocator: std.mem.Allocator, sandbox: []const u8) !void { diff --git a/platforms/cuda/flashattn/flashattn.zig b/platforms/cuda/flashattn/flashattn.zig index b4014c25..7d9c72b0 100644 --- a/platforms/cuda/flashattn/flashattn.zig +++ b/platforms/cuda/flashattn/flashattn.zig @@ -20,7 +20,7 @@ pub const Tensor = struct { .rank = @intCast(rank), .dims = undefined, .strides = undefined, - .dtype = @intCast(@intFromEnum(dtype)), + .dtype = @intCast(@backingInt(dtype)), }, }; @memcpy(ret.inner.dims[0..rank], dims); diff --git a/platforms/neuron/libzml_neuron.zig b/platforms/neuron/libzml_neuron.zig index 968f1584..404d8cc0 100644 --- a/platforms/neuron/libzml_neuron.zig +++ b/platforms/neuron/libzml_neuron.zig @@ -46,7 +46,7 @@ fn setupNeuronEnv(io: std.Io, sandbox_path: []const u8) !void { var root_comm_buf: [256]u8 = undefined; _ = setenv( "NEURON_RT_ROOT_COMM_ID", - try std.fmt.bufPrintZ(&root_comm_buf, "127.0.0.1:{d}", .{try findFreeTcpPort(io)}), + try std.mem.printSentinel(&root_comm_buf, "127.0.0.1:{d}", .{try findFreeTcpPort(io)}, 0), 1, ); _ = setenv( @@ -69,9 +69,9 @@ fn setupNeuronEnv(io: std.Io, sandbox_path: []const u8) !void { const old_path = if (std.c.getenv("PATH")) |path| std.mem.span(path) else ""; var new_path_buf: [std.posix.PATH_MAX:0]u8 = undefined; const new_path = if (old_path.len == 0) - try std.fmt.bufPrintZ(&new_path_buf, "{s}", .{bin_path}) + try std.mem.printSentinel(&new_path_buf, "{s}", .{bin_path}, 0) else - try std.fmt.bufPrintZ(&new_path_buf, "{s}:{s}", .{ bin_path, old_path }); + try std.mem.printSentinel(&new_path_buf, "{s}:{s}", .{ bin_path, old_path }, 0); if (setenv("PATH", new_path.ptr, 1) != 0) return error.SetEnvFailed; if (std.c.getenv("NEURON_CC_FLAGS") != null) return; @@ -81,7 +81,7 @@ fn setupNeuronEnv(io: std.Io, sandbox_path: []const u8) !void { var flags_buf: [512:0]u8 = undefined; const instance = try neuron.instance(); const target = @tagName(instance.compilerTarget()); - const flags = try std.fmt.bufPrintZ( + const flags = try std.mem.printSentinel( &flags_buf, "--target={s} " ++ "--optlevel=1 " ++ @@ -98,6 +98,7 @@ fn setupNeuronEnv(io: std.Io, sandbox_path: []const u8) !void { log_level, log_level, }, + 0, ); _ = setenv("NEURON_CC_FLAGS", flags.ptr, 0); diff --git a/platforms/neuron/neuron.zig b/platforms/neuron/neuron.zig index 039cc566..e0365fe9 100644 --- a/platforms/neuron/neuron.zig +++ b/platforms/neuron/neuron.zig @@ -82,16 +82,16 @@ pub const Instance = struct { pub fn instance() !Instance { var info = std.mem.zeroes(c.struct_nrt_instance_info); - info.family = @intFromEnum(Family.unknown); - info.size = @intFromEnum(Size.unknown); + info.family = @backingInt(Family.unknown); + info.size = @backingInt(Size.unknown); if (c.nrt_get_instance_info(&info, @sizeOf(c.struct_nrt_instance_info)) != c.NRT_SUCCESS) { return error.Unavailable; } return .{ - .family = @enumFromInt(info.family), - .size = @enumFromInt(info.size), + .family = @fromBackingInt(@intCast(info.family)), + .size = @fromBackingInt(@intCast(info.size)), }; } diff --git a/platforms/neuron/python_launcher.zig b/platforms/neuron/python_launcher.zig index 26ca9766..075034ab 100644 --- a/platforms/neuron/python_launcher.zig +++ b/platforms/neuron/python_launcher.zig @@ -113,7 +113,7 @@ fn configureInterpreter(init: std.process.Init, config: *c.PyConfig) ![]const u8 const args = try init.minimal.args.toSlice(arena.allocator()); const c_args = try arena.allocator().alloc([*:0]const u8, args.len); for (args, 0..) |arg, i| { - c_args[i] = (try arena.allocator().dupeZ(u8, arg)).ptr; + c_args[i] = (try arena.allocator().dupeSentinel(u8, arg, 0)).ptr; } pyStatusCheck(c.PyConfig_SetBytesArgv(config, @intCast(c_args.len), @ptrCast(c_args.ptr))); @@ -125,7 +125,7 @@ fn configureInterpreter(init: std.process.Init, config: *c.PyConfig) ![]const u8 { var buf: [std.Io.Dir.max_path_bytes]u8 = undefined; - const home = try std.fmt.bufPrintZ(&buf, "{f}{d}.{d}", .{ + const home = try std.mem.printSentinel(&buf, "{f}{d}.{d}", .{ std.Io.Dir.path.fmtJoin(&.{ self_exe_dir, "..", @@ -134,7 +134,7 @@ fn configureInterpreter(init: std.process.Init, config: *c.PyConfig) ![]const u8 }), c.PY_MAJOR_VERSION, c.PY_MINOR_VERSION, - }); + }, 0); pyStatusCheck(c.PyConfig_SetBytesString(config, &config.home, home)); pyStatusCheck(c.PyWideStringList_Append(&config.module_search_paths, &try toPosixPathW(home))); } diff --git a/platforms/platforms.zig b/platforms/platforms.zig index 6239ba77..789c9a10 100644 --- a/platforms/platforms.zig +++ b/platforms/platforms.zig @@ -24,8 +24,8 @@ pub const Platform = enum { furiosa, pub fn selectFirstAcceleratorEnabled() error{Unavailable}!Platform { - inline for (@typeInfo(Platform).@"enum".fields) |field| { - const target: Platform = @enumFromInt(field.value); + inline for (@typeInfo(Platform).@"enum".field_names) |field| { + const target: Platform = @field(Platform, field); if (comptime (target != .cpu and target.isEnabled())) return target; } diff --git a/stdx/flags.zig b/stdx/flags.zig index 6ee06eaf..52a9e6a4 100644 --- a/stdx/flags.zig +++ b/stdx/flags.zig @@ -94,7 +94,8 @@ pub fn parseProcessArgs(init_: std.process.Init.Minimal, comptime CliArgs: type) fn parse_commands(args: *std.process.Args.Iterator, comptime Commands: type) Commands { comptime assert(@typeInfo(Commands) == .@"union"); - comptime assert(std.meta.fields(Commands).len >= 2); + const field_names = std.meta.fieldNames(Commands); + comptime assert(field_names.len >= 2); const first_arg = args.next() orelse fatal( "subcommand required, expected {s}", @@ -109,10 +110,10 @@ fn parse_commands(args: *std.process.Args.Iterator, comptime Commands: type) Com } } - inline for (comptime std.meta.fields(Commands)) |field| { - comptime assert(std.mem.indexOf(u8, field.name, "_") == null); - if (std.mem.eql(u8, first_arg, field.name)) { - return @unionInit(Commands, field.name, parse_flags(args, field.type)); + inline for (field_names, std.meta.fieldTypes(Commands)) |field_name, FieldType| { + comptime assert(std.mem.indexOf(u8, field_name, "_") == null); + if (std.mem.eql(u8, first_arg, field_name)) { + return @unionInit(Commands, field_name, parse_flags(args, FieldType)); } } fatal("unknown subcommand: '{s}'", .{first_arg}); @@ -128,52 +129,61 @@ fn parse_flags(args: *std.process.Args.Iterator, comptime Flags: type) Flags { return {}; } - assert(@typeInfo(Flags) == .@"struct"); + const flags_info = @typeInfo(Flags).@"struct"; - comptime var fields: [std.meta.fields(Flags).len]std.builtin.Type.StructField = undefined; + const total_num_fields = flags_info.field_names.len; + comptime var field_names: [total_num_fields][]const u8 = undefined; + comptime var field_types: [total_num_fields]type = undefined; + comptime var field_defaults: [total_num_fields]?*const anyopaque = undefined; comptime var field_count = 0; - comptime var positional_fields: []const std.builtin.Type.StructField = &.{}; + const positional_infos: ?std.lang.Type.Struct = if (@hasField(Flags, "positional")) + @typeInfo(@FieldType(Flags, "positional")).@"struct" + else + null; - comptime for (std.meta.fields(Flags)) |field| { - if (std.mem.eql(u8, field.name, "positional")) { - assert(@typeInfo(field.type) == .@"struct"); - positional_fields = std.meta.fields(field.type); + comptime for (flags_info.field_names, flags_info.field_types, flags_info.field_attrs) |field_name, FieldType, field_attr| { + if (std.mem.eql(u8, field_name, "positional")) { var optional_tail = false; - for (positional_fields) |positional_field| { - if (default_value(positional_field) == null) { + for (positional_infos.?.field_types, positional_infos.?.field_attrs) |PosType, pos_attr| { + const default: ?PosType = pos_attr.defaultValue(PosType); + if (default == null) { if (optional_tail) @panic("optional positional arguments must be last"); } else { optional_tail = true; } - switch (@typeInfo(positional_field.type)) { + switch (@typeInfo(PosType)) { .optional => |optional| { // optional flags should have a default - assert(default_value(positional_field) != null); - assert(default_value(positional_field).? == null); + assert(default != null); + assert(default.? == null); assert_valid_value_type(optional.child); }, else => { - assert_valid_value_type(positional_field.type); + assert_valid_value_type(PosType); }, } } } else { - fields[field_count] = field; + field_names[field_count] = field_name; + field_types[field_count] = FieldType; + field_defaults[field_count] = field_attr.default_value_ptr; field_count += 1; - switch (@typeInfo(field.type)) { + const default: ?FieldType = field_attr.defaultValue(FieldType); + + switch (@typeInfo(FieldType)) { .bool => { // boolean flags should have a default - debug.assertComptime(default_value(field) != null and default_value(field).? == false, "boolean flag --{s} should default to false", .{field.name}); + debug.assertComptime(default != null and default.? == false, "boolean flag --{s} should default to false", .{field_name}); }, .optional => |optional| { // optional flags should have a default - debug.assertComptime(default_value(field) != null and default_value(field).? == null, "optional flag --{s} should have a null default value", .{field.name}); + debug.assertComptime(default != null and default.? == null, "optional flag --{s} should have a null default value", .{field_name}); assert_valid_value_type(optional.child); }, else => { - assert_valid_value_type(field.type); + assert_valid_value_type(FieldType); }, } } @@ -182,29 +192,33 @@ fn parse_flags(args: *std.process.Args.Iterator, comptime Flags: type) Flags { var result: Flags = undefined; // Would use std.enums.EnumFieldStruct(Flags, u32, 0) here but Flags is a struct not an Enum. var counts = comptime blk: { - const f = std.meta.fields(Flags); - var count_field_names: [fields.len][]const u8 = undefined; - var count_field_types: [fields.len]type = undefined; - var count_field_attrs: [fields.len]std.builtin.Type.StructField.Attributes = undefined; - for (f, &count_field_names, &count_field_types, &count_field_attrs) |field, *field_name, *field_type, *field_attr| { - field_name.* = field.name; - field_type.* = u32; - field_attr.* = .{ - .@"align" = @alignOf(u32), - .default_value_ptr = @ptrCast(&@as(u32, 0)), - }; - } - break :blk @Struct(.auto, null, &count_field_names, &count_field_types, &count_field_attrs){}; + const count_field_types: [total_num_fields]type = @splat(u32); + const count_field_attrs: [total_num_fields]std.builtin.Type.Struct.FieldAttributes = @splat(.{ + .@"align" = @alignOf(u32), + .default_value_ptr = @ptrCast(&@as(u32, 0)), + }); + break :blk @Struct(.auto, null, flags_info.field_names, &count_field_types, &count_field_attrs){}; }; // When parsing arguments, we must consider longer arguments first, such that `--foo-bar=92` is // not confused for a misspelled `--foo=92`. Using `std.sort` for comptime-only values does not // work, so open-code insertion sort, and comptime assert order during the actual parsing. comptime { - for (fields[0..field_count], 0..) |*field_right, i| { - for (fields[0..i]) |*field_left| { - if (field_left.name.len < field_right.name.len) { - std.mem.swap(std.builtin.Type.StructField, field_left, field_right); + for ( + 0.., + field_names[0..field_count], + field_types[0..field_count], + field_defaults[0..field_count], + ) |i, *name_right, *type_right, *default_right| { + for ( + field_names[0..i], + field_types[0..i], + field_defaults[0..i], + ) |*name_left, *type_left, *default_left| { + if (name_left.len < name_right.len) { + std.mem.swap([]const u8, name_left, name_right); + std.mem.swap(type, type_left, type_right); + std.mem.swap(?*const anyopaque, default_left, default_right); } } } @@ -221,29 +235,29 @@ fn parse_flags(args: *std.process.Args.Iterator, comptime Flags: type) Flags { } comptime var field_len_prev = std.math.maxInt(usize); - inline for (fields[0..field_count]) |field| { - const flag = comptime flag_name(field); + inline for (field_names[0..field_count], field_types[0..field_count]) |field_name, FieldType| { + const flag = comptime flag_name(field_name); - comptime assert(field_len_prev >= field.name.len); - field_len_prev = field.name.len; + comptime assert(field_len_prev >= field_name.len); + field_len_prev = field_name.len; if (std.mem.startsWith(u8, arg, flag)) { if (parsed_positional) { fatal("unexpected trailing option: '{s}'", .{arg}); } - @field(counts, field.name) += 1; - const flag_value = parse_flag(field.type, flag, arg); - @field(result, field.name) = flag_value; + @field(counts, field_name) += 1; + const flag_value = parse_flag(FieldType, flag, arg); + @field(result, field_name) = flag_value; continue :next_arg; } } - if (@hasField(Flags, "positional")) { + if (positional_infos) |pos_infos| { counts.positional += 1; switch (counts.positional - 1) { - inline 0...positional_fields.len - 1 => |positional_index| { - const positional_field = positional_fields[positional_index]; - const flag = comptime flag_name_positional(positional_field); + inline 0...pos_infos.field_names.len - 1 => |positional_index| { + const positional_field_name = pos_infos.field_names[positional_index]; + const flag = comptime flag_name_positional(positional_field_name); if (arg.len == 0) fatal("{s}: empty argument", .{flag}); // Prevent ambiguity between a flag and positional argument value. We could add @@ -252,8 +266,8 @@ fn parse_flags(args: *std.process.Args.Iterator, comptime Flags: type) Flags { if (arg[0] == '-') fatal("unexpected argument: '{s}'", .{arg}); parsed_positional = true; - @field(result.positional, positional_field.name) = - parse_value(positional_field.type, flag, arg); + @field(result.positional, positional_field_name) = + parse_value(pos_infos.field_types[positional_index], flag, arg); continue :next_arg; }, else => {}, // Fall-through to the unexpected argument error. @@ -263,11 +277,15 @@ fn parse_flags(args: *std.process.Args.Iterator, comptime Flags: type) Flags { fatal("unexpected argument: '{s}'", .{arg}); } - inline for (fields[0..field_count]) |field| { - const flag = flag_name(field); - switch (@field(counts, field.name)) { - 0 => if (default_value(field)) |default| { - @field(result, field.name) = default; + inline for ( + field_names[0..field_count], + field_types[0..field_count], + field_defaults[0..field_count], + ) |field_name, FieldType, default_ptr| { + const flag = flag_name(field_name); + switch (@field(counts, field_name)) { + 0 => if (defaultValue(FieldType, default_ptr)) |default| { + @field(result, field_name) = default; } else { fatal("{s}: argument is required", .{flag}); }, @@ -276,15 +294,19 @@ fn parse_flags(args: *std.process.Args.Iterator, comptime Flags: type) Flags { } } - if (@hasField(Flags, "positional")) { - assert(counts.positional <= positional_fields.len); - inline for (positional_fields, 0..) |positional_field, positional_index| { + if (positional_infos) |pos_infos| { + assert(counts.positional <= pos_infos.field_names.len); + inline for ( + 0.., + pos_infos.field_names, + pos_infos.field_types, + pos_infos.field_attrs, + ) |positional_index, name, PosFieldType, attr| { if (positional_index >= counts.positional) { - const flag = comptime flag_name_positional(positional_field); - if (default_value(positional_field)) |default| { - @field(result.positional, positional_field.name) = default; + if (attr.defaultValue(PosFieldType)) |default| { + @field(result.positional, name) = default; } else { - fatal("{s}: argument is required", .{flag}); + fatal("<{s}>: argument is required", .{name}); } } } @@ -299,8 +321,8 @@ fn assert_valid_value_type(comptime T: type) void { if (@typeInfo(T) == .@"enum") { const info = @typeInfo(T).@"enum"; - assert(info.is_exhaustive); - assert(info.fields.len >= 2); + assert(info.mode == .exhaustive); + assert(info.field_names.len >= 2); return; } @@ -449,7 +471,7 @@ pub const ByteSize = struct { else ByteUnit.bytes; - _ = std.math.mul(u64, amount, @intFromEnum(unit)) catch { + _ = std.math.mul(u64, amount, @backingInt(unit)) catch { return ByteSizeParseError.BytesOverflow; }; @@ -460,7 +482,7 @@ pub const ByteSize = struct { return std.math.mul( u64, size.value, - @intFromEnum(size.unit), + @backingInt(size.unit), ) catch unreachable; } @@ -542,7 +564,7 @@ fn parse_value_float(comptime T: type, flag: []const u8, value: [:0]const u8) T fn parse_value_enum(comptime E: type, flag: []const u8, value: [:0]const u8) E { assert((flag[0] == '-' and flag[1] == '-') or flag[0] == '<'); - comptime assert(@typeInfo(E).@"enum".is_exhaustive); + comptime assert(@typeInfo(E).@"enum".mode == .exhaustive); return std.meta.stringToEnum(E, value) orelse fatal( "{s}: expected one of {s}, but found '{s}'", @@ -552,53 +574,50 @@ fn parse_value_enum(comptime E: type, flag: []const u8, value: [:0]const u8) E { fn fields_to_comma_list(comptime E: type) []const u8 { comptime { - const field_count = std.meta.fields(E).len; + const field_names = std.meta.fieldNames(E); + const field_count = field_names.len; assert(field_count >= 2); var result: []const u8 = ""; - for (std.meta.fields(E), 0..) |field, field_index| { + for (field_names, 0..) |field_name, field_index| { const separator = switch (field_index) { 0 => "", else => ", ", field_count - 1 => if (field_count == 2) " or " else ", or ", }; - result = result ++ separator ++ "'" ++ field.name ++ "'"; + result = result ++ separator ++ "'" ++ field_name ++ "'"; } return result; } } -pub fn flag_name(comptime field: std.builtin.Type.StructField) []const u8 { +pub fn flag_name(comptime field_name: []const u8) []const u8 { // TODO(Zig): Cleanup when this is fixed after Zig 0.11. // Without comptime blk, the compiler thinks the result is a runtime slice returning a UAF. return comptime blk: { - assert(!std.mem.eql(u8, field.name, "positional")); + assert(!std.mem.eql(u8, field_name, "positional")); var result: []const u8 = "--"; var index = 0; - while (std.mem.indexOf(u8, field.name[index..], "_")) |i| { - result = result ++ field.name[index..][0..i] ++ "-"; + while (std.mem.indexOf(u8, field_name[index..], "_")) |i| { + result = result ++ field_name[index..][0..i] ++ "-"; index = index + i + 1; } - result = result ++ field.name[index..]; + result = result ++ field_name[index..]; break :blk result; }; } test flag_name { - const field = @typeInfo(struct { statsd: bool }).@"struct".fields[0]; - try std.testing.expectEqualStrings(flag_name(field), "--statsd"); + try std.testing.expectEqualStrings(flag_name("statsd"), "--statsd"); } -fn flag_name_positional(comptime field: std.builtin.Type.StructField) []const u8 { - comptime assert(std.mem.indexOf(u8, field.name, "_") == null); - return "<" ++ field.name ++ ">"; +fn flag_name_positional(comptime field_name: []const u8) []const u8 { + comptime assert(std.mem.indexOf(u8, field_name, "_") == null); + return "<" ++ field_name ++ ">"; } -/// This is essentially `field.default_value`, but with a useful type instead of `?*anyopaque`. -pub fn default_value(comptime field: std.builtin.Type.StructField) ?field.type { - return if (field.default_value_ptr) |default_opaque| - @as(*const field.type, @ptrCast(@alignCast(default_opaque))).* - else - null; +pub fn defaultValue(comptime FieldType: type, default_value_ptr: ?*const anyopaque) ?FieldType { + const dp: *const FieldType = @ptrCast(@alignCast(default_value_ptr orelse return null)); + return dp.*; } diff --git a/stdx/fmt.zig b/stdx/fmt.zig index 33351d93..a62d4f7d 100644 --- a/stdx/fmt.zig +++ b/stdx/fmt.zig @@ -222,15 +222,15 @@ fn printValue( switch (@typeInfo(T)) { .@"struct" => |info| { try w.writeAll(".{ "); - inline for (info.fields, 0..) |f, i| { + inline for (info.field_names, 0..) |field_name, i| { if (i > 0) try w.writeAll(", "); if (!info.is_tuple) { try w.writeByte('.'); - try w.writeAll(f.name); + try w.writeAll(field_name); try w.writeAll(" = "); } - try printValue(w, options, @field(value, f.name), max_depth - 1); + try printValue(w, options, @field(value, field_name), max_depth - 1); } try w.writeAll(" }"); }, diff --git a/stdx/json.zig b/stdx/json.zig index d1143efc..c1f71a4a 100644 --- a/stdx/json.zig +++ b/stdx/json.zig @@ -42,22 +42,22 @@ pub fn UnionHelpers(comptime T: type) type { } pub fn jsonParseFromValue(allocator: std.mem.Allocator, source: std.json.Value, options: std.json.ParseOptions) ParseFromValueError!T { - inline for (std.meta.fields(T)) |field| { - switch (field.type) { - bool => if (source == .bool) return @unionInit(T, field.name, source.bool), + inline for (comptime std.meta.fieldNames(T), comptime std.meta.fieldTypes(T)) |field_name, Field| { + switch (Field) { + bool => if (source == .bool) return @unionInit(T, field_name, source.bool), []const u8 => switch (source) { .string, .number_string => |v| { const dupe = try allocator.dupe(u8, v); - return @unionInit(T, field.name, dupe); + return @unionInit(T, field_name, dupe); }, else => {}, }, - else => switch (@typeInfo(field.type)) { - .int => if (source == .integer) return @unionInit(T, field.name, @intCast(source.integer)), - .float => if (source == .float) return @unionInit(T, field.name, @floatCast(source.float)), - .@"struct" => if (source == .object) return @unionInit(T, field.name, try std.json.innerParseFromValue(field.type, allocator, source, options)), + else => switch (@typeInfo(Field)) { + .int => if (source == .integer) return @unionInit(T, field_name, @intCast(source.integer)), + .float => if (source == .float) return @unionInit(T, field_name, @floatCast(source.float)), + .@"struct" => if (source == .object) return @unionInit(T, field_name, try std.json.innerParseFromValue(Field, allocator, source, options)), inline else => switch (source) { - .number_string, .array => return @unionInit(T, field.name, try std.json.innerParseFromValue(field.type, allocator, source, options)), + .number_string, .array => return @unionInit(T, field_name, try std.json.innerParseFromValue(Field, allocator, source, options)), else => {}, }, }, @@ -130,9 +130,9 @@ pub fn TaggedUnionHelpers(comptime T: type, comptime tag_name: [:0]const u8) typ if (@typeInfo(T) != .@"union") { @compileError("TaggedUnion expects a union type, found " ++ @typeName(T)); } - for (std.meta.fields(T)) |field| { - if (@typeInfo(field.type) != .@"struct") { - @compileError("TaggedUnion member '" ++ field.name ++ "' must be a struct, found " ++ @typeName(field.type)); + for (std.meta.fieldNames(T), std.meta.fieldTypes(T)) |field_name, Field| { + if (@typeInfo(Field) != .@"struct") { + @compileError("TaggedUnion member '" ++ field_name ++ "' must be a struct, found " ++ @typeName(Field)); } } } @@ -152,13 +152,13 @@ pub fn TaggedUnionHelpers(comptime T: type, comptime tag_name: [:0]const u8) typ var o = source.object; const tag = (o.fetchSwapRemove(tag_name) orelse return error.MissingField).value; if (tag != .string) return error.LengthMismatch; - inline for (std.meta.fields(T)) |field| { - if (std.mem.eql(u8, field.name, tag.string)) { - const inner: field.type = std.json.parseFromValueLeaky(field.type, allocator, .{ .object = o }, options) catch |err| { - std.log.warn("failed to interpret {s} as a {s}: {}", .{ tag.string, @typeName(field.type), err }); + inline for (comptime std.meta.fieldNames(T), comptime std.meta.fieldTypes(T)) |field_name, Field| { + if (std.mem.eql(u8, field_name, tag.string)) { + const inner: Field = std.json.parseFromValueLeaky(Field, allocator, .{ .object = o }, options) catch |err| { + std.log.warn("failed to interpret {s} as a {s}: {}", .{ tag.string, @typeName(Field), err }); return err; }; - return @unionInit(T, field.name, inner); + return @unionInit(T, field_name, inner); } } return error.InvalidEnumTag; @@ -172,9 +172,9 @@ pub fn TaggedUnionHelpers(comptime T: type, comptime tag_name: [:0]const u8) typ try jw.objectField(tag_name); try jw.write(@tagName(tag)); switch (@typeInfo(@TypeOf(v))) { - .@"struct" => inline for (std.meta.fields(@TypeOf(v))) |field| { - try jw.objectField(field.name); - try jw.write(@field(v, field.name)); + .@"struct" => inline for (comptime std.meta.fieldNames(@TypeOf(v))) |name| { + try jw.objectField(name); + try jw.write(@field(v, name)); }, else => unreachable, // Would have failed with comptime check. } @@ -230,11 +230,11 @@ pub fn NeverNull(comptime T: type, comptime default_value: T) type { } pub fn fillDefaultStructValues(comptime T: type, r: *T) !void { - inline for (@typeInfo(T).Struct.fields) |field| { - if (field.default_value) |default_ptr| { - if (@field(r, field.name) == null) { - const default = @as(*align(1) const field.type, @ptrCast(default_ptr)).*; - @field(r, field.name) = default; + const info = @typeInfo(T).@"struct"; + inline for (info.field_names, info.field_types, info.field_attrs) |field_name, Field, attrs| { + if (attrs.defaultValue(Field)) |default| { + if (@field(r, field_name) == null) { + @field(r, field_name) = default; } } } diff --git a/stdx/meta.zig b/stdx/meta.zig index cb9aaeba..9b1c05af 100644 --- a/stdx/meta.zig +++ b/stdx/meta.zig @@ -20,8 +20,8 @@ pub fn isTuple(comptime T: type) bool { pub fn isStructOf(comptime T: type, comptime Elem: type) bool { return switch (@typeInfo(T)) { .@"struct" => |info| blk: { - inline for (info.fields) |field| { - if (field.type != Elem) { + inline for (info.field_types) |FieldType| { + if (FieldType != Elem) { break :blk false; } } @@ -34,8 +34,8 @@ pub fn isStructOf(comptime T: type, comptime Elem: type) bool { pub fn isStructOfAny(comptime T: type, comptime f: fn (comptime type) bool) bool { return switch (@typeInfo(T)) { .@"struct" => |info| blk: { - inline for (info.fields) |field| { - if (f(field.type) == false) { + inline for (info.field_types) |FieldType| { + if (f(FieldType) == false) { break :blk false; } } @@ -121,9 +121,9 @@ pub fn asSlice(comptime T: type) type { } pub fn TupleRange(comptime T: type, comptime start: ?usize, comptime end: ?usize) type { - const fields = std.meta.fields(T); + const all_field_types = std.meta.fieldTypes(T); const start_ = start orelse 0; - const end_ = end orelse fields.len; + const end_ = end orelse all_field_types.len; if (start_ == end_) { return @Tuple(&.{}); @@ -131,17 +131,17 @@ pub fn TupleRange(comptime T: type, comptime start: ?usize, comptime end: ?usize var field_types: [end_ - start_]type = undefined; inline for (start_..end_, 0..) |i, j| { - field_types[j] = fields[i].type; + field_types[j] = all_field_types[i]; } return @Tuple(&field_types); } pub fn FnParam(comptime func: anytype, comptime n: comptime_int) type { - const params = @typeInfo(@TypeOf(func)).@"fn".params; + const params = @typeInfo(@TypeOf(func)).@"fn".param_types; if (n >= params.len) { @compileError("param doesn't exist in func"); } - return params[n].type orelse @compileError("anytype is not supported"); + return params[n] orelse @compileError("anytype is not supported"); } pub fn FnReturn(comptime func: anytype) type { @@ -167,8 +167,8 @@ pub fn FnReturnErrorSet(comptime func: anytype) ?type { pub fn Head(comptime Tuple: type) type { return switch (@typeInfo(Tuple)) { .@"struct" => |struct_info| { - if (struct_info.fields.len == 0) @compileError("Can't tail empty tuple"); - return struct_info.fields[0].type; + if (struct_info.field_types.len == 0) @compileError("Can't tail empty tuple"); + return struct_info.field_types[0]; }, else => @compileError("Head works on tuple type"), }; @@ -177,10 +177,10 @@ pub fn Head(comptime Tuple: type) type { pub fn Tail(comptime Tuple: type) type { return switch (@typeInfo(Tuple)) { .@"struct" => |struct_info| { - if (struct_info.fields.len == 0) @compileError("Can't tail empty tuple"); - var types: [struct_info.fields.len - 1]type = undefined; - for (struct_info.fields[1..], &types) |field, *type_| { - type_.* = field.type; + if (struct_info.field_types.len == 0) @compileError("Can't tail empty tuple"); + var types: [struct_info.field_types.len - 1]type = undefined; + for (struct_info.field_types[1..], &types) |FieldType, *type_| { + type_.* = FieldType; } return @Tuple(&types); }, diff --git a/stdx/segmented_list.zig b/stdx/segmented_list.zig index ee115ce2..567534be 100644 --- a/stdx/segmented_list.zig +++ b/stdx/segmented_list.zig @@ -107,7 +107,7 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type pub const prealloc_count = prealloc_item_count; fn AtType(comptime SelfType: type) type { - if (@typeInfo(SelfType).pointer.is_const) { + if (@typeInfo(SelfType).pointer.attrs.@"const") { return *const T; } else { return *T; diff --git a/stdx/stdx.zig b/stdx/stdx.zig index 8d1fb590..1b19e638 100644 --- a/stdx/stdx.zig +++ b/stdx/stdx.zig @@ -28,7 +28,7 @@ pub inline fn stackSlice(comptime max_len: usize, T: type, len: usize) []T { return storage[0..len]; } -pub const noalloc: std.mem.Allocator = if (builtin.mode == .ReleaseFast) undefined else std.testing.failing_allocator; +pub const noalloc: std.mem.Allocator = if (builtin.mode == .fast) undefined else std.testing.failing_allocator; pub fn arenaWithCapacity(parent: std.mem.Allocator, initial_capacity: usize) std.mem.Allocator.Error!std.heap.ArenaAllocator { var a: std.heap.ArenaAllocator = .init(parent); @@ -43,7 +43,7 @@ pub fn pinToCore(core_id: usize) void { if (builtin.os.tag == .linux) { const CPUSet = std.bit_set.ArrayBitSet(usize, std.os.linux.CPU_SETSIZE * @sizeOf(usize)); - var set: CPUSet = .initEmpty(); + var set: CPUSet = .empty; set.set(core_id); std.os.linux.sched_setaffinity(0, @ptrCast(&set.masks)) catch {}; } @@ -86,3 +86,60 @@ pub fn Once(comptime f: anytype) type { } }; } + +/// Packed storage of sub-byte values +/// +/// Note: before Zig 0.17, @Vector(u2, 4) was always one byte and could be used as a storage type, +/// But that's not true anymore. +pub fn Packed(T: type) type { + return switch (@bitSizeOf(T)) { + 2 => packed struct(u8) { + x: T, + y: T, + z: T, + w: T, + + const P = @This(); + pub fn pack(x: T, y: T, z: T, w: T) P { + return .{ .x = x, .y = y, .z = z, .w = w }; + } + + pub fn unpack(p: P) [4]T { + return .{ p.x, p.y, p.z, p.w }; + } + + pub fn formatNumber(p: P, w: *std.Io.Writer, n: std.fmt.Number) std.Io.Writer.Error!void { + try formatPackedNumber(T, &p.unpack(), w, n); + } + }, + 4 => packed struct(u8) { + x: T, + y: T, + + const P = @This(); + pub fn pack(x: T, y: T) P { + return .{ .x = x, .y = y }; + } + + pub fn unpack(p: P) [2]T { + return .{ p.x, p.y }; + } + + pub fn formatNumber(p: P, w: *std.Io.Writer, n: std.fmt.Number) std.Io.Writer.Error!void { + try formatPackedNumber(T, &p.unpack(), w, n); + } + }, + else => debug.compileError("stdx.Packed expects a bitsize of 2 or 4, got type {} with bitsize {d}", .{ T, @bitSizeOf(T) }), + }; +} + +fn formatPackedNumber(T: type, values: []const T, w: *std.Io.Writer, n: std.fmt.Number) std.Io.Writer.Error!void { + for (0.., values) |i, val| { + if (i > 0) try w.writeByte(','); + switch (@typeInfo(T)) { + .@"struct" => try val.formatNumber(w, n), + .int => try fmt.formatInt(val, n, w), + else => try w.print("{}", .{val}), + } + } +} diff --git a/third_party/arocc/arocc.bazel b/third_party/arocc/arocc.bazel index 853399f5..a5de1d98 100644 --- a/third_party/arocc/arocc.bazel +++ b/third_party/arocc/arocc.bazel @@ -80,19 +80,10 @@ zig_options( ], ) -zig_library( - name = "zig", - srcs = glob(["deps/zig/**/*.zig"]), - main = "deps/zig/lib.zig", -) - zig_library( name = "backend", main = "src/backend.zig", - deps = [ - ":build_options", - ":zig", - ], + deps = [":build_options"], ) zig_library( @@ -127,7 +118,6 @@ zig_binary( ":assembly_backend", ":build_options", ], - zigopts = ["-fm"], ) zig_binary( diff --git a/third_party/arocc/repo.bzl b/third_party/arocc/repo.bzl index 98a10e38..15ff6d7f 100644 --- a/third_party/arocc/repo.bzl +++ b/third_party/arocc/repo.bzl @@ -1,9 +1,10 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") def repo(): + # https://github.com/zml/arocc/releases/tag/0.17.0 git_repository( name = "arocc", - remote = "https://github.com/Vexu/arocc.git", - commit = "5f5a050569a95ecc40a426f0c3666ae7ef987ede", + remote = "https://github.com/zml/arocc", + commit = "d0c8c4d9c55daa7ef6e40cf0f630a5b5e900989b", build_file = Label("//third_party/arocc:arocc.bazel"), ) diff --git a/third_party/libvaxis/bump-zig.patch b/third_party/libvaxis/bump-zig.patch deleted file mode 100644 index 45e221b7..00000000 --- a/third_party/libvaxis/bump-zig.patch +++ /dev/null @@ -1,2019 +0,0 @@ -diff --git a/build.zig.zon b/build.zig.zon -index 6192c1a..4ca04f8 100644 ---- a/build.zig.zon -+++ b/build.zig.zon -@@ -2,15 +2,15 @@ - .name = .vaxis, - .fingerprint = 0x14fbbb94fc556305, - .version = "0.5.1", -- .minimum_zig_version = "0.15.1", -+ .minimum_zig_version = "0.16.0-dev.2261+d6b3dd25a", - .dependencies = .{ - .zigimg = .{ -- .url = "git+https://github.com/zigimg/zigimg#eab2522c023b9259db8b13f2f90d609b7437e5f6", -- .hash = "zigimg-0.1.0-8_eo2vUZFgAAtN1c6dAO5DdqL0d4cEWHtn6iR5ucZJti", -+ .url = "https://github.com/unexge/zigimg/archive/refs/heads/master.zip", -+ .hash = "zigimg-0.1.0-8_eo2tGrFwD-VzWa_E8HuIuNenM2US7PRXBj5EJdGfrw", - }, - .uucode = .{ -- .url = "git+https://github.com/jacobsandlund/uucode#5f05f8f83a75caea201f12cc8ea32a2d82ea9732", -- .hash = "uucode-0.1.0-ZZjBPj96QADXyt5sqwBJUnhaDYs_qBeeKijZvlRa0eqM", -+ .url = "https://github.com/jacobsandlund/uucode/archive/refs/heads/zig-0.16.zip", -+ .hash = "uucode-0.2.0-ZZjBPkJiVABQGPdyw9BOtU2sflHv3vovBzmYtPRj2hvm", - }, - }, - .paths = .{ -diff --git a/examples/cli.zig b/examples/cli.zig -index 3b44676..2b9a288 100644 ---- a/examples/cli.zig -+++ b/examples/cli.zig -@@ -4,30 +4,23 @@ const Cell = vaxis.Cell; - const TextInput = vaxis.widgets.TextInput; - - const log = std.log.scoped(.main); --pub fn main() !void { -- var gpa = std.heap.GeneralPurposeAllocator(.{}){}; -- defer { -- const deinit_status = gpa.deinit(); -- if (deinit_status == .leak) { -- log.err("memory leak", .{}); -- } -- } -- const alloc = gpa.allocator(); -+pub fn main(init: std.process.Init) !void { -+ const alloc = init.gpa; - - var buffer: [1024]u8 = undefined; -- var tty = try vaxis.Tty.init(&buffer); -+ var tty = try vaxis.Tty.init(init.io, &buffer); - defer tty.deinit(); - - var vx = try vaxis.init(alloc, .{}); - defer vx.deinit(alloc, tty.writer()); - -- var loop: vaxis.Loop(Event) = .{ .tty = &tty, .vaxis = &vx }; -+ var loop: vaxis.Loop(Event) = .{ .tty = &tty, .vaxis = &vx, .io = init.io, .queue = .{ .io = init.io } }; - try loop.init(); - - try loop.start(); - defer loop.stop(); - -- try vx.queryTerminal(tty.writer(), 1 * std.time.ns_per_s); -+ try vx.queryTerminal(tty.writer(), init.io, 1 * std.time.ns_per_s); - - var text_input = TextInput.init(alloc); - defer text_input.deinit(); -diff --git a/examples/counter.zig b/examples/counter.zig -index d19af42..e68420b 100644 ---- a/examples/counter.zig -+++ b/examples/counter.zig -@@ -111,13 +111,10 @@ const Model = struct { - } - }; - --pub fn main() !void { -- var gpa = std.heap.GeneralPurposeAllocator(.{}){}; -- defer _ = gpa.deinit(); -+pub fn main(init: std.process.Init) !void { -+ const allocator = init.gpa; - -- const allocator = gpa.allocator(); -- -- var app = try vxfw.App.init(allocator); -+ var app = try vxfw.App.init(allocator, init.io); - defer app.deinit(); - - // We heap allocate our model because we will require a stable pointer to it in our Button -diff --git a/examples/fuzzy.zig b/examples/fuzzy.zig -index 6ffbe6a..7fef980 100644 ---- a/examples/fuzzy.zig -+++ b/examples/fuzzy.zig -@@ -11,7 +11,6 @@ const Model = struct { - - /// Used for filtered RichText Spans and result - arena: std.heap.ArenaAllocator, -- filtered: std.ArrayList(vxfw.RichText), - result: []const u8, - - pub fn init(gpa: std.mem.Allocator) !*Model { -@@ -201,31 +200,24 @@ fn toLower(arena: std.mem.Allocator, src: []const u8) std.mem.Allocator.Error![] - return lower; - } - --pub fn main() !void { -- var debug_allocator = std.heap.GeneralPurposeAllocator(.{}){}; -- defer _ = debug_allocator.deinit(); -- -- const gpa = debug_allocator.allocator(); -+pub fn main(init: std.process.Init) !void { -+ const gpa = init.gpa; - -- var app = try vxfw.App.init(gpa); -+ var app = try vxfw.App.init(gpa, init.io); - errdefer app.deinit(); - - const model = try Model.init(gpa); - defer model.deinit(gpa); - - // Run the command -- var fd = std.process.Child.init(&.{"fd"}, gpa); -- fd.stdout_behavior = .Pipe; -- fd.stderr_behavior = .Pipe; -- var stdout = std.ArrayList(u8).empty; -- var stderr = std.ArrayList(u8).empty; -- defer stdout.deinit(gpa); -- defer stderr.deinit(gpa); -- try fd.spawn(); -- try fd.collectOutput(gpa, &stdout, &stderr, 10_000_000); -- _ = try fd.wait(); -- -- var iter = std.mem.splitScalar(u8, stdout.items, '\n'); -+ const result = try std.process.run(gpa, init.io, .{ -+ .argv = &.{"fd"}, -+ .stdout_limit = .limited(10_000_000), -+ }); -+ defer gpa.free(result.stdout); -+ defer gpa.free(result.stderr); -+ -+ var iter = std.mem.splitScalar(u8, result.stdout, '\n'); - while (iter.next()) |line| { - if (line.len == 0) continue; - try model.list.append(gpa, .{ .text = line }); -@@ -235,8 +227,8 @@ pub fn main() !void { - app.deinit(); - - if (model.result.len > 0) { -- _ = try std.posix.write(std.posix.STDOUT_FILENO, model.result); -- _ = try std.posix.write(std.posix.STDOUT_FILENO, "\n"); -+ try std.Io.File.stdout().writeStreamingAll(init.io, model.result); -+ try std.Io.File.stdout().writeStreamingAll(init.io, "\n"); - } else { - std.process.exit(130); - } -diff --git a/examples/image.zig b/examples/image.zig -index c14bbdb..af62862 100644 ---- a/examples/image.zig -+++ b/examples/image.zig -@@ -8,41 +8,34 @@ const Event = union(enum) { - winsize: vaxis.Winsize, - }; - --pub fn main() !void { -- var gpa = std.heap.GeneralPurposeAllocator(.{}){}; -- defer { -- const deinit_status = gpa.deinit(); -- if (deinit_status == .leak) { -- log.err("memory leak", .{}); -- } -- } -- const alloc = gpa.allocator(); -+pub fn main(init: std.process.Init) !void { -+ const alloc = init.gpa; - - var buffer: [1024]u8 = undefined; -- var tty = try vaxis.Tty.init(&buffer); -+ var tty = try vaxis.Tty.init(init.io, &buffer); - defer tty.deinit(); - - var vx = try vaxis.init(alloc, .{}); - defer vx.deinit(alloc, tty.writer()); - -- var loop: vaxis.Loop(Event) = .{ .tty = &tty, .vaxis = &vx }; -+ var loop: vaxis.Loop(Event) = .{ .tty = &tty, .vaxis = &vx, .io = init.io, .queue = .{ .io = init.io } }; - try loop.init(); - - try loop.start(); - defer loop.stop(); - - try vx.enterAltScreen(tty.writer()); -- try vx.queryTerminal(tty.writer(), 1 * std.time.ns_per_s); -+ try vx.queryTerminal(tty.writer(), init.io, 1 * std.time.ns_per_s); - - var read_buffer: [1024 * 1024]u8 = undefined; // 1MB buffer -- var img1 = try vaxis.zigimg.Image.fromFilePath(alloc, "examples/zig.png", &read_buffer); -+ var img1 = try vaxis.zigimg.Image.fromFilePath(alloc, init.io, "examples/zig.png", &read_buffer); - defer img1.deinit(alloc); - - const imgs = [_]vaxis.Image{ - try vx.transmitImage(alloc, tty.writer(), &img1, .rgba), - // var img1 = try vaxis.zigimg.Image.fromFilePath(alloc, "examples/zig.png"); -- // try vx.loadImage(alloc, tty.writer(), .{ .path = "examples/zig.png" }), -- try vx.loadImage(alloc, tty.writer(), .{ .path = "examples/vaxis.png" }), -+ // try vx.loadImage(alloc, init.io, tty.writer(), .{ .path = "examples/zig.png" }), -+ try vx.loadImage(alloc, init.io, tty.writer(), .{ .path = "examples/vaxis.png" }), - }; - defer vx.freeImage(tty.writer(), imgs[0].id); - defer vx.freeImage(tty.writer(), imgs[1].id); -diff --git a/examples/list_view.zig b/examples/list_view.zig -index 24cbf8d..5b961e9 100644 ---- a/examples/list_view.zig -+++ b/examples/list_view.zig -@@ -52,13 +52,10 @@ const Model = struct { - } - }; - --pub fn main() !void { -- var gpa = std.heap.GeneralPurposeAllocator(.{}){}; -- defer _ = gpa.deinit(); -+pub fn main(init: std.process.Init) !void { -+ const allocator = init.gpa; - -- const allocator = gpa.allocator(); -- -- var app = try vxfw.App.init(allocator); -+ var app = try vxfw.App.init(allocator, init.io); - defer app.deinit(); - - const model = try allocator.create(Model); -diff --git a/examples/main.zig b/examples/main.zig -index 2a4b96b..3caa7d9 100644 ---- a/examples/main.zig -+++ b/examples/main.zig -@@ -3,25 +3,17 @@ const vaxis = @import("vaxis"); - const Cell = vaxis.Cell; - - const log = std.log.scoped(.main); --pub fn main() !void { -- var gpa = std.heap.GeneralPurposeAllocator(.{}){}; -- defer { -- const deinit_status = gpa.deinit(); -- //fail test; can't try in defer as defer is executed after we return -- if (deinit_status == .leak) { -- log.err("memory leak", .{}); -- } -- } -- const alloc = gpa.allocator(); -+pub fn main(init: std.process.Init) !void { -+ const alloc = init.gpa; - - var buffer: [1024]u8 = undefined; -- var tty = try vaxis.Tty.init(&buffer); -+ var tty = try vaxis.Tty.init(init.io, &buffer); - defer tty.deinit(); - - var vx = try vaxis.init(alloc, .{}); - defer vx.deinit(alloc, tty.writer()); - -- var loop: vaxis.Loop(Event) = .{ .tty = &tty, .vaxis = &vx }; -+ var loop: vaxis.Loop(Event) = .{ .tty = &tty, .vaxis = &vx, .io = init.io, .queue = .{ .io = init.io } }; - try loop.init(); - - try loop.start(); -@@ -29,7 +21,7 @@ pub fn main() !void { - - // Optionally enter the alternate screen - try vx.enterAltScreen(tty.writer()); -- try vx.queryTerminal(tty.writer(), 1 * std.time.ns_per_s); -+ try vx.queryTerminal(tty.writer(), init.io, 1 * std.time.ns_per_s); - - // We'll adjust the color index every keypress - var color_idx: u8 = 0; -diff --git a/examples/scroll.zig b/examples/scroll.zig -index 0f92573..adf1f44 100644 ---- a/examples/scroll.zig -+++ b/examples/scroll.zig -@@ -151,13 +151,10 @@ const Model = struct { - } - }; - --pub fn main() !void { -- var gpa = std.heap.GeneralPurposeAllocator(.{}){}; -- defer _ = gpa.deinit(); -+pub fn main(init: std.process.Init) !void { -+ const allocator = init.gpa; - -- const allocator = gpa.allocator(); -- -- var app = try vxfw.App.init(allocator); -+ var app = try vxfw.App.init(allocator, init.io); - errdefer app.deinit(); - - var arena = std.heap.ArenaAllocator.init(allocator); -diff --git a/examples/split_view.zig b/examples/split_view.zig -index 78d4e6f..5c48432 100644 ---- a/examples/split_view.zig -+++ b/examples/split_view.zig -@@ -49,13 +49,10 @@ const Model = struct { - } - }; - --pub fn main() !void { -- var gpa = std.heap.GeneralPurposeAllocator(.{}){}; -- defer _ = gpa.deinit(); -+pub fn main(init: std.process.Init) !void { -+ const allocator = init.gpa; - -- const allocator = gpa.allocator(); -- -- var app = try vxfw.App.init(allocator); -+ var app = try vxfw.App.init(allocator, init.io); - defer app.deinit(); - - const model = try allocator.create(Model); -diff --git a/examples/table.zig b/examples/table.zig -index 430c3d5..c489828 100644 ---- a/examples/table.zig -+++ b/examples/table.zig -@@ -14,16 +14,14 @@ const ActiveSection = enum { - btm, - }; - --pub fn main() !void { -- var gpa = heap.GeneralPurposeAllocator(.{}){}; -- defer if (gpa.detectLeaks()) log.err("Memory leak detected!", .{}); -- const alloc = gpa.allocator(); -+pub fn main(init: std.process.Init) !void { -+ const alloc = init.gpa; - - // Users set up below the main function - const users_buf = try alloc.dupe(User, users[0..]); - - var buffer: [1024]u8 = undefined; -- var tty = try vaxis.Tty.init(&buffer); -+ var tty = try vaxis.Tty.init(init.io, &buffer); - defer tty.deinit(); - const tty_writer = tty.writer(); - var vx = try vaxis.init(alloc, .{ -@@ -35,12 +33,12 @@ pub fn main() !void { - key_press: vaxis.Key, - winsize: vaxis.Winsize, - table_upd, -- }) = .{ .tty = &tty, .vaxis = &vx }; -+ }) = .{ .tty = &tty, .vaxis = &vx, .io = init.io, .queue = .{ .io = init.io } }; - try loop.init(); - try loop.start(); - defer loop.stop(); - try vx.enterAltScreen(tty.writer()); -- try vx.queryTerminal(tty.writer(), 250 * std.time.ns_per_ms); -+ try vx.queryTerminal(tty.writer(), init.io, 250 * std.time.ns_per_ms); - - const logo = - \\░█░█░█▀█░█░█░▀█▀░█▀▀░░░▀█▀░█▀█░█▀▄░█░░░█▀▀░ -diff --git a/examples/text_input.zig b/examples/text_input.zig -index cea0466..5c3c6c6 100644 ---- a/examples/text_input.zig -+++ b/examples/text_input.zig -@@ -18,20 +18,12 @@ const Event = union(enum) { - foo: u8, - }; - --pub fn main() !void { -- var gpa = std.heap.GeneralPurposeAllocator(.{}){}; -- defer { -- const deinit_status = gpa.deinit(); -- //fail test; can't try in defer as defer is executed after we return -- if (deinit_status == .leak) { -- log.err("memory leak", .{}); -- } -- } -- const alloc = gpa.allocator(); -+pub fn main(init: std.process.Init) !void { -+ const alloc = init.gpa; - - // Initalize a tty - var buffer: [1024]u8 = undefined; -- var tty = try vaxis.Tty.init(&buffer); -+ var tty = try vaxis.Tty.init(init.io, &buffer); - defer tty.deinit(); - - // Use a buffered writer for better performance. There are a lot of writes -@@ -47,6 +39,8 @@ pub fn main() !void { - var loop: vaxis.Loop(Event) = .{ - .vaxis = &vx, - .tty = &tty, -+ .io = init.io, -+ .queue = .{ .io = init.io }, - }; - try loop.init(); - -@@ -71,7 +65,7 @@ pub fn main() !void { - try writer.flush(); - // Sends queries to terminal to detect certain features. This should - // _always_ be called, but is left to the application to decide when -- try vx.queryTerminal(tty.writer(), 1 * std.time.ns_per_s); -+ try vx.queryTerminal(tty.writer(), init.io, 1 * std.time.ns_per_s); - - // The main event loop. Vaxis provides a thread safe, blocking, buffered - // queue which can serve as the primary event queue for an application -@@ -94,8 +88,10 @@ pub fn main() !void { - } else if (key.matches('n', .{ .ctrl = true })) { - try vx.notify(tty.writer(), "vaxis", "hello from vaxis"); - loop.stop(); -- var child = std.process.Child.init(&.{"nvim"}, alloc); -- _ = try child.spawnAndWait(); -+ var child = try std.process.spawn(init.io, .{ -+ .argv = &.{"nvim"}, -+ }); -+ _ = try child.wait(init.io); - try loop.start(); - try vx.enterAltScreen(tty.writer()); - vx.queueRefresh(); -diff --git a/examples/text_view.zig b/examples/text_view.zig -index 73e8e54..d49cb5b 100644 ---- a/examples/text_view.zig -+++ b/examples/text_view.zig -@@ -9,31 +9,24 @@ const Event = union(enum) { - winsize: vaxis.Winsize, - }; - --pub fn main() !void { -- var gpa = std.heap.GeneralPurposeAllocator(.{}){}; -- -- defer { -- const deinit_status = gpa.deinit(); -- if (deinit_status == .leak) { -- log.err("memory leak", .{}); -- } -- } -- -- const alloc = gpa.allocator(); -+pub fn main(init: std.process.Init) !void { -+ const alloc = init.gpa; - var buffer: [1024]u8 = undefined; -- var tty = try vaxis.Tty.init(&buffer); -+ var tty = try vaxis.Tty.init(init.io, &buffer); - defer tty.deinit(); - var vx = try vaxis.init(alloc, .{}); - defer vx.deinit(alloc, tty.writer()); - var loop: vaxis.Loop(Event) = .{ - .vaxis = &vx, - .tty = &tty, -+ .io = init.io, -+ .queue = .{ .io = init.io }, - }; - try loop.init(); - try loop.start(); - defer loop.stop(); - try vx.enterAltScreen(tty.writer()); -- try vx.queryTerminal(tty.writer(), 20 * std.time.ns_per_s); -+ try vx.queryTerminal(tty.writer(), init.io, 20 * std.time.ns_per_s); - var text_view = TextView{}; - var text_view_buffer = TextView.Buffer{}; - defer text_view_buffer.deinit(alloc); -@@ -61,6 +54,6 @@ pub fn main() !void { - win.clear(); - text_view.draw(win, text_view_buffer); - try vx.render(tty.writer()); -- try tty.writer.flush(); -+ try tty.writer().flush(); - } - } -diff --git a/examples/vaxis.zig b/examples/vaxis.zig -index 5ca566c..8a12a66 100644 ---- a/examples/vaxis.zig -+++ b/examples/vaxis.zig -@@ -9,32 +9,24 @@ const Event = union(enum) { - - pub const panic = vaxis.panic_handler; - --pub fn main() !void { -- var gpa = std.heap.GeneralPurposeAllocator(.{}){}; -- defer { -- const deinit_status = gpa.deinit(); -- //fail test; can't try in defer as defer is executed after we return -- if (deinit_status == .leak) { -- std.log.err("memory leak", .{}); -- } -- } -- const alloc = gpa.allocator(); -+pub fn main(init: std.process.Init) !void { -+ const alloc = init.gpa; - - var buffer: [1024]u8 = undefined; -- var tty = try vaxis.Tty.init(&buffer); -+ var tty = try vaxis.Tty.init(init.io, &buffer); - defer tty.deinit(); - - var vx = try vaxis.init(alloc, .{}); - defer vx.deinit(alloc, tty.writer()); - -- var loop: vaxis.Loop(Event) = .{ .tty = &tty, .vaxis = &vx }; -+ var loop: vaxis.Loop(Event) = .{ .tty = &tty, .vaxis = &vx, .io = init.io, .queue = .{ .io = init.io } }; - try loop.init(); - - try loop.start(); - defer loop.stop(); - - try vx.enterAltScreen(tty.writer()); -- try vx.queryTerminal(tty.writer(), 1 * std.time.ns_per_s); -+ try vx.queryTerminal(tty.writer(), init.io, 1 * std.time.ns_per_s); - - try vx.queryColor(tty.writer(), .fg); - try vx.queryColor(tty.writer(), .bg); -@@ -84,7 +76,7 @@ pub fn main() !void { - // try vx.render(bw.writer().any()); - // try bw.flush(); - try vx.render(tty.writer()); -- std.Thread.sleep(16 * std.time.ns_per_ms); -+ try std.Io.sleep(init.io, std.Io.Duration.fromMilliseconds(16), .real); - switch (dir) { - .up => { - pct += 1; -diff --git a/examples/view.zig b/examples/view.zig -index 1b01dfd..3f5108a 100644 ---- a/examples/view.zig -+++ b/examples/view.zig -@@ -13,15 +13,8 @@ const Event = union(enum) { - winsize: vaxis.Winsize, - }; - --pub fn main() !void { -- var gpa = std.heap.GeneralPurposeAllocator(.{}){}; -- defer { -- const deinit_status = gpa.deinit(); -- if (deinit_status == .leak) { -- log.err("memory leak", .{}); -- } -- } -- const alloc = gpa.allocator(); -+pub fn main(init: std.process.Init) !void { -+ const alloc = init.gpa; - - var world_map: []const u8 = lg_world_map; - var map_width = lg_map_width; -@@ -45,7 +38,7 @@ pub fn main() !void { - }); - - var buffer: [1024]u8 = undefined; -- var tty = try vaxis.Tty.init(&buffer); -+ var tty = try vaxis.Tty.init(init.io, &buffer); - defer tty.deinit(); - - const writer = tty.writer(); -@@ -58,13 +51,15 @@ pub fn main() !void { - var loop: vaxis.Loop(Event) = .{ - .vaxis = &vx, - .tty = &tty, -+ .io = init.io, -+ .queue = .{ .io = init.io }, - }; - try loop.init(); - try loop.start(); - defer loop.stop(); - try vx.enterAltScreen(writer); - try writer.flush(); -- try vx.queryTerminal(tty.writer(), 20 * std.time.ns_per_s); -+ try vx.queryTerminal(tty.writer(), init.io, 20 * std.time.ns_per_s); - - // Initialize Views - // - Large Map -diff --git a/examples/vt.zig b/examples/vt.zig -index fc13149..6d7f647 100644 ---- a/examples/vt.zig -+++ b/examples/vt.zig -@@ -9,33 +9,24 @@ const Event = union(enum) { - - pub const panic = vaxis.panic_handler; - --pub fn main() !void { -- var gpa = std.heap.GeneralPurposeAllocator(.{}){}; -- defer { -- const deinit_status = gpa.deinit(); -- //fail test; can't try in defer as defer is executed after we return -- if (deinit_status == .leak) { -- std.log.err("memory leak", .{}); -- } -- } -- const alloc = gpa.allocator(); -+pub fn main(init: std.process.Init) !void { -+ const alloc = init.gpa; - - var buffer: [1024]u8 = undefined; -- var tty = try vaxis.Tty.init(&buffer); -+ var tty = try vaxis.Tty.init(init.io, &buffer); - const writer = tty.writer(); - var vx = try vaxis.init(alloc, .{}); - defer vx.deinit(alloc, writer); - -- var loop: vaxis.Loop(Event) = .{ .tty = &tty, .vaxis = &vx }; -+ var loop: vaxis.Loop(Event) = .{ .tty = &tty, .vaxis = &vx, .io = init.io, .queue = .{ .io = init.io } }; - try loop.init(); - - try loop.start(); - defer loop.stop(); - - try vx.enterAltScreen(writer); -- try vx.queryTerminal(writer, 1 * std.time.ns_per_s); -- var env = try std.process.getEnvMap(alloc); -- defer env.deinit(); -+ try vx.queryTerminal(writer, init.io, 1 * std.time.ns_per_s); -+ const env = init.environ_map; - - const vt_opts: vaxis.widgets.Terminal.Options = .{ - .winsize = .{ -@@ -52,8 +43,9 @@ pub fn main() !void { - var write_buf: [4096]u8 = undefined; - var vt = try vaxis.widgets.Terminal.init( - alloc, -+ init.io, - &argv, -- &env, -+ env, - vt_opts, - &write_buf, - ); -@@ -62,7 +54,7 @@ pub fn main() !void { - - var redraw: bool = false; - while (true) { -- std.Thread.sleep(8 * std.time.ns_per_ms); -+ std.Io.sleep(init.io, .fromMilliseconds(8), .awake) catch {}; - // try vt events first - while (vt.tryEvent()) |event| { - redraw = true; -diff --git a/src/Loop.zig b/src/Loop.zig -index a11e2f7..cd7e9d9 100644 ---- a/src/Loop.zig -+++ b/src/Loop.zig -@@ -18,8 +18,9 @@ pub fn Loop(comptime T: type) type { - - tty: *Tty, - vaxis: *Vaxis, -+ io: std.Io, - -- queue: Queue(T, 512) = .{}, -+ queue: Queue(T, 512), - thread: ?std.Thread = null, - should_quit: bool = false, - -@@ -214,7 +215,7 @@ pub fn handleEventGeneric(self: anytype, vx: *Vaxis, cache: *GraphemeCache, Even - } - }, - .cap_da1 => { -- std.Thread.Futex.wake(&vx.query_futex, 10); -+ std.Io.futexWake(self.io, u32, &vx.query_futex.raw, 10); - vx.queries_done.store(true, .unordered); - }, - .mouse => |mouse| { -@@ -359,7 +360,7 @@ pub fn handleEventGeneric(self: anytype, vx: *Vaxis, cache: *GraphemeCache, Even - vx.caps.multi_cursor = true; - }, - .cap_da1 => { -- std.Thread.Futex.wake(&vx.query_futex, 10); -+ std.Io.futexWake(self.io, u32, &vx.query_futex.raw, 10); - vx.queries_done.store(true, .unordered); - }, - .winsize => |winsize| { -@@ -386,13 +387,13 @@ test Loop { - foo: u8, - }; - -- var tty = try vaxis.Tty.init(&.{}); -+ var tty = try vaxis.Tty.init(std.testing.io); - defer tty.deinit(); - - var vx = try vaxis.init(std.testing.allocator, .{}); - defer vx.deinit(std.testing.allocator, tty.writer()); - -- var loop: vaxis.Loop(Event) = .{ .tty = &tty, .vaxis = &vx }; -+ var loop: vaxis.Loop(Event) = .{ .tty = &tty, .vaxis = &vx, .io = std.testing.io, .queue = .{ .io = std.testing.io } }; - try loop.init(); - - try loop.start(); -@@ -400,5 +401,5 @@ test Loop { - - // Optionally enter the alternate screen - try vx.enterAltScreen(tty.writer()); -- try vx.queryTerminal(tty.writer(), 1 * std.time.ns_per_ms); -+ try vx.queryTerminal(tty.writer(), std.testing.io, 1 * std.time.ns_per_ms); - } -diff --git a/src/Parser.zig b/src/Parser.zig -index 6358269..1b125dd 100644 ---- a/src/Parser.zig -+++ b/src/Parser.zig -@@ -118,7 +118,7 @@ inline fn parseGround(input: []const u8) !Result { - var grapheme_len: usize = 0; - var cp_count: usize = 0; - -- while (grapheme_iter.next()) |result| { -+ while (grapheme_iter.nextCodePoint()) |result| { - cp_count += 1; - if (result.is_break) { - // Found the first grapheme boundary -diff --git a/src/Vaxis.zig b/src/Vaxis.zig -index a6a3830..2e24e9b 100644 ---- a/src/Vaxis.zig -+++ b/src/Vaxis.zig -@@ -3,7 +3,7 @@ const builtin = @import("builtin"); - const atomic = std.atomic; - const base64Encoder = std.base64.standard.Encoder; - const zigimg = @import("zigimg"); --const IoWriter = std.io.Writer; -+const IoWriter = std.Io.Writer; - - const Cell = @import("Cell.zig"); - const Image = @import("Image.zig"); -@@ -250,10 +250,10 @@ pub fn exitAltScreen(self: *Vaxis, tty: *IoWriter) !void { - /// - /// This call will block until Vaxis.query_futex is woken up, or the timeout. - /// Event loops can wake up this futex when cap_da1 is received --pub fn queryTerminal(self: *Vaxis, tty: *IoWriter, timeout_ns: u64) !void { -+pub fn queryTerminal(self: *Vaxis, tty: *IoWriter, io: std.Io, timeout_ns: u64) !void { - try self.queryTerminalSend(tty); - // 1 second timeout -- std.Thread.Futex.timedWait(&self.query_futex, 0, timeout_ns) catch {}; -+ std.Io.futexWaitTimeout(io, u32, &self.query_futex.raw, 0, .{ .duration = .{ .raw = .{ .nanoseconds = @intCast(timeout_ns) }, .clock = .awake } }) catch {}; - self.queries_done.store(true, .unordered); - try self.enableDetectedFeatures(tty); - } -@@ -265,7 +265,7 @@ pub fn queryTerminalSend(vx: *Vaxis, tty: *IoWriter) !void { - vx.queries_done.store(false, .unordered); - - // TODO: re-enable this -- // const colorterm = std.posix.getenv("COLORTERM") orelse ""; -+ // const colorterm = std.c.getenv("COLORTERM") orelse ""; - // if (std.mem.eql(u8, colorterm, "truecolor") or - // std.mem.eql(u8, colorterm, "24bit")) - // { -@@ -320,22 +320,22 @@ pub fn enableDetectedFeatures(self: *Vaxis, tty: *IoWriter) !void { - }, - else => { - // Apply any environment variables -- if (std.posix.getenv("TERMUX_VERSION")) |_| -+ if (std.c.getenv("TERMUX_VERSION")) |_| - self.sgr = .legacy; -- if (std.posix.getenv("VHS_RECORD")) |_| { -+ if (std.c.getenv("VHS_RECORD")) |_| { - self.caps.unicode = .wcwidth; - self.caps.kitty_keyboard = false; - self.sgr = .legacy; - } -- if (std.posix.getenv("TERM_PROGRAM")) |prg| { -- if (std.mem.eql(u8, prg, "vscode")) -+ if (std.c.getenv("TERM_PROGRAM")) |prg| { -+ if (std.mem.eql(u8, std.mem.span(prg), "vscode")) - self.sgr = .legacy; - } -- if (std.posix.getenv("VAXIS_FORCE_LEGACY_SGR")) |_| -+ if (std.c.getenv("VAXIS_FORCE_LEGACY_SGR")) |_| - self.sgr = .legacy; -- if (std.posix.getenv("VAXIS_FORCE_WCWIDTH")) |_| -+ if (std.c.getenv("VAXIS_FORCE_WCWIDTH")) |_| - self.caps.unicode = .wcwidth; -- if (std.posix.getenv("VAXIS_FORCE_UNICODE")) |_| -+ if (std.c.getenv("VAXIS_FORCE_UNICODE")) |_| - self.caps.unicode = .unicode; - - // enable detected features -@@ -1067,6 +1067,7 @@ pub fn transmitImage( - pub fn loadImage( - self: *Vaxis, - alloc: std.mem.Allocator, -+ io: std.Io, - tty: *IoWriter, - src: Image.Source, - ) !Image { -@@ -1074,7 +1075,7 @@ pub fn loadImage( - - var read_buffer: [1024 * 1024]u8 = undefined; // 1MB buffer - var img = switch (src) { -- .path => |path| try zigimg.Image.fromFilePath(alloc, path, &read_buffer), -+ .path => |path| try zigimg.Image.fromFilePath(alloc, io, path, &read_buffer), - .mem => |bytes| try zigimg.Image.fromMemory(alloc, bytes), - }; - defer img.deinit(alloc); -@@ -1481,7 +1482,7 @@ pub fn setTerminalWorkingDirectory(_: *Vaxis, tty: *IoWriter, path: []const u8) - return error.InvalidAbsolutePath; - const hostname = switch (builtin.os.tag) { - .windows => null, -- else => std.posix.getenv("HOSTNAME"), -+ else => std.c.getenv("HOSTNAME"), - } orelse "localhost"; - - const uri: std.Uri = .{ -@@ -1495,11 +1496,11 @@ pub fn setTerminalWorkingDirectory(_: *Vaxis, tty: *IoWriter, path: []const u8) - - test "render: no output when no changes" { - var vx = try Vaxis.init(std.testing.allocator, .{}); -- var deinit_writer = std.io.Writer.Allocating.init(std.testing.allocator); -+ var deinit_writer: std.Io.Writer.Allocating = .init(std.testing.allocator); - defer deinit_writer.deinit(); - defer vx.deinit(std.testing.allocator, &deinit_writer.writer); - -- var render_writer = std.io.Writer.Allocating.init(std.testing.allocator); -+ var render_writer: std.Io.Writer.Allocating = .init(std.testing.allocator); - defer render_writer.deinit(); - try vx.render(&render_writer.writer); - const output = try render_writer.toOwnedSlice(); -diff --git a/src/gwidth.zig b/src/gwidth.zig -index 194139f..ecffaf7 100644 ---- a/src/gwidth.zig -+++ b/src/gwidth.zig -@@ -55,10 +55,10 @@ pub fn gwidth(str: []const u8, method: Method) u16 { - var grapheme_start: usize = 0; - var prev_break: bool = true; - -- while (grapheme_iter.next()) |result| { -+ while (grapheme_iter.nextCodePoint()) |result| { - if (prev_break and !result.is_break) { - // Start of a new grapheme -- const cp_len: usize = std.unicode.utf8CodepointSequenceLength(result.cp) catch 1; -+ const cp_len: usize = std.unicode.utf8CodepointSequenceLength(result.code_point) catch 1; - grapheme_start = grapheme_iter.i - cp_len; - } - -diff --git a/src/queue.zig b/src/queue.zig -index 6d847ea..908cf70 100644 ---- a/src/queue.zig -+++ b/src/queue.zig -@@ -1,7 +1,7 @@ - const std = @import("std"); - const assert = std.debug.assert; - const atomic = std.atomic; --const Condition = std.Thread.Condition; -+const Condition = std.Io.Condition; - - /// Thread safe. Fixed size. Blocking push and pop. - pub fn Queue( -@@ -11,23 +11,25 @@ pub fn Queue( - return struct { - buf: [size]T = undefined, - -+ io: std.Io, -+ - read_index: usize = 0, - write_index: usize = 0, - -- mutex: std.Thread.Mutex = .{}, -+ mutex: std.Io.Mutex = .init, - // blocks when the buffer is full -- not_full: Condition = .{}, -+ not_full: Condition = .init, - // ...or empty -- not_empty: Condition = .{}, -+ not_empty: Condition = .init, - - const Self = @This(); - - /// Pop an item from the queue. Blocks until an item is available. - pub fn pop(self: *Self) T { -- self.mutex.lock(); -- defer self.mutex.unlock(); -+ self.mutex.lockUncancelable(self.io); -+ defer self.mutex.unlock(self.io); - while (self.isEmptyLH()) { -- self.not_empty.wait(&self.mutex); -+ self.not_empty.waitUncancelable(self.io, &self.mutex); - } - std.debug.assert(!self.isEmptyLH()); - return self.popAndSignalLH(); -@@ -36,10 +38,10 @@ pub fn Queue( - /// Push an item into the queue. Blocks until an item has been - /// put in the queue. - pub fn push(self: *Self, item: T) void { -- self.mutex.lock(); -- defer self.mutex.unlock(); -+ self.mutex.lockUncancelable(self.io); -+ defer self.mutex.unlock(self.io); - while (self.isFullLH()) { -- self.not_full.wait(&self.mutex); -+ self.not_full.waitUncancelable(self.io, &self.mutex); - } - std.debug.assert(!self.isFullLH()); - self.pushAndSignalLH(item); -@@ -49,8 +51,8 @@ pub fn Queue( - /// was successfully placed in the queue, false if the queue - /// was full. - pub fn tryPush(self: *Self, item: T) bool { -- self.mutex.lock(); -- defer self.mutex.unlock(); -+ self.mutex.lockUncancelable(self.io); -+ defer self.mutex.unlock(self.io); - if (self.isFullLH()) return false; - self.pushAndSignalLH(item); - return true; -@@ -59,28 +61,28 @@ pub fn Queue( - /// Pop an item from the queue. Returns null when no item is - /// available. - pub fn tryPop(self: *Self) ?T { -- self.mutex.lock(); -- defer self.mutex.unlock(); -+ self.mutex.lockUncancelable(self.io); -+ defer self.mutex.unlock(self.io); - if (self.isEmptyLH()) return null; - return self.popAndSignalLH(); - } - - /// Poll the queue. This call blocks until events are in the queue - pub fn poll(self: *Self) void { -- self.mutex.lock(); -- defer self.mutex.unlock(); -+ self.mutex.lockUncancelable(self.io); -+ defer self.mutex.unlock(self.io); - while (self.isEmptyLH()) { -- self.not_empty.wait(&self.mutex); -+ self.not_empty.waitUncancelable(self.io, &self.mutex); - } - std.debug.assert(!self.isEmptyLH()); - } - - pub fn lock(self: *Self) void { -- self.mutex.lock(); -+ self.mutex.lockUncancelable(self.io); - } - - pub fn unlock(self: *Self) void { -- self.mutex.unlock(); -+ self.mutex.unlock(self.io); - } - - /// Used to efficiently drain the queue while the lock is externally held -@@ -92,7 +94,7 @@ pub fn Queue( - const was_full = self.isFullLH(); - const item = self.popLH(); - if (was_full) { -- self.not_full.signal(); -+ self.not_full.signal(self.io); - } - return item; - } -@@ -108,15 +110,15 @@ pub fn Queue( - - /// Returns `true` if the queue is empty and `false` otherwise. - pub fn isEmpty(self: *Self) bool { -- self.mutex.lock(); -- defer self.mutex.unlock(); -+ self.mutex.lockUncancelable(self.io); -+ defer self.mutex.unlock(self.io); - return self.isEmptyLH(); - } - - /// Returns `true` if the queue is full and `false` otherwise. - pub fn isFull(self: *Self) bool { -- self.mutex.lock(); -- defer self.mutex.unlock(); -+ self.mutex.lockUncancelable(self.io); -+ defer self.mutex.unlock(self.io); - return self.isFullLH(); - } - -@@ -143,7 +145,7 @@ pub fn Queue( - self.buf[self.mask(self.write_index)] = item; - self.write_index = self.mask2(self.write_index + 1); - if (was_empty) { -- self.not_empty.signal(); -+ self.not_empty.signal(self.io); - } - } - -@@ -151,7 +153,7 @@ pub fn Queue( - const was_full = self.isFullLH(); - const result = self.popLH(); - if (was_full) { -- self.not_full.signal(); -+ self.not_full.signal(self.io); - } - return result; - } -@@ -167,7 +169,7 @@ pub fn Queue( - const testing = std.testing; - const cfg = Thread.SpawnConfig{ .allocator = testing.allocator }; - test "Queue: simple push / pop" { -- var queue: Queue(u8, 16) = .{}; -+ var queue: Queue(u8, 16) = .{ .io = std.testing.io }; - queue.push(1); - queue.push(2); - const pop = queue.pop(); -@@ -182,7 +184,7 @@ fn testPushPop(q: *Queue(u8, 2)) !void { - } - - test "Fill, wait to push, pop once in another thread" { -- var queue: Queue(u8, 2) = .{}; -+ var queue: Queue(u8, 2) = .{ .io = std.testing.io }; - queue.push(1); - queue.push(2); - const t = try Thread.spawn(cfg, testPushPop, .{&queue}); -@@ -202,7 +204,7 @@ fn testPush(q: *Queue(u8, 2)) void { - } - - test "Try to pop, fill from another thread" { -- var queue: Queue(u8, 2) = .{}; -+ var queue: Queue(u8, 2) = .{ .io = std.testing.io }; - const thread = try Thread.spawn(cfg, testPush, .{&queue}); - for (0..5) |idx| { - try testing.expectEqual(@as(u8, @intCast(idx)), queue.pop()); -@@ -217,8 +219,8 @@ fn sleepyPop(q: *Queue(u8, 2), state: *atomic.Value(u8)) !void { - - // Then we spuriously wake it up, because that's a thing that can - // happen. -- q.not_full.signal(); -- q.not_empty.signal(); -+ q.not_full.signal(q.io); -+ q.not_empty.signal(q.io); - - // Then give the other thread a good chance of waking up. It's not - // clear that yield guarantees the other thread will be scheduled, -@@ -226,7 +228,7 @@ fn sleepyPop(q: *Queue(u8, 2), state: *atomic.Value(u8)) !void { - // still full and the push in the other thread is still blocked - // waiting for space. - try Thread.yield(); -- std.Thread.sleep(10 * std.time.ns_per_ms); -+ std.Io.sleep(std.testing.io, .fromMilliseconds(10), .awake) catch {}; - // Finally, let that other thread go. - try std.testing.expectEqual(1, q.pop()); - -@@ -235,15 +237,15 @@ fn sleepyPop(q: *Queue(u8, 2), state: *atomic.Value(u8)) !void { - try Thread.yield(); - // But we want to ensure that there's a second push waiting, so - // here's another sleep. -- std.Thread.sleep(10 * std.time.ns_per_ms); -+ std.Io.sleep(std.testing.io, .fromMilliseconds(10), .awake) catch {}; - - // Another spurious wake... -- q.not_full.signal(); -- q.not_empty.signal(); -+ q.not_full.signal(q.io); -+ q.not_empty.signal(q.io); - // And another chance for the other thread to see that it's - // spurious and go back to sleep. - try Thread.yield(); -- std.Thread.sleep(10 * std.time.ns_per_ms); -+ std.Io.sleep(std.testing.io, .fromMilliseconds(10), .awake) catch {}; - - // Pop that thing and we're done. - try std.testing.expectEqual(2, q.pop()); -@@ -256,19 +258,20 @@ test "Fill, block, fill, block" { - // that too (after some time) then drain the queue. This test - // fails if the while loop in `push` is turned into an `if`. - -- var queue: Queue(u8, 2) = .{}; -+ var queue: Queue(u8, 2) = .{ .io = std.testing.io }; - var state = atomic.Value(u8).init(0); - const thread = try Thread.spawn(cfg, sleepyPop, .{ &queue, &state }); - queue.push(1); - queue.push(2); - state.store(1, .release); -- const now = std.time.milliTimestamp(); -+ const start = std.Io.Clock.Timestamp.now(std.testing.io, .awake); - queue.push(3); // This one should block. -- const then = std.time.milliTimestamp(); -+ const end = std.Io.Clock.Timestamp.now(std.testing.io, .awake); - - // Just to make sure the sleeps are yielding to this thread, make - // sure it took at least 5ms to do the push. -- try std.testing.expect(then - now > 5); -+ const elapsed = start.durationTo(end); -+ try std.testing.expect(elapsed.raw.toMilliseconds() > 5); - - state.store(2, .release); - // This should block again, waiting for the other thread. -@@ -283,14 +286,14 @@ test "Fill, block, fill, block" { - fn sleepyPush(q: *Queue(u8, 1), state: *atomic.Value(u8)) !void { - // Try to ensure the other thread has already started trying to pop. - try Thread.yield(); -- std.Thread.sleep(10 * std.time.ns_per_ms); -+ std.Io.sleep(std.testing.io, .fromMilliseconds(10), .awake) catch {}; - - // Spurious wake -- q.not_full.signal(); -- q.not_empty.signal(); -+ q.not_full.signal(q.io); -+ q.not_empty.signal(q.io); - - try Thread.yield(); -- std.Thread.sleep(10 * std.time.ns_per_ms); -+ std.Io.sleep(std.testing.io, .fromMilliseconds(10), .awake) catch {}; - - // Stick something in the queue so it can be popped. - q.push(1); -@@ -299,11 +302,11 @@ fn sleepyPush(q: *Queue(u8, 1), state: *atomic.Value(u8)) !void { - try Thread.yield(); - // Give the other thread time to block again. - try Thread.yield(); -- std.Thread.sleep(10 * std.time.ns_per_ms); -+ std.Io.sleep(std.testing.io, .fromMilliseconds(10), .awake) catch {}; - - // Spurious wake -- q.not_full.signal(); -- q.not_empty.signal(); -+ q.not_full.signal(q.io); -+ q.not_empty.signal(q.io); - - q.push(2); - } -@@ -313,7 +316,7 @@ test "Drain, block, drain, block" { - // test should fail if the `while` loop in `pop` is turned into an - // `if`. - -- var queue: Queue(u8, 1) = .{}; -+ var queue: Queue(u8, 1) = .{ .io = std.testing.io }; - var state = atomic.Value(u8).init(0); - const thread = try Thread.spawn(cfg, sleepyPush, .{ &queue, &state }); - try std.testing.expectEqual(1, queue.pop()); -@@ -328,11 +331,11 @@ fn readerThread(q: *Queue(u8, 1)) !void { - - test "2 readers" { - // 2 threads read, one thread writes -- var queue: Queue(u8, 1) = .{}; -+ var queue: Queue(u8, 1) = .{ .io = std.testing.io }; - const t1 = try Thread.spawn(cfg, readerThread, .{&queue}); - const t2 = try Thread.spawn(cfg, readerThread, .{&queue}); - try Thread.yield(); -- std.Thread.sleep(10 * std.time.ns_per_ms); -+ std.Io.sleep(std.testing.io, .fromMilliseconds(10), .awake) catch {}; - queue.push(1); - queue.push(1); - t1.join(); -@@ -344,7 +347,7 @@ fn writerThread(q: *Queue(u8, 1)) !void { - } - - test "2 writers" { -- var queue: Queue(u8, 1) = .{}; -+ var queue: Queue(u8, 1) = .{ .io = std.testing.io }; - const t1 = try Thread.spawn(cfg, writerThread, .{&queue}); - const t2 = try Thread.spawn(cfg, writerThread, .{&queue}); - -diff --git a/src/tty.zig b/src/tty.zig -index 4a3c142..c1da795 100644 ---- a/src/tty.zig -+++ b/src/tty.zig -@@ -33,8 +33,11 @@ pub const PosixTty = struct { - /// The file descriptor of the tty - fd: posix.fd_t, - -+ io: std.Io, -+ - /// File.Writer for efficient buffered writing -- tty_writer: std.fs.File.Writer, -+ tty_buffer: [1024]u8 = undefined, -+ tty_writer: ?std.Io.File.Writer = null, - - pub const SignalHandler = struct { - context: *anyopaque, -@@ -43,7 +46,8 @@ pub const PosixTty = struct { - - /// global signal handlers - var handlers: [8]SignalHandler = undefined; -- var handler_mutex: std.Thread.Mutex = .{}; -+ var handler_mutex: std.Io.Mutex = .init; -+ var handler_io: std.Io = undefined; - var handler_idx: usize = 0; - - var handler_installed: bool = false; -@@ -51,9 +55,9 @@ pub const PosixTty = struct { - /// initializes a Tty instance by opening /dev/tty and "making it raw". A - /// signal handler is installed for SIGWINCH. No callbacks are installed, be - /// sure to register a callback when initializing the event loop -- pub fn init(buffer: []u8) !PosixTty { -+ pub fn init(io: std.Io) !PosixTty { - // Open our tty -- const fd = try posix.open("/dev/tty", .{ .ACCMODE = .RDWR }, 0); -+ const fd = try posix.openat(posix.AT.FDCWD, "/dev/tty", .{ .ACCMODE = .RDWR }, 0); - - // Set the termios of the tty - const termios = try makeRaw(fd); -@@ -69,13 +73,8 @@ pub const PosixTty = struct { - posix.sigaction(posix.SIG.WINCH, &act, null); - handler_installed = true; - -- const file = std.fs.File{ .handle = fd }; -- -- const self: PosixTty = .{ -- .fd = fd, -- .termios = termios, -- .tty_writer = .initStreaming(file, buffer), -- }; -+ handler_io = io; -+ const self: PosixTty = .{ .fd = fd, .io = io, .termios = termios }; - - global_tty = self; - -@@ -88,7 +87,7 @@ pub const PosixTty = struct { - std.log.err("couldn't restore terminal: {}", .{err}); - }; - if (builtin.os.tag != .macos) // closing /dev/tty may block indefinitely on macos -- posix.close(self.fd); -+ (std.Io.File{ .handle = self.fd, .flags = .{ .nonblocking = false } }).close(handler_io); - } - - /// Resets the signal handler to it's default -@@ -107,7 +106,12 @@ pub const PosixTty = struct { - } - - pub fn writer(self: *PosixTty) *std.Io.Writer { -- return &self.tty_writer.interface; -+ if (self.tty_writer == null) { -+ const file: std.Io.File = .{ .handle = self.fd, .flags = .{ .nonblocking = false } }; -+ self.tty_writer = .initStreaming(file, self.io, &self.tty_buffer); -+ } -+ -+ return &self.tty_writer.?.interface; - } - - pub fn read(self: *const PosixTty, buf: []u8) !usize { -@@ -117,16 +121,16 @@ pub const PosixTty = struct { - /// Install a signal handler for winsize. A maximum of 8 handlers may be - /// installed - pub fn notifyWinsize(handler: SignalHandler) !void { -- handler_mutex.lock(); -- defer handler_mutex.unlock(); -+ handler_mutex.lockUncancelable(handler_io); -+ defer handler_mutex.unlock(handler_io); - if (handler_idx == handlers.len) return error.OutOfMemory; - handlers[handler_idx] = handler; - handler_idx += 1; - } - -- fn handleWinch(_: c_int) callconv(.c) void { -- handler_mutex.lock(); -- defer handler_mutex.unlock(); -+ fn handleWinch(_: posix.SIG) callconv(.c) void { -+ if (!handler_mutex.tryLock()) return; -+ defer handler_mutex.unlock(handler_io); - var i: usize = 0; - while (i < handler_idx) : (i += 1) { - const handler = handlers[i]; -@@ -189,6 +193,7 @@ pub const PosixTty = struct { - pub const WindowsTty = struct { - stdin: windows.HANDLE, - stdout: windows.HANDLE, -+ io: std.Io, - - initial_codepage: c_uint, - initial_input_mode: CONSOLE_MODE_INPUT, -@@ -198,7 +203,8 @@ pub const WindowsTty = struct { - buf: [4]u8 = undefined, - - /// File.Writer for efficient buffered writing -- tty_writer: std.fs.File.Writer, -+ tty_buffer: [1024]u8 = undefined, -+ tty_writer: ?std.Io.File.Writer = null, - - /// The last mouse button that was pressed. We store the previous state of button presses on each - /// mouse event so we can detect which button was released -@@ -221,7 +227,7 @@ pub const WindowsTty = struct { - .ENABLE_LVB_GRID_WORLDWIDE = 1, // enables reverse video and underline - }; - -- pub fn init(buffer: []u8) !Tty { -+ pub fn init(io: std.Io) !Tty { - const stdin: std.fs.File = .stdin(); - const stdout: std.fs.File = .stdout(); - -@@ -237,12 +243,12 @@ pub const WindowsTty = struct { - return windows.unexpectedError(windows.kernel32.GetLastError()); - - const self: Tty = .{ -+ .io = io, - .stdin = stdin.handle, - .stdout = stdout.handle, - .initial_codepage = initial_output_codepage, - .initial_input_mode = initial_input_mode, - .initial_output_mode = initial_output_mode, -- .tty_writer = .initStreaming(stdout, buffer), - }; - - // save a copy of this tty as the global_tty for panic handling -@@ -298,7 +304,12 @@ pub const WindowsTty = struct { - } - - pub fn writer(self: *Tty) *std.Io.Writer { -- return &self.tty_writer.interface; -+ if (self.tty_writer == null) { -+ const stdout: std.fs.File = .stdout(); -+ self.tty_writer = .initStreaming(stdout, &self.tty_buffer); -+ } -+ -+ return &self.tty_writer.?.interface; - } - - pub fn read(self: *const Tty, buf: []u8) !usize { -@@ -694,20 +705,20 @@ pub const WindowsTty = struct { - pub const TestTty = struct { - /// Used for API compat - fd: posix.fd_t, -+ io: std.Io, - pipe_read: posix.fd_t, - pipe_write: posix.fd_t, - tty_writer: *std.Io.Writer.Allocating, - - /// Initializes a TestTty. -- pub fn init(buffer: []u8) !TestTty { -- _ = buffer; -- -+ pub fn init(io: std.Io) !TestTty { - if (builtin.os.tag == .windows) return error.SkipZigTest; - const list = try std.testing.allocator.create(std.Io.Writer.Allocating); - list.* = .init(std.testing.allocator); -- const r, const w = try posix.pipe(); -+ const r, const w = try std.Io.Threaded.pipe2(.{}); - return .{ - .fd = r, -+ .io = io, - .pipe_read = r, - .pipe_write = w, - .tty_writer = list, -@@ -715,8 +726,9 @@ pub const TestTty = struct { - } - - pub fn deinit(self: TestTty) void { -- std.posix.close(self.pipe_read); -- std.posix.close(self.pipe_write); -+ const io = std.testing.io; -+ (std.Io.File{ .handle = self.pipe_read, .flags = .{ .nonblocking = false } }).close(io); -+ (std.Io.File{ .handle = self.pipe_write, .flags = .{ .nonblocking = false } }).close(io); - self.tty_writer.deinit(); - std.testing.allocator.destroy(self.tty_writer); - } -diff --git a/src/unicode.zig b/src/unicode.zig -index a5253ac..4ff2e4c 100644 ---- a/src/unicode.zig -+++ b/src/unicode.zig -@@ -26,10 +26,10 @@ pub const GraphemeIterator = struct { - } - - pub fn next(self: *GraphemeIterator) ?Grapheme { -- while (self.inner.next()) |res| { -+ while (self.inner.nextCodePoint()) |res| { - // When leaving a break and entering a non-break, set the start of a cluster - if (self.prev_break and !res.is_break) { -- const cp_len: usize = std.unicode.utf8CodepointSequenceLength(res.cp) catch 1; -+ const cp_len: usize = std.unicode.utf8CodepointSequenceLength(res.code_point) catch 1; - self.start = self.inner.i - cp_len; - } - -diff --git a/src/vxfw/App.zig b/src/vxfw/App.zig -index 6d394a9..fc3962f 100644 ---- a/src/vxfw/App.zig -+++ b/src/vxfw/App.zig -@@ -16,7 +16,7 @@ tty: vaxis.Tty, - vx: vaxis.Vaxis, - timers: std.ArrayList(vxfw.Tick), - wants_focus: ?vxfw.Widget, --buffer: [1024]u8, -+io: std.Io, - - /// Runtime options - pub const Options = struct { -@@ -27,10 +27,10 @@ pub const Options = struct { - /// Create an application. We require stable pointers to do the set up, so this will create an App - /// object on the heap. Call destroy when the app is complete to reset terminal state and release - /// resources --pub fn init(allocator: Allocator) !App { -- var app: App = .{ -+pub fn init(allocator: Allocator, io: std.Io) !App { -+ return .{ - .allocator = allocator, -- .tty = undefined, -+ .tty = try vaxis.Tty.init(io), - .vx = try vaxis.init(allocator, .{ - .system_clipboard_allocator = allocator, - .kitty_keyboard_flags = .{ -@@ -39,10 +39,8 @@ pub fn init(allocator: Allocator) !App { - }), - .timers = std.ArrayList(vxfw.Tick){}, - .wants_focus = null, -- .buffer = undefined, -+ .io = io, - }; -- app.tty = try vaxis.Tty.init(&app.buffer); -- return app; - } - - pub fn deinit(self: *App) void { -@@ -55,7 +53,8 @@ pub fn run(self: *App, widget: vxfw.Widget, opts: Options) anyerror!void { - const tty = &self.tty; - const vx = &self.vx; - -- var loop: EventLoop = .{ .tty = tty, .vaxis = vx }; -+ const io = self.io; -+ var loop: EventLoop = .{ .tty = tty, .vaxis = vx, .io = io, .queue = .{ .io = io } }; - try loop.start(); - defer loop.stop(); - -@@ -65,7 +64,7 @@ pub fn run(self: *App, widget: vxfw.Widget, opts: Options) anyerror!void { - loop.postEvent(.focus_in); - - try vx.enterAltScreen(tty.writer()); -- try vx.queryTerminal(tty.writer(), 1 * std.time.ns_per_s); -+ try vx.queryTerminal(tty.writer(), io, 1 * std.time.ns_per_s); - try vx.setBracketedPaste(tty.writer(), true); - try vx.subscribeToColorSchemeUpdates(tty.writer()); - -@@ -97,13 +96,14 @@ pub fn run(self: *App, widget: vxfw.Widget, opts: Options) anyerror!void { - defer focus_handler.deinit(self.allocator); - - // Timestamp of our next frame -- var next_frame_ms: u64 = @intCast(std.time.milliTimestamp()); -+ var next_frame_ms: u64 = nowMs(io); - - // Create our event context - var ctx: vxfw.EventContext = .{ - .alloc = self.allocator, - .phase = .capturing, - .cmds = vxfw.CommandList{}, -+ .io = io, - .consume_event = false, - .redraw = false, - .quit = false, -@@ -111,13 +111,13 @@ pub fn run(self: *App, widget: vxfw.Widget, opts: Options) anyerror!void { - defer ctx.cmds.deinit(self.allocator); - - while (true) { -- const now_ms: u64 = @intCast(std.time.milliTimestamp()); -+ const now_ms: u64 = nowMs(io); - if (now_ms >= next_frame_ms) { - // Deadline exceeded. Schedule the next frame - next_frame_ms = now_ms + tick_ms; - } else { - // Sleep until the deadline -- std.Thread.sleep((next_frame_ms - now_ms) * std.time.ns_per_ms); -+ try std.Io.sleep(io, .fromMilliseconds(@intCast(next_frame_ms - now_ms)), .real); - next_frame_ms += tick_ms; - } - -@@ -296,7 +296,7 @@ fn handleCommand(self: *App, cmds: *vxfw.CommandList) Allocator.Error!void { - } - - fn checkTimers(self: *App, ctx: *vxfw.EventContext) anyerror!void { -- const now_ms = std.time.milliTimestamp(); -+ const now_ms = nowMs(ctx.io); - - // timers are always sorted descending - while (self.timers.pop()) |tick| { -@@ -349,12 +349,16 @@ const MouseHandler = struct { - .surface = last_frame, - .z_index = 0, - }; -- const mouse_point: vxfw.Point = .{ -- .row = @intCast(mouse.row), -- .col = @intCast(mouse.col), -- }; -- if (sub.containsPoint(mouse_point)) { -- try last_frame.hitTest(app.allocator, &hits, mouse_point); -+ -+ if (mouse.row >= 0 and mouse.col >= 0) { -+ const mouse_point: vxfw.Point = .{ -+ .row = @intCast(mouse.row), -+ .col = @intCast(mouse.col), -+ }; -+ -+ if (sub.containsPoint(mouse_point)) { -+ try last_frame.hitTest(app.allocator, &hits, mouse_point); -+ } - } - - // We store the hit list from the last mouse event to determine mouse_enter and mouse_leave -@@ -408,12 +412,16 @@ const MouseHandler = struct { - .surface = last_frame, - .z_index = 0, - }; -- const mouse_point: vxfw.Point = .{ -- .row = @intCast(mouse.row), -- .col = @intCast(mouse.col), -- }; -- if (sub.containsPoint(mouse_point)) { -- try last_frame.hitTest(app.allocator, &hits, mouse_point); -+ -+ if (mouse.row >= 0 and mouse.col >= 0) { -+ const mouse_point: vxfw.Point = .{ -+ .row = @intCast(mouse.row), -+ .col = @intCast(mouse.col), -+ }; -+ -+ if (sub.containsPoint(mouse_point)) { -+ try last_frame.hitTest(app.allocator, &hits, mouse_point); -+ } - } - - // Handle mouse_enter and mouse_leave events -@@ -602,3 +610,8 @@ const FocusHandler = struct { - } - } - }; -+ -+fn nowMs(io: std.Io) u64 { -+ const now = std.Io.Clock.now(.real, io); -+ return @intCast(now.toMilliseconds()); -+} -diff --git a/src/vxfw/Button.zig b/src/vxfw/Button.zig -index d4b2a9c..075627e 100644 ---- a/src/vxfw/Button.zig -+++ b/src/vxfw/Button.zig -@@ -142,6 +142,7 @@ test Button { - var ctx: vxfw.EventContext = .{ - .alloc = std.testing.allocator, - .cmds = .empty, -+ .io = std.testing.io, - }; - defer ctx.cmds.deinit(ctx.alloc); - -diff --git a/src/vxfw/ListView.zig b/src/vxfw/ListView.zig -index 8ff9551..de93d5d 100644 ---- a/src/vxfw/ListView.zig -+++ b/src/vxfw/ListView.zig -@@ -564,6 +564,7 @@ test ListView { - var ctx: vxfw.EventContext = .{ - .alloc = std.testing.allocator, - .cmds = .empty, -+ .io = std.testing.io, - }; - defer ctx.cmds.deinit(ctx.alloc); - -@@ -731,6 +732,7 @@ test "ListView: uneven scroll" { - var ctx: vxfw.EventContext = .{ - .alloc = std.testing.allocator, - .cmds = .empty, -+ .io = std.testing.io, - }; - defer ctx.cmds.deinit(ctx.alloc); - -diff --git a/src/vxfw/ScrollView.zig b/src/vxfw/ScrollView.zig -index 36319a4..38859ea 100644 ---- a/src/vxfw/ScrollView.zig -+++ b/src/vxfw/ScrollView.zig -@@ -646,6 +646,7 @@ test ScrollView { - var ctx: vxfw.EventContext = .{ - .alloc = std.testing.allocator, - .cmds = .empty, -+ .io = std.testing.io, - }; - defer ctx.cmds.deinit(ctx.alloc); - -@@ -1044,6 +1045,7 @@ test "ScrollView: uneven scroll" { - var ctx: vxfw.EventContext = .{ - .alloc = std.testing.allocator, - .cmds = .empty, -+ .io = std.testing.io, - }; - defer ctx.cmds.deinit(ctx.alloc); - -diff --git a/src/vxfw/Spinner.zig b/src/vxfw/Spinner.zig -index 6619522..eb3d8ba 100644 ---- a/src/vxfw/Spinner.zig -+++ b/src/vxfw/Spinner.zig -@@ -20,11 +20,11 @@ frame: u4 = 0, - was_spinning: std.atomic.Value(bool) = .{ .raw = false }, - - /// Start, or add one, to the spinner counter. Thread safe. --pub fn start(self: *Spinner) ?vxfw.Command { -+pub fn start(self: *Spinner, io: std.Io) ?vxfw.Command { - self.was_spinning.store(true, .unordered); - const count = self.count.fetchAdd(1, .monotonic); - if (count == 0) { -- return vxfw.Tick.in(time_lapse, self.widget()); -+ return vxfw.Tick.in(io, time_lapse, self.widget()); - } - return null; - } -@@ -111,13 +111,13 @@ test Spinner { - // Start the spinner. This (maybe) returns a Tick command to schedule the next frame. If the - // spinner is already running, no command is returned. Calling start is thread safe. The - // returned command can be added to an EventContext to schedule the frame -- const maybe_cmd = spinner.start(); -+ const maybe_cmd = spinner.start(std.testing.io); - try std.testing.expect(maybe_cmd != null); - try std.testing.expect(maybe_cmd.? == .tick); - try std.testing.expectEqual(1, spinner.count.load(.unordered)); - - // If we call start again, we won't get another command but our counter will go up -- const maybe_cmd2 = spinner.start(); -+ const maybe_cmd2 = spinner.start(std.testing.io); - try std.testing.expect(maybe_cmd2 == null); - try std.testing.expectEqual(2, spinner.count.load(.unordered)); - -@@ -126,6 +126,7 @@ test Spinner { - var ctx: vxfw.EventContext = .{ - .alloc = arena.allocator(), - .cmds = .empty, -+ .io = std.testing.io, - }; - - // The event loop handles the tick event and calls us back with a .tick event. If we should keep -diff --git a/src/vxfw/SplitView.zig b/src/vxfw/SplitView.zig -index 9a355a0..591e5e9 100644 ---- a/src/vxfw/SplitView.zig -+++ b/src/vxfw/SplitView.zig -@@ -229,6 +229,7 @@ test SplitView { - var ctx: vxfw.EventContext = .{ - .alloc = arena.allocator(), - .cmds = .empty, -+ .io = std.testing.io, - }; - try split_widget.handleEvent(&ctx, .{ .mouse = mouse }); - // We should get a command to change the mouse shape -diff --git a/src/vxfw/Text.zig b/src/vxfw/Text.zig -index 1f76cba..a7b71bb 100644 ---- a/src/vxfw/Text.zig -+++ b/src/vxfw/Text.zig -@@ -223,7 +223,7 @@ pub const SoftwrapIterator = struct { - // Advance the hard iterator - if (self.index == self.line.len) { - self.line = self.hard_iter.next() orelse return null; -- self.line = std.mem.trimRight(u8, self.line, " \t"); -+ self.line = std.mem.trimEnd(u8, self.line, " \t"); - self.index = 0; - } - -@@ -237,7 +237,7 @@ pub const SoftwrapIterator = struct { - if (self.ctx.max.width) |max| { - if (cur_width + next_width > max) { - // Trim the word to see if it can fit on a line by itself -- const trimmed = std.mem.trimLeft(u8, word, " \t"); -+ const trimmed = std.mem.trimStart(u8, word, " \t"); - const trimmed_bytes = word.len - trimmed.len; - // The number of bytes we trimmed is equal to the reduction in length - const trimmed_width = next_width - trimmed_bytes; -diff --git a/src/vxfw/TextField.zig b/src/vxfw/TextField.zig -index 6ad108b..e5a4d5b 100644 ---- a/src/vxfw/TextField.zig -+++ b/src/vxfw/TextField.zig -@@ -346,7 +346,7 @@ pub fn deleteAfterCursor(self: *TextField) void { - /// Moves the cursor backward by words. If the character before the cursor is a space, the cursor is - /// positioned just after the next previous space - pub fn moveBackwardWordwise(self: *TextField) void { -- const trimmed = std.mem.trimRight(u8, self.buf.firstHalf(), " "); -+ const trimmed = std.mem.trimEnd(u8, self.buf.firstHalf(), " "); - const idx = if (std.mem.lastIndexOfScalar(u8, trimmed, ' ')) |last| - last + 1 - else -@@ -562,6 +562,7 @@ test TextField { - var ctx: vxfw.EventContext = .{ - .alloc = arena.allocator(), - .cmds = .empty, -+ .io = std.testing.io, - }; - - // Enough boiler plate...Create the text field -diff --git a/src/vxfw/vxfw.zig b/src/vxfw/vxfw.zig -index 1510e71..f768d56 100644 ---- a/src/vxfw/vxfw.zig -+++ b/src/vxfw/vxfw.zig -@@ -61,8 +61,8 @@ pub const Tick = struct { - return lhs.deadline_ms > rhs.deadline_ms; - } - -- pub fn in(ms: u32, widget: Widget) Command { -- const now = std.time.milliTimestamp(); -+ pub fn in(io: std.Io, ms: u32, widget: Widget) Command { -+ const now = std.Io.Clock.now(.real, io).toMilliseconds(); - return .{ .tick = .{ - .deadline_ms = now + ms, - .widget = widget, -@@ -101,6 +101,7 @@ pub const EventContext = struct { - phase: Phase = .at_target, - alloc: Allocator, - cmds: CommandList, -+ io: std.Io, - - /// The event was handled, do not pass it on - consume_event: bool = false, -@@ -120,7 +121,7 @@ pub const EventContext = struct { - } - - pub fn tick(self: *EventContext, ms: u32, widget: Widget) Allocator.Error!void { -- try self.addCmd(Tick.in(ms, widget)); -+ try self.addCmd(Tick.in(self.io, ms, widget)); - } - - pub fn consumeAndRedraw(self: *EventContext) void { -@@ -541,10 +542,10 @@ test "All widgets have a doctest and refAllDecls test" { - // it easy to fail CI early, or spot bad tests vs non-existant tests - const excludes = &[_][]const u8{ "vxfw.zig", "App.zig" }; - -- var cwd = try std.fs.cwd().openDir("./src/vxfw", .{ .iterate = true }); -+ var cwd = try std.Io.Dir.cwd().openDir(std.testing.io, "./src/vxfw", .{ .iterate = true }); - var iter = cwd.iterate(); -- defer cwd.close(); -- outer: while (try iter.next()) |file| { -+ defer cwd.close(std.testing.io); -+ outer: while (try iter.next(std.testing.io)) |file| { - if (file.kind != .file) continue; - for (excludes) |ex| if (std.mem.eql(u8, ex, file.name)) continue :outer; - -@@ -552,7 +553,7 @@ test "All widgets have a doctest and refAllDecls test" { - file.name[0..idx] - else - continue; -- const data = try cwd.readFileAllocOptions(std.testing.allocator, file.name, 10_000_000, null, .of(u8), 0x00); -+ const data = try cwd.readFileAllocOptions(std.testing.io, file.name, std.testing.allocator, std.Io.Limit.limited(10_000_000), .of(u8), 0x00); - defer std.testing.allocator.free(data); - var ast = try std.zig.Ast.parse(std.testing.allocator, data, .zig); - defer ast.deinit(std.testing.allocator); -diff --git a/src/widgets/TextInput.zig b/src/widgets/TextInput.zig -index a6236a4..6b8871b 100644 ---- a/src/widgets/TextInput.zig -+++ b/src/widgets/TextInput.zig -@@ -266,7 +266,7 @@ pub fn deleteAfterCursor(self: *TextInput) void { - /// Moves the cursor backward by words. If the character before the cursor is a space, the cursor is - /// positioned just after the next previous space - pub fn moveBackwardWordwise(self: *TextInput) void { -- const trimmed = std.mem.trimRight(u8, self.buf.firstHalf(), " "); -+ const trimmed = std.mem.trimEnd(u8, self.buf.firstHalf(), " "); - const idx = if (std.mem.lastIndexOfScalar(u8, trimmed, ' ')) |last| - last + 1 - else -diff --git a/src/widgets/TextView.zig b/src/widgets/TextView.zig -index 45f9e44..ee326cf 100644 ---- a/src/widgets/TextView.zig -+++ b/src/widgets/TextView.zig -@@ -79,52 +79,22 @@ pub const Buffer = struct { - var cols: usize = self.last_cols; - var iter = uucode.grapheme.Iterator(uucode.utf8.Iterator).init(.init(content.bytes)); - -- var grapheme_start: usize = 0; -- var prev_break: bool = true; -- -- while (iter.next()) |result| { -- if (prev_break and !result.is_break) { -- // Start of a new grapheme -- const cp_len: usize = std.unicode.utf8CodepointSequenceLength(result.cp) catch 1; -- grapheme_start = iter.i - cp_len; -- } -- -- if (result.is_break) { -- // End of a grapheme -- const grapheme_end = iter.i; -- const grapheme_len = grapheme_end - grapheme_start; -- -- try self.grapheme.append(allocator, .{ -- .len = @intCast(grapheme_len), -- .offset = @intCast(self.content.items.len + grapheme_start), -- }); -- -- const cluster = content.bytes[grapheme_start..grapheme_end]; -- if (std.mem.eql(u8, cluster, "\n")) { -- self.cols = @max(self.cols, cols); -- cols = 0; -- } else { -- // Calculate width using gwidth -- const w = vaxis.gwidth.gwidth(cluster, .unicode); -- cols +|= w; -- } -- -- grapheme_start = grapheme_end; -- } -- prev_break = result.is_break; -- } -- -- // Flush the last grapheme if we ended mid-cluster -- if (!prev_break and grapheme_start < content.bytes.len) { -- const grapheme_len = content.bytes.len - grapheme_start; -+ while (iter.nextGrapheme()) |grapheme| { -+ const grapheme_start = grapheme.start; -+ const grapheme_end = grapheme.end; -+ const grapheme_len = grapheme_end - grapheme_start; - - try self.grapheme.append(allocator, .{ - .len = @intCast(grapheme_len), - .offset = @intCast(self.content.items.len + grapheme_start), - }); - -- const cluster = content.bytes[grapheme_start..]; -- if (!std.mem.eql(u8, cluster, "\n")) { -+ const cluster = content.bytes[grapheme_start..grapheme_end]; -+ if (std.mem.eql(u8, cluster, "\n")) { -+ self.cols = @max(self.cols, cols); -+ cols = 0; -+ } else { -+ // Calculate width using gwidth - const w = vaxis.gwidth.gwidth(cluster, .unicode); - cols +|= w; - } -diff --git a/src/widgets/terminal/Command.zig b/src/widgets/terminal/Command.zig -index 0cd24f7..ed41553 100644 ---- a/src/widgets/terminal/Command.zig -+++ b/src/widgets/terminal/Command.zig -@@ -14,7 +14,7 @@ working_directory: ?[]const u8, - // Set after spawn() - pid: ?std.posix.pid_t = null, - --env_map: *const std.process.EnvMap, -+env_map: *const std.process.Environ.Map, - - pty: Pty, - -@@ -43,8 +43,8 @@ pub fn spawn(self: *Command, allocator: std.mem.Allocator) !void { - try posix.dup2(self.pty.tty.handle, std.posix.STDOUT_FILENO); - try posix.dup2(self.pty.tty.handle, std.posix.STDERR_FILENO); - -- self.pty.tty.close(); -- if (self.pty.pty.handle > 2) self.pty.pty.close(); -+ _ = std.os.linux.close(self.pty.tty.handle); -+ if (self.pty.pty.handle > 2) _ = std.os.linux.close(self.pty.pty.handle); - - if (self.working_directory) |wd| { - try std.posix.chdir(wd); -@@ -78,8 +78,8 @@ pub fn spawn(self: *Command, allocator: std.mem.Allocator) !void { - fn handleSigChild(_: c_int) callconv(.c) void { - const result = std.posix.waitpid(-1, 0); - -- Terminal.global_vt_mutex.lock(); -- defer Terminal.global_vt_mutex.unlock(); -+ if (!Terminal.global_vt_mutex.tryLock()) return; -+ defer Terminal.global_vt_mutex.unlock(Terminal.global_vt_io); - if (Terminal.global_vts) |vts| { - var vt = vts.get(result.pid) orelse return; - vt.event_queue.push(.exited); -@@ -97,7 +97,7 @@ pub fn kill(self: *Command) void { - /// hash map plus options. - fn createEnvironFromMap( - arena: std.mem.Allocator, -- map: *const std.process.EnvMap, -+ map: *const std.process.Environ.Map, - ) ![:null]?[*:0]u8 { - const envp_count: usize = map.count(); - -diff --git a/src/widgets/terminal/Pty.zig b/src/widgets/terminal/Pty.zig -index d9f4138..4c67328 100644 ---- a/src/widgets/terminal/Pty.zig -+++ b/src/widgets/terminal/Pty.zig -@@ -7,8 +7,8 @@ const Winsize = @import("../../main.zig").Winsize; - - const posix = std.posix; - --pty: std.fs.File, --tty: std.fs.File, -+pty: std.Io.File, -+tty: std.Io.File, - - /// opens a new tty/pty pair - pub fn init() !Pty { -@@ -19,9 +19,9 @@ pub fn init() !Pty { - } - - /// closes the tty and pty --pub fn deinit(self: Pty) void { -- self.pty.close(); -- self.tty.close(); -+pub fn deinit(self: Pty, io: std.Io) void { -+ self.pty.close(io); -+ self.tty.close(io); - } - - /// sets the size of the pty -@@ -37,7 +37,7 @@ pub fn setSize(self: Pty, ws: Winsize) !void { - } - - fn openPtyLinux() !Pty { -- const p = try posix.open("/dev/ptmx", .{ .ACCMODE = .RDWR, .NOCTTY = true }, 0); -+ const p = try posix.openat(posix.AT.FDCWD, "/dev/ptmx", .{ .ACCMODE = .RDWR, .NOCTTY = true }, 0); - errdefer posix.close(p); - - // unlockpt -@@ -50,7 +50,7 @@ fn openPtyLinux() !Pty { - const sname = try std.fmt.bufPrint(&buf, "/dev/pts/{d}", .{n}); - std.log.debug("pts: {s}", .{sname}); - -- const t = try posix.open(sname, .{ .ACCMODE = .RDWR, .NOCTTY = true }, 0); -+ const t = try posix.openat(posix.AT.FDCWD, sname, .{ .ACCMODE = .RDWR, .NOCTTY = true }, 0); - - return .{ - .pty = .{ .handle = p }, -diff --git a/src/widgets/terminal/Terminal.zig b/src/widgets/terminal/Terminal.zig -index 36d61d7..786ca85 100644 ---- a/src/widgets/terminal/Terminal.zig -+++ b/src/widgets/terminal/Terminal.zig -@@ -43,21 +43,23 @@ pub const InputEvent = union(enum) { - key_press: vaxis.Key, - }; - --pub var global_vt_mutex: std.Thread.Mutex = .{}; -+pub var global_vt_mutex: std.Io.Mutex = .init; -+var global_vt_io: std.Io = undefined; - pub var global_vts: ?std.AutoHashMap(i32, *Terminal) = null; - pub var global_sigchild_installed: bool = false; - - allocator: std.mem.Allocator, -+io: std.Io, - scrollback_size: u16, - - pty: Pty, --pty_writer: std.fs.File.Writer, -+pty_writer: std.Io.File.Writer, - cmd: Command, - thread: ?std.Thread = null, - - /// the screen we draw from - front_screen: Screen, --front_mutex: std.Thread.Mutex = .{}, -+front_mutex: std.Io.Mutex = .init, - - /// the back screens - back_screen: *Screen = undefined, -@@ -65,7 +67,7 @@ back_screen_pri: Screen, - back_screen_alt: Screen, - // only applies to primary screen - scroll_offset: usize = 0, --back_mutex: std.Thread.Mutex = .{}, -+back_mutex: std.Io.Mutex = .init, - // dirty is protected by back_mutex. Only access this field when you hold that mutex - dirty: bool = false, - -@@ -79,14 +81,15 @@ working_directory: std.ArrayList(u8) = .empty, - - last_printed: []const u8 = "", - --event_queue: Queue = .{}, -+event_queue: Queue, - - /// initialize a Terminal. This sets the size of the underlying pty and allocates the sizes of the - /// screen - pub fn init( - allocator: std.mem.Allocator, -+ io: std.Io, - argv: []const []const u8, -- env: *const std.process.EnvMap, -+ env: *const std.process.Environ.Map, - opts: Options, - write_buf: []u8, - ) !Terminal { -@@ -107,8 +110,10 @@ pub fn init( - while (col < opts.winsize.cols) : (col += 8) { - try tabs.append(allocator, col); - } -+ global_vt_io = io; - return .{ - .allocator = allocator, -+ .io = io, - .pty = pty, - .pty_writer = pty.pty.writerStreaming(write_buf), - .cmd = cmd, -@@ -117,6 +122,7 @@ pub fn init( - .back_screen_pri = try Screen.init(allocator, opts.winsize.cols, opts.winsize.rows + opts.scrollback_size), - .back_screen_alt = try Screen.init(allocator, opts.winsize.cols, opts.winsize.rows), - .tab_stops = tabs, -+ .event_queue = .{ .io = io }, - }; - } - -@@ -125,8 +131,8 @@ pub fn deinit(self: *Terminal) void { - self.should_quit = true; - - pid: { -- global_vt_mutex.lock(); -- defer global_vt_mutex.unlock(); -+ global_vt_mutex.lockUncancelable(global_vt_io); -+ defer global_vt_mutex.unlock(global_vt_io); - var vts = global_vts orelse break :pid; - if (self.cmd.pid) |pid| - _ = vts.remove(pid); -@@ -143,7 +149,7 @@ pub fn deinit(self: *Terminal) void { - thread.join(); - self.thread = null; - } -- self.pty.deinit(); -+ self.pty.deinit(self.io); - self.front_screen.deinit(self.allocator); - self.back_screen_pri.deinit(self.allocator); - self.back_screen_alt.deinit(self.allocator); -@@ -162,16 +168,15 @@ pub fn spawn(self: *Terminal) !void { - if (self.cmd.working_directory) |pwd| { - try self.working_directory.appendSlice(self.allocator, pwd); - } else { -- const pwd = std.fs.cwd(); - var buffer: [std.fs.max_path_bytes]u8 = undefined; -- const out_path = try std.os.getFdPath(pwd.fd, &buffer); -+ const out_path = try std.posix.readlinkZ("/proc/self/cwd", &buffer); - try self.working_directory.appendSlice(self.allocator, out_path); - } - - { - // add to our global list -- global_vt_mutex.lock(); -- defer global_vt_mutex.unlock(); -+ global_vt_mutex.lockUncancelable(global_vt_io); -+ defer global_vt_mutex.unlock(global_vt_io); - if (global_vts == null) - global_vts = std.AutoHashMap(i32, *Terminal).init(self.allocator); - if (self.cmd.pid) |pid| -@@ -190,8 +195,8 @@ pub fn resize(self: *Terminal, ws: Winsize) !void { - ws.rows == self.front_screen.height) - return; - -- self.back_mutex.lock(); -- defer self.back_mutex.unlock(); -+ self.back_mutex.lockUncancelable(self.io); -+ defer self.back_mutex.unlock(self.io); - - self.front_screen.deinit(self.allocator); - self.front_screen = try Screen.init(self.allocator, ws.cols, ws.rows); -@@ -206,7 +211,7 @@ pub fn resize(self: *Terminal, ws: Winsize) !void { - - pub fn draw(self: *Terminal, allocator: std.mem.Allocator, win: vaxis.Window) !void { - if (self.back_mutex.tryLock()) { -- defer self.back_mutex.unlock(); -+ defer self.back_mutex.unlock(self.io); - // We keep this as a separate condition so we don't deadlock by obtaining the lock but not - // having sync - if (!self.mode.sync) { -@@ -249,7 +254,7 @@ pub fn get_pty_writer(self: *Terminal) *std.Io.Writer { - return &self.pty_writer.interface; - } - --fn reader(self: *const Terminal, buf: []u8) std.fs.File.Reader { -+fn reader(self: *const Terminal, buf: []u8) std.Io.File.Reader { - return self.pty.pty.readerStreaming(buf); - } - -@@ -265,8 +270,8 @@ fn run(self: *Terminal) !void { - - while (!self.should_quit) { - const event = try parser.parseReader(&reader_.interface); -- self.back_mutex.lock(); -- defer self.back_mutex.unlock(); -+ self.back_mutex.lockUncancelable(self.io); -+ defer self.back_mutex.unlock(self.io); - - if (!self.dirty and self.event_queue.tryPush(.redraw)) - self.dirty = true; diff --git a/third_party/libvaxis/fixes.patch b/third_party/libvaxis/fixes.patch index aca9c136..effbb2aa 100644 --- a/third_party/libvaxis/fixes.patch +++ b/third_party/libvaxis/fixes.patch @@ -1,86 +1,108 @@ -diff --git a/examples/table.zig b/examples/table.zig -index c489828..16aefdc 100644 ---- a/examples/table.zig -+++ b/examples/table.zig -@@ -20,8 +20,8 @@ pub fn main(init: std.process.Init) !void { - // Users set up below the main function - const users_buf = try alloc.dupe(User, users[0..]); - -- var buffer: [1024]u8 = undefined; -- var tty = try vaxis.Tty.init(init.io, &buffer); -+ // var buffer: [1024]u8 = undefined; -+ var tty = try vaxis.Tty.init(init.io); - defer tty.deinit(); - const tty_writer = tty.writer(); - var vx = try vaxis.init(alloc, .{ +diff --git a/src/Loop.zig b/src/Loop.zig +--- a/src/Loop.zig ++++ b/src/Loop.zig +@@ -352,7 +352,7 @@ + } + }, + .cap_da1 => { +- std.Io.futexWake(vx.io, std.atomic.Value(u32), &vx.query_futex, 10); ++ std.Io.futexWake(vx.io, u32, &vx.query_futex.raw, 10); + vx.queries_done.store(true, .unordered); + }, + .mouse => |mouse| { +@@ -484,7 +484,7 @@ + vx.caps.program_status = true; + }, + .cap_da1 => { +- std.Io.futexWake(vx.io, std.atomic.Value(u32), &vx.query_futex, 10); ++ std.Io.futexWake(vx.io, u32, &vx.query_futex.raw, 10); + vx.queries_done.store(true, .unordered); + }, + .winsize => |winsize| { diff --git a/src/Vaxis.zig b/src/Vaxis.zig -index 2e24e9b..2b2ee49 100644 --- a/src/Vaxis.zig +++ b/src/Vaxis.zig -@@ -127,14 +127,13 @@ pub fn deinit(self: *Vaxis, alloc: ?std.mem.Allocator, tty: *IoWriter) void { +@@ -139,14 +139,13 @@ } } -/// resets enabled features, sends cursor to home and clears below cursor --pub fn resetState(self: *Vaxis, tty: *IoWriter) !void { +-pub fn resetState(self: *Vaxis, tty: *std.Io.Writer) !void { - // always show the cursor on state reset +/// Resets enabled terminal features without clearing screen content. +/// Use this for non-interactive / single-shot rendering where the +/// output should remain visible after exit. -+pub fn resetModes(self: *Vaxis, tty: *IoWriter) !void { ++pub fn resetModes(self: *Vaxis, tty: *std.Io.Writer) !void { tty.writeAll(ctlseqs.show_cursor) catch {}; tty.writeAll(ctlseqs.sgr_reset) catch {}; if (self.screen.cursor_shape != .default) { - // In many terminals, `.default` will set to the configured cursor shape. Others, it will - // change to a blinking block. - tty.print(ctlseqs.cursor_shape, .{@intFromEnum(Cell.CursorShape.default)}) catch {}; + tty.print(ctlseqs.cursor_shape, .{@backingInt(Cell.CursorShape.default)}) catch {}; } if (self.state.kitty_keyboard) { -@@ -147,18 +146,6 @@ pub fn resetState(self: *Vaxis, tty: *IoWriter) !void { +@@ -159,6 +158,32 @@ if (self.state.bracketed_paste) { try self.setBracketedPaste(tty, false); } -- if (self.state.alt_screen) { -- try tty.writeAll(ctlseqs.home); -- try tty.writeAll(ctlseqs.erase_below_cursor); -- try self.exitAltScreen(tty); -- } else { -- try tty.writeByte('\r'); -- var i: u16 = 0; -- while (i < self.state.cursor.row) : (i += 1) { -- try tty.writeAll(ctlseqs.ri); -- } -- try tty.writeAll(ctlseqs.erase_below_cursor); -- } - if (self.state.color_scheme_updates) { - try tty.writeAll(ctlseqs.color_scheme_reset); - self.state.color_scheme_updates = false; -@@ -179,7 +166,24 @@ pub fn resetState(self: *Vaxis, tty: *IoWriter) !void { - try tty.writeAll(ctlseqs.osc12_reset); - self.state.changed_cursor_color = false; - } ++ if (self.state.color_scheme_updates) { ++ try tty.writeAll(ctlseqs.color_scheme_reset); ++ self.state.color_scheme_updates = false; ++ } ++ if (self.state.in_band_resize) { ++ try tty.writeAll(ctlseqs.in_band_resize_reset); ++ self.state.in_band_resize = false; ++ } ++ if (self.state.changed_default_fg) { ++ try tty.writeAll(ctlseqs.osc10_reset); ++ self.state.changed_default_fg = false; ++ } ++ if (self.state.changed_default_bg) { ++ try tty.writeAll(ctlseqs.osc11_reset); ++ self.state.changed_default_bg = false; ++ } ++ if (self.state.changed_cursor_color) { ++ try tty.writeAll(ctlseqs.osc12_reset); ++ self.state.changed_cursor_color = false; ++ } + try tty.flush(); +} - ++ +/// resets enabled features, sends cursor to home and clears below cursor -+pub fn resetState(self: *Vaxis, tty: *IoWriter) !void { ++pub fn resetState(self: *Vaxis, tty: *std.Io.Writer) !void { + self.resetModes(tty) catch {}; -+ if (self.state.alt_screen) { -+ try tty.writeAll(ctlseqs.home); -+ try tty.writeAll(ctlseqs.erase_below_cursor); -+ try self.exitAltScreen(tty); -+ } else { -+ try tty.writeByte('\r'); -+ var i: u16 = 0; -+ while (i < self.state.cursor.row) : (i += 1) { -+ try tty.writeAll(ctlseqs.ri); -+ } -+ try tty.writeAll(ctlseqs.erase_below_cursor); -+ } + if (self.state.alt_screen) { + try tty.writeAll(ctlseqs.home); + try tty.writeAll(ctlseqs.erase_below_cursor); +@@ -171,27 +196,6 @@ + } + try tty.writeAll(ctlseqs.erase_below_cursor); + } +- if (self.state.color_scheme_updates) { +- try tty.writeAll(ctlseqs.color_scheme_reset); +- self.state.color_scheme_updates = false; +- } +- if (self.state.in_band_resize) { +- try tty.writeAll(ctlseqs.in_band_resize_reset); +- self.state.in_band_resize = false; +- } +- if (self.state.changed_default_fg) { +- try tty.writeAll(ctlseqs.osc10_reset); +- self.state.changed_default_fg = false; +- } +- if (self.state.changed_default_bg) { +- try tty.writeAll(ctlseqs.osc11_reset); +- self.state.changed_default_bg = false; +- } +- if (self.state.changed_cursor_color) { +- try tty.writeAll(ctlseqs.osc12_reset); +- self.state.changed_cursor_color = false; +- } +- try tty.flush(); } -@@ -943,19 +947,19 @@ pub fn transmitLocalImagePath( +@@ -1101,19 +1105,19 @@ switch (format) { .rgb => { try tty.print( @@ -103,7 +125,7 @@ index 2e24e9b..2b2ee49 100644 .{ id, medium_char, encoded }, ); }, -@@ -991,7 +995,7 @@ pub fn transmitPreEncodedImage( +@@ -1149,7 +1153,7 @@ if (bytes.len < 4096) { try tty.print( @@ -112,7 +134,7 @@ index 2e24e9b..2b2ee49 100644 .{ fmt, width, -@@ -1004,14 +1008,14 @@ pub fn transmitPreEncodedImage( +@@ -1162,14 +1166,14 @@ var n: usize = 4096; try tty.print( @@ -129,11 +151,22 @@ index 2e24e9b..2b2ee49 100644 .{ m, bytes[n..end], +diff --git a/src/c_api.zig b/src/c_api.zig +--- a/src/c_api.zig ++++ b/src/c_api.zig +@@ -965,7 +965,7 @@ + .cap_multi_cursor => vx.caps.multi_cursor = true, + .cap_program_status => vx.caps.program_status = true, + .cap_da1 => { +- std.Io.futexWake(vx.io, std.atomic.Value(u32), &vx.query_futex, 10); ++ std.Io.futexWake(vx.io, u32, &vx.query_futex.raw, 10); + vx.queries_done.store(true, .unordered); + }, + .winsize => { diff --git a/src/ctlseqs.zig b/src/ctlseqs.zig -index ab415c6..4baa496 100644 --- a/src/ctlseqs.zig +++ b/src/ctlseqs.zig -@@ -138,8 +138,8 @@ pub const osc52_clipboard_copy = "\x1b]52;c;{s}\x1b\\"; +@@ -140,8 +140,8 @@ pub const osc52_clipboard_request = "\x1b]52;c;?\x1b\\"; // Kitty graphics @@ -144,118 +177,10 @@ index ab415c6..4baa496 100644 pub const kitty_graphics_closing = ",C=1\x1b\\"; // Color control sequences -diff --git a/src/tty.zig b/src/tty.zig -index c1da795..7f6a303 100644 ---- a/src/tty.zig -+++ b/src/tty.zig -@@ -52,6 +52,10 @@ pub const PosixTty = struct { - - var handler_installed: bool = false; - -+ /// Atomic flag set by the SIGWINCH signal handler. Checked and cleared -+ /// by pollWinch() from a non-signal context to avoid deadlocks. -+ var winch_pending: std.atomic.Value(bool) = .{ .raw = false }; -+ - /// initializes a Tty instance by opening /dev/tty and "making it raw". A - /// signal handler is installed for SIGWINCH. No callbacks are installed, be - /// sure to register a callback when initializing the event loop -@@ -129,7 +133,20 @@ pub const PosixTty = struct { - } - - fn handleWinch(_: posix.SIG) callconv(.c) void { -- if (!handler_mutex.tryLock()) return; -+ // Only set an atomic flag. Calling mutex.lock() or queue.push() -+ // from a signal handler is not async-signal-safe and causes -+ // deadlocks when the signal is delivered to a thread that already -+ // holds one of those locks. Registered handlers are dispatched -+ // from pollWinch() instead. -+ winch_pending.store(true, .release); -+ } -+ -+ /// Check if a SIGWINCH was received and dispatch registered handlers. -+ /// Must be called from a non-signal context (e.g., the main event loop) -+ /// to avoid the async-signal-safety issues with the old approach. -+ pub fn pollWinch() void { -+ if (!winch_pending.swap(false, .acquire)) return; -+ handler_mutex.lockUncancelable(handler_io); - defer handler_mutex.unlock(handler_io); - var i: usize = 0; - while (i < handler_idx) : (i += 1) { -diff --git a/src/vxfw/App.zig b/src/vxfw/App.zig -index fc3962f..2661cf4 100644 ---- a/src/vxfw/App.zig -+++ b/src/vxfw/App.zig -@@ -1,4 +1,5 @@ - const std = @import("std"); -+const builtin = @import("builtin"); - const vaxis = @import("../main.zig"); - const vxfw = @import("vxfw.zig"); - -@@ -36,8 +37,8 @@ fn init(allocator: Allocator, io: std.Io) !App { - .kitty_keyboard_flags = .{ - .report_events = true, - }, - }), -- .timers = std.ArrayList(vxfw.Tick){}, -+ .timers = .empty, - .wants_focus = null, - .io = io, - }; -@@ -102,7 +103,7 @@ - var ctx: vxfw.EventContext = .{ - .alloc = self.allocator, - .phase = .capturing, -- .cmds = vxfw.CommandList{}, -+ .cmds = .empty, - .io = io, - .consume_event = false, - .redraw = false, -@@ -123,6 +124,13 @@ pub fn run(self: *App, widget: vxfw.Widget, opts: Options) anyerror!void { - - try self.checkTimers(&ctx); - -+ // Poll for pending SIGWINCH outside of queue lock. -+ // The signal handler only sets an atomic flag; we dispatch -+ // the registered callbacks here where mutex operations are safe. -+ if (builtin.os.tag != .windows and !builtin.is_test) { -+ if (!vx.state.in_band_resize) vaxis.Tty.pollWinch(); -+ } -+ - { - loop.queue.lock(); - defer loop.queue.unlock(); -@@ -342,7 +350,7 @@ - // For mouse events we store the last frame and use that for hit testing - const last_frame = surface; - -- var hits = std.ArrayList(vxfw.HitResult){}; -+ var hits: std.ArrayList(vxfw.HitResult) = .empty; - defer hits.deinit(app.allocator); - const sub: vxfw.SubSurface = .{ - .origin = .{ .row = 0, .col = 0 }, -@@ -405,7 +413,7 @@ - const last_frame = self.last_frame; - self.mouse = mouse; - -- var hits = std.ArrayList(vxfw.HitResult){}; -+ var hits: std.ArrayList(vxfw.HitResult) = .empty; - defer hits.deinit(app.allocator); - const sub: vxfw.SubSurface = .{ - .origin = .{ .row = 0, .col = 0 }, -@@ -524,7 +532,7 @@ - return .{ - .root = root, - .focused_widget = root, -- .path_to_focused = std.ArrayList(Widget){}, -+ .path_to_focused = .empty, - }; - } - diff --git a/src/vxfw/Padding.zig b/src/vxfw/Padding.zig -index e60162f..6e5f40b 100644 --- a/src/vxfw/Padding.zig +++ b/src/vxfw/Padding.zig -@@ -6,7 +6,7 @@ const Allocator = std.mem.Allocator; +@@ -6,7 +6,7 @@ const vxfw = @import("vxfw.zig"); const Padding = @This(); @@ -264,7 +189,7 @@ index e60162f..6e5f40b 100644 left: u16 = 0, right: u16 = 0, top: u16 = 0, -@@ -54,10 +54,6 @@ fn typeErasedDrawFn(ptr: *anyopaque, ctx: vxfw.DrawContext) Allocator.Error!vxfw +@@ -54,10 +54,6 @@ pub fn draw(self: *const Padding, ctx: vxfw.DrawContext) Allocator.Error!vxfw.Surface { const pad = self.padding; diff --git a/third_party/libvaxis/repo.bzl b/third_party/libvaxis/repo.bzl index 8305d1c0..e10982a4 100644 --- a/third_party/libvaxis/repo.bzl +++ b/third_party/libvaxis/repo.bzl @@ -4,8 +4,8 @@ def repo(): git_repository( name = "libvaxis", remote = "https://github.com/rockorager/libvaxis.git", - commit = "a3ae1d53feeeeaeb6218de3d38837559811acae4", + commit = "14b7684272234a3d66316c0d1bbdc876d4e8997c", build_file = "//third_party/libvaxis:libvaxis.bazel", - patches = ["//third_party/libvaxis:bump-zig.patch", "//third_party/libvaxis:fixes.patch"], + patches = ["//third_party/libvaxis:fixes.patch"], patch_args = ["-p1"], ) diff --git a/third_party/non_module_deps.bzl b/third_party/non_module_deps.bzl index 44632c4d..bd792d4c 100644 --- a/third_party/non_module_deps.bzl +++ b/third_party/non_module_deps.bzl @@ -17,6 +17,7 @@ load("//third_party/uucode:repo.bzl", uucode = "repo") load("//third_party/xla:repo.bzl", xla = "repo") load("//third_party/zigimg:repo.bzl", zigimg = "repo") load("//third_party/zio:repo.bzl", zio = "repo") +load("//third_party/zls:repo.bzl", zls = "repo") def _non_module_deps_impl(mctx): cloud_accelerator_diagnostics() @@ -38,6 +39,7 @@ def _non_module_deps_impl(mctx): flydsl() cute_ir() zio() + zls() return mctx.extension_metadata( reproducible = True, diff --git a/third_party/translate-c/repo.bzl b/third_party/translate-c/repo.bzl index 8315b2af..dfd8835d 100644 --- a/third_party/translate-c/repo.bzl +++ b/third_party/translate-c/repo.bzl @@ -3,8 +3,9 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") def repo(): git_repository( name = "translate-c", - # Use ZML Github mirror of translate-c because Codeber is too unstable + # Use the ZML GitHub mirror because Codeberg is unreliable. remote = "https://github.com/zml/translate-c", - commit = "46b5609b5ac4c0a896217d1d984f3ae50e4810b5", + # 2.0.0 + commit = "0da7a16c3235b935b82421646076e0657cda21f6", build_file = Label("//third_party/translate-c:translate-c.bazel"), ) diff --git a/third_party/translate-c/translate-c.bazel b/third_party/translate-c/translate-c.bazel index b2ff9c98..7de2a5eb 100644 --- a/third_party/translate-c/translate-c.bazel +++ b/third_party/translate-c/translate-c.bazel @@ -1,4 +1,12 @@ load("@rules_zig//zig:defs.bzl", "zig_binary", "zig_configure_binary", "zig_library") +load("@zml//bazel:zig_options.bzl", "zig_option", "zig_options") + +zig_option(name = "debug_allocations", bool = False) + +zig_options( + name = "build_options", + settings = [":debug_allocations"], +) zig_library( name = "c_builtins", @@ -19,6 +27,7 @@ zig_binary( main = "src/main.zig", linkopts = ["-lc"], deps = [ + ":build_options", ":c_builtins", ":helpers", "@arocc//:aro", diff --git a/third_party/uucode/repo.bzl b/third_party/uucode/repo.bzl index 20a2f080..5f7b1cbf 100644 --- a/third_party/uucode/repo.bzl +++ b/third_party/uucode/repo.bzl @@ -21,7 +21,8 @@ _uucode_repo = repository_rule( def repo(): _uucode_repo( name = "uucode", - commit = "f1c687f09174f9f11eda14d3e3ce497d68ab09a6", + # main branch + commit = "1fb73433bba5d93366c57f23ff2e9d7939746500", build_config = "//third_party/uucode:build_config.zig", build_file = "//third_party/uucode:uucode.bazel", config_storage_patch = "//third_party/uucode:config-storage-module.patch", diff --git a/third_party/uucode/uucode.bazel b/third_party/uucode/uucode.bazel index f2b5634d..4a3710f2 100644 --- a/third_party/uucode/uucode.bazel +++ b/third_party/uucode/uucode.bazel @@ -8,6 +8,7 @@ zig_library( main = "src/config.zig", srcs = [ "src/components.zig", + "src/ucd_inputs.zig", "src/fields.zig", "src/multi_slice.zig", "src/quirks.zig", @@ -51,6 +52,7 @@ zig_library( main = "src/config.zig", srcs = [ "src/components.zig", + "src/ucd_inputs.zig", "src/fields.zig", "src/multi_slice.zig", "src/quirks.zig", diff --git a/third_party/zigimg/bump-zig.patch b/third_party/zigimg/bump-zig.patch deleted file mode 100644 index b668dadc..00000000 --- a/third_party/zigimg/bump-zig.patch +++ /dev/null @@ -1,4491 +0,0 @@ -diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml -index 400aee8..72ad6f9 100644 ---- a/.github/workflows/main.yml -+++ b/.github/workflows/main.yml -@@ -25,7 +25,7 @@ jobs: - - name: Setup Zig - uses: mlugg/setup-zig@v2 - with: -- version: 0.15.2 -+ version: 0.16.0-dev.2261+d6b3dd25a - - name: AST Verify - run: zig fmt --check --ast-check src/ - working-directory: zigimg -diff --git a/build.zig.zon b/build.zig.zon -index 3ff4816..536d37b 100644 ---- a/build.zig.zon -+++ b/build.zig.zon -@@ -1,7 +1,7 @@ - .{ - .name = .zigimg, - .fingerprint = 0x6d2b443cdaa8f7f3, -- .minimum_zig_version = "0.15.2", -+ .minimum_zig_version = "0.16.0-dev.2261+d6b3dd25a", - .version = "0.1.0", - .paths = .{ - "build.zig", -diff --git a/src/Image.zig b/src/Image.zig -index d67cd61..6472129 100644 ---- a/src/Image.zig -+++ b/src/Image.zig -@@ -71,7 +71,7 @@ pub const WriteError = Error || - std.mem.Allocator.Error || - io.ReadStream.Error || - io.WriteStream.Error || -- std.fs.File.OpenError || -+ std.Io.File.OpenError || - error{ EndOfStream, InvalidData, UnfinishedBits }; - - pub const ConvertError = Error || -@@ -101,7 +101,7 @@ - }; - - pub const Animation = struct { -- frames: FrameList = .{}, -+ frames: FrameList = .empty, - loop_count: i32 = AnimationLoopInfinite, - - pub const FrameList = std.ArrayList(AnimationFrame); -@@ -150,16 +150,16 @@ pub fn deinit(self: *Image, allocator: std.mem.Allocator) void { - } - - /// Detect which image format is used by the file path --pub fn detectFormatFromFilePath(file_path: []const u8, read_buffer: []u8) !Format { -- var file = try std.fs.cwd().openFile(file_path, .{}); -- defer file.close(); -+pub fn detectFormatFromFilePath(std_io: std.Io, file_path: []const u8, read_buffer: []u8) !Format { -+ var file = try std.Io.Dir.openFile(std.Io.Dir.cwd(), std_io, file_path, .{}); -+ defer file.close(std_io); - -- return detectFormatFromFile(file, read_buffer); -+ return detectFormatFromFile(std_io, file, read_buffer); - } - - /// Detect which image format is used by the file --pub fn detectFormatFromFile(file: std.fs.File, read_buffer: []u8) !Format { -- var read_stream = io.ReadStream.initFile(file, read_buffer); -+pub fn detectFormatFromFile(std_io: std.Io, file: std.Io.File, read_buffer: []u8) !Format { -+ var read_stream = io.ReadStream.initFile(std_io, file, read_buffer); - return internalDetectFormat(&read_stream); - } - -@@ -170,16 +170,16 @@ pub fn detectFormatFromMemory(buffer: []const u8) !Format { - } - - /// Load an image from a file path --pub fn fromFilePath(allocator: std.mem.Allocator, file_path: []const u8, read_buffer: []u8) !Image { -- var file = try std.fs.cwd().openFile(file_path, .{}); -- defer file.close(); -+pub fn fromFilePath(allocator: std.mem.Allocator, std_io: std.Io, file_path: []const u8, read_buffer: []u8) !Image { -+ var file = try std.Io.Dir.openFile(std.Io.Dir.cwd(), std_io, file_path, .{}); -+ defer file.close(std_io); - -- return fromFile(allocator, file, read_buffer); -+ return fromFile(allocator, std_io, file, read_buffer); - } - --/// Load an image from a standard library std.fs.File --pub fn fromFile(allocator: std.mem.Allocator, file: std.fs.File, read_buffer: []u8) !Image { -- var read_stream = io.ReadStream.initFile(file, read_buffer); -+/// Load an image from a standard library std.Io.File -+pub fn fromFile(allocator: std.mem.Allocator, std_io: std.Io, file: std.Io.File, read_buffer: []u8) !Image { -+ var read_stream = io.ReadStream.initFile(std_io, file, read_buffer); - return internalRead(allocator, &read_stream); - } - -@@ -260,16 +260,16 @@ pub fn toManaged(self: Image, allocator: std.mem.Allocator) Managed { - } - - /// Write the image to an image format to the specified path --pub fn writeToFilePath(self: Image, allocator: std.mem.Allocator, file_path: []const u8, write_buffer: []u8, encoder_options: EncoderOptions) WriteError!void { -- var file = try std.fs.cwd().createFile(file_path, .{}); -- defer file.close(); -+pub fn writeToFilePath(self: Image, allocator: std.mem.Allocator, std_io: std.Io, file_path: []const u8, write_buffer: []u8, encoder_options: EncoderOptions) WriteError!void { -+ var file = try std.Io.Dir.createFile(std.Io.Dir.cwd(), std_io, file_path, .{}); -+ defer file.close(std_io); - -- try self.writeToFile(allocator, file, write_buffer, encoder_options); -+ try self.writeToFile(allocator, std_io, file, write_buffer, encoder_options); - } - --/// Write the image to an image format to the specified std.fs.File --pub fn writeToFile(self: Image, allocator: std.mem.Allocator, file: std.fs.File, write_buffer: []u8, encoder_options: EncoderOptions) WriteError!void { -- var write_stream = io.WriteStream.initFile(file, write_buffer); -+/// Write the image to an image format to the specified std.Io.File -+pub fn writeToFile(self: Image, allocator: std.mem.Allocator, std_io: std.Io, file: std.Io.File, write_buffer: []u8, encoder_options: EncoderOptions) WriteError!void { -+ var write_stream = io.WriteStream.initFile(std_io, file, write_buffer); - - try self.internalWrite(allocator, &write_stream, encoder_options); - } -diff --git a/src/Image/Managed.zig b/src/Image/Managed.zig -index 608b1d6..1517e7c 100644 ---- a/src/Image/Managed.zig -+++ b/src/Image/Managed.zig -@@ -20,14 +20,16 @@ width: usize = 0, - height: usize = 0, - pixels: color.PixelStorage = .{ .invalid = void{} }, - animation: Animation = .{}, -+io: std.Io = undefined, - allocator: std.mem.Allocator = undefined, // Allocator needs to be last in order to be able to ptrCast to Image - - const Managed = @This(); - - /// Init an empty image with no pixel data --pub fn init(allocator: std.mem.Allocator) Managed { -+pub fn init(allocator: std.mem.Allocator, io: std.Io) Managed { - return Managed{ - .allocator = allocator, -+ .io = io, - }; - } - -@@ -37,13 +39,13 @@ pub fn deinit(self: *Managed) void { - } - - /// Detect which image format is used by the file path --pub fn detectFormatFromFilePath(file_path: []const u8, read_buffer: []u8) !Format { -- return Image.detectFormatFromFilePath(file_path, read_buffer); -+pub fn detectFormatFromFilePath(io: std.Io, file_path: []const u8, read_buffer: []u8) !Format { -+ return Image.detectFormatFromFilePath(io, file_path, read_buffer); - } - - /// Detect which image format is used by the file --pub fn detectFormatFromFile(file: std.fs.File, read_buffer: []u8) !Format { -- return Image.detectFormatFromFile(file, read_buffer); -+pub fn detectFormatFromFile(io: std.Io, file: std.Io.File, read_buffer: []u8) !Format { -+ return Image.detectFormatFromFile(io, file, read_buffer); - } - - /// Detect which image format is used by the memory buffer -@@ -52,13 +54,13 @@ pub fn detectFormatFromMemory(buffer: []const u8) !Format { - } - - /// Load an image from a file path --pub fn fromFilePath(allocator: std.mem.Allocator, file_path: []const u8, read_buffer: []u8) !Managed { -- return (try Image.fromFilePath(allocator, file_path, read_buffer)).toManaged(allocator); -+pub fn fromFilePath(allocator: std.mem.Allocator, io: std.Io, file_path: []const u8, read_buffer: []u8) !Managed { -+ return (try Image.fromFilePath(allocator, io, file_path, read_buffer)).toManaged(allocator); - } - --/// Load an image from a standard library std.fs.File --pub fn fromFile(allocator: std.mem.Allocator, file: std.fs.File, read_buffer: []u8) !Managed { -- return (try Image.fromFile(allocator, file, read_buffer)).toManaged(allocator); -+/// Load an image from a standard library std.Io.File -+pub fn fromFile(allocator: std.mem.Allocator, io: std.Io, file: std.Io.File, read_buffer: []u8) !Managed { -+ return (try Image.fromFile(allocator, io, file, read_buffer)).toManaged(allocator); - } - - /// Load an image from a memory buffer -@@ -116,12 +118,12 @@ pub fn isAnimation(self: Managed) bool { - - /// Write the image to an image format to the specified path - pub fn writeToFilePath(self: Managed, file_path: []const u8, write_buffer: []u8, encoder_options: EncoderOptions) WriteError!void { -- return Image.writeToFilePath(self.toUnmanaged(), self.allocator, file_path, write_buffer, encoder_options); -+ return Image.writeToFilePath(self.toUnmanaged(), self.allocator, self.io, file_path, write_buffer, encoder_options); - } - --/// Write the image to an image format to the specified std.fs.File --pub fn writeToFile(self: Managed, file: std.fs.File, write_buffer: []u8, encoder_options: EncoderOptions) WriteError!void { -- return Image.writeToFile(self.toUnmanaged(), self.allocator, file, write_buffer, encoder_options); -+/// Write the image to an image format to the specified std.Io.File -+pub fn writeToFile(self: Managed, file: std.Io.File, write_buffer: []u8, encoder_options: EncoderOptions) WriteError!void { -+ return Image.writeToFile(self.toUnmanaged(), self.allocator, file, self.io, write_buffer, encoder_options); - } - - /// Write the image to an image format in a memory buffer. The memory buffer is not grown -diff --git a/src/color.zig b/src/color.zig -index 4591bce..8a1a6ac 100644 ---- a/src/color.zig -+++ b/src/color.zig -@@ -55,10 +55,7 @@ pub fn ScaleValue(comptime T: type) fn (anytype) T { - // In order to fit `value * out_max` we need an - // int of size `in_bits + out_bits` in the worst - // case scenario. -- const FitInt = @Type(.{ .int = .{ -- .bits = in_bits + out_bits, -- .signedness = .unsigned, -- } }); -+ const FitInt = @Int(.unsigned, in_bits + out_bits); - - return @truncate((@as(FitInt, value) * out_max + in_max / 2) / in_max); - } else return value; -@@ -395,7 +392,7 @@ fn ToMethods( - return packed struct(u0) { - const To = @This(); - -- fn getSelf(to: *const To) *align(1) const T { -+ fn getSelf(to: anytype) *align(1) const T { - // @fieldParentPtr is broken for packed structs. - // See: https://github.com/ziglang/zig/issues/20458 - if (@typeInfo(T).@"struct".layout == .@"packed") { -@@ -408,47 +405,47 @@ fn ToMethods( - } - - /// Assumes the target color type has `FromMethods` for it. -- pub fn color(to: *const To, ColorT: type) ColorT { -- return ColorT.from.color(to.getSelf().*); -+ pub fn color(to: anytype, ColorT: type) ColorT { -+ return ColorT.from.color(getSelf(to).*); - } - -- pub fn u32Rgba(to: *const To) u32 { -- const self = to.getSelf(); -+ pub fn u32Rgba(to: anytype) u32 { -+ const self = getSelf(to); - return @as(u32, toU8(self.r)) << 24 | - @as(u32, toU8(self.g)) << 16 | - @as(u32, toU8(self.b)) << 8 | - if (has_alpha) toU8(self.a) else 0xff; - } - -- pub fn u32Rgb(to: *const To) u32 { -- const self = to.getSelf(); -+ pub fn u32Rgb(to: anytype) u32 { -+ const self = getSelf(to); - return @as(u32, toU8(self.r)) << 16 | - @as(u32, toU8(self.g)) << 8 | - toU8(self.b); - } - -- pub fn u64Rgba(to: *const To) u64 { -- const self = to.getSelf(); -+ pub fn u64Rgba(to: anytype) u64 { -+ const self = getSelf(to); - return @as(u64, toU16(self.r)) << 48 | - @as(u64, toU16(self.g)) << 32 | - @as(u64, toU16(self.b)) << 16 | - if (has_alpha) toU16(self.a) else 0xffff; - } - -- pub fn u64Rgb(to: *const To) u64 { -- const self = to.getSelf(); -+ pub fn u64Rgb(to: anytype) u64 { -+ const self = getSelf(to); - return @as(u64, toU16(self.r)) << 32 | - @as(u64, toU16(self.g)) << 16 | - toU16(self.b); - } - - /// Only valid for color types where all channels are the same type. -- pub fn array(to: *const To) [4]RedT { -+ pub fn array(to: anytype) [4]RedT { - if (comptime multiple_channel_types) { - @compileError("Color.to.array may only be used when all channels in the color are the same type."); - } - -- const self = to.getSelf(); -+ const self = getSelf(to); - - return .{ - self.r, -@@ -461,8 +458,8 @@ fn ToMethods( - }; - } - -- pub fn float4(to: *const To) math.float4 { -- const self = to.getSelf(); -+ pub fn float4(to: anytype) math.float4 { -+ const self = getSelf(to); - - return .{ - toF32(self.r), -@@ -477,8 +474,8 @@ fn ToMethods( - - /// For int channels, premultiplication - /// is done with a round-trip to f32. -- pub fn premultipliedAlpha(to: *const To) T { -- const self = to.getSelf(); -+ pub fn premultipliedAlpha(to: anytype) T { -+ const self = getSelf(to); - var res = self.*; - if (!has_alpha) return res; - -diff --git a/src/formats/pam.zig b/src/formats/pam.zig -index f366d95..7ef9833 100644 ---- a/src/formats/pam.zig -+++ b/src/formats/pam.zig -@@ -70,7 +70,7 @@ - var maybe_maxval: ?u16 = null; - var maybe_tuple_type: ?TupleType = null; -- var comments = std.ArrayListUnmanaged([]const u8){}; -+ var comments: std.ArrayListUnmanaged([]const u8) = .empty; - defer { - for (comments.items) |comment| allocator.free(comment); - comments.deinit(allocator); -@@ -77,7 +77,7 @@ const Header = struct { - } - - { -- var line_buffer_stream = try std.io.Writer.Allocating.initCapacity(allocator, 32); -+ var line_buffer_stream = try std.Io.Writer.Allocating.initCapacity(allocator, 32); - defer line_buffer_stream.deinit(); - - while (true) { -diff --git a/src/formats/pcx.zig b/src/formats/pcx.zig -index b694762..52c2bb0 100644 ---- a/src/formats/pcx.zig -+++ b/src/formats/pcx.zig -@@ -218,7 +218,7 @@ test "PCX RLE Fast encoder" { - const uncompressed_data = [_]u8{ 1, 1, 1, 1, 1, 1, 1, 1, 1, 64, 64, 2, 2, 2, 2, 2, 215, 215, 215, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 200, 200, 200, 200, 210, 210 }; - const compressed_data = [_]u8{ 0xC9, 0x01, 0xC2, 0x40, 0xC5, 0x02, 0xC3, 0xD7, 0xCA, 0x03, 0xC4, 0xC8, 0xC2, 0xD2 }; - -- var writer_alloc = std.io.Writer.Allocating.init(std.testing.allocator); -+ var writer_alloc = std.Io.Writer.Allocating.init(std.testing.allocator); - defer writer_alloc.deinit(); - - try RLEFastEncoder.encode(uncompressed_data[0..], &writer_alloc.writer); -@@ -233,7 +233,7 @@ test "PCX RLE Fast encoder should encore more than 63 bytes similar" { - - const compressed_data = [_]u8{ 0xFF, 0x45, 0x45, 0x45, 0xC4, 0x1 }; - -- var writer_alloc = std.io.Writer.Allocating.init(std.testing.allocator); -+ var writer_alloc = std.Io.Writer.Allocating.init(std.testing.allocator); - defer writer_alloc.deinit(); - - try RLEFastEncoder.encode(uncompressed_data[0..], &writer_alloc.writer); -diff --git a/src/formats/tiff/types.zig b/src/formats/tiff/types.zig -index 8bcce86..067480a 100644 ---- a/src/formats/tiff/types.zig -+++ b/src/formats/tiff/types.zig -@@ -335,7 +335,7 @@ pub const IFD = struct { - // Skip unknown tags instead of panicking on invalid enum values. - // Many TIFF files contain vendor/proprietary tags (Make, Model, ICC profile, etc.) - // that we don't need to handle for image decoding. -- const maybe_tag_id = std.meta.intToEnum(TagId, tag_id_raw) catch continue; -+ const maybe_tag_id = std.enums.fromInt(TagId, tag_id_raw) orelse continue; - - try self.tags_map.put(maybe_tag_id, TagField{ - .data_type = std.mem.toNative(u16, tag.data_type, endianess), -diff --git a/src/formats/xbm.zig b/src/formats/xbm.zig -index d72e4ec..19ac9c0 100644 ---- a/src/formats/xbm.zig -+++ b/src/formats/xbm.zig -@@ -100,7 +100,7 @@ pub const XBM = struct { - - var line_full = try reader.takeDelimiterInclusive('\n'); - while (line_full.len > 0) { -- const line = std.mem.trimRight(u8, line_full, " \r\n"); -+ const line = std.mem.trimEnd(u8, line_full, " \r\n"); - if (isDefineLine(line)) { - if (parseDefineValue(line)) |value| { - if (width == null) { -diff --git a/src/io.zig b/src/io.zig -index 2c1363d..8d463a1 100644 ---- a/src/io.zig -+++ b/src/io.zig -@@ -5,11 +5,11 @@ pub const DEFAULT_BUFFER_SIZE = 4096; - - pub const ReadStream = union(enum) { - memory: std.Io.Reader, -- file: std.fs.File.Reader, -+ file: std.Io.File.Reader, - - pub const Error = SeekError || EndPosError || std.Io.Reader.Error || std.Io.Reader.StreamError; -- pub const SeekError = std.fs.File.Reader.SeekError; -- pub const EndPosError = std.fs.File.Reader.SizeError; -+ pub const SeekError = std.Io.File.Reader.SeekError; -+ pub const EndPosError = std.Io.File.Reader.SizeError; - - pub fn initMemory(buffer: []const u8) ReadStream { - return .{ -@@ -17,9 +17,9 @@ pub const ReadStream = union(enum) { - }; - } - -- pub fn initFile(file: std.fs.File, buffer: []u8) ReadStream { -+ pub fn initFile(io: std.Io, file: std.Io.File, buffer: []u8) ReadStream { - return .{ -- .file = file.reader(buffer), -+ .file = file.reader(io, buffer), - }; - } - -@@ -58,7 +58,7 @@ pub const ReadStream = union(enum) { - .memory => |*memory| { - const new_pos: i64 = @as(i64, @intCast(memory.seek)) + offset; - if (new_pos < 0 or new_pos >= memory.end) { -- return std.fs.File.SeekError.Unseekable; -+ return std.Io.File.SeekError.Unseekable; - } - - memory.seek = @intCast(new_pos); -@@ -96,10 +96,10 @@ pub const ReadStream = union(enum) { - - pub const WriteStream = union(enum) { - memory: std.Io.Writer, -- file: std.fs.File.Writer, -+ file: std.Io.File.Writer, - - pub const Error = SeekError || std.Io.Writer.Error; -- pub const SeekError = std.fs.File.SeekError; -+ pub const SeekError = std.Io.File.SeekError || std.Io.Writer.Error; - - pub fn initMemory(buffer: []u8) WriteStream { - return .{ -@@ -107,9 +107,9 @@ pub const WriteStream = union(enum) { - }; - } - -- pub fn initFile(file: std.fs.File, buffer: []u8) WriteStream { -+ pub fn initFile(io: std.Io, file: std.Io.File, buffer: []u8) WriteStream { - return .{ -- .file = file.writer(buffer), -+ .file = file.writer(io, buffer), - }; - } - -diff --git a/src/math.zig b/src/math.zig -index c4e5910..bad9687 100644 ---- a/src/math.zig -+++ b/src/math.zig -@@ -24,11 +24,11 @@ pub fn Matrix(comptime T: type) type { - var temp = self; - - // To find the determinant, use a Gaussian elimination to transform the temp matrix into the row echelon form -- for (0..(ComponentSize - 1)) |row| { -- for ((row + 1)..ComponentSize) |next_row| { -+ inline for (0..(ComponentSize - 1)) |row| { -+ inline for ((row + 1)..ComponentSize) |next_row| { - const factor = temp.matrix[next_row][row] / temp.matrix[row][row]; - -- for (0..ComponentSize) |column| { -+ inline for (0..ComponentSize) |column| { - temp.matrix[next_row][column] = temp.matrix[next_row][column] - factor * temp.matrix[row][column]; - } - } -@@ -37,7 +37,7 @@ pub fn Matrix(comptime T: type) type { - // Once the temp matrix is in row echelon form, multiply the diagonal to find the determinant - var result: f32 = temp.matrix[0][0]; - -- for (1..ComponentSize) |diagonal| { -+ inline for (1..ComponentSize) |diagonal| { - result *= temp.matrix[diagonal][diagonal]; - } - -@@ -48,9 +48,9 @@ pub fn Matrix(comptime T: type) type { - pub fn fromArray(array: [ComponentSize * ComponentSize]f32) Self { - var result: Self = undefined; - -- for (0..ComponentSize) |row| { -+ inline for (0..ComponentSize) |row| { - const stride = row * ComponentSize; -- for (0..ComponentSize) |column| { -+ inline for (0..ComponentSize) |column| { - result.matrix[row][column] = array[stride + column]; - } - } -@@ -72,20 +72,20 @@ pub fn Matrix(comptime T: type) type { - var temp = self; - var result: Self = identity(); - -- for (0..ComponentSize) |row| { -+ inline for (0..ComponentSize) |row| { - // Transform the pivot to 1 by multiplying the row by its inverse - const inverse_pivot = 1.0 / temp.matrix[row][row]; - -- for (0..ComponentSize) |column| { -+ inline for (0..ComponentSize) |column| { - temp.matrix[row][column] *= inverse_pivot; - result.matrix[row][column] *= inverse_pivot; - } - - // Then do Gaussian elimination from current row to bottom -- for ((row + 1)..ComponentSize) |next_row| { -+ inline for ((row + 1)..ComponentSize) |next_row| { - const factor = temp.matrix[next_row][row] / temp.matrix[row][row]; - -- for (0..ComponentSize) |column| { -+ inline for (0..ComponentSize) |column| { - temp.matrix[next_row][column] = temp.matrix[next_row][column] - factor * temp.matrix[row][column]; - result.matrix[next_row][column] = result.matrix[next_row][column] - factor * result.matrix[row][column]; - } -@@ -94,14 +94,12 @@ pub fn Matrix(comptime T: type) type { - - // Then do a Gaussian elimination bottom-up to transform the temp matrix into an identity matrix. - // The result will be the inverse of the matrix -- var row: usize = ComponentSize -% 1; -- while (row >= 1 and row < ComponentSize) : (row -%= 1) { -- var previous_row = row -% 1; -- -- while (previous_row >= 0 and previous_row < ComponentSize) : (previous_row -%= 1) { -+ inline for (1..ComponentSize) |i| { -+ const row = ComponentSize - i; -+ inline for (0..row) |previous_row| { - const factor = temp.matrix[previous_row][row] / temp.matrix[row][row]; - -- for (0..ComponentSize) |column| { -+ inline for (0..ComponentSize) |column| { - temp.matrix[previous_row][column] = temp.matrix[previous_row][column] - factor * temp.matrix[row][column]; - result.matrix[previous_row][column] = result.matrix[previous_row][column] - factor * result.matrix[row][column]; - } -@@ -126,8 +124,8 @@ pub fn Matrix(comptime T: type) type { - - const transposed_right = right.transpose(); - -- for (0..ComponentSize) |row| { -- for (0..ComponentSize) |column| { -+ inline for (0..ComponentSize) |row| { -+ inline for (0..ComponentSize) |column| { - result.matrix[row][column] = @reduce(.Add, self.matrix[row] * transposed_right.matrix[column]); - } - } -@@ -138,8 +136,8 @@ pub fn Matrix(comptime T: type) type { - pub fn transpose(self: Self) Self { - var result = std.mem.zeroes(Self); - -- for (0..ComponentSize) |row| { -- for (0..ComponentSize) |column| { -+ inline for (0..ComponentSize) |row| { -+ inline for (0..ComponentSize) |column| { - result.matrix[row][column] = self.matrix[column][row]; - } - } -diff --git a/src/simd.zig b/src/simd.zig -index 20c5dcb..cb115c9 100644 ---- a/src/simd.zig -+++ b/src/simd.zig -@@ -78,8 +78,10 @@ pub fn vpermd(v: @Vector(8, i32), mask: @Vector(8, i32)) @Vector(8, i32) { - [v] "x" (v), - ); - } else { -- var res: @Vector(8, i32) = undefined; -- inline for (0..8) |i| res[i] = v[@as(u32, @bitCast(mask[i]))]; -+ const v_arr: [8]i32 = v; -+ const mask_arr: [8]i32 = mask; -+ var res: [8]i32 = undefined; -+ for (0..8) |i| res[i] = v_arr[@intCast(mask_arr[i] & 7)]; - return res; - } - } -diff --git a/src/utils.zig b/src/utils.zig -index f55c12c..a12733e 100644 ---- a/src/utils.zig -+++ b/src/utils.zig -@@ -4,7 +4,7 @@ const std = @import("std"); - const native_endian = builtin.target.cpu.arch.endian(); - - pub const StructReadError = error{InvalidData} || std.Io.Reader.Error; --pub const StructWriteError = std.io.StreamSource.WriteError; -+pub const StructWriteError = std.Io.Writer.Error; - - pub fn FixedStorage(comptime T: type, comptime storage_size: usize) type { - return struct { -diff --git a/tests/formats/bmp_test.zig b/tests/formats/bmp_test.zig -index cc80b74..635dc04 100644 ---- a/tests/formats/bmp_test.zig -+++ b/tests/formats/bmp_test.zig -@@ -87,12 +87,12 @@ fn verifyBitmapRGBAV5(the_bitmap: bmp.BMP, pixels: zigimg.color.PixelStorage) !v - - test "Read simple version 4 24-bit RGB bitmap" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "bmp/simple_v4.bmp"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_bitmap = bmp.BMP{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_bitmap.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -145,10 +145,10 @@ test "Read simple version 4 24-bit RGB bitmap" { - - test "Read a valid version 5 RGBA bitmap from file" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "bmp/windows_rgba_v5.bmp"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var the_bitmap = bmp.BMP{}; - -@@ -174,10 +174,10 @@ test "Read a valid version 5 RGBA bitmap from memory" { - - test "Should error when reading an invalid file" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "bmp/notbmp.png"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var the_bitmap = bmp.BMP{}; - -@@ -215,17 +215,17 @@ test "Write a v4 bitmap when writing an image with bgr24 pixel format" { - pixels.bgr24[7] = zigimg.color.Bgr24.from.rgb(255, 255, 0); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ .bmp = .{} }); -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ .bmp = .{} }); - - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var read_bmp = bmp.BMP{}; - -@@ -277,17 +277,17 @@ test "Write a v5 bitmap when writing an image with bgra32 pixel format" { - pixels.bgra32[8] = zigimg.color.Bgra32.from.rgba(0, 0, 0, 0); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ .bmp = .{} }); -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ .bmp = .{} }); - - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var read_bmp = bmp.BMP{}; - -diff --git a/tests/formats/farbfeld_test.zig b/tests/formats/farbfeld_test.zig -index a48a7fb..00a73a0 100644 ---- a/tests/formats/farbfeld_test.zig -+++ b/tests/formats/farbfeld_test.zig -@@ -5,10 +5,10 @@ const farbfeld = zigimg.formats.farbfeld; - - test "Farbfeld: Read yellow file" { - const yellow_file = try helpers.testOpenFile(helpers.fixtures_path ++ "farbfeld/yellow-1x1-semitransparent.png.ff"); -- defer yellow_file.close(); -+ defer yellow_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var yellow_read_stream = zigimg.io.ReadStream.initFile(yellow_file, read_buffer[0..]); -+ var yellow_read_stream = zigimg.io.ReadStream.initFile(std.testing.io, yellow_file, read_buffer[0..]); - - var yellow_image = farbfeld.Farbfeld{}; - const yellow_pixels = try yellow_image.read(helpers.zigimg_test_allocator, &yellow_read_stream); -@@ -21,10 +21,10 @@ test "Farbfeld: Read yellow file" { - - test "Farbfeld: read dragon file" { - const dragon_file = try helpers.testOpenFile(helpers.fixtures_path ++ "farbfeld/dragon.ff"); -- defer dragon_file.close(); -+ defer dragon_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var dragon_read_stream = zigimg.io.ReadStream.initFile(dragon_file, read_buffer[0..]); -+ var dragon_read_stream = zigimg.io.ReadStream.initFile(std.testing.io, dragon_file, read_buffer[0..]); - - var dragon_image = farbfeld.Farbfeld{}; - const dragon_pixels = try dragon_image.read(helpers.zigimg_test_allocator, &dragon_read_stream); -@@ -37,10 +37,10 @@ test "Farbfeld: read dragon file" { - - test "Farbfeld: invalid file format" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "farbfeld/dragon.png"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var farbfeld_image = farbfeld.Farbfeld{}; - const image_error = farbfeld_image.read(helpers.zigimg_test_allocator, &read_stream); -@@ -50,10 +50,10 @@ test "Farbfeld: invalid file format" { - - test "Farbfeld: read writeImage output" { - const source_file = try helpers.testOpenFile(helpers.fixtures_path ++ "farbfeld/yellow-1x1-semitransparent.png.ff"); -- defer source_file.close(); -+ defer source_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var source_read_stream = zigimg.io.ReadStream.initFile(source_file, read_buffer[0..]); -+ var source_read_stream = zigimg.io.ReadStream.initFile(std.testing.io, source_file, read_buffer[0..]); - - var source_image: farbfeld.Farbfeld = .{}; - const source_pixels = try source_image.read(helpers.zigimg_test_allocator, &source_read_stream); -diff --git a/tests/formats/gif_test.zig b/tests/formats/gif_test.zig -index 496e14f..bdd84f6 100644 ---- a/tests/formats/gif_test.zig -+++ b/tests/formats/gif_test.zig -@@ -325,10 +325,10 @@ test "GIF writer roundtrip read existing GIF, write, read again" { - - // Read an existing GIF file using low-level reader - const gif_input_file = try helpers.testOpenFile(helpers.fixtures_path ++ "gif/rotating_earth.gif"); -- defer gif_input_file.close(); -+ defer gif_input_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(gif_input_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, gif_input_file, read_buffer[0..]); - - var original_gif = gif.GIF.init(allocator); - defer original_gif.deinit(); -@@ -489,10 +489,10 @@ test "GIF writer rejects non-indexed data without auto convert" { - - test "Should error on non GIF images" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "bmp/simple_v4.bmp"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var gif_file = gif.GIF.init(helpers.zigimg_test_allocator); - defer gif_file.deinit(); -@@ -563,7 +563,7 @@ const SINGLE_GIF_FILE_TEST = false; - fn loadRotatingEarthImage(allocator: std.mem.Allocator) !zigimg.Image { - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - const image_path = helpers.fixtures_path ++ "gif/rotating_earth.gif"; -- return zigimg.Image.fromFilePath(allocator, image_path, read_buffer[0..]); -+ return zigimg.Image.fromFilePath(allocator, std.testing.io, image_path, read_buffer[0..]); - } - - test "GIF test suite" { -@@ -575,10 +575,10 @@ test "GIF test suite" { - defer test_list.deinit(helpers.zigimg_test_allocator); - - const test_list_file = try helpers.testOpenFile(helpers.fixtures_path ++ "gif/TESTS"); -- defer test_list_file.close(); -+ defer test_list_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(test_list_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, test_list_file, read_buffer[0..]); - - var reader = read_stream.reader(); - -@@ -598,11 +598,11 @@ test "GIF test suite" { - for (test_list.items) |entry| { - doGifTest(entry) catch |err| { - has_failed_file = true; -- std.debug.print("Error: {}\n", .{err}); -+ std.log.info("Error: {}\n", .{err}); - continue; - }; - -- std.debug.print("OK\n", .{}); -+ std.log.info("OK\n", .{}); - } - - if (has_failed_file) { -@@ -612,10 +612,10 @@ test "GIF test suite" { - - test "Rotating Earth GIF" { - const gif_input_file = try helpers.testOpenFile(helpers.fixtures_path ++ "gif/rotating_earth.gif"); -- defer gif_input_file.close(); -+ defer gif_input_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(gif_input_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, gif_input_file, read_buffer[0..]); - - var gif_file = gif.GIF.init(helpers.zigimg_test_allocator); - defer gif_file.deinit(); -@@ -710,8 +710,8 @@ const IniFile = struct { - const equals_sign_position_opt = std.mem.indexOf(u8, read_line[0..], "="); - - if (equals_sign_position_opt) |equals_sign_position| { -- const key_name = std.mem.trimRight(u8, read_line[0..(equals_sign_position - 1)], " "); -- const string_value = std.mem.trimLeft(u8, read_line[(equals_sign_position + 1)..], " "); -+ const key_name = std.mem.trimEnd(u8, read_line[0..(equals_sign_position - 1)], " "); -+ const string_value = std.mem.trimStart(u8, read_line[(equals_sign_position + 1)..], " "); - - if (self.sections.getPtr(current_section)) |section_entry| { - const value = blk: { -@@ -760,7 +760,7 @@ const IniFile = struct { - }; - - fn doGifTest(entry_name: []const u8) !void { -- std.debug.print("GIF test {s}... ", .{entry_name}); -+ std.log.info("GIF test {s}... ", .{entry_name}); - - var area_alloc = std.heap.ArenaAllocator.init(helpers.zigimg_test_allocator); - const area_allocator = area_alloc.allocator(); -@@ -770,13 +770,13 @@ fn doGifTest(entry_name: []const u8) !void { - const config_filepath = try std.fs.path.resolve(area_allocator, &[_][]const u8{ helpers.fixtures_path, "gif", config_filename }); - - const config_file = try helpers.testOpenFile(config_filepath); -- defer config_file.close(); -+ defer config_file.close(std.testing.io); - - var config_ini = IniFile.init(helpers.zigimg_test_allocator); - defer config_ini.deinit(); - - var ini_read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var ini_read_stream = zigimg.io.ReadStream.initFile(config_file, ini_read_buffer[0..]); -+ var ini_read_stream = zigimg.io.ReadStream.initFile(std.testing.io, config_file, ini_read_buffer[0..]); - - try config_ini.parse(ini_read_stream.reader()); - -@@ -804,10 +804,10 @@ fn doGifTest(entry_name: []const u8) !void { - - const gif_input_filepath = try std.fs.path.resolve(area_allocator, &[_][]const u8{ helpers.fixtures_path, "gif", input_filename.string }); - const gif_input_file = try helpers.testOpenFile(gif_input_filepath); -- defer gif_input_file.close(); -+ defer gif_input_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(gif_input_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, gif_input_file, read_buffer[0..]); - - var gif_file = gif.GIF.init(helpers.zigimg_test_allocator); - defer gif_file.deinit(); -@@ -856,10 +856,10 @@ fn doGifTest(entry_name: []const u8) !void { - const pixels_filename = frame_section.getValue("pixels") orelse return error.InvalidGifConfigFile; - const pixels_filepath = try std.fs.path.resolve(area_allocator, &[_][]const u8{ helpers.fixtures_path, "gif", pixels_filename.string }); - const pixels_file = try helpers.testOpenFile(pixels_filepath); -- defer pixels_file.close(); -+ defer pixels_file.close(std.testing.io); - - var pixels_read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var pixels_read_stream = zigimg.io.ReadStream.initFile(pixels_file, pixels_read_buffer[0..]); -+ var pixels_read_stream = zigimg.io.ReadStream.initFile(std.testing.io, pixels_file, pixels_read_buffer[0..]); - - var pixels_reader = pixels_read_stream.reader(); - -@@ -894,7 +894,7 @@ fn doGifTest(entry_name: []const u8) !void { - try helpers.expectEq(actual_color.to.color(zigimg.color.Rgba32), gif_background_color); - } else { - helpers.expectEq(actual_color.to.color(zigimg.color.Rgba32), expected_color) catch |err| { -- std.debug.print("Pixel #{} does not match: expected={}, actual={}\n", .{ index, expected_color, actual_color.to.color(zigimg.color.Rgba32) }); -+ std.log.info("Pixel #{} does not match: expected={}, actual={}\n", .{ index, expected_color, actual_color.to.color(zigimg.color.Rgba32) }); - return err; - }; - } -@@ -929,27 +929,27 @@ fn doGifRoundtripTest(entry_name: []const u8) !RoundtripResult { - - // Build path to GIF file - const gif_filename = std.fmt.allocPrint(area_allocator, "{s}.gif", .{entry_name}) catch { -- std.debug.print("FAIL (allocPrint failed)\n", .{}); -+ std.log.info("FAIL (allocPrint failed)\n", .{}); - return .failed; - }; - const gif_filepath = std.fs.path.resolve(area_allocator, &[_][]const u8{ helpers.fixtures_path, "gif", gif_filename }) catch { -- std.debug.print("FAIL (path resolve failed)\n", .{}); -+ std.log.info("FAIL (path resolve failed)\n", .{}); - return .failed; - }; - - // Read original GIF -- const gif_input_file = try std.fs.cwd().openFile(gif_filepath, .{}); -- defer gif_input_file.close(); -+ const gif_input_file = try std.Io.Dir.openFile(std.Io.Dir.cwd(), std.testing.io, gif_filepath, .{}); -+ defer gif_input_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(gif_input_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, gif_input_file, read_buffer[0..]); - - var original_gif = gif.GIF.init(helpers.zigimg_test_allocator); - defer original_gif.deinit(); - - var original_frames = original_gif.read(&read_stream) catch { - // Reader correctly rejected bad data -- std.debug.print("OK (reader correctly rejected bad data)\n", .{}); -+ std.log.info("OK (reader correctly rejected bad data)\n", .{}); - return .passed; - }; - defer { -@@ -961,7 +961,7 @@ fn doGifRoundtripTest(entry_name: []const u8) !RoundtripResult { - - if (original_frames.items.len == 0) { - // No frames means nothing to write -- std.debug.print("OK (no frames to write)\n", .{}); -+ std.log.info("OK (no frames to write)\n", .{}); - return .passed; - } - -@@ -974,13 +974,13 @@ fn doGifRoundtripTest(entry_name: []const u8) !RoundtripResult { - - // Non-indexed formats can't be written without auto_convert - if (!image.pixelFormat().isIndexed()) { -- std.debug.print("OK (non-indexed format correctly not written: {s})\n", .{@tagName(image.pixels)}); -+ std.log.info("OK (non-indexed format correctly not written: {s})\n", .{@tagName(image.pixels)}); - return .passed; - } - - // Zero dimensions can't be written - if (image.width == 0 or image.height == 0) { -- std.debug.print("OK (zero dimensions correctly not written)\n", .{}); -+ std.log.info("OK (zero dimensions correctly not written)\n", .{}); - return .passed; - } - -@@ -991,16 +991,16 @@ fn doGifRoundtripTest(entry_name: []const u8) !RoundtripResult { - gif.GIF.writeImage(helpers.zigimg_test_allocator, &write_stream, image, .{ .gif = .{} }) catch |err| { - // For very large images, running out of buffer space is expected - if (err == error.WriteFailed and (image.width > 1000 or image.height > 1000)) { -- std.debug.print("OK (large image exceeded buffer)\n", .{}); -+ std.log.info("OK (large image exceeded buffer)\n", .{}); - return .passed; - } -- std.debug.print("FAIL (write error: {})\n", .{err}); -+ std.log.info("FAIL (write error: {})\n", .{err}); - return .failed; - }; - - const written_len = write_stream.writer().end; - if (written_len == 0) { -- std.debug.print("FAIL (wrote 0 bytes)\n", .{}); -+ std.log.info("FAIL (wrote 0 bytes)\n", .{}); - return .failed; - } - -@@ -1011,7 +1011,7 @@ fn doGifRoundtripTest(entry_name: []const u8) !RoundtripResult { - defer decoded_gif.deinit(); - - var decoded_frames = decoded_gif.read(&read_back_stream) catch |err| { -- std.debug.print("FAIL (read-back error: {})\n", .{err}); -+ std.log.info("FAIL (read-back error: {})\n", .{err}); - return .failed; - }; - defer { -@@ -1025,7 +1025,7 @@ fn doGifRoundtripTest(entry_name: []const u8) !RoundtripResult { - if (original_gif.header.width != decoded_gif.header.width or - original_gif.header.height != decoded_gif.header.height) - { -- std.debug.print("FAIL (dimension mismatch: {}x{} vs {}x{})\n", .{ -+ std.log.info("FAIL (dimension mismatch: {}x{} vs {}x{})\n", .{ - original_gif.header.width, - original_gif.header.height, - decoded_gif.header.width, -@@ -1036,7 +1036,7 @@ fn doGifRoundtripTest(entry_name: []const u8) !RoundtripResult { - - // Verify we got at least one frame - if (decoded_frames.items.len == 0) { -- std.debug.print("FAIL (no frames in output)\n", .{}); -+ std.log.info("FAIL (no frames in output)\n", .{}); - return .failed; - } - -@@ -1048,14 +1048,14 @@ fn doGifRoundtripTest(entry_name: []const u8) !RoundtripResult { - while (original_iter.next()) |original_color| { - const decoded_color_opt = decoded_iter.next(); - if (decoded_color_opt == null) { -- std.debug.print("FAIL (missing pixel at index {})\n", .{pixel_index}); -+ std.log.info("FAIL (missing pixel at index {})\n", .{pixel_index}); - return .failed; - } - const original = original_color.to.color(zigimg.color.Rgba32); - const decoded = decoded_color_opt.?.to.color(zigimg.color.Rgba32); - - if (original.r != decoded.r or original.g != decoded.g or original.b != decoded.b) { -- std.debug.print("FAIL (pixel {} mismatch: ({},{},{}) vs ({},{},{}))\n", .{ -+ std.log.info("FAIL (pixel {} mismatch: ({},{},{}) vs ({},{},{}))\n", .{ - pixel_index, original.r, original.g, original.b, decoded.r, decoded.g, decoded.b, - }); - return .failed; -@@ -1071,10 +1071,10 @@ test "GIF writer roundtrip test suite" { - defer test_list.deinit(helpers.zigimg_test_allocator); - - const test_list_file = try helpers.testOpenFile(helpers.fixtures_path ++ "gif/TESTS"); -- defer test_list_file.close(); -+ defer test_list_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(test_list_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, test_list_file, read_buffer[0..]); - - var reader = read_stream.reader(); - -diff --git a/tests/formats/iff_test.zig b/tests/formats/iff_test.zig -index ab2dd6b..6a3594d 100644 ---- a/tests/formats/iff_test.zig -+++ b/tests/formats/iff_test.zig -@@ -5,12 +5,12 @@ const zigimg = @import("zigimg"); - - test "IFF-PBM indexed8 (chunky Deluxe Paint DOS file)" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "ilbm/sample-pbm.iff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_iff = iff.IFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_iff.read(&read_stream, helpers.zigimg_test_allocator); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -37,12 +37,12 @@ test "IFF-PBM indexed8 (chunky Deluxe Paint DOS file)" { - - test "IFF-ILBM indexed8 8 bitplanes" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "ilbm/sample-ilbm-8bit-compressed.iff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_iff = iff.IFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_iff.read(&read_stream, helpers.zigimg_test_allocator); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -63,12 +63,12 @@ test "IFF-ILBM indexed8 8 bitplanes" { - - test "IFF-ILBM indexed8 8 bitplanes uncompressed" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "ilbm/sample-ilbm-8bit-uncompressed.iff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_iff = iff.IFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_iff.read(&read_stream, helpers.zigimg_test_allocator); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -89,12 +89,12 @@ test "IFF-ILBM indexed8 8 bitplanes uncompressed" { - - test "IFF-ILBM indexed8 6 bitplanes EHB" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "ilbm/sample-ehb.iff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_iff = iff.IFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_iff.read(&read_stream, helpers.zigimg_test_allocator); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -121,12 +121,12 @@ test "IFF-ILBM indexed8 6 bitplanes EHB" { - - test "IFF-ILBM indexed8 4 bitplanes HAM" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "ilbm/sample-ham.iff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_iff = iff.IFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_iff.read(&read_stream, helpers.zigimg_test_allocator); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -150,12 +150,12 @@ test "IFF-ILBM indexed8 4 bitplanes HAM" { - - test "IFF-ILBM indexed8 6 bitplanes HAM8" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "ilbm/sample-ham8.iff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_iff = iff.IFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_iff.read(&read_stream, helpers.zigimg_test_allocator); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -179,12 +179,12 @@ test "IFF-ILBM indexed8 6 bitplanes HAM8" { - - test "IFF-ILBM 24bit" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "ilbm/sample-24bit.iff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_iff = iff.IFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_iff.read(&read_stream, helpers.zigimg_test_allocator); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -208,12 +208,12 @@ test "IFF-ILBM 24bit" { - - test "IFF-ILBM indexed8 4 bitplanes Atari ST" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "ilbm/sample-ilbm-4bit-compressed-atari.iff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_iff = iff.IFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_iff.read(&read_stream, helpers.zigimg_test_allocator); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -240,12 +240,12 @@ test "IFF-ILBM indexed8 4 bitplanes Atari ST" { - - test "IFF-ACBM indexed8 3 bitplanes uncompressed" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "ilbm/sample-8bit.acbm"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_iff = iff.IFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_iff.read(&read_stream, helpers.zigimg_test_allocator); - defer pixels.deinit(helpers.zigimg_test_allocator); -diff --git a/tests/formats/jpeg_test.zig b/tests/formats/jpeg_test.zig -index 8288b62..0f1254f 100644 ---- a/tests/formats/jpeg_test.zig -+++ b/tests/formats/jpeg_test.zig -@@ -7,10 +7,10 @@ const color = zigimg.color; - - test "Should error on non JPEG images" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "bmp/simple_v4.bmp"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var jpeg_file = jpeg.JPEG.init(helpers.zigimg_test_allocator); - defer jpeg_file.deinit(); -@@ -28,10 +28,10 @@ test "Should error on non JPEG images" { - - test "Read JFIF header properly and decode simple Huffman stream" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "jpeg/huff_simple0.jpg"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var jpeg_file = jpeg.JPEG.init(helpers.zigimg_test_allocator); - defer jpeg_file.deinit(); -@@ -59,10 +59,10 @@ test "Read JFIF header properly and decode simple Huffman stream" { - - test "Read the tuba properly" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "jpeg/tuba.jpg"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var jpeg_file = jpeg.JPEG.init(helpers.zigimg_test_allocator); - defer jpeg_file.deinit(); -@@ -95,10 +95,10 @@ test "Read the tuba properly" { - - test "Read grayscale images" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "jpeg/grayscale_sample0.jpg"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var jpeg_file = jpeg.JPEG.init(helpers.zigimg_test_allocator); - defer jpeg_file.deinit(); -@@ -130,19 +130,19 @@ test "Read grayscale images" { - } - - test "Read subsampling images" { -- var testdir = std.fs.cwd().openDir(helpers.fixtures_path ++ "jpeg/", .{ .access_sub_paths = false, .no_follow = true, .iterate = true }) catch null; -+ var testdir = std.Io.Dir.openDir(std.Io.Dir.cwd(), std.testing.io, helpers.fixtures_path ++ "jpeg/", .{ .access_sub_paths = false, .iterate = true }) catch null; - if (testdir) |*idir| { -- defer idir.close(); -+ defer idir.close(std.testing.io); - - var it = idir.iterate(); -- while (try it.next()) |entry| { -+ while (try it.next(std.testing.io)) |entry| { - if (entry.kind != .file or !std.mem.endsWith(u8, entry.name, ".jpg") or !std.mem.startsWith(u8, entry.name, "subsampling_")) continue; - -- var test_file = try idir.openFile(entry.name, .{ .mode = .read_only }); -- defer test_file.close(); -+ var test_file = try idir.openFile(std.testing.io, entry.name, .{ .mode = .read_only }); -+ defer test_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(test_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, test_file, read_buffer[0..]); - - var jpeg_file = jpeg.JPEG.init(helpers.zigimg_test_allocator); - defer jpeg_file.deinit(); -@@ -182,10 +182,10 @@ test "Read subsampling images" { - - test "Read progressive jpeg with restart intervals" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "jpeg/tuba_restart_prog.jpg"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var jpeg_file = jpeg.JPEG.init(helpers.zigimg_test_allocator); - defer jpeg_file.deinit(); -@@ -403,10 +403,10 @@ test "JPEG writer round-trip with all test fixtures" { - for (test_fixtures) |fixture_path| { - // Skip if file doesn't exist - const file = helpers.testOpenFile(fixture_path) catch continue; -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [4096]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - var jpeg_file = jpeg.JPEG.init(helpers.zigimg_test_allocator); - defer jpeg_file.deinit(); - -diff --git a/tests/formats/netpbm_test.zig b/tests/formats/netpbm_test.zig -index ee06575..e0ffe05 100644 ---- a/tests/formats/netpbm_test.zig -+++ b/tests/formats/netpbm_test.zig -@@ -5,10 +5,10 @@ const zigimg = @import("zigimg"); - - test "Load ASCII PBM image" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "netpbm/pbm_ascii.pbm"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var pbm_file = netpbm.PBM{}; - -@@ -27,10 +27,10 @@ test "Load ASCII PBM image" { - - test "Load binary PBM image" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "netpbm/pbm_binary.pbm"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var pbm_file = netpbm.PBM{}; - -@@ -49,10 +49,10 @@ test "Load binary PBM image" { - - test "Load ASCII PGM 8-bit grayscale image" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "netpbm/pgm_ascii_grayscale8.pgm"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var pgm_file = netpbm.PGM{}; - -@@ -71,10 +71,10 @@ test "Load ASCII PGM 8-bit grayscale image" { - - test "Load Binary PGM 8-bit grayscale image" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "netpbm/pgm_binary_grayscale8.pgm"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var pgm_file = netpbm.PGM{}; - -@@ -93,10 +93,10 @@ test "Load Binary PGM 8-bit grayscale image" { - - test "Load ASCII PGM 16-bit grayscale image" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "netpbm/pgm_ascii_grayscale16.pgm"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var pgm_file = netpbm.PGM{}; - -@@ -115,10 +115,10 @@ test "Load ASCII PGM 16-bit grayscale image" { - - test "Load Binary PGM 16-bit grayscale image" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "netpbm/pgm_binary_grayscale16.pgm"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var pgm_file = netpbm.PGM{}; - -@@ -137,10 +137,10 @@ test "Load Binary PGM 16-bit grayscale image" { - - test "Load ASCII PPM image" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "netpbm/ppm_ascii_rgb24.ppm"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var ppm_file = netpbm.PPM{}; - -@@ -176,10 +176,10 @@ test "Load ASCII PPM image" { - - test "Load binary PPM image" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "netpbm/ppm_binary_rgb24.ppm"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var ppm_file = netpbm.PPM{}; - -@@ -234,16 +234,16 @@ test "Write bitmap(grayscale1) ASCII PBM file" { - } - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ - .pbm = .{ .binary = false }, - }); - - defer { -- std.fs.cwd().deleteFile(image_file_name) catch unreachable; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch unreachable; - } - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_image = try zigimg.Image.fromFilePath(helpers.zigimg_test_allocator, image_file_name, read_buffer[0..]); -+ var read_image = try zigimg.Image.fromFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, read_buffer[0..]); - defer read_image.deinit(helpers.zigimg_test_allocator); - - try helpers.expectEq(read_image.width, width); -@@ -281,16 +281,16 @@ test "Write bitmap(Grayscale1) binary PBM file" { - } - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ - .pbm = .{ .binary = true }, - }); - - defer { -- std.fs.cwd().deleteFile(image_file_name) catch unreachable; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch unreachable; - } - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_image = try zigimg.Image.fromFilePath(helpers.zigimg_test_allocator, image_file_name, read_buffer[0..]); -+ var read_image = try zigimg.Image.fromFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, read_buffer[0..]); - defer read_image.deinit(helpers.zigimg_test_allocator); - - try helpers.expectEq(read_image.width, width); -@@ -324,16 +324,16 @@ test "Write grayscale8 ASCII PGM file" { - } - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ - .pgm = .{ .binary = false }, - }); - - defer { -- std.fs.cwd().deleteFile(image_file_name) catch unreachable; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch unreachable; - } - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_image = try zigimg.Image.fromFilePath(helpers.zigimg_test_allocator, image_file_name, read_buffer[0..]); -+ var read_image = try zigimg.Image.fromFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, read_buffer[0..]); - defer read_image.deinit(helpers.zigimg_test_allocator); - - try helpers.expectEq(read_image.width, width); -@@ -367,16 +367,16 @@ test "Write grayscale8 binary PGM file" { - } - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ - .pgm = .{ .binary = true }, - }); - - defer { -- std.fs.cwd().deleteFile(image_file_name) catch unreachable; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch unreachable; - } - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_image = try zigimg.Image.fromFilePath(helpers.zigimg_test_allocator, image_file_name, read_buffer[0..]); -+ var read_image = try zigimg.Image.fromFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, read_buffer[0..]); - defer read_image.deinit(helpers.zigimg_test_allocator); - - try helpers.expectEq(read_image.width, width); -@@ -420,16 +420,16 @@ test "Writing Rgb24 ASCII PPM format" { - pixels.rgb24[7] = zigimg.color.Rgb24.from.rgb(255, 255, 0); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ - .ppm = .{ .binary = false }, - }); - - defer { -- std.fs.cwd().deleteFile(image_file_name) catch unreachable; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch unreachable; - } - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_image = try zigimg.Image.fromFilePath(helpers.zigimg_test_allocator, image_file_name, read_buffer[0..]); -+ var read_image = try zigimg.Image.fromFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, read_buffer[0..]); - defer read_image.deinit(helpers.zigimg_test_allocator); - - try helpers.expectEq(read_image.width, width); -@@ -474,16 +474,16 @@ test "Writing Rgb24 binary PPM format" { - pixels.rgb24[7] = zigimg.color.Rgb24.from.rgb(255, 255, 0); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ - .ppm = .{ .binary = true }, - }); - - defer { -- std.fs.cwd().deleteFile(image_file_name) catch unreachable; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch unreachable; - } - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_image = try zigimg.Image.fromFilePath(helpers.zigimg_test_allocator, image_file_name, read_buffer[0..]); -+ var read_image = try zigimg.Image.fromFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, read_buffer[0..]); - defer read_image.deinit(helpers.zigimg_test_allocator); - - try helpers.expectEq(read_image.width, width); -@@ -505,7 +505,7 @@ test "Trying to write a bitmap or grayscale Netpbm with an true color pixel form - defer source_image.deinit(helpers.zigimg_test_allocator); - - defer { -- std.fs.cwd().deleteFile(image_file_name) catch unreachable; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch unreachable; - } - - const pixels = source_image.pixels; -@@ -527,12 +527,12 @@ test "Trying to write a bitmap or grayscale Netpbm with an true color pixel form - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - - { -- const write_error = source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ .pbm = .{} }); -+ const write_error = source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ .pbm = .{} }); - try std.testing.expectError(zigimg.Image.WriteError.Unsupported, write_error); - } - - { -- const write_error = source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ .pgm = .{} }); -+ const write_error = source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ .pgm = .{} }); - try std.testing.expectError(zigimg.Image.WriteError.Unsupported, write_error); - } - } -@@ -551,7 +551,7 @@ test "Trying to write a bitmap or true color Netpbm with a 8-bit grayscale pixel - defer source_image.deinit(helpers.zigimg_test_allocator); - - defer { -- std.fs.cwd().deleteFile(image_file_name) catch unreachable; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch unreachable; - } - - const source = source_image.pixels; -@@ -562,12 +562,12 @@ test "Trying to write a bitmap or true color Netpbm with a 8-bit grayscale pixel - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - - { -- const write_error = source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ .pbm = .{} }); -+ const write_error = source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ .pbm = .{} }); - try std.testing.expectError(zigimg.Image.WriteError.Unsupported, write_error); - } - - { -- const write_error = source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ .ppm = .{} }); -+ const write_error = source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ .ppm = .{} }); - try std.testing.expectError(zigimg.Image.WriteError.Unsupported, write_error); - } - } -@@ -589,7 +589,7 @@ test "Trying to write a grayscale or true color Netbpm with a 1-bit grayscale pi - defer source_image.deinit(helpers.zigimg_test_allocator); - - defer { -- std.fs.cwd().deleteFile(image_file_name) catch unreachable; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch unreachable; - } - - const source = source_image.pixels; -@@ -601,12 +601,12 @@ test "Trying to write a grayscale or true color Netbpm with a 1-bit grayscale pi - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - - { -- const write_error = source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ .pgm = .{} }); -+ const write_error = source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ .pgm = .{} }); - try std.testing.expectError(zigimg.Image.WriteError.Unsupported, write_error); - } - - { -- const write_error = source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ .ppm = .{} }); -+ const write_error = source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ .ppm = .{} }); - try std.testing.expectError(zigimg.Image.WriteError.Unsupported, write_error); - } - } -diff --git a/tests/formats/pam_test.zig b/tests/formats/pam_test.zig -index 2d58d45..5742f77 100644 ---- a/tests/formats/pam_test.zig -+++ b/tests/formats/pam_test.zig -@@ -5,10 +5,10 @@ const zigimg = @import("zigimg"); - - test "rejects non-PAM images" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "bmp/simple_v4.bmp"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const invalid = pam.PAM.readImage(helpers.zigimg_test_allocator, &read_stream); - -@@ -17,10 +17,10 @@ test "rejects non-PAM images" { - - test "rejects PAM images with unsupported depth" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "pam/unsupported_depth.pam"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const invalid = pam.PAM.readImage(helpers.zigimg_test_allocator, &read_stream); - -@@ -29,10 +29,10 @@ test "rejects PAM images with unsupported depth" { - - test "rejects PAM images with invalid maxval" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "pam/invalid_maxval.pam"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const invalid = pam.PAM.readImage(helpers.zigimg_test_allocator, &read_stream); - -@@ -41,10 +41,10 @@ test "rejects PAM images with invalid maxval" { - - test "rejects PAM images with component values greater than maxval" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "pam/value_greater_than_maxval.pam"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const invalid = pam.PAM.readImage(helpers.zigimg_test_allocator, &read_stream); - try helpers.expectError(invalid, zigimg.Image.ReadError.InvalidData); -@@ -52,10 +52,10 @@ test "rejects PAM images with component values greater than maxval" { - - test "rejects PAM images with unknown tuple type" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "pam/unknown_tupletype.pam"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const invalid = pam.PAM.readImage(helpers.zigimg_test_allocator, &read_stream); - -@@ -64,10 +64,10 @@ test "rejects PAM images with unknown tuple type" { - - test "rejects PAM images with invalid first token" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "pam/invalid_first_token.pam"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const invalid = pam.PAM.readImage(helpers.zigimg_test_allocator, &read_stream); - -@@ -76,10 +76,10 @@ test "rejects PAM images with invalid first token" { - - test "rejects PAM images with tuple type not matching other parameters" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "pam/non_matching_tuple_type.pam"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const invalid = pam.PAM.readImage(helpers.zigimg_test_allocator, &read_stream); - -@@ -88,10 +88,10 @@ test "rejects PAM images with tuple type not matching other parameters" { - - test "accepts comments" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "pam/simple_blackandwhite_comments.pam"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var image = try pam.PAM.readImage(helpers.zigimg_test_allocator, &read_stream); - defer image.deinit(helpers.zigimg_test_allocator); -@@ -110,10 +110,10 @@ test "accepts comments" { - - test "reads blackandwhite pam" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "pam/simple_blackandwhite.pam"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var image = try pam.PAM.readImage(helpers.zigimg_test_allocator, &read_stream); - defer image.deinit(helpers.zigimg_test_allocator); -@@ -132,10 +132,10 @@ test "reads blackandwhite pam" { - - test "reads blackandwhite_alpha pam" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "pam/simple_blackandwhite_alpha.pam"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var image = try pam.PAM.readImage(helpers.zigimg_test_allocator, &read_stream); - defer image.deinit(helpers.zigimg_test_allocator); -@@ -154,10 +154,10 @@ test "reads blackandwhite_alpha pam" { - - test "reads grayscale pam with maxval 255" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "pam/simple_grayscale_maxval_255.pam"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var image = try pam.PAM.readImage(helpers.zigimg_test_allocator, &read_stream); - defer image.deinit(helpers.zigimg_test_allocator); -@@ -176,10 +176,10 @@ test "reads grayscale pam with maxval 255" { - - test "reads grayscale alpha pam with maxval 255" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "pam/simple_grayscale_alpha_maxval_255.pam"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var image = try pam.PAM.readImage(helpers.zigimg_test_allocator, &read_stream); - defer image.deinit(helpers.zigimg_test_allocator); -@@ -198,10 +198,10 @@ test "reads grayscale alpha pam with maxval 255" { - - test "read of rgb pam with maxval 255" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "pam/horse.pam"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var image = try pam.PAM.readImage(helpers.zigimg_test_allocator, &read_stream); - defer image.deinit(helpers.zigimg_test_allocator); -@@ -211,10 +211,10 @@ test "read of rgb pam with maxval 255" { - - test "basic read-write-read produces same result" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "pam/simple_grayscale_alpha_maxval_255.pam"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var image = try pam.PAM.readImage(helpers.zigimg_test_allocator, &read_stream); - defer image.deinit(helpers.zigimg_test_allocator); -@@ -239,7 +239,7 @@ test "basic read-write-read produces same result" { - - var decoded_image = try pam.PAM.readImage(helpers.zigimg_test_allocator, &read_back_stream); - defer decoded_image.deinit(helpers.zigimg_test_allocator); -- -+ - try std.testing.expectEqual(@as(usize, 4), decoded_image.height); - try std.testing.expectEqual(@as(usize, 4), decoded_image.width); - try helpers.expectEqSlice(zigimg.color.Grayscale8Alpha, decoded_image.pixels.grayscale8Alpha, &[16]zigimg.color.Grayscale8Alpha{ -@@ -254,10 +254,10 @@ test "basic read-write-read produces same result" { - - test "reads rgba pam with maxval 255" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "pam/simple_rgba_maxval_255.pam"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var image = try pam.PAM.readImage(helpers.zigimg_test_allocator, &read_stream); - defer image.deinit(helpers.zigimg_test_allocator); -@@ -273,10 +273,10 @@ test "reads rgba pam with maxval 255" { - - test "reads rgba pam with maxval 65535" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "pam/simple_rgba_maxval_65535.pam"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var image = try pam.PAM.readImage(helpers.zigimg_test_allocator, &read_stream); - defer image.deinit(helpers.zigimg_test_allocator); -diff --git a/tests/formats/pcx_test.zig b/tests/formats/pcx_test.zig -index db5d556..ee51851 100644 ---- a/tests/formats/pcx_test.zig -+++ b/tests/formats/pcx_test.zig -@@ -7,10 +7,10 @@ const toU8 = zigimg.color.ScaleValue(u8); - - test "PCX indexed1 (linear)" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "pcx/test-bpp1.pcx"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var pcx_file = pcx.PCX{}; - -@@ -45,10 +45,10 @@ test "PCX indexed1 (linear)" { - - test "PCX indexed4 (linear)" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "pcx/test-bpp4.pcx"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var pcx_file = pcx.PCX{}; - -@@ -84,10 +84,10 @@ test "PCX indexed4 (linear)" { - - test "PCX indexed8 (linear)" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "pcx/test-bpp8.pcx"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var pcx_file = pcx.PCX{}; - -@@ -125,10 +125,10 @@ test "PCX indexed8 (linear)" { - - test "PCX indexed24 (planar)" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "pcx/test-bpp24.pcx"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var pcx_file = pcx.PCX{}; - -@@ -169,25 +169,25 @@ test "Write PCX indexed1 (odd width)" { - const image_file_name = "zigimg_pcx_indexed1_odd.pcx"; - - var source_file = try helpers.testOpenFile(helpers.fixtures_path ++ "pcx/test-bpp1.pcx"); -- defer source_file.close(); -+ defer source_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, source_file, read_buffer[0..]); -+ var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, std.testing.io, source_file, read_buffer[0..]); - defer source_image.deinit(helpers.zigimg_test_allocator); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ - .pcx = .{}, - }); - - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var pcx_file = pcx.PCX{}; - -@@ -242,18 +242,18 @@ test "Write PCX indexed 1 (even width)" { - const image_file_name = "zigimg_pcx_indexed1_even.pcx"; - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try image_pattern.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ -+ try image_pattern.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ - .pcx = .{}, - }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var pcx_file = pcx.PCX{}; - -@@ -285,25 +285,25 @@ test "Write PCX indexed4 (odd width)" { - const image_file_name = "zigimg_pcx_indexed4_odd.pcx"; - - var source_file = try helpers.testOpenFile(helpers.fixtures_path ++ "pcx/test-bpp4.pcx"); -- defer source_file.close(); -+ defer source_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, source_file, read_buffer[0..]); -+ var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, std.testing.io, source_file, read_buffer[0..]); - defer source_image.deinit(helpers.zigimg_test_allocator); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ - .pcx = .{}, - }); - - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var pcx_file = pcx.PCX{}; - -@@ -359,18 +359,18 @@ test "Write PCX indexed 4 (even width)" { - const image_file_name = "zigimg_pcx_indexed4_even.pcx"; - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try rainbow_test.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ -+ try rainbow_test.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ - .pcx = .{}, - }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var pcx_file = pcx.PCX{}; - -@@ -400,25 +400,25 @@ test "Write PCX indexed8 (odd width)" { - const image_file_name = "zigimg_pcx_indexed8_odd.pcx"; - - var source_file = try helpers.testOpenFile(helpers.fixtures_path ++ "pcx/test-bpp8.pcx"); -- defer source_file.close(); -+ defer source_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, source_file, read_buffer[0..]); -+ var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, std.testing.io, source_file, read_buffer[0..]); - defer source_image.deinit(helpers.zigimg_test_allocator); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ - .pcx = .{}, - }); - - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var pcx_file = pcx.PCX{}; - -@@ -472,18 +472,18 @@ test "Write PCX indexed 8 (even width)" { - const image_file_name = "zigimg_pcx_indexed8_even.pcx"; - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try rainbow_test.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ -+ try rainbow_test.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ - .pcx = .{}, - }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var pcx_file = pcx.PCX{}; - -@@ -513,25 +513,25 @@ test "Write PCX rgb24 (odd width)" { - const image_file_name = "zigimg_pcx_bpp24_odd.pcx"; - - var source_file = try helpers.testOpenFile(helpers.fixtures_path ++ "pcx/test-bpp24.pcx"); -- defer source_file.close(); -+ defer source_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, source_file, read_buffer[0..]); -+ var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, std.testing.io, source_file, read_buffer[0..]); - defer source_image.deinit(helpers.zigimg_test_allocator); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ - .pcx = .{}, - }); - - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var pcx_file = pcx.PCX{}; - -@@ -594,18 +594,18 @@ test "Write PCX rgb24 (even width)" { - const image_file_name = "zigimg_pcx_rgb24_even.pcx"; - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try rainbow_test.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ -+ try rainbow_test.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ - .pcx = .{}, - }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var pcx_file = pcx.PCX{}; - -diff --git a/tests/formats/png_test.zig b/tests/formats/png_test.zig -index ec39855..def25c7 100644 ---- a/tests/formats/png_test.zig -+++ b/tests/formats/png_test.zig -@@ -8,10 +8,10 @@ const valid_header_data = png.magic_header ++ "\x00\x00\x00\x0d" ++ png.Chunks.I - - test "png: Should error on non PNG images" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "bmp/simple_v4.bmp"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const invalidFile = png.PNG.readImage(helpers.zigimg_test_allocator, &read_stream); - -@@ -111,10 +111,10 @@ test "png: Indexed PNG with transparency (Aseprite output)" { - // mlarouche: While the full test suite already test this image, I like having a smaller test that I can verify - // some specific info myself - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "png/aseprite_indexed_transparent.png"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var png_image = try png.PNG.readImage(helpers.zigimg_test_allocator, &read_stream); - defer png_image.deinit(helpers.zigimg_test_allocator); -@@ -180,18 +180,18 @@ test "png: Don't write tRNS chunk in indexed format when there is no alpha" { - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - const image_file_name = "zigimg_png_indexed_no_trns.png"; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ - .png = .{}, - }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var check_trns_processor: CheckTrnsPresentProcessor = .{}; - -@@ -220,18 +220,18 @@ test "png: Write tRNS chunk in indexed format only when alpha is present" { - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - const image_file_name = "zigimg_png_indexed_trns.png"; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ - .png = .{}, - }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var check_trns_processor: CheckTrnsPresentProcessor = .{}; - -@@ -268,16 +268,16 @@ test "png: Write indexed1 format" { - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - const image_file_name = "zigimg_png_indexed1.png"; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ .png = .{} }); -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ .png = .{} }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var options = png.DefaultOptions.init(.{}); - -@@ -322,16 +322,16 @@ test "png: Write indexed2 format" { - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - const image_file_name = "zigimg_png_indexed2.png"; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ .png = .{} }); -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ .png = .{} }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var options = png.DefaultOptions.init(.{}); - -@@ -376,16 +376,16 @@ test "png: Write indexed4 format" { - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - const image_file_name = "zigimg_png_indexed4.png"; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ .png = .{} }); -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ .png = .{} }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var options = png.DefaultOptions.init(.{}); - -@@ -430,16 +430,16 @@ test "png: Write indexed8 format" { - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - const image_file_name = "zigimg_png_indexed8.png"; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ .png = .{} }); -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ .png = .{} }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var options = png.DefaultOptions.init(.{}); - -@@ -475,16 +475,16 @@ test "png: Write grayscale1 format" { - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - const image_file_name = "zigimg_png_grayscale1.png"; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ .png = .{} }); -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ .png = .{} }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var options = png.DefaultOptions.init(.{}); - -@@ -513,16 +513,16 @@ test "png: Write grayscale2 format" { - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - const image_file_name = "zigimg_png_grayscale2.png"; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ .png = .{} }); -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ .png = .{} }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var options = png.DefaultOptions.init(.{}); - -@@ -551,16 +551,16 @@ test "png: Write grayscale4 format" { - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - const image_file_name = "zigimg_png_grayscale4.png"; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ .png = .{} }); -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ .png = .{} }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var options = png.DefaultOptions.init(.{}); - -@@ -589,16 +589,16 @@ test "png: Write grayscale8 format" { - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - const image_file_name = "zigimg_png_grayscale8.png"; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ .png = .{} }); -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ .png = .{} }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var options = png.DefaultOptions.init(.{}); - -@@ -628,16 +628,16 @@ test "png: Write grayscale8Alpha format" { - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - const image_file_name = "zigimg_png_grayscale8Alpha.png"; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ .png = .{} }); -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ .png = .{} }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var options = png.DefaultOptions.init(.{}); - -@@ -667,16 +667,16 @@ test "png: Write grayscale16 format" { - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - const image_file_name = "zigimg_png_grayscale16.png"; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ .png = .{} }); -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ .png = .{} }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var options = png.DefaultOptions.init(.{}); - -@@ -706,16 +706,16 @@ test "png: Write grayscale16Alpha format" { - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - const image_file_name = "zigimg_png_grayscale16Alpha.png"; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ .png = .{} }); -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ .png = .{} }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var options = png.DefaultOptions.init(.{}); - -@@ -747,16 +747,16 @@ test "png: Write rgb24 format" { - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - const image_file_name = "zigimg_png_rgb24.png"; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ .png = .{} }); -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ .png = .{} }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var options = png.DefaultOptions.init(.{}); - -@@ -790,16 +790,16 @@ test "png: Write rgba32 format" { - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - const image_file_name = "zigimg_png_rgba32.png"; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ .png = .{} }); -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ .png = .{} }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var options = png.DefaultOptions.init(.{}); - -@@ -833,16 +833,16 @@ test "png: Write rgb48 format" { - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - const image_file_name = "zigimg_png_rgb48.png"; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ .png = .{} }); -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ .png = .{} }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var options = png.DefaultOptions.init(.{}); - -@@ -876,16 +876,16 @@ test "png: Write rgba64 format" { - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - const image_file_name = "zigimg_png_rgba64.png"; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], .{ .png = .{} }); -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], .{ .png = .{} }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var options = png.DefaultOptions.init(.{}); - -@@ -910,32 +910,32 @@ test "png: Official Test Suite" { - - // Useful to quickly test everything on full dir of images - pub fn testWithDir(directory: []const u8, test_md5_signature: bool) !void { -- var test_dir_opt = std.fs.cwd().openDir(directory, .{ .access_sub_paths = false, .no_follow = true, .iterate = true }) catch null; -+ var test_dir_opt = std.Io.Dir.openDir(std.Io.Dir.cwd(), std.testing.io, directory, .{ .access_sub_paths = false, .follow_symlinks = false, .iterate = true }) catch null; - if (test_dir_opt) |*test_dir| { -- defer test_dir.close(); -+ defer test_dir.close(std.testing.io); - var it = test_dir.iterate(); - if (test_md5_signature) { -- std.debug.print("\n", .{}); -+ std.log.info("\n", .{}); - } -- while (try it.next()) |entry| { -+ while (try it.next(std.testing.io)) |entry| { - if (entry.kind != .file or !std.mem.eql(u8, std.fs.path.extension(entry.name), ".png")) { - continue; - } - - if (test_md5_signature) { -- std.debug.print("Testing file {s} ... ", .{entry.name}); -+ std.log.info("Testing file {s} ... ", .{entry.name}); - } - -- var test_file = try test_dir.openFile(entry.name, .{ .mode = .read_only }); -- defer test_file.close(); -+ var test_file = try test_dir.openFile(std.testing.io, entry.name, .{ .mode = .read_only }); -+ defer test_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(test_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, test_file, read_buffer[0..]); - - if (entry.name[0] == 'x' and entry.name[2] != 't' and entry.name[2] != 's') { - try std.testing.expectError(zigimg.Image.ReadError.InvalidData, png.loadHeader(&read_stream)); - if (test_md5_signature) { -- std.debug.print("OK\n", .{}); -+ std.log.info("OK\n", .{}); - } - continue; - } -@@ -946,7 +946,7 @@ pub fn testWithDir(directory: []const u8, test_md5_signature: bool) !void { - const error_result = png.loadWithHeader(&read_stream, &header, std.testing.allocator, default_options.get()); - try std.testing.expectError(zigimg.Image.ReadError.InvalidData, error_result); - if (test_md5_signature) { -- std.debug.print("OK\n", .{}); -+ std.log.info("OK\n", .{}); - } - continue; - } -@@ -968,11 +968,11 @@ pub fn testWithDir(directory: []const u8, test_md5_signature: bool) !void { - @memcpy(test_data_name[len - 3 .. len], "tsd"); - - // Read test data and check with it -- if (test_dir.openFile(test_data_name[0..len], .{ .mode = .read_only })) |test_data_file| { -- defer test_data_file.close(); -+ if (test_dir.openFile(std.testing.io, test_data_name[0..len], .{ .mode = .read_only })) |test_data_file| { -+ defer test_data_file.close(std.testing.io); - - var test_read_buffer: [512]u8 = undefined; -- var test_file_reader = test_data_file.reader(test_read_buffer[0..]); -+ var test_file_reader = test_data_file.reader(std.testing.io, test_read_buffer[0..]); - var test_reader = &test_file_reader.interface; - - var expected_md5: [16]u8 = undefined; -@@ -983,31 +983,31 @@ pub fn testWithDir(directory: []const u8, test_md5_signature: bool) !void { - const str_md5 = try test_reader.takeDelimiterExclusive('\n'); - _ = try std.fmt.hexToBytes(expected_md5[0..], str_md5); - try std.testing.expectEqual(expected_pixel_format, std.meta.activeTag(result)); -- try std.testing.expectEqualSlices(u8, expected_md5[0..], md5_val[0..]); // catch std.debug.print("MD5 Expected: {s} Got {s}\n", .{std.fmt.fmtSliceHexUpper(expected_md5[0..]), std.fmt.fmtSliceHexUpper(md5_val[0..])}); -+ try std.testing.expectEqualSlices(u8, expected_md5[0..], md5_val[0..]); // catch std.log.info("MD5 Expected: {s} Got {s}\n", .{std.fmt.fmtSliceHexUpper(expected_md5[0..]), std.fmt.fmtSliceHexUpper(md5_val[0..])}); - } else |_| { - // If there is no test data assume test is correct and write it out - try writeTestData(test_dir, test_data_name[0..len], &result, md5_val[0..]); - } - - if (test_md5_signature) { -- std.debug.print("OK\n", .{}); -+ std.log.info("OK\n", .{}); - } - - // Write Raw bytes - // std.mem.copyForwards(u8, tst_data_name[len - 3 .. len + 1], "data"); - // var rawoutput = try idir.createFile(tst_data_name[0 .. len + 1], .{}); -- // defer rawoutput.close(); -+ // defer rawoutput.close(std.testing.io); - // try rawoutput.writeAll(result_bytes); - } - } - } - --fn writeTestData(dir: *std.fs.Dir, test_data_name: []const u8, result: *zigimg.color.PixelStorage, md5_value: []const u8) !void { -- var test_output = try dir.createFile(test_data_name, .{}); -- defer test_output.close(); -+fn writeTestData(dir: *std.Io.Dir, test_data_name: []const u8, result: *zigimg.color.PixelStorage, md5_value: []const u8) !void { -+ var test_output = try dir.createFile(std.testing.io, test_data_name, .{}); -+ defer test_output.close(std.testing.io); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var file_writer = test_output.writer(write_buffer[0..]); -+ var file_writer = test_output.writer(std.testing.io, write_buffer[0..]); - var writer = &file_writer.interface; - - try writer.print("{s}\n{X}", .{ @tagName(result.*), md5_value }); -@@ -1018,14 +1018,14 @@ fn writeTestData(dir: *std.fs.Dir, test_data_name: []const u8, result: *zigimg.c - test "png: InfoProcessor on Png Test suite" { - const directory = helpers.fixtures_path ++ "png/"; - -- var test_dir_opt = std.fs.cwd().openDir(directory, .{ .access_sub_paths = false, .no_follow = true, .iterate = true }) catch null; -+ var test_dir_opt = std.Io.Dir.openDir(std.Io.Dir.cwd(), std.testing.io, directory, .{ .access_sub_paths = false, .iterate = true }) catch null; - if (test_dir_opt) |*test_dir| { -- defer test_dir.close(); -+ defer test_dir.close(std.testing.io); - var it = test_dir.iterate(); - - var info_buffer: [16384]u8 = undefined; - -- while (try it.next()) |entry| { -+ while (try it.next(std.testing.io)) |entry| { - if (entry.kind != .file or !std.mem.eql(u8, std.fs.path.extension(entry.name), ".png")) { - continue; - } -@@ -1033,11 +1033,11 @@ test "png: InfoProcessor on Png Test suite" { - var info_stream = zigimg.io.WriteStream.initMemory(info_buffer[0..]); - var options = png.InfoProcessor.PngInfoOptions.init(png.InfoProcessor.init(info_stream.writer())); - -- var test_file = try test_dir.openFile(entry.name, .{ .mode = .read_only }); -- defer test_file.close(); -+ var test_file = try test_dir.openFile(std.testing.io, entry.name, .{ .mode = .read_only }); -+ defer test_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(test_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, test_file, read_buffer[0..]); - if (entry.name[0] == 'x') { - continue; - } -@@ -1051,13 +1051,13 @@ test "png: InfoProcessor on Png Test suite" { - @memcpy(test_data_name[len - 4 .. len], "info"); - - // Read test data and check with it -- if (test_dir.openFile(test_data_name[0..len], .{ .mode = .read_only })) |test_data_file| { -- defer test_data_file.close(); -+ if (test_dir.openFile(std.testing.io, test_data_name[0..len], .{ .mode = .read_only })) |test_data_file| { -+ defer test_data_file.close(std.testing.io); - - var expected_data_buffer: [16384]u8 = undefined; - - var test_read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var file_reader = test_data_file.reader(test_read_buffer[0..]); -+ var file_reader = test_data_file.reader(std.testing.io, test_read_buffer[0..]); - var reader = &file_reader.interface; - - const loaded = try reader.readSliceShort(expected_data_buffer[0..]); -@@ -1065,11 +1065,11 @@ test "png: InfoProcessor on Png Test suite" { - try std.testing.expectEqualSlices(u8, expected_data_buffer[0..loaded], info_buffer[0..loaded]); - } else |_| { - // If there is no test data assume test is correct and write it out -- var test_output_file = try test_dir.createFile(test_data_name[0..len], .{}); -- defer test_output_file.close(); -+ var test_output_file = try test_dir.createFile(std.testing.io, test_data_name[0..len], .{}); -+ defer test_output_file.close(std.testing.io); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var file_writer = test_output_file.writer(write_buffer[0..]); -+ var file_writer = test_output_file.writer(std.testing.io, write_buffer[0..]); - var writer = &file_writer.interface; - - try writer.writeAll(info_buffer[0..@intCast(info_stream.getPos())]); -diff --git a/tests/formats/qoi_test.zig b/tests/formats/qoi_test.zig -index 96256e3..5a9f985 100644 ---- a/tests/formats/qoi_test.zig -+++ b/tests/formats/qoi_test.zig -@@ -8,10 +8,10 @@ const zero_qoi_file = helpers.fixtures_path ++ "qoi/zero.qoi"; - - test "Should error on non QOI images" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "bmp/simple_v4.bmp"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var qoi_file = qoi.QOI{}; - -@@ -22,10 +22,10 @@ test "Should error on non QOI images" { - - test "Read zero.qoi file" { - const file = try helpers.testOpenFile(zero_qoi_file); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var qoi_file = qoi.QOI{}; - -diff --git a/tests/formats/ras_test.zig b/tests/formats/ras_test.zig -index d7240a1..5452098 100644 ---- a/tests/formats/ras_test.zig -+++ b/tests/formats/ras_test.zig -@@ -5,10 +5,10 @@ const helpers = @import("../helpers.zig"); - - test "Should error on non RAS images" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "bmp/simple_v4.bmp"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var ras_file = ras.RAS{}; - -@@ -18,12 +18,12 @@ test "Should error on non RAS images" { - - test "Sun-Raster 24-bit RGB24 uncompressed" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "ras/sample-rgb24.ras"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var ras_file = ras.RAS{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try ras_file.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -46,12 +46,12 @@ test "Sun-Raster 24-bit RGB24 uncompressed" { - - test "Sun-Raster 24-bit BGR24 uncompressed" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "ras/sample-bgr24.ras"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var ras_file = ras.RAS{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try ras_file.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -74,12 +74,12 @@ test "Sun-Raster 24-bit BGR24 uncompressed" { - - test "Sun-Raster 32-bit xRGB uncompressed" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "ras/sample-xrgb32.ras"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var ras_file = ras.RAS{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try ras_file.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -98,12 +98,12 @@ test "Sun-Raster 32-bit xRGB uncompressed" { - - test "Sun-Raster 8-bit with palette uncompressed" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "ras/sample-8bit.ras"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var ras_file = ras.RAS{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try ras_file.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -124,12 +124,12 @@ test "Sun-Raster 8-bit with palette uncompressed" { - - test "Sun-Raster 8-bit grayscale uncompressed" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "ras/sample-8bit-grayscale.ras"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var ras_file = ras.RAS{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try ras_file.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -144,12 +144,12 @@ test "Sun-Raster 8-bit grayscale uncompressed" { - - test "Sun-Raster 1-bit black & white uncompressed" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "ras/sample-blackwhite.ras"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var ras_file = ras.RAS{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try ras_file.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -164,12 +164,12 @@ test "Sun-Raster 1-bit black & white uncompressed" { - - test "Sun-Raster bgr24 rle compressed" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "ras/sample-24bit-bgr-rle.ras"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var ras_file = ras.RAS{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try ras_file.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -diff --git a/tests/formats/sgi_test.zig b/tests/formats/sgi_test.zig -index d098ef7..ed23769 100644 ---- a/tests/formats/sgi_test.zig -+++ b/tests/formats/sgi_test.zig -@@ -5,10 +5,10 @@ const zigimg = @import("zigimg"); - - test "Should error on non SGI images" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "bmp/simple_v4.bmp"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var sgi_file = sgi.SGI{}; - -@@ -18,12 +18,12 @@ test "Should error on non SGI images" { - - test "SGI 24-bit uncompressed" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "sgi/sample-rgb24.sgi"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var sgi_file = sgi.SGI{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try sgi_file.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -46,12 +46,12 @@ test "SGI 24-bit uncompressed" { - - test "SGI grayscale uncompressed" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "sgi/sample-blackwhite.sgi"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var sgi_file = sgi.SGI{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try sgi_file.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -66,12 +66,12 @@ test "SGI grayscale uncompressed" { - - test "SGI 32-bit RGBA uncompressed" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "sgi/sample-rgba.sgi"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var sgi_file = sgi.SGI{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try sgi_file.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -94,12 +94,12 @@ test "SGI 32-bit RGBA uncompressed" { - - test "SGI RGB48be uncompressed" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "sgi/sample-rgb48be.sgi"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var sgi_file = sgi.SGI{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try sgi_file.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -122,12 +122,12 @@ test "SGI RGB48be uncompressed" { - - test "SGI grayscale rle compressed" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "sgi/sample-gray-rle.sgi"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var sgi_file = sgi.SGI{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try sgi_file.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -142,12 +142,12 @@ test "SGI grayscale rle compressed" { - - test "SGI 24-bit rle compressed" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "sgi/sample-24bit-rle.sgi"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var sgi_file = sgi.SGI{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try sgi_file.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -170,12 +170,12 @@ test "SGI 24-bit rle compressed" { - - test "SGI RGB48be rle uncompressed" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "sgi/sample-rgb48be-rle.sgi"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var sgi_file = sgi.SGI{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try sgi_file.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -198,12 +198,12 @@ test "SGI RGB48be rle uncompressed" { - - test "SGI 32-bit RGBA rle compressed" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "sgi/sample-rgba-rle.sgi"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var sgi_file = sgi.SGI{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try sgi_file.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -diff --git a/tests/formats/tga_test.zig b/tests/formats/tga_test.zig -index 83f2d76..c3182d4 100644 ---- a/tests/formats/tga_test.zig -+++ b/tests/formats/tga_test.zig -@@ -5,10 +5,10 @@ const zigimg = @import("zigimg"); - - test "Should error on non TGA images" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "bmp/simple_v4.bmp"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -19,10 +19,10 @@ test "Should error on non TGA images" { - - test "Read ubw8 TGA file" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tga/ubw8.tga"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -56,10 +56,10 @@ test "Read ubw8 TGA file" { - - test "Read ucm8 TGA file" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tga/ucm8.tga"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -101,10 +101,10 @@ test "Read ucm8 TGA file" { - - test "Read utc16 TGA file" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tga/utc16.tga"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -140,10 +140,10 @@ test "Read utc16 TGA file" { - - test "Read utc24 TGA file" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tga/utc24.tga"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -179,10 +179,10 @@ test "Read utc24 TGA file" { - - test "Read utc32 TGA file" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tga/utc32.tga"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -218,10 +218,10 @@ test "Read utc32 TGA file" { - - test "Read cbw8 TGA file" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tga/cbw8.tga"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -255,10 +255,10 @@ test "Read cbw8 TGA file" { - - test "Read ccm8 TGA file" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tga/ccm8.tga"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -300,10 +300,10 @@ test "Read ccm8 TGA file" { - - test "Read ctc24 TGA file" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tga/ctc24.tga"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -339,10 +339,10 @@ test "Read ctc24 TGA file" { - - test "Read matte-01 TGA file" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tga/matte-01.tga"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -384,10 +384,10 @@ test "Read matte-01 TGA file" { - - test "Read font TGA file" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tga/font.tga"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -411,10 +411,10 @@ test "Read font TGA file" { - - test "Read stopsignsmall TGA v1 file" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tga/stopsignsmall.tga"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -436,10 +436,10 @@ test "Read stopsignsmall TGA v1 file" { - - test "Read stopsignsmallcompressed TGA v1 file" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tga/stopsignsmallcompressed.tga"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -463,11 +463,11 @@ test "Write TGA uncompressed grayscale8" { - const image_file_name = "zigimg_tga_uncompressed_grayscale8.tga"; - - var source_file = try helpers.testOpenFile(helpers.fixtures_path ++ "tga/ubw8.tga"); -- defer source_file.close(); -+ defer source_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - -- var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, source_file, read_buffer[0..]); -+ var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, std.testing.io, source_file, read_buffer[0..]); - defer source_image.deinit(helpers.zigimg_test_allocator); - - const encoder_options = zigimg.Image.EncoderOptions{ -@@ -500,15 +500,15 @@ test "Write TGA uncompressed grayscale8" { - }; - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], encoder_options); -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], encoder_options); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -558,15 +558,15 @@ test "Write TGA compressed grayscale8" { - const image_file_name = "zigimg_tga_compressed_grayscale8.tga"; - - var source_file = try helpers.testOpenFile(helpers.fixtures_path ++ "tga/cbw8.tga"); -- defer source_file.close(); -+ defer source_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - -- var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, source_file, read_buffer[0..]); -+ var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, std.testing.io, source_file, read_buffer[0..]); - defer source_image.deinit(helpers.zigimg_test_allocator); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ - .tga = .{ - .rle_compressed = true, - .color_map_depth = 16, -@@ -575,13 +575,13 @@ test "Write TGA compressed grayscale8" { - }, - }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -617,15 +617,15 @@ test "Write uncompressed indexed8 (color map 16-bit)" { - const image_file_name = "zigimg_tga_uncompressed_indexed8.tga"; - - var source_file = try helpers.testOpenFile(helpers.fixtures_path ++ "tga/ucm8.tga"); -- defer source_file.close(); -+ defer source_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - -- var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, source_file, read_buffer[0..]); -+ var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, std.testing.io, source_file, read_buffer[0..]); - defer source_image.deinit(helpers.zigimg_test_allocator); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ - .tga = .{ - .rle_compressed = false, - .color_map_depth = 16, -@@ -634,13 +634,13 @@ test "Write uncompressed indexed8 (color map 16-bit)" { - }, - }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -684,15 +684,15 @@ test "Write uncompressed indexed8 (color map 24-bit)" { - const image_file_name = "zigimg_tga_uncompressed_indexed8.tga"; - - var source_file = try helpers.testOpenFile(helpers.fixtures_path ++ "tga/ucm8.tga"); -- defer source_file.close(); -+ defer source_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - -- var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, source_file, read_buffer[0..]); -+ var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, std.testing.io, source_file, read_buffer[0..]); - defer source_image.deinit(helpers.zigimg_test_allocator); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ - .tga = .{ - .rle_compressed = false, - .color_map_depth = 24, -@@ -701,13 +701,13 @@ test "Write uncompressed indexed8 (color map 24-bit)" { - }, - }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -751,15 +751,15 @@ test "Write compressed indexed8 (color map 16-bit)" { - const image_file_name = "zigimg_tga_compressed_indexed8.tga"; - - var source_file = try helpers.testOpenFile(helpers.fixtures_path ++ "tga/ccm8.tga"); -- defer source_file.close(); -+ defer source_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - -- var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, source_file, read_buffer[0..]); -+ var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, std.testing.io, source_file, read_buffer[0..]); - defer source_image.deinit(helpers.zigimg_test_allocator); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ - .tga = .{ - .rle_compressed = true, - .color_map_depth = 16, -@@ -768,13 +768,13 @@ test "Write compressed indexed8 (color map 16-bit)" { - }, - }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -818,15 +818,15 @@ test "Write compressed indexed8 (color map 24-bit)" { - const image_file_name = "zigimg_tga_compressed_indexed8.tga"; - - var source_file = try helpers.testOpenFile(helpers.fixtures_path ++ "tga/ccm8.tga"); -- defer source_file.close(); -+ defer source_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - -- var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, source_file, read_buffer[0..]); -+ var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, std.testing.io, source_file, read_buffer[0..]); - defer source_image.deinit(helpers.zigimg_test_allocator); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ - .tga = .{ - .rle_compressed = true, - .color_map_depth = 24, -@@ -835,13 +835,13 @@ test "Write compressed indexed8 (color map 24-bit)" { - }, - }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -885,15 +885,15 @@ test "Write uncompressed 16-bit true color TGA" { - const image_file_name = "zigimg_tga_uncompressed_true_color_16.tga"; - - var source_file = try helpers.testOpenFile(helpers.fixtures_path ++ "tga/utc16.tga"); -- defer source_file.close(); -+ defer source_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - -- var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, source_file, read_buffer[0..]); -+ var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, std.testing.io, source_file, read_buffer[0..]); - defer source_image.deinit(helpers.zigimg_test_allocator); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ - .tga = .{ - .rle_compressed = false, - .color_map_depth = 16, -@@ -902,13 +902,13 @@ test "Write uncompressed 16-bit true color TGA" { - }, - }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -946,15 +946,15 @@ test "Write compressed 16-bit true color TGA" { - const image_file_name = "zigimg_tga_compressed_true_color_16.tga"; - - var source_file = try helpers.testOpenFile(helpers.fixtures_path ++ "tga/utc16.tga"); -- defer source_file.close(); -+ defer source_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - -- var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, source_file, read_buffer[0..]); -+ var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, std.testing.io, source_file, read_buffer[0..]); - defer source_image.deinit(helpers.zigimg_test_allocator); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ - .tga = .{ - .rle_compressed = true, - .color_map_depth = 16, -@@ -963,13 +963,13 @@ test "Write compressed 16-bit true color TGA" { - }, - }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -1007,15 +1007,15 @@ test "Write uncompressed 24-bit true color TGA" { - const image_file_name = "zigimg_tga_uncompressed_true_color_24.tga"; - - var source_file = try helpers.testOpenFile(helpers.fixtures_path ++ "tga/utc24.tga"); -- defer source_file.close(); -+ defer source_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - -- var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, source_file, read_buffer[0..]); -+ var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, std.testing.io, source_file, read_buffer[0..]); - defer source_image.deinit(helpers.zigimg_test_allocator); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ - .tga = .{ - .rle_compressed = false, - .color_map_depth = 24, -@@ -1024,13 +1024,13 @@ test "Write uncompressed 24-bit true color TGA" { - }, - }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -1068,15 +1068,15 @@ test "Write compressed 24-bit true color TGA" { - const image_file_name = "zigimg_tga_compressed_true_color_24.tga"; - - var source_file = try helpers.testOpenFile(helpers.fixtures_path ++ "tga/ctc24.tga"); -- defer source_file.close(); -+ defer source_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - -- var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, source_file, read_buffer[0..]); -+ var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, std.testing.io, source_file, read_buffer[0..]); - defer source_image.deinit(helpers.zigimg_test_allocator); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ - .tga = .{ - .rle_compressed = true, - .color_map_depth = 24, -@@ -1085,13 +1085,13 @@ test "Write compressed 24-bit true color TGA" { - }, - }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -1129,15 +1129,15 @@ test "Write uncompressed 32-bit true color TGA" { - const image_file_name = "zigimg_tga_uncompressed_true_color_32.tga"; - - var source_file = try helpers.testOpenFile(helpers.fixtures_path ++ "tga/utc32.tga"); -- defer source_file.close(); -+ defer source_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - -- var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, source_file, read_buffer[0..]); -+ var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, std.testing.io, source_file, read_buffer[0..]); - defer source_image.deinit(helpers.zigimg_test_allocator); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ - .tga = .{ - .rle_compressed = false, - .color_map_depth = 24, -@@ -1146,13 +1146,13 @@ test "Write uncompressed 32-bit true color TGA" { - }, - }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -1190,15 +1190,15 @@ test "Write compressed 32-bit true color TGA" { - const image_file_name = "zigimg_tga_compressed_true_color_32.tga"; - - var source_file = try helpers.testOpenFile(helpers.fixtures_path ++ "tga/ctc32.tga"); -- defer source_file.close(); -+ defer source_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; - -- var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, source_file, read_buffer[0..]); -+ var source_image = try zigimg.Image.fromFile(helpers.zigimg_test_allocator, std.testing.io, source_file, read_buffer[0..]); - defer source_image.deinit(helpers.zigimg_test_allocator); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ - .tga = .{ - .rle_compressed = true, - .color_map_depth = 24, -@@ -1207,13 +1207,13 @@ test "Write compressed 32-bit true color TGA" { - }, - }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -1270,7 +1270,7 @@ test "Write uncompressed Rgb24 to TGA" { - @memcpy(source_image.pixels.rgb24[0..], uncompressed_source[0..]); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ - .tga = .{ - .rle_compressed = false, - .color_map_depth = 24, -@@ -1279,14 +1279,14 @@ test "Write uncompressed Rgb24 to TGA" { - }, - }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -1329,7 +1329,7 @@ test "Write compressed Rgb24 to TGA" { - @memcpy(source_image.pixels.rgb24[0..], uncompressed_source[0..]); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ - .tga = .{ - .rle_compressed = true, - .color_map_depth = 24, -@@ -1338,14 +1338,14 @@ test "Write compressed Rgb24 to TGA" { - }, - }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -1403,7 +1403,7 @@ test "Write uncompressed Rgba32 to TGA" { - @memcpy(source_image.pixels.rgba32[0..], uncompressed_source[0..]); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ - .tga = .{ - .rle_compressed = false, - .color_map_depth = 24, -@@ -1412,14 +1412,14 @@ test "Write uncompressed Rgba32 to TGA" { - }, - }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -@@ -1478,7 +1478,7 @@ test "Write compressed Rgba32 to TGA" { - @memcpy(source_image.pixels.rgba32[0..], uncompressed_source[0..]); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- try source_image.writeToFilePath(helpers.zigimg_test_allocator, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ -+ try source_image.writeToFilePath(helpers.zigimg_test_allocator, std.testing.io, image_file_name, write_buffer[0..], zigimg.Image.EncoderOptions{ - .tga = .{ - .rle_compressed = true, - .color_map_depth = 24, -@@ -1487,14 +1487,14 @@ test "Write compressed Rgba32 to TGA" { - }, - }); - defer { -- std.fs.cwd().deleteFile(image_file_name) catch {}; -+ std.Io.Dir.deleteFile(std.Io.Dir.cwd(), std.testing.io, image_file_name) catch {}; - } - - const read_file = try helpers.testOpenFile(image_file_name); -- defer read_file.close(); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var tga_file = tga.TGA{}; - -diff --git a/tests/formats/tiff_test.zig b/tests/formats/tiff_test.zig -index cce4cfa..2a8a042 100644 ---- a/tests/formats/tiff_test.zig -+++ b/tests/formats/tiff_test.zig -@@ -5,10 +5,10 @@ const zigimg = @import("zigimg"); - - test "Should error on non TIFF images" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "bmp/simple_v4.bmp"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - var sgi_file = tiff.TIFF{}; - -@@ -18,12 +18,12 @@ test "Should error on non TIFF images" { - - test "TIFF/LE monochrome black uncompressed" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tiff/sample-monob-raw.tiff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_tiff = tiff.TIFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_tiff.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -39,12 +39,12 @@ test "TIFF/LE monochrome black uncompressed" { - - test "TIFF/LE grayscale8 uncompressed" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tiff/sample-grayscale8-raw.tiff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_tiff = tiff.TIFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_tiff.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -61,12 +61,12 @@ test "TIFF/LE grayscale8 uncompressed" { - - test "TIFF/LE 8-bit with colormap uncompressed" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tiff/sample-pal8-raw.tiff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_tiff = tiff.TIFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_tiff.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -87,12 +87,12 @@ test "TIFF/LE 8-bit with colormap uncompressed" { - - test "TIFF/LE 24-bit uncompressed" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tiff/sample-rgb24-raw.tiff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_tiff = tiff.TIFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_tiff.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -115,12 +115,12 @@ test "TIFF/LE 24-bit uncompressed" { - - test "TIFF/BE rgb24 gray single strip uncompressed" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tiff/big-endian/sample-rgb24-single-strip.tiff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_tiff = tiff.TIFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_tiff.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -143,12 +143,12 @@ test "TIFF/BE rgb24 gray single strip uncompressed" { - - test "TIFF/BE rgb24 color single strip uncompressed" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tiff/big-endian/sample-pal8-raw.tiff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_tiff = tiff.TIFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_tiff.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -171,12 +171,12 @@ test "TIFF/BE rgb24 color single strip uncompressed" { - - test "TIFF/BE 24-bit uncompressed" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tiff/big-endian/sample-rgb24-raw.tiff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_tiff = tiff.TIFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_tiff.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -199,12 +199,12 @@ test "TIFF/BE 24-bit uncompressed" { - - test "TIFF/LE RGBA uncompressed" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tiff/sample-rgba-raw.tiff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_tiff = tiff.TIFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_tiff.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -223,12 +223,12 @@ test "TIFF/LE RGBA uncompressed" { - - test "TIFF/LE monochrome black packbits" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tiff/sample-monob-packbits.tiff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_tiff = tiff.TIFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_tiff.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -244,12 +244,12 @@ test "TIFF/LE monochrome black packbits" { - - test "TIFF/LE grayscale8 packbits" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tiff/sample-grayscale8-packbits.tiff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_tiff = tiff.TIFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_tiff.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -266,12 +266,12 @@ test "TIFF/LE grayscale8 packbits" { - - test "TIFF/LE 8-bit with colormap packbits" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tiff/sample-pal8-packbits.tiff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_tiff = tiff.TIFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_tiff.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -292,12 +292,12 @@ test "TIFF/LE 8-bit with colormap packbits" { - - test "TIFF/LE 24-bit packbits" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tiff/sample-rgb24-packbits.tiff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_tiff = tiff.TIFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_tiff.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -320,12 +320,12 @@ test "TIFF/LE 24-bit packbits" { - - test "TIFF/LE RGBA packbits" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tiff/sample-rgba-packbits.tiff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_tiff = tiff.TIFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_tiff.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -344,12 +344,12 @@ test "TIFF/LE RGBA packbits" { - - test "TIFF/LE monochrome black CCITT" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tiff/ccitt_rle.tiff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_tiff = tiff.TIFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_tiff.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -364,12 +364,12 @@ test "TIFF/LE monochrome black CCITT" { - - test "TIFF/LE monochrome black LZW" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tiff/sample-monob-lzw.tiff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_tiff = tiff.TIFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_tiff.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -385,12 +385,12 @@ test "TIFF/LE monochrome black LZW" { - - test "TIFF/LE grayscale8 LZW" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tiff/sample-grayscale8-lzw.tiff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_tiff = tiff.TIFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_tiff.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -407,12 +407,12 @@ test "TIFF/LE grayscale8 LZW" { - - test "TIFF/LE 8-bit with colormap LZW" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tiff/sample-pal8-lzw.tiff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_tiff = tiff.TIFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_tiff.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -433,12 +433,12 @@ test "TIFF/LE 8-bit with colormap LZW" { - - test "TIFF/LE 24-bit LZW" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tiff/sample-rgb24-lzw.tiff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_tiff = tiff.TIFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_tiff.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -461,12 +461,12 @@ test "TIFF/LE 24-bit LZW" { - - test "TIFF/LE RGBA LZW" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tiff/sample-rgba-lzw.tiff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_tiff = tiff.TIFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_tiff.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -485,12 +485,12 @@ test "TIFF/LE RGBA LZW" { - - test "TIFF/LE monochrome black Deflate" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tiff/sample-monob-deflate.tiff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_bitmap = tiff.TIFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_bitmap.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -506,12 +506,12 @@ test "TIFF/LE monochrome black Deflate" { - - test "TIFF/LE grayscale8 Deflate" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tiff/sample-grayscale8-deflate.tiff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_tiff = tiff.TIFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_tiff.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -528,12 +528,12 @@ test "TIFF/LE grayscale8 Deflate" { - - test "TIFF/LE 8-bit with colormap Deflate" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tiff/sample-pal8-deflate.tiff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_tiff = tiff.TIFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_tiff.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -554,12 +554,12 @@ test "TIFF/LE 8-bit with colormap Deflate" { - - test "TIFF/LE 24-bit Deflate" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tiff/sample-rgb24-deflate.tiff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_tiff = tiff.TIFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_tiff.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -@@ -582,12 +582,12 @@ test "TIFF/LE 24-bit Deflate" { - - test "TIFF/LE RGBA Deflate" { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "tiff/sample-rgba-deflate.tiff"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_tiff = tiff.TIFF{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const pixels = try the_tiff.read(helpers.zigimg_test_allocator, &read_stream); - defer pixels.deinit(helpers.zigimg_test_allocator); -diff --git a/tests/formats/xbm_test.zig b/tests/formats/xbm_test.zig -index 52eb29c..053e41e 100644 ---- a/tests/formats/xbm_test.zig -+++ b/tests/formats/xbm_test.zig -@@ -30,12 +30,12 @@ const simple_4x4_xbm = - test "XBM: invalid file format" { - { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "xbm/bad_missing_dim.xbm"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_xbm = xbm.XBM{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const actual_error = the_xbm.read(helpers.zigimg_test_allocator, &read_stream); - try helpers.expectError(actual_error, zigimg.Image.ReadError.InvalidData); -@@ -43,12 +43,12 @@ test "XBM: invalid file format" { - - { - const file = try helpers.testOpenFile(helpers.fixtures_path ++ "xbm/bad_missing_pixels.xbm"); -- defer file.close(); -+ defer file.close(std.testing.io); - - var the_xbm = xbm.XBM{}; - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, file, read_buffer[0..]); - - const actual_error = the_xbm.read(helpers.zigimg_test_allocator, &read_stream); - try helpers.expectError(actual_error, zigimg.Image.ReadError.InvalidData); -diff --git a/tests/helpers.zig b/tests/helpers.zig -index 9a4ef29..b9f06b1 100644 ---- a/tests/helpers.zig -+++ b/tests/helpers.zig -@@ -30,17 +30,17 @@ pub inline fn expectApproxEqRel(actual: anytype, expected: anytype, tolerance: a - return try std.testing.expectApproxEqRel(expected, actual, tolerance); - } - --pub fn testOpenFile(file_path: []const u8) !std.fs.File { -- return std.fs.cwd().openFile(file_path, .{}) catch |err| -+pub fn testOpenFile(file_path: []const u8) !std.Io.File { -+ return std.Io.Dir.openFile(std.Io.Dir.cwd(), std.testing.io, file_path, .{}) catch |err| - if (err == error.FileNotFound) return error.SkipZigTest else return err; - } - - pub fn testImageFromFile(image_path: []const u8, buffer: []u8) !zigimg.Image { -- return zigimg.Image.fromFilePath(zigimg_test_allocator, image_path, buffer) catch |err| -+ return zigimg.Image.fromFilePath(zigimg_test_allocator, std.testing.io, image_path, buffer) catch |err| - if (err == error.FileNotFound) return error.SkipZigTest else return err; - } - - pub fn testReadFile(file_path: []const u8, buffer: []u8) ![]u8 { -- return std.fs.cwd().readFile(file_path, buffer) catch |err| -+ return std.Io.Dir.readFile(std.Io.Dir.cwd(), std.testing.io, file_path, buffer) catch |err| - if (err == error.FileNotFound) return error.SkipZigTest else return err; - } -diff --git a/tests/image_test.zig b/tests/image_test.zig -index ccd2d11..529be41 100644 ---- a/tests/image_test.zig -+++ b/tests/image_test.zig -@@ -187,7 +187,7 @@ test "Should detect BMP properly" { - - for (image_tests) |image_path| { - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- const format = try Image.detectFormatFromFilePath(image_path, read_buffer[0..]); -+ const format = try Image.detectFormatFromFilePath(std.testing.io, image_path, read_buffer[0..]); - try std.testing.expect(format == .bmp); - - var test_image = try helpers.testImageFromFile(image_path, read_buffer[0..]); -@@ -213,7 +213,7 @@ test "Should detect GIF properly" { - - for (image_tests) |image_path| { - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- const format = try Image.detectFormatFromFilePath(image_path, read_buffer[0..]); -+ const format = try Image.detectFormatFromFilePath(std.testing.io, image_path, read_buffer[0..]); - try std.testing.expect(format == .gif); - - var test_image = try helpers.testImageFromFile(image_path, read_buffer[0..]); -@@ -231,7 +231,7 @@ test "Should detect PCX properly" { - - for (image_tests) |image_path| { - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- const format = try Image.detectFormatFromFilePath(image_path, read_buffer[0..]); -+ const format = try Image.detectFormatFromFilePath(std.testing.io, image_path, read_buffer[0..]); - try std.testing.expect(format == .pcx); - - var test_image = try helpers.testImageFromFile(image_path, read_buffer[0..]); -@@ -247,7 +247,7 @@ test "Should detect PBM properly" { - - for (image_tests) |image_path| { - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- const format = try Image.detectFormatFromFilePath(image_path, read_buffer[0..]); -+ const format = try Image.detectFormatFromFilePath(std.testing.io, image_path, read_buffer[0..]); - try std.testing.expect(format == .pbm); - - var test_image = try helpers.testImageFromFile(image_path, read_buffer[0..]); -@@ -265,7 +265,7 @@ test "Should detect PGM properly" { - - for (image_tests) |image_path| { - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- const format = try Image.detectFormatFromFilePath(image_path, read_buffer[0..]); -+ const format = try Image.detectFormatFromFilePath(std.testing.io, image_path, read_buffer[0..]); - try std.testing.expect(format == .pgm); - - var test_image = try helpers.testImageFromFile(image_path, read_buffer[0..]); -@@ -281,7 +281,7 @@ test "Should detect PPM properly" { - - for (image_tests) |image_path| { - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- const format = try Image.detectFormatFromFilePath(image_path, read_buffer[0..]); -+ const format = try Image.detectFormatFromFilePath(std.testing.io, image_path, read_buffer[0..]); - try std.testing.expect(format == .ppm); - - var test_image = try helpers.testImageFromFile(image_path, read_buffer[0..]); -@@ -297,7 +297,7 @@ test "Should detect PNG properly" { - - for (image_tests) |image_path| { - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- const format = try Image.detectFormatFromFilePath(image_path, read_buffer[0..]); -+ const format = try Image.detectFormatFromFilePath(std.testing.io, image_path, read_buffer[0..]); - try std.testing.expect(format == .png); - - var test_image = try helpers.testImageFromFile(image_path, read_buffer[0..]); -@@ -321,7 +321,7 @@ test "Should detect TGA properly" { - - for (image_tests) |image_path| { - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- const format = try Image.detectFormatFromFilePath(image_path, read_buffer[0..]); -+ const format = try Image.detectFormatFromFilePath(std.testing.io, image_path, read_buffer[0..]); - try std.testing.expect(format == .tga); - - var test_image = try helpers.testImageFromFile(image_path, read_buffer[0..]); -@@ -334,7 +334,7 @@ test "Should detect QOI properly" { - - for (image_tests) |image_path| { - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- const format = try Image.detectFormatFromFilePath(image_path, read_buffer[0..]); -+ const format = try Image.detectFormatFromFilePath(std.testing.io, image_path, read_buffer[0..]); - try std.testing.expect(format == .qoi); - - var test_image = try helpers.testImageFromFile(image_path, read_buffer[0..]); -@@ -350,7 +350,7 @@ test "Should detect JPEG properly" { - - for (image_tests) |image_path| { - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- const format = try Image.detectFormatFromFilePath(image_path, read_buffer[0..]); -+ const format = try Image.detectFormatFromFilePath(std.testing.io, image_path, read_buffer[0..]); - try std.testing.expect(format == .jpeg); - - var test_image = try helpers.testImageFromFile(image_path, read_buffer[0..]); -@@ -366,7 +366,7 @@ test "Should detect Farbfeld properly" { - - for (image_tests) |image_path| { - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- const format = try Image.detectFormatFromFilePath(image_path, read_buffer[0..]); -+ const format = try Image.detectFormatFromFilePath(std.testing.io, image_path, read_buffer[0..]); - try std.testing.expect(format == .farbfeld); - - var test_image = try helpers.testImageFromFile(image_path, read_buffer[0..]); -@@ -381,7 +381,7 @@ test "Should detect IFF/PBM properly" { - - for (image_tests) |image_path| { - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- const format = try Image.detectFormatFromFilePath(image_path, read_buffer[0..]); -+ const format = try Image.detectFormatFromFilePath(std.testing.io, image_path, read_buffer[0..]); - try std.testing.expect(format == .iff); - - var test_image = try helpers.testImageFromFile(image_path, read_buffer[0..]); -@@ -396,7 +396,7 @@ test "Should detect RAS properly" { - - for (image_tests) |image_path| { - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- const format = try Image.detectFormatFromFilePath(image_path, read_buffer[0..]); -+ const format = try Image.detectFormatFromFilePath(std.testing.io, image_path, read_buffer[0..]); - try std.testing.expect(format == .ras); - - var test_image = try helpers.testImageFromFile(image_path, read_buffer[0..]); -@@ -411,7 +411,7 @@ test "Should detect SGI properly" { - - for (image_tests) |image_path| { - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- const format = try Image.detectFormatFromFilePath(image_path, read_buffer[0..]); -+ const format = try Image.detectFormatFromFilePath(std.testing.io, image_path, read_buffer[0..]); - try std.testing.expect(format == .sgi); - - var test_image = try helpers.testImageFromFile(image_path, read_buffer[0..]); -@@ -426,7 +426,7 @@ test "Should detect TIFF properly" { - - for (image_tests) |image_path| { - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- const format = try Image.detectFormatFromFilePath(image_path, read_buffer[0..]); -+ const format = try Image.detectFormatFromFilePath(std.testing.io, image_path, read_buffer[0..]); - try std.testing.expect(format == .tiff); - - var test_image = try helpers.testImageFromFile(image_path, read_buffer[0..]); -@@ -449,7 +449,7 @@ test "Should detect XBM properly" { - - for (image_tests) |image_path| { - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- const format = try Image.detectFormatFromFilePath(image_path, read_buffer[0..]); -+ const format = try Image.detectFormatFromFilePath(std.testing.io, image_path, read_buffer[0..]); - try std.testing.expect(format == .xbm); - - var test_image = try helpers.testImageFromFile(image_path, read_buffer[0..]); -diff --git a/tests/io_test.zig b/tests/io_test.zig -index 2dc6f7a..1ec5d60 100644 ---- a/tests/io_test.zig -+++ b/tests/io_test.zig -@@ -55,12 +55,12 @@ test "io.ReadStream: should read and seek properly within a unbuffered file" { - var temp_folder = std.testing.tmpDir(.{}); - defer temp_folder.cleanup(); - -- try temp_folder.dir.writeFile(.{ .sub_path = TEST_FILENAME, .data = TEST_FILE_CONTENTS }); -+ try temp_folder.dir.writeFile(std.testing.io, .{ .sub_path = TEST_FILENAME, .data = TEST_FILE_CONTENTS }); - -- const read_file = try temp_folder.dir.openFile(TEST_FILENAME, .{}); -- defer read_file.close(); -+ const read_file = try temp_folder.dir.openFile(std.testing.io, TEST_FILENAME, .{}); -+ defer read_file.close(std.testing.io); - -- var read_stream = zigimg.io.ReadStream.initFile(read_file, &.{}); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, &.{}); - - var reader = read_stream.reader(); - -@@ -99,12 +99,12 @@ test "io.ReadStream: should error on invalid seek within unbuffered file" { - var temp_folder = std.testing.tmpDir(.{}); - defer temp_folder.cleanup(); - -- try temp_folder.dir.writeFile(.{ .sub_path = TEST_FILENAME, .data = TEST_FILE_CONTENTS }); -+ try temp_folder.dir.writeFile(std.testing.io, .{ .sub_path = TEST_FILENAME, .data = TEST_FILE_CONTENTS }); - -- const read_file = try temp_folder.dir.openFile(TEST_FILENAME, .{}); -- defer read_file.close(); -+ const read_file = try temp_folder.dir.openFile(std.testing.io, TEST_FILENAME, .{}); -+ defer read_file.close(std.testing.io); - -- var read_stream = zigimg.io.ReadStream.initFile(read_file, &.{}); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, &.{}); - - const seek_to_error = read_stream.seekTo(123456); - try helpers.expectError(seek_to_error, zigimg.io.ReadStream.SeekError.Unseekable); -@@ -122,13 +122,13 @@ test "io.ReadStream: should read and seek properly within a file with a small bu - var temp_folder = std.testing.tmpDir(.{}); - defer temp_folder.cleanup(); - -- try temp_folder.dir.writeFile(.{ .sub_path = TEST_FILENAME, .data = TEST_FILE_CONTENTS }); -+ try temp_folder.dir.writeFile(std.testing.io, .{ .sub_path = TEST_FILENAME, .data = TEST_FILE_CONTENTS }); - -- const read_file = try temp_folder.dir.openFile(TEST_FILENAME, .{}); -- defer read_file.close(); -+ const read_file = try temp_folder.dir.openFile(std.testing.io, TEST_FILENAME, .{}); -+ defer read_file.close(std.testing.io); - - var small_buffer: [30]u8 = @splat(0); -- var read_stream = zigimg.io.ReadStream.initFile(read_file, small_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, small_buffer[0..]); - - var reader = read_stream.reader(); - -@@ -164,13 +164,13 @@ test "io.ReadStream: should read and seek properly within a file with a large bu - var temp_folder = std.testing.tmpDir(.{}); - defer temp_folder.cleanup(); - -- try temp_folder.dir.writeFile(.{ .sub_path = TEST_FILENAME, .data = TEST_FILE_CONTENTS }); -+ try temp_folder.dir.writeFile(std.testing.io, .{ .sub_path = TEST_FILENAME, .data = TEST_FILE_CONTENTS }); - -- const read_file = try temp_folder.dir.openFile(TEST_FILENAME, .{}); -- defer read_file.close(); -+ const read_file = try temp_folder.dir.openFile(std.testing.io, TEST_FILENAME, .{}); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - var reader = read_stream.reader(); - -@@ -206,13 +206,13 @@ test "io.ReadStream: should error on invalid seek within a file with a large buf - var temp_folder = std.testing.tmpDir(.{}); - defer temp_folder.cleanup(); - -- try temp_folder.dir.writeFile(.{ .sub_path = TEST_FILENAME, .data = TEST_FILE_CONTENTS }); -+ try temp_folder.dir.writeFile(std.testing.io, .{ .sub_path = TEST_FILENAME, .data = TEST_FILE_CONTENTS }); - -- const read_file = try temp_folder.dir.openFile(TEST_FILENAME, .{}); -- defer read_file.close(); -+ const read_file = try temp_folder.dir.openFile(std.testing.io, TEST_FILENAME, .{}); -+ defer read_file.close(std.testing.io); - - var read_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var read_stream = zigimg.io.ReadStream.initFile(read_file, read_buffer[0..]); -+ var read_stream = zigimg.io.ReadStream.initFile(std.testing.io, read_file, read_buffer[0..]); - - const seek_to_error = read_stream.seekTo(123456); - try helpers.expectError(seek_to_error, zigimg.io.ReadStream.SeekError.Unseekable); -@@ -261,10 +261,10 @@ test "io.WriteStream: should write property within a file with a small buffer" { - defer temp_folder.cleanup(); - - { -- const write_file = try temp_folder.dir.createFile(TEST_FILENAME, .{}); -- defer write_file.close(); -+ const write_file = try temp_folder.dir.createFile(std.testing.io, TEST_FILENAME, .{}); -+ defer write_file.close(std.testing.io); - -- var write_stream = zigimg.io.WriteStream.initFile(write_file, buffer[0..]); -+ var write_stream = zigimg.io.WriteStream.initFile(std.testing.io, write_file, buffer[0..]); - - var writer = write_stream.writer(); - try writer.writeAll(TEST_FILE_CONTENTS[0..3]); -@@ -283,11 +283,11 @@ test "io.WriteStream: should write property within a file with a small buffer" { - try writer.flush(); - } - -- var read_file = try temp_folder.dir.openFile(TEST_FILENAME, .{}); -- defer read_file.close(); -+ var read_file = try temp_folder.dir.openFile(std.testing.io, TEST_FILENAME, .{}); -+ defer read_file.close(std.testing.io); - - var read_buffer: [1024]u8 = @splat(0); -- var file_reader = read_file.reader(read_buffer[0..]); -+ var file_reader = read_file.reader(std.testing.io, read_buffer[0..]); - - var reader = &file_reader.interface; - -@@ -305,11 +305,11 @@ test "io.WriteStream: should write property within a file with a large buffer" { - defer temp_folder.cleanup(); - - { -- const write_file = try temp_folder.dir.createFile(TEST_FILENAME, .{}); -- defer write_file.close(); -+ const write_file = try temp_folder.dir.createFile(std.testing.io, TEST_FILENAME, .{}); -+ defer write_file.close(std.testing.io); - - var write_buffer: [zigimg.io.DEFAULT_BUFFER_SIZE]u8 = undefined; -- var write_stream = zigimg.io.WriteStream.initFile(write_file, write_buffer[0..]); -+ var write_stream = zigimg.io.WriteStream.initFile(std.testing.io, write_file, write_buffer[0..]); - - var writer = write_stream.writer(); - try writer.writeAll(TEST_FILE_CONTENTS[0..3]); -@@ -328,11 +328,11 @@ test "io.WriteStream: should write property within a file with a large buffer" { - try writer.flush(); - } - -- var read_file = try temp_folder.dir.openFile(TEST_FILENAME, .{}); -- defer read_file.close(); -+ var read_file = try temp_folder.dir.openFile(std.testing.io, TEST_FILENAME, .{}); -+ defer read_file.close(std.testing.io); - - var read_buffer: [1024]u8 = @splat(0); -- var file_reader = read_file.reader(read_buffer[0..]); -+ var file_reader = read_file.reader(std.testing.io, read_buffer[0..]); - - var reader = &file_reader.interface; - -diff --git a/zigimg.zig b/zigimg.zig -index 9f6b1a8..a53b23c 100644 ---- a/zigimg.zig -+++ b/zigimg.zig -@@ -38,5 +38,5 @@ test { - @import("tests/octree_quantizer_test.zig"), - @import("tests/pixel_format_converter_test.zig"), - @import("tests/pixel_format_test.zig"), -- }) |source_file| std.testing.refAllDeclsRecursive(source_file); -+ }) |source_file| std.testing.refAllDecls(source_file); - } -diff --git a/src/formats/gif.zig b/src/formats/gif.zig ---- a/src/formats/gif.zig -+++ b/src/formats/gif.zig -@@ -8,7 +8,7 @@ - const std = @import("std"); - const utils = @import("../utils.zig"); - --pub const HeaderFlags = packed struct { -+pub const HeaderFlags = packed struct(u8) { - global_color_table_size: u3 = 0, - sorted: bool = false, - color_resolution: u3 = 0, -@@ -129,9 +129,9 @@ - pub const GIF = struct { - header: Header = .{}, - global_color_table: utils.FixedStorage(color.Rgb24, 256) = .{}, -- frames: std.ArrayList(FrameData) = .{}, -- comments: std.ArrayList(CommentExtension) = .{}, -- application_infos: std.ArrayList(ApplicationExtension) = .{}, -+ frames: std.ArrayList(FrameData) = .empty, -+ comments: std.ArrayList(CommentExtension) = .empty, -+ application_infos: std.ArrayList(ApplicationExtension) = .empty, - arena_allocator: std.heap.ArenaAllocator = undefined, - - pub const SubImage = struct { -@@ -147,6 +147,6 @@ - pub const FrameData = struct { - graphics_control: ?GraphicControlExtension = null, -- sub_images: std.ArrayList(*SubImage) = .{}, -+ sub_images: std.ArrayList(*SubImage) = .empty, - - pub fn deinit(self: *FrameData, allocator: std.mem.Allocator) void { - for (self.sub_images.items) |sub_image| { -@@ -683,7 +683,7 @@ - const final_pixel_format = self.findBestPixelFormat(); - - const frame_list_allocator = self.arena_allocator.child_allocator; - -- var frame_list = Image.Animation.FrameList{}; -+ var frame_list: Image.Animation.FrameList = .empty; - - if (self.frames.items.len == 0) { -diff --git a/src/compressions/lzw.zig b/src/compressions/lzw.zig ---- a/src/compressions/lzw.zig -+++ b/src/compressions/lzw.zig -@@ -11,9 +11,10 @@ - next_code: u13 = 0, - previous_code: ?u13 = null, -- dictionary: std.AutoArrayHashMap(u13, []const u8), -+ dictionary: std.AutoArrayHashMapUnmanaged(u13, []const u8) = .empty, -+ dict_allocator: std.mem.Allocator, - - remaining_data: ?u13 = null, - remaining_bits: u4 = 0, -@@ -27,7 +28,7 @@ - var result = Self{ - .area_allocator = std.heap.ArenaAllocator.init(allocator), - .code_size = initial_code_size, -- .dictionary = std.AutoArrayHashMap(u13, []const u8).init(allocator), -+ .dict_allocator = allocator, - .initial_code_size = initial_code_size, - .clear_code = @as(u13, 1) << @intCast(initial_code_size), - .end_information_code = (@as(u13, 1) << @intCast(initial_code_size)) + 1, -@@ -43,7 +44,7 @@ - - pub fn deinit(self: *Self) void { - self.area_allocator.deinit(); -- self.dictionary.deinit(); -+ self.dictionary.deinit(self.dict_allocator); - } - - pub fn decode(self: *Self, reader: *std.Io.Reader, writer: *std.Io.Writer) !void { -@@ -85,7 +86,7 @@ - var new_value = try allocator.alloc(u8, previous_value.len + 1); - std.mem.copyForwards(u8, new_value, previous_value); - new_value[previous_value.len] = value[0]; -- try self.dictionary.put(self.next_code, new_value); -+ try self.dictionary.put(self.dict_allocator, self.next_code, new_value); - - self.next_code += 1; - -@@ -109,7 +110,7 @@ - var new_value = try allocator.alloc(u8, previous_value.len + 1); - std.mem.copyForwards(u8, new_value, previous_value); - new_value[previous_value.len] = previous_value[0]; -- try self.dictionary.put(self.next_code, new_value); -+ try self.dictionary.put(self.dict_allocator, self.next_code, new_value); - - _ = try writer.write(new_value); - -@@ -154,7 +155,7 @@ - var data = try allocator.alloc(u8, 1); - data[0] = @as(u8, @truncate(index)); - -- try self.dictionary.put(index, data); -+ try self.dictionary.put(self.dict_allocator, index, data); - } - } - }; -diff --git a/src/formats/jpeg/huffman.zig b/src/formats/jpeg/huffman.zig ---- a/src/formats/jpeg/huffman.zig -+++ b/src/formats/jpeg/huffman.zig -@@ -9,7 +9,7 @@ - - const HuffmanCode = struct { length_minus_one: u4, code: u16 }; --const HuffmanCodeMap = std.AutoArrayHashMap(HuffmanCode, u8); -+const HuffmanCodeMap = std.AutoArrayHashMapUnmanaged(HuffmanCode, u8); - - const JPEG_DEBUG = false; - const JPEG_VERY_DEBUG = false; -@@ -40,8 +40,8 @@ - for (code_counts) |count| total_huffman_codes += count; - -- var huffman_code_map = HuffmanCodeMap.init(allocator); -- errdefer huffman_code_map.deinit(); -+ var huffman_code_map: HuffmanCodeMap = .empty; -+ errdefer huffman_code_map.deinit(allocator); - - var fast_table: [1 << fast_bits]u8 = @splat(255); - var fast_size: [1 << fast_bits]u5 = @splat(0); -@@ -65,7 +65,7 @@ - - const byte = try reader.takeByte(); -- try huffman_code_map.put(.{ .length_minus_one = @as(u4, @intCast(i)), .code = code }, byte); -+ try huffman_code_map.put(allocator, .{ .length_minus_one = @as(u4, @intCast(i)), .code = code }, byte); - - // construct accelaration structure see stb_image - if (i + 1 <= fast_bits) { -@@ -96,5 +96,5 @@ - - pub fn deinit(self: *Table) void { -- self.code_map.deinit(); -+ self.code_map.deinit(self.allocator); - } - }; - diff --git a/third_party/zigimg/repo.bzl b/third_party/zigimg/repo.bzl index aa375cfc..a4bb178f 100644 --- a/third_party/zigimg/repo.bzl +++ b/third_party/zigimg/repo.bzl @@ -1,25 +1,10 @@ -def _zigimg_repo_impl(ctx): - ctx.download_and_extract( - url = "https://github.com/zigimg/zigimg/archive/{}.tar.gz".format(ctx.attr.commit), - stripPrefix = "zigimg-{}".format(ctx.attr.commit), - ) - - ctx.patch(ctx.attr.patch, strip = 1) - ctx.symlink(ctx.attr.build_file, "BUILD.bazel") - -_zigimg_repo = repository_rule( - implementation = _zigimg_repo_impl, - attrs = { - "commit": attr.string(mandatory = True), - "patch": attr.label(mandatory = True, allow_single_file = True), - "build_file": attr.label(mandatory = True, allow_single_file = True), - }, -) +load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") def repo(): - _zigimg_repo( + git_repository( name = "zigimg", - commit = "7b98e82621fe302a9edc147df1191f4d1b7ff7a5", - patch = "//third_party/zigimg:bump-zig.patch", - build_file = "//third_party/zigimg:zigimg.bazel", + remote = "https://github.com/zigimg/zigimg.git", + # Match libvaxis build.zig.zon. + commit = "734fa919fb15b7917d4eb124f53600348f4ffa30", + build_file = Label("//third_party/zigimg:zigimg.bazel"), ) diff --git a/third_party/zio/repo.bzl b/third_party/zio/repo.bzl index 16b9e277..96133ef0 100644 --- a/third_party/zio/repo.bzl +++ b/third_party/zio/repo.bzl @@ -4,6 +4,6 @@ def repo(): git_repository( name = "zio", remote = "https://github.com/lalinsky/zio", - commit = "281d969fdefe04f2e8b28d1f45fac0011f881c73", # v0.19.0 + commit = "1b4e9787f8a4a67d91372a603b23258364f89bf0", build_file = Label("//third_party/zio:zio.bazel"), ) diff --git a/third_party/zls/BUILD.bazel b/third_party/zls/BUILD.bazel new file mode 100644 index 00000000..964fe87b --- /dev/null +++ b/third_party/zls/BUILD.bazel @@ -0,0 +1,36 @@ +load("@rules_zig//zig:defs.bzl", "zig_library") +load("@rules_zig//zig/zls:toolchain.bzl", "zls_toolchain") + +exports_files(glob(["*.bazel"])) + +zig_library( + name = "build_options", + main = "build_options.zig", + visibility = ["@zls//:__pkg__"], +) + +zig_library( + name = "exe_options", + main = "exe_options.zig", + visibility = ["@zls//:__pkg__"], +) + +zig_library( + name = "tracy_options", + import_name = "options", + main = "tracy_options.zig", + visibility = ["@zls//:__pkg__"], +) + +zls_toolchain( + name = "zls", + bin = "@zls//:zls", + zls_version = "0.17.0-dev+eab2be0fd744", +) + +toolchain( + name = "toolchain", + target_settings = ["@zig_toolchains//:0.17.0"], + toolchain = ":zls", + toolchain_type = "@rules_zig//zig/zls:toolchain_type", +) diff --git a/third_party/zls/build_options.zig b/third_party/zls/build_options.zig new file mode 100644 index 00000000..b50cb2d8 --- /dev/null +++ b/third_party/zls/build_options.zig @@ -0,0 +1,5 @@ +const std = @import("std"); + +pub const version_string = "0.17.0-dev+eab2be0fd744"; +pub const version = std.SemanticVersion.parse(version_string) catch unreachable; +pub const minimum_runtime_zig_version_string = "0.17.0"; diff --git a/third_party/zls/diffz.bazel b/third_party/zls/diffz.bazel new file mode 100644 index 00000000..fb4b85fa --- /dev/null +++ b/third_party/zls/diffz.bazel @@ -0,0 +1,8 @@ +load("@rules_zig//zig:defs.bzl", "zig_library") + +zig_library( + name = "diffz", + srcs = glob(["**/*.zig"]), + main = "DiffMatchPatch.zig", + visibility = ["@zls//:__pkg__"], +) diff --git a/third_party/zls/exe_options.zig b/third_party/zls/exe_options.zig new file mode 100644 index 00000000..eaad61b5 --- /dev/null +++ b/third_party/zls/exe_options.zig @@ -0,0 +1,3 @@ +pub const enable_failing_allocator = false; +pub const enable_failing_allocator_likelihood: u32 = 256; +pub const debug_gpa = false; diff --git a/third_party/zls/known_folders.bazel b/third_party/zls/known_folders.bazel new file mode 100644 index 00000000..234db4b0 --- /dev/null +++ b/third_party/zls/known_folders.bazel @@ -0,0 +1,8 @@ +load("@rules_zig//zig:defs.bzl", "zig_library") + +zig_library( + name = "known-folders", + srcs = glob(["**/*.zig"]), + main = "known-folders.zig", + visibility = ["@zls//:__pkg__"], +) diff --git a/third_party/zls/lsp.bazel b/third_party/zls/lsp.bazel new file mode 100644 index 00000000..b7c6b6dd --- /dev/null +++ b/third_party/zls/lsp.bazel @@ -0,0 +1,51 @@ +load("@rules_zig//zig:defs.bzl", "zig_binary", "zig_library") + +# @embedFile resolves a module's root file without parsing it as Zig. +genrule( + name = "meta_model_source", + srcs = ["metaModel.json"], + outs = ["meta_model.zig"], + cmd = "cp $(<) $(@)", +) + +zig_library( + name = "meta-model", + main = ":meta_model.zig", +) + +zig_binary( + name = "codegen", + srcs = glob(["src/codegen/*.zig"]), + extra_srcs = ["src/codegen/config.zon"], + main = "src/codegen/codegen.zig", + deps = [":meta-model"], +) + +genrule( + name = "generate_types", + outs = ["lsp_types.zig"], + cmd = "$(location :codegen) $(@)", + tools = [":codegen"], +) + +zig_library( + name = "parser", + main = "src/parser.zig", +) + +zig_library( + name = "types", + main = ":lsp_types.zig", + deps = [":parser"], +) + +zig_library( + name = "lsp", + srcs = glob(["src/*.zig"]), + main = "src/lsp.zig", + visibility = ["@zls//:__pkg__"], + deps = [ + ":parser", + ":types", + ], +) diff --git a/third_party/zls/repo.bzl b/third_party/zls/repo.bzl new file mode 100644 index 00000000..27f05c5c --- /dev/null +++ b/third_party/zls/repo.bzl @@ -0,0 +1,28 @@ +load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") + +def repo(): + # ZLS 0.17 development revision; dependencies match its build.zig.zon. + git_repository( + name = "zls", + remote = "https://github.com/zigtools/zls.git", + commit = "eab2be0fd74443a27662da809b771c4ad0d2afcf", + build_file = Label("//third_party/zls:zls.bazel"), + ) + git_repository( + name = "zls_lsp", + remote = "https://github.com/zigtools/lsp-kit.git", + commit = "d148676ace1eaecf3c703ce7d350d0e94e502ed7", + build_file = Label("//third_party/zls:lsp.bazel"), + ) + git_repository( + name = "zls_diffz", + remote = "https://github.com/ziglibs/diffz.git", + commit = "aac8aa99c436ab8277b0711922aad062c0167b12", + build_file = Label("//third_party/zls:diffz.bazel"), + ) + git_repository( + name = "zls_known_folders", + remote = "https://github.com/ziglibs/known-folders.git", + commit = "6da0d0c41b78b9ed2d34fa364fcb81b5ebece6c4", + build_file = Label("//third_party/zls:known_folders.bazel"), + ) diff --git a/third_party/zls/tracy_options.zig b/third_party/zls/tracy_options.zig new file mode 100644 index 00000000..01dfcb1d --- /dev/null +++ b/third_party/zls/tracy_options.zig @@ -0,0 +1,3 @@ +pub const enable = false; +pub const enable_allocation = false; +pub const enable_callstack = false; diff --git a/third_party/zls/zls.bazel b/third_party/zls/zls.bazel new file mode 100644 index 00000000..56ccbff8 --- /dev/null +++ b/third_party/zls/zls.bazel @@ -0,0 +1,53 @@ +load("@rules_zig//zig:defs.bzl", "zig_binary", "zig_library") + +zig_binary( + name = "config_gen", + extra_srcs = ["src/tools/config.json"], + main = "src/tools/config_gen.zig", +) + +genrule( + name = "generate_version_data", + srcs = ["src/tools/langref.html.in"], + outs = ["version_data.zig"], + cmd = "$(location :config_gen) --langref-version master --langref-path $(<) --generate-version-data $(@)", + tools = [":config_gen"], +) + +zig_library( + name = "version_data", + main = ":version_data.zig", +) + +zig_library( + name = "tracy", + main = "src/tracy.zig", + deps = ["@zml//third_party/zls:tracy_options"], +) + +zig_library( + name = "zls_lib", + srcs = glob(["src/**/*.zig"]), + import_name = "zls", + main = "src/zls.zig", + deps = [ + ":tracy", + ":version_data", + "@zls_diffz//:diffz", + "@zls_lsp//:lsp", + "@zml//third_party/zls:build_options", + ], +) + +zig_binary( + name = "zls", + srcs = glob(["src/**/*.zig"]), + main = "src/main.zig", + visibility = ["//visibility:public"], + deps = [ + ":tracy", + ":zls_lib", + "@zls_known_folders//:known-folders", + "@zml//third_party/zls:exe_options", + ], +) diff --git a/vfs/BUILD.bazel b/vfs/BUILD.bazel index 0ebc39e1..c8de1e0c 100644 --- a/vfs/BUILD.bazel +++ b/vfs/BUILD.bazel @@ -1,8 +1,7 @@ -load("@rules_zig//zig:defs.bzl", "zig_library") +load("@rules_zig//zig:defs.bzl", "zig_library", "zig_test") zig_library( name = "vfs", - main = "vfs.zig", srcs = [ "base.zig", "file.zig", @@ -12,9 +11,15 @@ zig_library( "parallel_read.zig", "s3.zig", ], + main = "vfs.zig", tags = ["manual"], visibility = ["//visibility:public"], deps = [ "//stdx", ], ) + +zig_test( + name = "test", + deps = [":vfs"], +) diff --git a/vfs/base.zig b/vfs/base.zig index 33d79509..1e66ca89 100644 --- a/vfs/base.zig +++ b/vfs/base.zig @@ -93,12 +93,12 @@ pub const VFSBase = struct { .processSetCurrentDir = processSetCurrentDir, .processSetCurrentPath = processSetCurrentPath, .processReplace = processReplace, - .processReplacePath = processReplacePath, .processSpawn = processSpawn, - .processSpawnPath = processSpawnPath, .childWait = childWait, .childKill = childKill, .progressParentFile = progressParentFile, + .inheritParentDir = inheritParentDir, + .inheritParentFile = inheritParentFile, .now = now, .clockResolution = clockResolution, .sleep = sleep, @@ -111,9 +111,6 @@ pub const VFSBase = struct { .netListenUnix = netListenUnix, .netConnectUnix = netConnectUnix, .netSocketCreatePair = netSocketCreatePair, - .netSend = netSend, - .netRead = netRead, - .netWrite = netWrite, .netWriteFile = netWriteFile, .netClose = netClose, .netShutdown = netShutdown, @@ -261,7 +258,7 @@ pub const VFSBase = struct { return self.inner.vtable.dirAccess(self.inner.userdata, dir, sub_path, options); } - pub fn dirCreateFile(userdata: ?*anyopaque, dir: std.Io.Dir, sub_path: []const u8, flags: std.Io.File.CreateFlags) std.Io.File.OpenError!std.Io.File { + pub fn dirCreateFile(userdata: ?*anyopaque, dir: std.Io.Dir, sub_path: []const u8, flags: std.Io.Dir.CreateFileOptions) std.Io.File.OpenError!std.Io.File { const self: *VFSBase = @ptrCast(@alignCast(userdata.?)); return self.inner.vtable.dirCreateFile(self.inner.userdata, dir, sub_path, flags); } @@ -271,7 +268,7 @@ pub const VFSBase = struct { return self.inner.vtable.dirCreateFileAtomic(self.inner.userdata, dir, sub_path, options); } - pub fn dirOpenFile(userdata: ?*anyopaque, dir: std.Io.Dir, sub_path: []const u8, flags: std.Io.File.OpenFlags) std.Io.File.OpenError!std.Io.File { + pub fn dirOpenFile(userdata: ?*anyopaque, dir: std.Io.Dir, sub_path: []const u8, flags: std.Io.Dir.OpenFileOptions) std.Io.File.OpenError!std.Io.File { const self: *VFSBase = @ptrCast(@alignCast(userdata.?)); return self.inner.vtable.dirOpenFile(self.inner.userdata, dir, sub_path, flags); } @@ -496,7 +493,7 @@ pub const VFSBase = struct { return self.inner.vtable.fileMemoryMapWrite(self.inner.userdata, memory_map); } - pub fn processExecutableOpen(userdata: ?*anyopaque, flags: std.Io.File.OpenFlags) std.process.OpenExecutableError!std.Io.File { + pub fn processExecutableOpen(userdata: ?*anyopaque, flags: std.Io.Dir.OpenFileOptions) std.process.OpenExecutableError!std.Io.File { const self: *VFSBase = @ptrCast(@alignCast(userdata.?)); return self.inner.vtable.processExecutableOpen(self.inner.userdata, flags); } @@ -541,21 +538,11 @@ pub const VFSBase = struct { return self.inner.vtable.processReplace(self.inner.userdata, options); } - pub fn processReplacePath(userdata: ?*anyopaque, dir: std.Io.Dir, options: std.process.ReplaceOptions) std.process.ReplaceError { - const self: *VFSBase = @ptrCast(@alignCast(userdata.?)); - return self.inner.vtable.processReplacePath(self.inner.userdata, dir, options); - } - pub fn processSpawn(userdata: ?*anyopaque, options: std.process.SpawnOptions) std.process.SpawnError!std.process.Child { const self: *VFSBase = @ptrCast(@alignCast(userdata.?)); return self.inner.vtable.processSpawn(self.inner.userdata, options); } - pub fn processSpawnPath(userdata: ?*anyopaque, dir: std.Io.Dir, options: std.process.SpawnOptions) std.process.SpawnError!std.process.Child { - const self: *VFSBase = @ptrCast(@alignCast(userdata.?)); - return self.inner.vtable.processSpawnPath(self.inner.userdata, dir, options); - } - pub fn childWait(userdata: ?*anyopaque, child: *std.process.Child) std.process.Child.WaitError!std.process.Child.Term { const self: *VFSBase = @ptrCast(@alignCast(userdata.?)); return self.inner.vtable.childWait(self.inner.userdata, child); @@ -571,6 +558,16 @@ pub const VFSBase = struct { return self.inner.vtable.progressParentFile(self.inner.userdata); } + pub fn inheritParentDir(userdata: ?*anyopaque, handle: std.Io.Dir.Handle) std.Io.InheritParentHandleError!std.Io.Dir { + const self: *VFSBase = @ptrCast(@alignCast(userdata.?)); + return self.inner.vtable.inheritParentDir(self.inner.userdata, handle); + } + + pub fn inheritParentFile(userdata: ?*anyopaque, handle: std.Io.File.Handle, flags: std.Io.File.Flags) std.Io.InheritParentHandleError!std.Io.File { + const self: *VFSBase = @ptrCast(@alignCast(userdata.?)); + return self.inner.vtable.inheritParentFile(self.inner.userdata, handle, flags); + } + pub fn now(userdata: ?*anyopaque, clock: std.Io.Clock) std.Io.Timestamp { const self: *VFSBase = @ptrCast(@alignCast(userdata.?)); return self.inner.vtable.now(self.inner.userdata, clock); @@ -631,29 +628,14 @@ pub const VFSBase = struct { return self.inner.vtable.netSocketCreatePair(self.inner.userdata, options); } - pub fn netSend(userdata: ?*anyopaque, handle: std.Io.net.Socket.Handle, msgs: []std.Io.net.OutgoingMessage, flags: std.Io.net.SendFlags) struct { ?std.Io.net.Socket.SendError, usize } { - const self: *VFSBase = @ptrCast(@alignCast(userdata.?)); - return self.inner.vtable.netSend(self.inner.userdata, handle, msgs, flags); - } - - pub fn netRead(userdata: ?*anyopaque, src: std.Io.net.Socket.Handle, data: [][]u8) std.Io.net.Stream.Reader.Error!usize { - const self: *VFSBase = @ptrCast(@alignCast(userdata.?)); - return self.inner.vtable.netRead(self.inner.userdata, src, data); - } - - pub fn netWrite(userdata: ?*anyopaque, dest: std.Io.net.Socket.Handle, header: []const u8, data: []const []const u8, splat: usize) std.Io.net.Stream.Writer.Error!usize { - const self: *VFSBase = @ptrCast(@alignCast(userdata.?)); - return self.inner.vtable.netWrite(self.inner.userdata, dest, header, data, splat); - } - pub fn netWriteFile(userdata: ?*anyopaque, handle: std.Io.net.Socket.Handle, header: []const u8, reader: *std.Io.File.Reader, limit: std.Io.Limit) std.Io.net.Stream.Writer.WriteFileError!usize { const self: *VFSBase = @ptrCast(@alignCast(userdata.?)); return self.inner.vtable.netWriteFile(self.inner.userdata, handle, header, reader, limit); } - pub fn netClose(userdata: ?*anyopaque, handles: []const std.Io.net.Socket.Handle) void { + pub fn netClose(userdata: ?*anyopaque, sockets: []const std.Io.net.Socket) void { const self: *VFSBase = @ptrCast(@alignCast(userdata.?)); - self.inner.vtable.netClose(self.inner.userdata, handles); + self.inner.vtable.netClose(self.inner.userdata, sockets); } pub fn netShutdown(userdata: ?*anyopaque, handle: std.Io.net.Socket.Handle, how: std.Io.net.ShutdownHow) std.Io.net.ShutdownError!void { diff --git a/vfs/file.zig b/vfs/file.zig index 627f79d9..1b077c33 100644 --- a/vfs/file.zig +++ b/vfs/file.zig @@ -21,9 +21,30 @@ fn canUseDirectIO() bool { return false; } +fn getStatusFlags(file: std.Io.File) DirectIoError!c_int { + while (true) { + const result: c_int = std.posix.system.fcntl(file.handle, std.posix.F.GETFL, @as(c_int, 0)); + switch (std.posix.errno(result)) { + .SUCCESS => return result, + .INTR => continue, + else => return DirectIoError.UnexpectedFcntlResult, + } + } +} + +fn setStatusFlags(file: std.Io.File, flags: c_int) DirectIoError!void { + while (true) { + switch (std.posix.errno(std.posix.system.fcntl(file.handle, std.posix.F.SETFL, flags))) { + .SUCCESS => return, + .INTR => continue, + else => return DirectIoError.UnexpectedFcntlResult, + } + } +} + fn useDirectIO(file: std.Io.File) DirectIoError!bool { if (comptime canUseDirectIO()) { - const flags = std.posix.system.fcntl(file.handle, std.posix.F.GETFL); + const flags = try getStatusFlags(file); const direct_flag: c_int = @bitCast(std.posix.O{ .DIRECT = true }); return (flags & direct_flag) != 0; } else { @@ -33,12 +54,11 @@ fn useDirectIO(file: std.Io.File) DirectIoError!bool { fn switchToBufferedIO(file: std.fs.File) DirectIoError!void { if (comptime canUseDirectIO()) { - const flags = std.posix.system.fcntl(file.handle, std.posix.F.GETFL); + const flags = try getStatusFlags(file); const direct_flag: c_int = @bitCast(std.posix.O{ .DIRECT = true }); if ((flags & direct_flag) == 0) return; - const result = try std.posix.fcntl(file.handle, std.posix.F.SETFL, flags & ~@as(c_uint, @bitCast(@as(u32, @intCast(direct_flag))))); - if (result != 0) return DirectIoError.UnexpectedFcntlResult; + try setStatusFlags(file, flags & ~direct_flag); } else { return DirectIoError.UnsupportedPlatform; } @@ -46,11 +66,9 @@ fn switchToBufferedIO(file: std.fs.File) DirectIoError!void { fn switchToDirectIO(file: std.Io.File) DirectIoError!void { if (builtin.os.tag == .linux and canUseDirectIO()) { - const flags = std.posix.system.fcntl(file.handle, std.posix.F.GETFL); + const flags = try getStatusFlags(file); const direct_flag: c_int = @bitCast(std.posix.O{ .DIRECT = true }); - - const result = std.posix.system.fcntl(file.handle, std.posix.F.SETFL, flags | direct_flag); - if (result != 0) return DirectIoError.UnexpectedFcntlResult; + try setStatusFlags(file, flags | direct_flag); } else { return DirectIoError.UnsupportedPlatform; } @@ -111,6 +129,7 @@ pub const File = struct { .dirStat = dirStat, .dirStatFile = dirStatFile, .dirAccess = dirAccess, + .dirCreateFile = dirCreateFile, .dirOpenFile = dirOpenFile, .dirClose = dirClose, .dirRead = dirRead, @@ -119,6 +138,9 @@ pub const File = struct { .fileStat = fileStat, .fileLength = fileLength, .fileClose = fileClose, + .fileWritePositional = fileWritePositional, + .fileWriteFileStreaming = fileWriteFileStreaming, + .fileWriteFilePositional = fileWriteFilePositional, .fileReadPositional = fileReadPositional, .fileSeekBy = fileSeekBy, .fileSeekTo = fileSeekTo, @@ -151,7 +173,7 @@ pub const File = struct { return self.handles.at(@intCast(file.handle)); } - fn canOpenWithDirectIO(self: *File, file: std.Io.File, flags: std.Io.File.OpenFlags) std.Io.File.OpenError!bool { + fn canOpenWithDirectIO(self: *File, file: std.Io.File, flags: std.Io.Dir.OpenFileOptions) std.Io.File.OpenError!bool { const file_stat = self.base.inner.vtable.fileStat(self.base.inner.userdata, file) catch |err| switch (err) { else => return std.Io.File.OpenError.Unexpected, }; @@ -201,7 +223,18 @@ pub const File = struct { }, }); }, - .file_write_streaming, .device_io_control, .net_receive => { + .file_write_streaming => |o| { + const handle = self.getFileHandle(o.file); + return self.base.inner.vtable.operate(self.base.inner.userdata, .{ + .file_write_streaming = .{ + .file = handle.innerFile(), + .header = o.header, + .data = o.data, + .splat = o.splat, + }, + }); + }, + .device_io_control, .net_receive, .net_read, .net_send, .net_write => { return self.base.inner.vtable.operate(self.base.inner.userdata, operation); }, } @@ -227,7 +260,21 @@ pub const File = struct { return self.base.inner.vtable.dirAccess(self.base.inner.userdata, dir, sub_path, options); } - fn dirOpenFile(userdata: ?*anyopaque, dir: std.Io.Dir, sub_path: []const u8, flags: std.Io.File.OpenFlags) std.Io.File.OpenError!std.Io.File { + fn dirCreateFile(userdata: ?*anyopaque, dir: std.Io.Dir, sub_path: []const u8, flags: std.Io.Dir.CreateFileOptions) std.Io.File.OpenError!std.Io.File { + const self: *File = @fieldParentPtr("base", VFSBase.as(userdata)); + const inner_file = try self.base.inner.vtable.dirCreateFile(self.base.inner.userdata, dir, sub_path, flags); + errdefer inner_file.close(self.base.inner); + + const idx, const handle = self.openHandle() catch return std.Io.File.OpenError.Unexpected; + handle.* = .{ + .inner_handle = inner_file.handle, + .inner_flags = inner_file.flags, + .direct_io_handle = null, + }; + return .{ .handle = @intCast(idx), .flags = inner_file.flags }; + } + + fn dirOpenFile(userdata: ?*anyopaque, dir: std.Io.Dir, sub_path: []const u8, flags: std.Io.Dir.OpenFileOptions) std.Io.File.OpenError!std.Io.File { const self: *File = @fieldParentPtr("base", VFSBase.as(userdata)); const inner_file = try self.base.inner.vtable.dirOpenFile(self.base.inner.userdata, dir, sub_path, flags); errdefer inner_file.close(self.base.inner); @@ -311,6 +358,52 @@ pub const File = struct { } } + fn fileWritePositional(userdata: ?*anyopaque, file: std.Io.File, header: []const u8, data: []const []const u8, splat: usize, offset: u64) std.Io.File.WritePositionalError!usize { + const self: *File = @fieldParentPtr("base", VFSBase.as(userdata)); + const handle = self.getFileHandle(file); + return self.base.inner.vtable.fileWritePositional(self.base.inner.userdata, handle.innerFile(), header, data, splat, offset); + } + + fn fileWriteFileStreaming(userdata: ?*anyopaque, file: std.Io.File, header: []const u8, reader: *std.Io.File.Reader, limit: std.Io.Limit) std.Io.File.Writer.WriteFileError!usize { + const self: *File = @fieldParentPtr("base", VFSBase.as(userdata)); + const own_io = self.io(); + if (reader.io.userdata != own_io.userdata or reader.io.vtable != own_io.vtable) return error.Unimplemented; + + const destination = self.getFileHandle(file); + const source = self.getFileHandle(reader.file); + + const original_source_io = reader.io; + const original_source_file = reader.file; + reader.io = self.base.inner; + reader.file = source.innerFile(); + defer { + reader.io = original_source_io; + reader.file = original_source_file; + } + + return self.base.inner.vtable.fileWriteFileStreaming(self.base.inner.userdata, destination.innerFile(), header, reader, limit); + } + + fn fileWriteFilePositional(userdata: ?*anyopaque, file: std.Io.File, header: []const u8, reader: *std.Io.File.Reader, limit: std.Io.Limit, offset: u64) std.Io.File.WriteFilePositionalError!usize { + const self: *File = @fieldParentPtr("base", VFSBase.as(userdata)); + const own_io = self.io(); + if (reader.io.userdata != own_io.userdata or reader.io.vtable != own_io.vtable) return error.Unimplemented; + + const destination = self.getFileHandle(file); + const source = self.getFileHandle(reader.file); + + const original_source_io = reader.io; + const original_source_file = reader.file; + reader.io = self.base.inner; + reader.file = source.innerFile(); + defer { + reader.io = original_source_io; + reader.file = original_source_file; + } + + return self.base.inner.vtable.fileWriteFilePositional(self.base.inner.userdata, destination.innerFile(), header, reader, limit, offset); + } + fn fileReadPositional(userdata: ?*anyopaque, file: std.Io.File, data: []const []u8, offset: u64) std.Io.File.ReadPositionalError!usize { const self: *File = @fieldParentPtr("base", VFSBase.as(userdata)); const inner_file = self.innerFile(file, data, offset); diff --git a/vfs/gcs.zig b/vfs/gcs.zig index 649e9958..acc7f634 100644 --- a/vfs/gcs.zig +++ b/vfs/gcs.zig @@ -652,7 +652,7 @@ pub const GCS = struct { handle.pos += @intCast(total); return .{ .file_read_streaming = total }; }, - .file_write_streaming, .device_io_control, .net_receive => { + .file_write_streaming, .device_io_control, .net_receive, .net_read, .net_send, .net_write => { return self.base.inner.vtable.operate(self.base.inner.userdata, operation); }, } @@ -709,7 +709,7 @@ pub const GCS = struct { fn dirAccess(_: ?*anyopaque, _: std.Io.Dir, _: []const u8, _: std.Io.Dir.AccessOptions) std.Io.Dir.AccessError!void {} - fn dirOpenFile(userdata: ?*anyopaque, dir: std.Io.Dir, sub_path: []const u8, _: std.Io.File.OpenFlags) std.Io.File.OpenError!std.Io.File { + fn dirOpenFile(userdata: ?*anyopaque, dir: std.Io.Dir, sub_path: []const u8, _: std.Io.Dir.OpenFileOptions) std.Io.File.OpenError!std.Io.File { const self: *GCS = @alignCast(@fieldParentPtr("base", VFSBase.as(userdata))); const size = self.fetchSize(dir, sub_path) catch |err| switch (err) { error.FileNotFound => return std.Io.File.OpenError.FileNotFound, @@ -875,7 +875,7 @@ pub const GCS = struct { return try std.fmt.bufPrint(buf, "{d:0>4}{d:0>2}{d:0>2}T{d:0>2}{d:0>2}{d:0>2}Z", .{ year_day.year, - @intFromEnum(month_day.month), + @backingInt(month_day.month), month_day.day_index + 1, day_seconds.getHoursIntoDay(), day_seconds.getMinutesIntoHour(), diff --git a/vfs/hf.zig b/vfs/hf.zig index 2a1e9249..8770fe18 100644 --- a/vfs/hf.zig +++ b/vfs/hf.zig @@ -652,7 +652,7 @@ pub const HF = struct { handle.pos += @intCast(total); return .{ .file_read_streaming = total }; }, - .file_write_streaming, .device_io_control, .net_receive => { + .file_write_streaming, .device_io_control, .net_receive, .net_read, .net_send, .net_write => { return self.base.inner.vtable.operate(self.base.inner.userdata, operation); }, } @@ -732,7 +732,7 @@ pub const HF = struct { if (node == null) return std.Io.Dir.AccessError.FileNotFound; } - fn dirOpenFile(userdata: ?*anyopaque, dir: std.Io.Dir, sub_path: []const u8, _: std.Io.File.OpenFlags) std.Io.File.OpenError!std.Io.File { + fn dirOpenFile(userdata: ?*anyopaque, dir: std.Io.Dir, sub_path: []const u8, _: std.Io.Dir.OpenFileOptions) std.Io.File.OpenError!std.Io.File { const self: *HF = @fieldParentPtr("base", VFSBase.as(userdata)); var path_buffer: [8 * 1024]u8 = undefined; diff --git a/vfs/http.zig b/vfs/http.zig index ed8c5ee4..9054983e 100644 --- a/vfs/http.zig +++ b/vfs/http.zig @@ -156,7 +156,7 @@ pub const HTTP = struct { handle.pos += @intCast(total); return .{ .file_read_streaming = total }; }, - .file_write_streaming, .device_io_control, .net_receive => { + .file_write_streaming, .device_io_control, .net_receive, .net_read, .net_send, .net_write => { return self.base.inner.vtable.operate(self.base.inner.userdata, operation); }, } @@ -210,7 +210,7 @@ pub const HTTP = struct { fn dirAccess(_: ?*anyopaque, _: std.Io.Dir, _: []const u8, _: std.Io.Dir.AccessOptions) std.Io.Dir.AccessError!void {} - fn dirOpenFile(userdata: ?*anyopaque, dir: std.Io.Dir, sub_path: []const u8, _: std.Io.File.OpenFlags) std.Io.File.OpenError!std.Io.File { + fn dirOpenFile(userdata: ?*anyopaque, dir: std.Io.Dir, sub_path: []const u8, _: std.Io.Dir.OpenFileOptions) std.Io.File.OpenError!std.Io.File { const self: *HTTP = @fieldParentPtr("base", VFSBase.as(userdata)); const size = self.fetchSize(dir, sub_path) catch return std.Io.File.OpenError.Unexpected; diff --git a/vfs/s3.zig b/vfs/s3.zig index 51adcc7c..eb849e21 100644 --- a/vfs/s3.zig +++ b/vfs/s3.zig @@ -544,7 +544,7 @@ pub const S3 = struct { handle.pos += @intCast(total); return .{ .file_read_streaming = total }; }, - .file_write_streaming, .device_io_control, .net_receive => { + .file_write_streaming, .device_io_control, .net_receive, .net_read, .net_send, .net_write => { return self.base.inner.vtable.operate(self.base.inner.userdata, operation); }, } @@ -601,7 +601,7 @@ pub const S3 = struct { fn dirAccess(_: ?*anyopaque, _: std.Io.Dir, _: []const u8, _: std.Io.Dir.AccessOptions) std.Io.Dir.AccessError!void {} - fn dirOpenFile(userdata: ?*anyopaque, dir: std.Io.Dir, sub_path: []const u8, _: std.Io.File.OpenFlags) std.Io.File.OpenError!std.Io.File { + fn dirOpenFile(userdata: ?*anyopaque, dir: std.Io.Dir, sub_path: []const u8, _: std.Io.Dir.OpenFileOptions) std.Io.File.OpenError!std.Io.File { const self: *S3 = @fieldParentPtr("base", VFSBase.as(userdata)); const size = self.fetchSize(dir, sub_path) catch |err| switch (err) { error.FileNotFound => return std.Io.File.OpenError.FileNotFound, @@ -767,7 +767,7 @@ pub const S3 = struct { return try std.fmt.bufPrint(buf, "{d:0>4}{d:0>2}{d:0>2}T{d:0>2}{d:0>2}{d:0>2}Z", .{ year_day.year, - @intFromEnum(month_day.month), + @backingInt(month_day.month), month_day.day_index + 1, day_seconds.getHoursIntoDay(), day_seconds.getMinutesIntoHour(), diff --git a/vfs/vfs.zig b/vfs/vfs.zig index b5e5c580..fe626ff9 100644 --- a/vfs/vfs.zig +++ b/vfs/vfs.zig @@ -187,7 +187,16 @@ fn operate(userdata: ?*anyopaque, operation: std.Io.Operation) std.Io.Cancelable .data = o.data, } }); }, - .device_io_control, .file_write_streaming, .net_receive => { + .file_write_streaming => |o| { + const handle, const backend = self.getFileHandle(o.file); + return backend.vtable.operate(backend.userdata, .{ .file_write_streaming = .{ + .file = .{ .handle = @intCast(handle.handle), .flags = handle.flags }, + .header = o.header, + .data = o.data, + .splat = o.splat, + } }); + }, + .device_io_control, .net_receive, .net_read, .net_send, .net_write => { return self.base.inner.vtable.operate(self.base.inner.userdata, operation); }, } @@ -235,7 +244,7 @@ pub fn dirAccess(userdata: ?*anyopaque, dir: std.Io.Dir, sub_path: []const u8, o return backend.vtable.dirAccess(backend.userdata, dir_, stripScheme(sub_path), options); } -pub fn dirCreateFile(userdata: ?*anyopaque, dir: std.Io.Dir, sub_path: []const u8, flags: std.Io.File.CreateFlags) std.Io.File.OpenError!std.Io.File { +pub fn dirCreateFile(userdata: ?*anyopaque, dir: std.Io.Dir, sub_path: []const u8, flags: std.Io.Dir.CreateFileOptions) std.Io.File.OpenError!std.Io.File { const self: *VFS = @fieldParentPtr("base", VFSBase.as(userdata)); const backend_idx, const dir_, const backend = self.lookupDir(dir, sub_path) catch |err| { log.err("Failed to lookup backend for dir create file '{s}' : {any}", .{ sub_path, err }); @@ -243,25 +252,29 @@ pub fn dirCreateFile(userdata: ?*anyopaque, dir: std.Io.Dir, sub_path: []const u }; const file = try backend.vtable.dirCreateFile(backend.userdata, dir_, stripScheme(sub_path), flags); + errdefer file.close(backend); const idx, const handle = self.openHandle() catch return std.Io.File.OpenError.Unexpected; handle.* = .{ .handle = @intCast(file.handle), .backend_idx = backend_idx, + .flags = file.flags, }; - return .{ .handle = @intCast(idx), .flags = .{ .nonblocking = false } }; + return .{ .handle = @intCast(idx), .flags = file.flags }; } -fn dirOpenFile(userdata: ?*anyopaque, dir: std.Io.Dir, sub_path: []const u8, flags: std.Io.File.OpenFlags) std.Io.File.OpenError!std.Io.File { +fn dirOpenFile(userdata: ?*anyopaque, dir: std.Io.Dir, sub_path: []const u8, flags: std.Io.Dir.OpenFileOptions) std.Io.File.OpenError!std.Io.File { const self: *VFS = @fieldParentPtr("base", VFSBase.as(userdata)); const backend_idx, const dir_, const backend = self.lookupDir(dir, sub_path) catch |err| { log.err("Failed to lookup backend for opening file '{s}' : {any}", .{ sub_path, err }); return std.Io.File.OpenError.Unexpected; }; const file = try backend.vtable.dirOpenFile(backend.userdata, dir_, stripScheme(sub_path), flags); + errdefer file.close(backend); const idx, const handle = self.openHandle() catch return std.Io.Dir.OpenError.Unexpected; handle.* = .{ .handle = @intCast(file.handle), .backend_idx = backend_idx, + .flags = file.flags, }; return .{ .handle = @intCast(idx), .flags = handle.flags }; } @@ -353,26 +366,42 @@ fn fileWritePositional(userdata: ?*anyopaque, file: std.Io.File, header: []const fn fileWriteFileStreaming(userdata: ?*anyopaque, file: std.Io.File, header: []const u8, reader: *std.Io.File.Reader, limit: std.Io.Limit) std.Io.File.Writer.WriteFileError!usize { const self: *VFS = @fieldParentPtr("base", VFSBase.as(userdata)); + const own_io = self.io(); + if (reader.io.userdata != own_io.userdata or reader.io.vtable != own_io.vtable) return error.Unimplemented; const dst_handle, const dst_backend = self.getFileHandle(file); - const src_handle, _ = self.getFileHandle(reader.file); + const src_handle, const src_backend = self.getFileHandle(reader.file); + if (src_backend.userdata != dst_backend.userdata or src_backend.vtable != dst_backend.vtable) return error.Unimplemented; + const original_src_io = reader.io; const original_src_handle = reader.file; + reader.io = src_backend; reader.file = .{ .handle = @intCast(src_handle.handle), .flags = src_handle.flags }; - defer reader.file = original_src_handle; + defer { + reader.io = original_src_io; + reader.file = original_src_handle; + } return dst_backend.vtable.fileWriteFileStreaming(dst_backend.userdata, .{ .handle = @intCast(dst_handle.handle), .flags = dst_handle.flags }, header, reader, limit); } fn fileWriteFilePositional(userdata: ?*anyopaque, file: std.Io.File, header: []const u8, reader: *std.Io.File.Reader, limit: std.Io.Limit, offset: u64) std.Io.File.WriteFilePositionalError!usize { const self: *VFS = @fieldParentPtr("base", VFSBase.as(userdata)); + const own_io = self.io(); + if (reader.io.userdata != own_io.userdata or reader.io.vtable != own_io.vtable) return error.Unimplemented; const dst_handle, const dst_backend = self.getFileHandle(file); - const src_handle, _ = self.getFileHandle(reader.file); + const src_handle, const src_backend = self.getFileHandle(reader.file); + if (src_backend.userdata != dst_backend.userdata or src_backend.vtable != dst_backend.vtable) return error.Unimplemented; + const original_src_io = reader.io; const original_src_handle = reader.file; + reader.io = src_backend; reader.file = .{ .handle = @intCast(src_handle.handle), .flags = src_handle.flags }; - defer reader.file = original_src_handle; + defer { + reader.io = original_src_io; + reader.file = original_src_handle; + } return dst_backend.vtable.fileWriteFilePositional(dst_backend.userdata, .{ .handle = @intCast(dst_handle.handle), .flags = dst_handle.flags }, header, reader, limit, offset); } @@ -407,3 +436,48 @@ fn fileRealPath(userdata: ?*anyopaque, file: std.Io.File, out_buffer: []u8) std. return try backend.vtable.fileRealPath(backend.userdata, .{ .handle = @intCast(handle.handle), .flags = handle.flags }, out_buffer); } } + +test "copy a local file through the VFS" { + const allocator = std.testing.allocator; + const process_io = std.testing.io; + + var tmp = std.testing.tmpDir(.{}); + defer tmp.cleanup(); + + const source_data: [8192]u8 = @splat('x'); + try tmp.dir.writeFile(process_io, .{ + .sub_path = "source", + .data = &source_data, + }); + + var path_buffer: [std.Io.Dir.max_path_bytes]u8 = undefined; + const path_len = try tmp.dir.realPath(process_io, &path_buffer); + const source_uri = try std.fmt.allocPrint(allocator, "file://{s}/source", .{path_buffer[0..path_len]}); + defer allocator.free(source_uri); + const destination_uri = try std.fmt.allocPrint(allocator, "file://{s}/destination", .{path_buffer[0..path_len]}); + defer allocator.free(destination_uri); + + var file_backend: File = .init(allocator, process_io, .{}); + defer file_backend.deinit(); + var vfs: VFS = try .init(allocator, process_io); + defer vfs.deinit(); + try vfs.register("file", file_backend.io()); + + const vfs_io = vfs.io(); + { + var source = try std.Io.Dir.openFile(.cwd(), vfs_io, source_uri, .{}); + defer source.close(vfs_io); + var destination = try std.Io.Dir.createFile(.cwd(), vfs_io, destination_uri, .{}); + defer destination.close(vfs_io); + + var reader: std.Io.File.Reader = .initStreaming(source, vfs_io, &.{}); + var copy_buffer: [4096]u8 align(4096) = undefined; + var writer = destination.writer(vfs_io, ©_buffer); + try std.testing.expectEqual(source_data.len, try reader.interface.streamRemaining(&writer.interface)); + try writer.interface.flush(); + } + + const copied = try tmp.dir.readFileAlloc(process_io, "destination", allocator, .limited(source_data.len + 1)); + defer allocator.free(copied); + try std.testing.expectEqualSlices(u8, &source_data, copied); +} diff --git a/zml/Compiler.zig b/zml/Compiler.zig index 200f2265..15685740 100644 --- a/zml/Compiler.zig +++ b/zml/Compiler.zig @@ -164,7 +164,7 @@ pub fn init(allocator: std.mem.Allocator, io: std.Io, platform: *const Platform, var mlir_known_types: std.enums.EnumArray(DataType, *const mlir.Type) = .initUndefined(); { for (0.., &mlir_known_types.values) |i, *mlir_type| { - mlir_type.* = mlirx.Type.fromDType(mlir_ctx, @enumFromInt(i)); + mlir_type.* = mlirx.Type.fromDType(mlir_ctx, @fromBackingInt(@intCast(i))); } } @@ -316,7 +316,7 @@ pub fn mlirType(self: *const Compiler, dt: DataType) *const mlir.Type { pub fn dtype(self: *const Compiler, mlir_type: *const mlir.Type) DataType { @setRuntimeSafety(false); for (0.., &self.mlir_known_types.values) |i, known_type| { - if (known_type == mlir_type) return @enumFromInt(i); + if (known_type == mlir_type) return @fromBackingInt(@intCast(i)); } std.debug.panic("Can't convert unknown mlir type to dtype: {f}", .{mlir_type}); } diff --git a/zml/Sharding.zig b/zml/Sharding.zig index 5ce487ee..792dff69 100644 --- a/zml/Sharding.zig +++ b/zml/Sharding.zig @@ -135,21 +135,21 @@ pub const PartitionSpec = enum(u4) { open = 15, pub fn sharded(mesh_axis: u3) PartitionSpec { - return @enumFromInt(mesh_axis); + return @fromBackingInt(@intCast(mesh_axis)); } /// Extract the mesh axis along which we are sharded. Null if not sharded. pub fn meshAxis(self: PartitionSpec) ?u3 { - const ax = @intFromEnum(self); - return if (ax < @intFromEnum(PartitionSpec.replicated)) @intCast(ax) else null; + const ax = @backingInt(self); + return if (ax < @backingInt(PartitionSpec.replicated)) @intCast(ax) else null; } pub fn isSharded(self: PartitionSpec) bool { - return @intFromEnum(self) < @intFromEnum(PartitionSpec.replicated); + return @backingInt(self) < @backingInt(PartitionSpec.replicated); } pub fn isClosed(self: PartitionSpec) bool { - return @intFromEnum(self) <= @intFromEnum(PartitionSpec.replicated); + return @backingInt(self) <= @backingInt(PartitionSpec.replicated); } test isClosed { @@ -285,13 +285,13 @@ pub const Partitioning = packed struct { } pub fn splat(spec: PartitionSpec) Partitioning { - const vec: Vec = @splat(@intFromEnum(spec)); + const vec: Vec = @splat(@backingInt(spec)); return @bitCast(vec); } pub fn repeat(spec: PartitionSpec, rank_: usize) Partitioning { std.debug.assert(rank_ <= MAX_RANK); - const splatted: Vec = @splat(@intFromEnum(spec)); + const splatted: Vec = @splat(@backingInt(spec)); const mask = std.simd.iota(u4, 8) < @as(Vec, @splat(@truncate(rank_))); return @bitCast(@select(u4, mask, splatted, @as(Vec, @bitCast(out_of_bound)))); } @@ -300,7 +300,7 @@ pub const Partitioning = packed struct { std.debug.assert(ax < MAX_RANK); const pack: u32 = @bitCast(p); const shift: u5 = @intCast(4 * ax); - return @enumFromInt(@as(u4, @truncate(pack >> shift))); + return @fromBackingInt(@truncate(pack >> shift)); } pub fn set(p: Partitioning, ax: usize, spec: PartitionSpec) Partitioning { @@ -308,7 +308,7 @@ pub const Partitioning = packed struct { const pack: u32 = @bitCast(p); const shift: u5 = @intCast(4 * ax); const mask = @as(u32, 0xf) << shift; - return @bitCast((pack & ~mask) | (@as(u32, @intFromEnum(spec)) << shift)); + return @bitCast((pack & ~mask) | (@as(u32, @backingInt(spec)) << shift)); } pub fn rank(p: Partitioning) u8 { @@ -325,7 +325,7 @@ pub const Partitioning = packed struct { const pack: u32 = @bitCast(p); const shift: u5 = @intCast(4 * ax); const lower_mask = (@as(u32, 1) << shift) - 1; - return @bitCast((pack & lower_mask) | ((pack & ~lower_mask) << 4) | (@as(u32, @intFromEnum(spec)) << shift)); + return @bitCast((pack & lower_mask) | ((pack & ~lower_mask) << 4) | (@as(u32, @backingInt(spec)) << shift)); } /// Removes a spec, shifting subsequent slots left and filling the last with unknown. @@ -334,7 +334,7 @@ pub const Partitioning = packed struct { const pack: u32 = @bitCast(p); const shift: u5 = @intCast(4 * ax); const lower_mask = (@as(u32, 1) << shift) - 1; - return @bitCast((pack & lower_mask) | ((pack >> 4) & ~lower_mask) | (@as(u32, @intFromEnum(PartitionSpec.out_of_bound)) << 28)); + return @bitCast((pack & lower_mask) | ((pack >> 4) & ~lower_mask) | (@as(u32, @backingInt(PartitionSpec.out_of_bound)) << 28)); } pub fn toArray(p: Partitioning) [MAX_RANK]PartitionSpec { @@ -344,7 +344,7 @@ pub const Partitioning = packed struct { } pub fn hasUniqueAxes(p: Partitioning) bool { - var used_mesh_axes: std.StaticBitSet(MAX_RANK) = .initEmpty(); + var used_mesh_axes: std.StaticBitSet(MAX_RANK) = .empty; for (0..MAX_RANK) |shape_ax| { const spec = p.get(shape_ax); if (spec.meshAxis()) |mesh_axis| { @@ -383,7 +383,7 @@ pub const Partitioning = packed struct { test "insertion and removal at every slot" { var parts: Partitioning = .out_of_bound; - for (0..MAX_RANK) |ax| parts = parts.set(ax, @enumFromInt(ax)); + for (0..MAX_RANK) |ax| parts = parts.set(ax, @fromBackingInt(@intCast(ax))); const original = parts.toArray(); for (0..MAX_RANK) |ax| { var inserted = original; @@ -414,13 +414,13 @@ pub const Partitioning = packed struct { const T = @TypeOf(partitioning); stdx.debug.assertComptime(stdx.meta.isStruct(T), "parsePartitioning expected a struct of enum literals eg {{ .b = .data, .d = .model }}, got: {any}", .{T}); - inline for (std.meta.fields(T)) |field| { - const shape_tag = Shape.toTag(field); + inline for (comptime std.meta.fieldNames(T)) |field_name| { + const shape_tag = Shape.toTag(field_name); const shape_ax = Shape.axisFromTagMaybe(tags, shape_tag) orelse { - std.debug.panic("{f} doesn't have an axis {s} to be partitioned on.", .{ stdx.fmt.stringsZ(tags), field.name }); + std.debug.panic("{f} doesn't have an axis {s} to be partitioned on.", .{ stdx.fmt.stringsZ(tags), field_name }); }; - const value = @field(partitioning, field.name); + const value = @field(partitioning, field_name); const spec: PartitionSpec = if (@TypeOf(value) == PartitionSpec) value else switch (value) { .replicated => .replicated, .out_of_bound => std.debug.panic("value out_of_bound not allowed", .{}), @@ -603,11 +603,11 @@ pub const PhysicalMesh = struct { try writer.writeAll("], depth_by_tag={"); - const fields = std.meta.fields(PhysicalAxisTag); - inline for (fields, 0..) |field, i| { + const field_names = comptime std.meta.fieldNames(PhysicalAxisTag); + inline for (field_names, 0..) |field_name, i| { if (i > 0) try writer.writeAll(", "); - const tag = @field(PhysicalAxisTag, field.name); - try writer.writeAll(field.name); + const tag = @field(PhysicalAxisTag, field_name); + try writer.writeAll(field_name); try writer.writeAll("="); if (self.depth_by_tag.get(tag)) |d| { try writer.print("{d}", .{d}); @@ -1349,9 +1349,9 @@ pub const LogicalMesh = struct { var axes: Axes = .empty; var intents: Intents = .empty; - inline for (std.meta.fields(T)) |field| { - const value = @field(axes_, field.name); - axes.appendAssumeCapacity(Shape.toTag(field)); + inline for (comptime std.meta.fieldNames(T)) |field_name| { + const value = @field(axes_, field_name); + axes.appendAssumeCapacity(Shape.toTag(field_name)); intents.appendAssumeCapacity(intentFromValue(value)); } @@ -1922,15 +1922,15 @@ pub const Strategy = struct { pub fn parseBindings(bindings: anytype) Strategy { const err_msg = "Strategy.parseBindings excepts fields to be PhysicalAxisTag or tuple of PhysicalAxisTag, got {}"; var res: Strategy = .{ .bindings = .empty, .folding = .empty }; - const fields = @typeInfo(@TypeOf(bindings)).@"struct".fields; - if (fields.len == 0) @compileError("Strategy.parseBindings requires at least one binding"); - inline for (fields) |field_info| { - switch (@typeInfo(field_info.type)) { - .enum_literal, .@"enum" => res.addBinding(field_info, @field(bindings, field_info.name)), + const info = @typeInfo(@TypeOf(bindings)).@"struct"; + if (info.field_names.len == 0) @compileError("Strategy.parseBindings requires at least one binding"); + inline for (info.field_names, info.field_types) |field_name, Field| { + switch (@typeInfo(Field)) { + .enum_literal, .@"enum" => res.addBinding(field_name, @field(bindings, field_name)), .@"struct" => |struct_info| { stdx.debug.assertComptime(struct_info.is_tuple, err_msg, .{@TypeOf(bindings)}); - inline for (@field(bindings, field_info.name)) |axis_tag| { - res.addBinding(field_info, axis_tag); + inline for (@field(bindings, field_name)) |axis_tag| { + res.addBinding(field_name, axis_tag); } }, else => stdx.debug.compileError(err_msg, .{@TypeOf(bindings)}), @@ -2042,13 +2042,13 @@ pub const Placement = struct { // Note this shape is mainly use to indicate the dims of the sharded buffer. // We may want to only store that. shape: Shape, - global_shape: if (builtin.mode == .Debug) Shape else void, + global_shape: if (builtin.mode == .debug) Shape else void, axis_plans: stdx.BoundedArray(AxisSplit, Shape.MAX_RANK), pub fn init(shape: Shape) error{IncompatibleSharding}!Placement { var pl: Placement = .{ .shape = shape, // modified below - .global_shape = if (builtin.mode == .Debug) shape else {}, + .global_shape = if (builtin.mode == .debug) shape else {}, .axis_plans = .empty, // set below }; // mesh == null => replicated => no axis plan @@ -2088,7 +2088,7 @@ pub const Placement = struct { } pub fn shardPtr(pl: *const Placement, device: Device.Coords, slice: Slice) [*]const u8 { - if (builtin.mode == .Debug) { + if (builtin.mode == .debug) { // there is a bug in caller code that used a placement for a different shape std.debug.assert(pl.global_shape.eql(slice.shape)); } @@ -2276,10 +2276,10 @@ const ShardingTest = struct { /// Creates a 1D-3D PhysicalMesh from simple dimensions. pub fn physical(self: ShardingTest, dims: anytype, geometry: AxisGeometry) !PhysicalMesh { const info = @typeInfo(@TypeOf(dims)).@"struct"; - const N = info.fields.len; + const N = info.field_names.len; var sizes: [N]usize = undefined; - inline for (info.fields, sizes[0..]) |field, *s| { - s.* = @intCast(@field(dims, field.name)); + inline for (info.field_names, sizes[0..]) |field_name, *s| { + s.* = @intCast(@field(dims, field_name)); } const tags: [3]PhysicalAxisTag = .{ .link_x, .link_y, .link_z }; diff --git a/zml/buffer/HostAccessible.zig b/zml/buffer/HostAccessible.zig index 212c460d..76dab0ba 100644 --- a/zml/buffer/HostAccessible.zig +++ b/zml/buffer/HostAccessible.zig @@ -1264,7 +1264,7 @@ test "HostAccessible.HostPinnedAllocations keeps each region's replicas together // replicas arrive interleaved with other regions. const shard_shape: Shape = .init(.{4}, .u8); for ([_]usize{ 0, 4, 0, 8, 4 }, 0..) |row, i| { - allocations.add(shard_shape, .{ .origin = .{ .axes = .{row} ++ .{0} ** (Shape.MAX_RANK - 1) }, .ptr = base + i, .shard_index = undefined, .handle = undefined }); + allocations.add(shard_shape, .{ .origin = .{ .axes = .{row} ++ @as([Shape.MAX_RANK - 1]usize, @splat(0)) }, .ptr = base + i, .shard_index = undefined, .handle = undefined }); } try std.testing.expectEqualSlices([*]u8, &.{ base, base + 2, base + 1, base + 4, base + 3 }, allocations.entries.items(.ptr)); diff --git a/zml/dtype.zig b/zml/dtype.zig index c56fdd5b..f8d24089 100644 --- a/zml/dtype.zig +++ b/zml/dtype.zig @@ -1,5 +1,7 @@ const std = @import("std"); +const stdx = @import("stdx"); + const floats = @import("floats.zig"); const C64 = std.math.Complex(f32); @@ -139,8 +141,9 @@ pub const DataType = enum(u8) { pub fn toPackedZigType(comptime dtype: DataType) type { return switch (dtype) { .bool => bool, - .i2, .i4, .u2, .u4 => |dt| @Vector(8 / dt.bitSizeOf(), @FieldType(Value, @tagName(dtype))), + .i2, .i4, .u2, .u4 => |dt| stdx.Packed(@FieldType(Value, @tagName(dt))), .f4e2m1 => floats.Float4E2M1.Packed, + inline .c64, .c128 => |dt| @FieldType(Value, @tagName(dt)), else => { const T = @FieldType(Value, @tagName(dtype)); if (@bitSizeOf(T) < 8) @compileLog("Forgot type !", T); @@ -165,6 +168,8 @@ pub const DataType = enum(u8) { pub fn bitSizeOf(self: DataType) u16 { return switch (self) { .bool => 8, // In PJRT/stablehlo bool always occupy a full byte + .c64 => 64, + .c128 => 128, inline else => |tag| @bitSizeOf(tag.toZigType()), }; } diff --git a/zml/exe.zig b/zml/exe.zig index 2acc0b61..1dd1a2f2 100644 --- a/zml/exe.zig +++ b/zml/exe.zig @@ -396,7 +396,7 @@ pub fn FnExe(comptime function_: anytype) type { .@"fn" => |info| info, else => @compileError("FnExe expects a function, got " ++ @typeName(@TypeOf(function_))), }; - if (function_info.is_var_args or function_info.params.len != 1) { + if (function_info.attrs.varargs or function_info.param_types.len != 1) { @compileError("FnExe function must accept exactly one input struct"); } @@ -446,7 +446,7 @@ pub fn FnExe(comptime function_: anytype) type { const RunnerSelf = @This(); pub const BakedInput = structFieldRange(Input, 0, count); - pub const NonBakedInput = structFieldRange(Input, count, @typeInfo(Input).@"struct".fields.len); + pub const NonBakedInput = structFieldRange(Input, count, @typeInfo(Input).@"struct".field_names.len); pub fn init(exe: *const Self, allocator: std.mem.Allocator, baked: BakedInput) !RunnerSelf { var arguments = try exe.raw.args(allocator); @@ -488,42 +488,30 @@ fn countBackedFields(comptime Input: type, comptime baked_fields: anytype) usize @compileError("FnExe baked fields must be a tuple of enum literals"); } - const input_fields = @typeInfo(Input).@"struct".fields; - if (baked_info.fields.len > input_fields.len) { + const input_info = @typeInfo(Input).@"struct"; + if (baked_info.field_names.len > input_info.field_names.len) { @compileError("FnExe baked fields must be a prefix of its bufferized input fields"); } - inline for (baked_info.fields, 0..) |tuple_field, i| { - const baked_field = @field(baked_fields, tuple_field.name); + inline for (baked_info.field_names, 0..) |tuple_field_name, i| { + const baked_field = @field(baked_fields, tuple_field_name); if (@TypeOf(baked_field) != @EnumLiteral()) { @compileError("FnExe baked fields must be enum literals"); } - if (!std.mem.eql(u8, @tagName(baked_field), input_fields[i].name)) { + if (!std.mem.eql(u8, @tagName(baked_field), input_info.field_names[i])) { @compileError("FnExe baked fields must be an ordered prefix of its bufferized input fields"); } } - return baked_info.fields.len; + return baked_info.field_names.len; } fn structFieldRange(comptime Struct: type, comptime start: usize, comptime end: usize) type { - const fields = @typeInfo(Struct).@"struct".fields[start..end]; - var field_names: [fields.len][]const u8 = undefined; - var field_types: [fields.len]type = undefined; - var field_attrs: [fields.len]std.builtin.Type.StructField.Attributes = undefined; - for (&field_names, &field_types, &field_attrs, fields) |*name, *T, *attrs, field| { - name.* = field.name; - T.* = field.type; - attrs.* = .{ - .@"comptime" = field.is_comptime, - .@"align" = field.alignment, - .default_value_ptr = field.default_value_ptr, - }; - } - return @Struct(.auto, null, &field_names, &field_types, &field_attrs); + const info = @typeInfo(Struct).@"struct"; + return @Struct(.auto, null, info.field_names[start..end], info.field_types[start..end], info.field_attrs[start..end]); } fn typedFunctionInput(comptime function_: anytype) type { - const Input = @typeInfo(@TypeOf(function_)).@"fn".params[0].type orelse + const Input = @typeInfo(@TypeOf(function_)).@"fn".param_types[0] orelse @compileError("FnExe function must have a concrete input type"); validateFnExeStruct("input", Input); return Input; @@ -547,16 +535,13 @@ fn validateFnExeStruct(comptime role: []const u8, comptime T: type) void { fn typedOutputDestinations(comptime BufferizedOutput: type) type { const output_info = @typeInfo(BufferizedOutput).@"struct"; - const fields = output_info.fields; - var field_names: [fields.len][]const u8 = undefined; - var field_types: [fields.len]type = undefined; - var field_attrs: [fields.len]std.builtin.Type.StructField.Attributes = undefined; - for (&field_names, &field_types, &field_attrs, fields) |*name, *T, *attrs, field| { - name.* = field.name; - T.* = *field.type; - attrs.* = .{ .@"align" = @alignOf(*field.type) }; + var field_types: [output_info.field_names.len]type = undefined; + var field_attrs: [output_info.field_names.len]std.builtin.Type.Struct.FieldAttributes = undefined; + for (&field_types, &field_attrs, output_info.field_types) |*T, *attrs, Field| { + T.* = *Field; + attrs.* = .{ .@"align" = @alignOf(*Field) }; } - return @Struct(.auto, null, &field_names, &field_types, &field_attrs); + return @Struct(.auto, null, output_info.field_names, &field_types, &field_attrs); } test "FnExe derives baked and runtime calls from a function" { diff --git a/zml/floats.zig b/zml/floats.zig index 7bf08824..689c22a8 100644 --- a/zml/floats.zig +++ b/zml/floats.zig @@ -8,8 +8,8 @@ fn FloatConversionHelpers(Float: type) type { @compileError(err_msg); } comptime { - for (info.@"struct".fields, &.{ "mantissa", "exponent", "sign" }) |field, expected_name| { - if (!std.mem.eql(u8, field.name, expected_name)) + for (info.@"struct".field_names, &.{ "mantissa", "exponent", "sign" }) |field_name, expected_name| { + if (!std.mem.eql(u8, field_name, expected_name)) @compileError(err_msg); } } @@ -20,7 +20,7 @@ fn FloatConversionHelpers(Float: type) type { const mantissa_bits: u8 = @typeInfo(@FieldType(Float, "mantissa")).int.bits; const exponent_bits: u8 = @typeInfo(@FieldType(Float, "exponent")).int.bits; const f32_mantissa_bits: u8 = @typeInfo(@FieldType(Float32, "mantissa")).int.bits; - const exp_bias: i16 = std.math.maxInt(std.meta.Int(.unsigned, exponent_bits - 1)); + const exp_bias: i16 = std.math.maxInt(@Int(.unsigned, exponent_bits - 1)); const exp_off: u8 = FloatConversionHelpers(Float32).exp_bias - exp_bias; /// Lossy conversion from f32, similar to @floatCast @@ -106,8 +106,8 @@ fn FloatHelpers(Float: type) type { @compileError(err_msg); } comptime { - for (info.@"struct".fields, &.{ "mantissa", "exponent", "sign" }) |field, expected_name| { - if (!std.mem.eql(u8, field.name, expected_name)) + for (info.@"struct".field_names, &.{ "mantissa", "exponent", "sign" }) |field_name, expected_name| { + if (!std.mem.eql(u8, field_name, expected_name)) @compileError(err_msg); } } @@ -517,7 +517,7 @@ pub const Float4E2M1 = packed struct(u4) { pub fn formatNumber(xy: Packed, w: *std.Io.Writer, n: std.fmt.Number) std.Io.Writer.Error!void { try xy.x.formatNumber(w, n); - w.writeByte(','); + try w.writeByte(','); try xy.y.formatNumber(w, n); } }; @@ -544,7 +544,7 @@ pub fn isInf(x: anytype) bool { } if (!@hasDecl(Float, "inf")) return false; - const FBits = std.meta.Int(.unsigned, @bitSizeOf(Float)); + const FBits = @Int(.unsigned, @bitSizeOf(Float)); const remove_sign = ~@as(FBits, 0) >> 1; return @as(FBits, @bitCast(x)) & remove_sign == @as(FBits, @bitCast(Float.inf)); } diff --git a/zml/kernel.zig b/zml/kernel.zig index 33c685cc..204f224d 100644 --- a/zml/kernel.zig +++ b/zml/kernel.zig @@ -50,10 +50,10 @@ fn resolveOutputOperandAliases( var out: stdx.BoundedArray(dialects.stablehlo.CustomCallOpts.OutputOperandAlias, dialects.stablehlo.CustomCallOpts.MAX_RESULTS) = .empty; if (aliases_opt) |a| { - inline for (@typeInfo(@TypeOf(a)).@"struct".fields, 0..) |field, output_index| { - if (@field(a, field.name)) |operand| out.appendAssumeCapacity(.{ + inline for (@typeInfo(@TypeOf(a)).@"struct".field_names, 0..) |field_name, output_index| { + if (@field(a, field_name)) |operand| out.appendAssumeCapacity(.{ .output_index = @intCast(output_index), - .operand_index = @as(i64, @intCast(@intFromEnum(operand))) + operand_offset, + .operand_index = @as(i64, @intCast(@backingInt(operand))) + operand_offset, }); } } @@ -832,7 +832,7 @@ pub const fly = struct { /// `zeroed_args` index of an output. pub fn zeroedOutput(comptime f: std.meta.FieldEnum(Outputs)) i32 { - return @intCast(spec.inputs.len + @intFromEnum(f)); + return @intCast(spec.inputs.len + @backingInt(f)); } /// `shapes` is inputs, then outputs. diff --git a/zml/kernels/flash_attention/cute/attention.zig b/zml/kernels/flash_attention/cute/attention.zig index 016dee40..396537fe 100644 --- a/zml/kernels/flash_attention/cute/attention.zig +++ b/zml/kernels/flash_attention/cute/attention.zig @@ -119,8 +119,8 @@ fn run(b: *B, cfg: Config) cute.FinishError!void { unreachable; } -fn tupleOf(array: anytype) std.meta.Tuple(&([_]type{Value} ** array.len)) { - var result: std.meta.Tuple(&([_]type{Value} ** array.len)) = undefined; +fn tupleOf(array: anytype) @Tuple(&@as([array.len]type, @splat(Value))) { + var result: @Tuple(&@as([array.len]type, @splat(Value))) = undefined; inline for (0..array.len) |i| result[i] = array[i]; return result; } diff --git a/zml/mem.zig b/zml/mem.zig index 4dbce05f..58067e07 100644 --- a/zml/mem.zig +++ b/zml/mem.zig @@ -341,8 +341,8 @@ fn bufferizeInner(allocator: std.mem.Allocator, model: anytype, bufferized_: *Bu const type_info = @typeInfo(ModelBufferized); switch (type_info) { .@"struct" => |struct_type_info| { - inline for (struct_type_info.fields) |field| { - try bufferizeInner(allocator, @field(model, field.name), &@field(bufferized_, field.name)); + inline for (struct_type_info.field_names) |field_name| { + try bufferizeInner(allocator, @field(model, field_name), &@field(bufferized_, field_name)); } }, .@"union" => { @@ -364,7 +364,7 @@ fn bufferizeInner(allocator: std.mem.Allocator, model: anytype, bufferized_: *Bu .pointer => |p| { switch (p.size) { .slice => { - bufferized_.* = try allocator.alignedAlloc(p.child, .fromByteUnits(p.alignment orelse @alignOf(p.child)), model.len); + bufferized_.* = try allocator.alignedAlloc(p.child, .fromByteUnits(p.attrs.@"align" orelse @alignOf(p.child)), model.len); for (model, bufferized_.*) |src, *dst| { try bufferizeInner(allocator, src, dst); } diff --git a/zml/meta.zig b/zml/meta.zig index 08738e11..c9a43f25 100644 --- a/zml/meta.zig +++ b/zml/meta.zig @@ -20,27 +20,30 @@ pub fn MapType(From: type, To: type) type { return switch (@typeInfo(T)) { .@"struct" => |struct_infos| { - const fields = struct_infos.fields; + const field_names = struct_infos.field_names; var same: bool = true; - var struct_field_names: [fields.len][]const u8 = undefined; - var struct_field_types: [fields.len]type = undefined; - var struct_field_attrs: [fields.len]std.builtin.Type.StructField.Attributes = undefined; - for (struct_field_names[0..], struct_field_types[0..], struct_field_attrs[0..], fields) |*field_name, *field_type, *field_attr, field| { - if (!field.is_comptime) { - const R = map(field.type); - if (R == field.type) { - field_name.* = field.name; - field_type.* = field.type; - field_attr.* = .{ - .@"comptime" = field.is_comptime, - .@"align" = field.alignment, - .default_value_ptr = field.default_value_ptr, - }; + var struct_field_names: [field_names.len][]const u8 = undefined; + var struct_field_types: [field_names.len]type = undefined; + var struct_field_attrs: [field_names.len]std.builtin.Type.Struct.FieldAttributes = undefined; + for ( + struct_field_names[0..], + struct_field_types[0..], + struct_field_attrs[0..], + struct_infos.field_names, + struct_infos.field_types, + struct_infos.field_attrs, + ) |*field_name, *field_type, *field_attr, source_name, SourceField, source_attrs| { + if (!source_attrs.@"comptime") { + const R = map(SourceField); + if (R == SourceField) { + field_name.* = source_name; + field_type.* = SourceField; + field_attr.* = source_attrs; } else { - field_name.* = field.name; + field_name.* = source_name; field_type.* = R; field_attr.* = .{ - .@"comptime" = field.is_comptime, + .@"comptime" = source_attrs.@"comptime", .@"align" = @alignOf(R), }; same = false; @@ -52,34 +55,35 @@ pub fn MapType(From: type, To: type) type { } } } else { - field_name.* = field.name; - field_type.* = field.type; - field_attr.* = .{ - .@"comptime" = field.is_comptime, - .@"align" = field.alignment, - .default_value_ptr = field.default_value_ptr, - }; + field_name.* = source_name; + field_type.* = SourceField; + field_attr.* = source_attrs; } } if (same) return T; return if (struct_infos.is_tuple) @Tuple(&struct_field_types) else @Struct(.auto, null, &struct_field_names, &struct_field_types, &struct_field_attrs); }, .@"union" => |union_info| { - const fields = union_info.fields; + const field_names = union_info.field_names; var same: bool = true; - var union_field_names: [fields.len][]const u8 = undefined; - var union_field_types: [fields.len]type = undefined; - var union_field_attrs: [fields.len]std.builtin.Type.UnionField.Attributes = undefined; - for (union_field_names[0..], union_field_types[0..], union_field_attrs[0..], fields) |*field_name, *field_type, *field_attr, field| { - const R = map(field.type); - if (R == field.type) { - field_name.* = field.name; - field_type.* = field.type; - field_attr.* = .{ - .@"align" = field.alignment, - }; + var union_field_names: [field_names.len][]const u8 = undefined; + var union_field_types: [field_names.len]type = undefined; + var union_field_attrs: [field_names.len]std.builtin.Type.Union.FieldAttributes = undefined; + for ( + union_field_names[0..], + union_field_types[0..], + union_field_attrs[0..], + union_info.field_names, + union_info.field_types, + union_info.field_attrs, + ) |*field_name, *field_type, *field_attr, source_name, SourceField, source_attrs| { + const R = map(SourceField); + if (R == SourceField) { + field_name.* = source_name; + field_type.* = SourceField; + field_attr.* = source_attrs; } else { - field_name.* = field.name; + field_name.* = source_name; field_type.* = R; field_attr.* = .{ .@"align" = @alignOf(R), @@ -92,11 +96,11 @@ pub fn MapType(From: type, To: type) type { }, .array => |arr_info| [arr_info.len]map(arr_info.child), .pointer => |ptr_info| switch (ptr_info.size) { - .slice => if (ptr_info.is_const) + .slice => if (ptr_info.attrs.@"const") []const map(ptr_info.child) else []map(ptr_info.child), - .one => if (ptr_info.is_const) + .one => if (ptr_info.attrs.@"const") *const map(ptr_info.child) else *map(ptr_info.child), @@ -179,26 +183,26 @@ pub fn mapAlloc(comptime cb: anytype, allocator: std.mem.Allocator, ctx: FnParam if (@sizeOf(ToStruct) == 0) return; switch (type_info_to) { - .@"struct" => |info| inline for (info.fields) |field| { - if (field.is_comptime or @sizeOf(field.type) == 0) continue; - const field_type_info = @typeInfo(field.type); + .@"struct" => |info| inline for (info.field_names, info.field_types, info.field_attrs) |field_name, Field, field_attrs| { + if (field_attrs.@"comptime" or @sizeOf(Field) == 0) continue; + const field_type_info = @typeInfo(Field); // If the field is already a pointer, we recurse with it directly, otherwise, we recurse with a pointer to the field. switch (field_type_info) { // .pointer => try convertType(From, To, allocator, @field(from, field.name), @field(to, field.name), Ctx, ctx, cb), - .array, .optional, .@"union", .@"struct", .pointer => if (@hasField(FromStruct, field.name)) { + .array, .optional, .@"union", .@"struct", .pointer => if (@hasField(FromStruct, field_name)) { try mapAlloc( cb, allocator, ctx, - @field(from, field.name), - &@field(to, field.name), + @field(from, field_name), + &@field(to, field_name), ); - } else if (field.default_value_ptr) |_| { - @field(to, field.name) = null; + } else if (field_attrs.default_value_ptr) |_| { + @field(to, field_name) = null; } else { - stdx.debug.compileError("Mapping {} -> {} inside {} failed. Missing field {s} in {}", .{ From, To, FromStruct, field.name, ToStruct }); + stdx.debug.compileError("Mapping {} -> {} inside {} failed. Missing field {s} in {}", .{ From, To, FromStruct, field_name, ToStruct }); }, - else => @field(to, field.name) = @field(from, field.name), + else => @field(to, field_name) = @field(from, field_name), } }, .@"union" => { @@ -332,25 +336,21 @@ pub fn MapRestrict(From: type, To: type) type { .@"struct" => |struct_infos| { // We know that at least one of the struct field contains a From. // We map each field individually. Fields without From and comptime fields are removed. - const fields = struct_infos.fields; + const field_names = struct_infos.field_names; var num_fields: usize = 0; - var struct_field_names: [fields.len][]const u8 = undefined; - var struct_field_types: [fields.len]type = undefined; - var struct_field_attrs: [fields.len]std.builtin.Type.StructField.Attributes = undefined; - for (fields) |field| { - if (!field.is_comptime and Contains(field.type, From)) { - const R = map(field.type); - if (R == field.type) { - struct_field_names[num_fields] = field.name; - struct_field_types[num_fields] = field.type; - struct_field_attrs[num_fields] = .{ - .@"comptime" = field.is_comptime, - .@"align" = field.alignment, - .default_value_ptr = field.default_value_ptr, - }; + var struct_field_names: [field_names.len][]const u8 = undefined; + var struct_field_types: [field_names.len]type = undefined; + var struct_field_attrs: [field_names.len]std.builtin.Type.Struct.FieldAttributes = undefined; + for (struct_infos.field_names, struct_infos.field_types, struct_infos.field_attrs) |field_name, Field, field_attrs| { + if (!field_attrs.@"comptime" and Contains(Field, From)) { + const R = map(Field); + if (R == Field) { + struct_field_names[num_fields] = field_name; + struct_field_types[num_fields] = Field; + struct_field_attrs[num_fields] = field_attrs; } else { - const name = if (struct_infos.is_tuple) struct_infos.fields[num_fields].name else field.name; + const name = if (struct_infos.is_tuple) struct_infos.field_names[num_fields] else field_name; struct_field_names[num_fields] = name; struct_field_types[num_fields] = R; struct_field_attrs[num_fields] = .{ @@ -377,13 +377,13 @@ pub fn MapRestrict(From: type, To: type) type { .@"union" => |union_info| { // We know that at least one of the union field contains a From. // We map each field individually. Fields without From, are replaced by "void". - const fields = union_info.fields; - var union_field_names: [fields.len][]const u8 = undefined; - var union_field_types: [fields.len]type = undefined; - var union_field_attrs: [fields.len]std.builtin.Type.UnionField.Attributes = undefined; - for (0.., fields) |i, field| { - const FT = map(field.type); - union_field_names[i] = field.name; + const field_names = union_info.field_names; + var union_field_names: [field_names.len][]const u8 = undefined; + var union_field_types: [field_names.len]type = undefined; + var union_field_attrs: [field_names.len]std.builtin.Type.Union.FieldAttributes = undefined; + for (0.., union_info.field_names, union_info.field_types) |i, field_name, Field| { + const FT = map(Field); + union_field_names[i] = field_name; union_field_types[i] = FT; union_field_attrs[i] = .{ .@"align" = @alignOf(FT), @@ -393,19 +393,19 @@ pub fn MapRestrict(From: type, To: type) type { }, .array => |arr_info| [arr_info.len]map(arr_info.child), .pointer => |ptr_info| switch (ptr_info.size) { - .slice => if (ptr_info.is_const) + .slice => if (ptr_info.attrs.@"const") []const map(ptr_info.child) else []map(ptr_info.child), - .one => if (ptr_info.is_const) + .one => if (ptr_info.attrs.@"const") *const map(ptr_info.child) else *map(ptr_info.child), - .many => if (ptr_info.is_const) + .many => if (ptr_info.attrs.@"const") [*]const map(ptr_info.child) else [*]map(ptr_info.child), - .c => if (ptr_info.is_const) + .c => if (ptr_info.attrs.@"const") [*c]map(ptr_info.child) else [*c]map(ptr_info.child), @@ -499,7 +499,7 @@ pub fn visit(comptime callback: anytype, ctx: FnParam(callback, 0), v: anytype) .callback => callback(ctx, v), .recurse => { const TargetType, const mutating_cb = switch (@typeInfo(FnParam(callback, 1))) { - .pointer => |info| .{ info.child, !info.is_const }, + .pointer => |info| .{ info.child, !info.attrs.@"const" }, else => stdx.debug.compileError("zml.meta.visit({any}) is expecting a callback with a pointer as second argument but found {any}", .{ @TypeOf(callback), FnParam(callback, 1) }), }; @@ -511,12 +511,12 @@ pub fn visit(comptime callback: anytype, ctx: FnParam(callback, 0), v: anytype) switch (ptr_info_v.size) { .one => switch (@typeInfo(ChildTypeV)) { - .@"struct" => |s| inline for (s.fields) |field| { - if (field.is_comptime or comptime !Contains(field.type, TargetType)) continue; - if (@typeInfo(field.type) == .pointer) { - if (can_error) try visit(callback, ctx, @field(v, field.name)) else visit(callback, ctx, @field(v, field.name)); + .@"struct" => |s| inline for (s.field_names, s.field_types, s.field_attrs) |field_name, Field, field_attrs| { + if (field_attrs.@"comptime" or comptime !Contains(Field, TargetType)) continue; + if (@typeInfo(Field) == .pointer) { + if (can_error) try visit(callback, ctx, @field(v, field_name)) else visit(callback, ctx, @field(v, field_name)); } else { - if (can_error) try visit(callback, ctx, &@field(v, field.name)) else visit(callback, ctx, &@field(v, field.name)); + if (can_error) try visit(callback, ctx, &@field(v, field_name)) else visit(callback, ctx, &@field(v, field_name)); } }, .array => for (v[0..]) |*elem| { @@ -654,11 +654,11 @@ pub fn visitFlatStruct(comptime callback: anytype, ctx: FnParam(callback, 0), v: return switch (ptr_info_v.size) { .one => switch (@typeInfo(ChildTypeV)) { - .@"struct" => |s| inline for (s.fields) |field| { - if (field.is_comptime or comptime !Contains(field.type, TargetType)) continue; - stdx.debug.assertComptime(@typeInfo(field.type) != .pointer, err_msg, err_args); + .@"struct" => |s| inline for (s.field_names, s.field_types, s.field_attrs) |field_name, Field, field_attrs| { + if (field_attrs.@"comptime" or comptime !Contains(Field, TargetType)) continue; + stdx.debug.assertComptime(@typeInfo(Field) != .pointer, err_msg, err_args); - if (can_error) try visitFlatStruct(callback, ctx, &@field(v, field.name)) else visitFlatStruct(callback, ctx, &@field(v, field.name)); + if (can_error) try visitFlatStruct(callback, ctx, &@field(v, field_name)) else visitFlatStruct(callback, ctx, &@field(v, field_name)); }, .array => for (v[0..]) |*elem| { if (can_error) try visitFlatStruct(callback, ctx, elem) else visitFlatStruct(callback, ctx, elem); @@ -786,17 +786,17 @@ pub fn zip(comptime func: anytype, allocator: std.mem.Allocator, values: anytype .pointer => stdx.debug.compileError("zip only accept by value arguments. Received: {}", .{V}), .@"struct" => |struct_info| { var out: V = values[0]; - inline for (struct_info.fields) |f| { - if (f.is_comptime) continue; - if (@typeInfo(f.type) == .pointer) { + inline for (struct_info.field_names, struct_info.field_types, struct_info.field_attrs) |field_name, Field, field_attrs| { + if (field_attrs.@"comptime") continue; + if (@typeInfo(Field) == .pointer) { stdx.debug.compileError("zip doesn't follow pointers and don't accept struct containing them. Received: {}", .{V}); } - var fields = try allocator.alloc(f.type, values.len); + var fields = try allocator.alloc(Field, values.len); defer allocator.free(fields); for (values, 0..) |val, i| { - fields[i] = @field(val, f.name); + fields[i] = @field(val, field_name); } - @field(out, f.name) = try zip(func, allocator, fields, args); + @field(out, field_name) = try zip(func, allocator, fields, args); } return out; }, @@ -844,7 +844,7 @@ pub fn collectAlloc( allocator: std.mem.Allocator, obj: anytype, ) std.mem.Allocator.Error![]stdx.meta.FnReturn(func) { - stdx.debug.assertComptime(@typeInfo(@TypeOf(func)).@"fn".params.len <= 2, "zml.meta.collect expects a func with two arguments, got: {}", .{@TypeOf(func)}); + stdx.debug.assertComptime(@typeInfo(@TypeOf(func)).@"fn".param_types.len <= 2, "zml.meta.collect expects a func with two arguments, got: {}", .{@TypeOf(func)}); const CollectAllocCtx = struct { func_ctx: _CollectCtx(func), @@ -871,7 +871,7 @@ pub fn collectAlloc( /// finds all X in the given object, and write the result of func(X) into a given slice. /// Asserts that the number of X found is equal to the slice len. pub fn collectBuf(func: anytype, func_ctx: _CollectCtx(func), obj: anytype, out: []stdx.meta.FnReturn(func)) void { - stdx.debug.assertComptime(@typeInfo(@TypeOf(func)).@"fn".params.len <= 2, "zml.meta.collectBuf expects a func with one or two arguments, got: {}", .{@TypeOf(func)}); + stdx.debug.assertComptime(@typeInfo(@TypeOf(func)).@"fn".param_types.len <= 2, "zml.meta.collectBuf expects a func with one or two arguments, got: {}", .{@TypeOf(func)}); const LocalContext = struct { func_ctx: _CollectCtx(func), out: @TypeOf(out), @@ -916,14 +916,14 @@ pub fn collectPtrs( } fn _CollectCtx(func: anytype) type { - const params = @typeInfo(@TypeOf(func)).@"fn".params; + const params = @typeInfo(@TypeOf(func)).@"fn".param_types; if (params.len == 1) return void; - return params[0].type orelse @compileError("anytype not supported in collect"); + return params[0] orelse @compileError("anytype not supported in collect"); } fn _CollectArg(func: anytype) type { - const params = @typeInfo(@TypeOf(func)).@"fn".params; - return params[params.len - 1].type orelse @compileError("anytype not supported in collect"); + const params = @typeInfo(@TypeOf(func)).@"fn".param_types; + return params[params.len - 1] orelse @compileError("anytype not supported in collect"); } pub fn Contains(Haystack: type, T: type) bool { @@ -939,8 +939,8 @@ pub fn Contains(Haystack: type, T: type) bool { return switch (@typeInfo(Haystack)) { .@"struct" => |info| { if (@hasDecl(Haystack, "zml_no_meta_visit")) return false; - inline for (info.fields) |field| { - if (!field.is_comptime and Contains(field.type, T)) { + inline for (info.field_types, info.field_attrs) |Field, field_attrs| { + if (!field_attrs.@"comptime" and Contains(Field, T)) { return true; } } @@ -948,8 +948,8 @@ pub fn Contains(Haystack: type, T: type) bool { }, .@"union" => |info| { if (@hasDecl(Haystack, "zml_no_meta_visit")) return false; - inline for (info.fields) |field| { - if (Contains(field.type, T)) + inline for (info.field_types) |Field| { + if (Contains(Field, T)) return true; } return false; diff --git a/zml/moe/cute_kernels/persistent_mxfp4.zig b/zml/moe/cute_kernels/persistent_mxfp4.zig index 1f4b25cb..7208e6ce 100644 --- a/zml/moe/cute_kernels/persistent_mxfp4.zig +++ b/zml/moe/cute_kernels/persistent_mxfp4.zig @@ -1032,11 +1032,11 @@ fn runTmaProducer( } fn Tuple(comptime T: type, comptime len: usize) type { - return std.meta.Tuple(&([_]type{T} ** len)); + return @Tuple(&@as([len]type, @splat(T))); } fn arity(comptime T: type) usize { - return @typeInfo(T).@"struct".fields.len; + return @typeInfo(T).@"struct".field_names.len; } /// The MLIR types of a tuple of values, as `openWhile` expects them. diff --git a/zml/moe/cutlass_flashinfer.zig b/zml/moe/cutlass_flashinfer.zig index 734283cd..75b52eeb 100644 --- a/zml/moe/cutlass_flashinfer.zig +++ b/zml/moe/cutlass_flashinfer.zig @@ -95,7 +95,7 @@ pub const Variant = enum { const max_num_devices = zml.platform.Platform.MAX_NUM_DEVICES; pub const Runners = struct { - runners: [std.meta.fields(Variant).len][max_num_devices]?DeviceRunner = + runners: [std.meta.fieldNames(Variant).len][max_num_devices]?DeviceRunner = @splat(@splat(null)), pub fn deinit(self: *Runners) void { @@ -112,7 +112,7 @@ pub const Runners = struct { if (device < 0 or device >= max_num_devices) return error.UnsupportedDevice; const index: usize = @intCast(device); - const variant_index: usize = @intFromEnum(variant); + const variant_index: usize = @backingInt(variant); if (self.runners[variant_index][index]) |runner| return runner; const api = try fi_cutlass_moe.apiForDevice(device); diff --git a/zml/moe/triton_kernels/mxfp4.zig b/zml/moe/triton_kernels/mxfp4.zig index 4da51a5a..74170966 100644 --- a/zml/moe/triton_kernels/mxfp4.zig +++ b/zml/moe/triton_kernels/mxfp4.zig @@ -64,8 +64,8 @@ pub fn validateInputs(c: Config, a: Inputs) !void { .w2 = zml.Shape.init(.{ c.experts, c.hidden, @divTrunc(c.intermediate, 2) }, .u8), .s2 = zml.Shape.init(.{ c.experts, c.hidden, a.s2.dim(2) }, .f8e8m0), }; - inline for (std.meta.fields(Inputs)) |field| { - if (!@field(a, field.name).shape().eql(@field(shapes, field.name))) return error.InvalidInputShape; + inline for (comptime std.meta.fieldNames(Inputs)) |field| { + if (!@field(a, field).shape().eql(@field(shapes, field))) return error.InvalidInputShape; } } diff --git a/zml/nn.zig b/zml/nn.zig index 1403788f..7519a435 100644 --- a/zml/nn.zig +++ b/zml/nn.zig @@ -2259,8 +2259,13 @@ pub fn collectDims( return context.res; } -fn shapeToDims(shape: anytype) [@divExact(@sizeOf(@TypeOf(shape)), @sizeOf(i64))]i64 { - return @bitCast(shape); +fn shapeToDims(shape: anytype) [std.meta.fieldNames(@TypeOf(shape)).len]i64 { + const field_names = comptime std.meta.fieldNames(@TypeOf(shape)); + var result: [field_names.len]i64 = undefined; + inline for (field_names, 0..) |field_name, i| { + result[i] = @field(shape, field_name); + } + return result; } test collectDims { @@ -2315,7 +2320,7 @@ fn ShapeStruct(comptime dims: anytype) type { @setEvalBranchQuota(rank + 5); var struct_field_names: [rank][]const u8 = undefined; var struct_field_types: [rank]type = undefined; - var struct_field_attrs: [rank]std.builtin.Type.StructField.Attributes = undefined; + var struct_field_attrs: [rank]std.builtin.Type.Struct.FieldAttributes = undefined; const default: i64 = NOT_SET; for (&struct_field_names, &struct_field_types, &struct_field_attrs, dims) |*field_name, *field_type, *field_attr, axis| { field_name.* = @tagName(axis); diff --git a/zml/ops.zig b/zml/ops.zig index fbfc67b8..11a31ea0 100644 --- a/zml/ops.zig +++ b/zml/ops.zig @@ -34,7 +34,7 @@ pub fn allReduce(inputs: anytype, comptime func: anytype) AllReduceReturnType(@T if (!struct_info.is_tuple) { @compileError("zml.ops.allReduce expects Tensor, tuple of Tensor, or [N]Tensor inputs"); } - break :b struct_info.fields.len; + break :b struct_info.field_names.len; }, .array => |array_info| b: { if (array_info.child != Tensor) { @@ -72,7 +72,7 @@ pub fn allReduce(inputs: anytype, comptime func: anytype) AllReduceReturnType(@T const reducer_block = b: { const ArgsTypes: [input_tensors.len]type = @splat(ReduceArgs); - var args: std.meta.Tuple(&ArgsTypes) = undefined; + var args: @Tuple(&ArgsTypes) = undefined; var block_types: [2 * input_tensors.len]*const mlir.Type = undefined; inline for (0..input_tensors.len) |i| { @@ -158,8 +158,8 @@ pub fn allReduce(inputs: anytype, comptime func: anytype) AllReduceReturnType(@T } var out: @TypeOf(inputs) = undefined; - inline for (struct_info.fields, 0..) |field, i| { - @field(out, field.name) = Tensor._result(input_tensors[i].shape(), op.result(i)); + inline for (struct_info.field_names, 0..) |field_name, i| { + @field(out, field_name) = Tensor._result(input_tensors[i].shape(), op.result(i)); } break :b out; }, @@ -216,7 +216,7 @@ pub fn reduce(inputs: anytype, inits: anytype, axes_: []const i64, comptime func // Note: inputs and inits are infered to be tuple of ReduceArgs const reduce_block, var result = b: { const ArgsTypes: [inits.len]type = @splat(ReduceArgs); - const ArgsType = std.meta.Tuple(&ArgsTypes); + const ArgsType = @Tuple(&ArgsTypes); var args: ArgsType = undefined; var block_types: [2 * inits.len]*const mlir.Type = undefined; @@ -315,7 +315,7 @@ pub const ReduceWindowOpts = struct { pub fn ReduceWindowFn(N: comptime_int) type { return @Fn( &@as([N]type, @splat(ReduceArgs)), - &@as([N]std.builtin.Type.Fn.Param.Attributes, @splat(.{})), + &@as([N]std.builtin.Type.Fn.ParamAttributes, @splat(.{})), [N]Tensor, .{}, ); @@ -405,7 +405,7 @@ pub fn sort(inputs: anytype, axis_: i64, comptime func: anytype, context: anytyp const sort_block = b: { const ArgsTypes: [inputs.len]type = @splat(SortArgs); - const ArgsType = std.meta.Tuple(&ArgsTypes); + const ArgsType = @Tuple(&ArgsTypes); var args: ArgsType = undefined; var block_types: [2 * inputs.len]*const mlir.Type = undefined; @@ -547,7 +547,7 @@ pub fn @"while"( const result: While.State = captured_context.body(initial_state); - if (builtin.mode == .Debug) { + if (builtin.mode == .debug) { const result_tensors = meta.collectPtrs(Tensor, allocator, &result) catch @panic("OOM"); stdx.debug.assert(flat_operands.len == result_tensors.len, "zml.ops.while({s}) expects body to return {d} Tensor values, got {d} values in ", .{ @typeName(While), flat_operands.len, result_tensors.len }); for (0.., flat_operands, result_tensors) |i, in, out| { @@ -1623,7 +1623,7 @@ test "cuda_tile grid" { var exe = try zml.module.compile(std.testing.allocator, std.testing.io, Mod.forward, .{a}, platform, .{}); defer exe.deinit(); - const input = [_]f32{0} ** n; + const input: [n]f32 = @splat(0); var a_buffer: zml.Buffer = try .fromBytes(std.testing.io, platform, a.shape(), std.mem.sliceAsBytes(&input)); defer a_buffer.deinit(); @@ -1729,7 +1729,7 @@ pub fn scatter( const update_block, var result = b: { const ArgsTypes: [inputs.len]type = @splat(ScatterArgs); - const ArgsType = std.meta.Tuple(&ArgsTypes); + const ArgsType = @Tuple(&ArgsTypes); var args: ArgsType = undefined; var block_types: [2 * inputs.len]*const mlir.Type = undefined; @@ -2063,7 +2063,7 @@ pub fn gather(self: Tensor, idx_axes: []const u3, idx_per_axis: []const Tensor, var self_kind: stdx.BoundedArray(GatherAxisKind, constants.MAX_RANK) = .{ .buffer = @splat(.offset), .len = self.rank() }; for (self._shape.tags(), 0..self.rank()) |t, self_ax| { - const is_gather_axis = std.mem.containsAtLeastScalar(u3, idx_axes, 1, @intCast(self_ax)); + const is_gather_axis = std.mem.containsAtLeastScalar(u3, idx_axes, @intCast(self_ax), 1); if (indices_shape.hasTag(t)) |id_ax| { // tag is both in self and indices -> it's a batching dim // Note: tags are required for batching. @@ -2087,7 +2087,7 @@ pub fn gather(self: Tensor, idx_axes: []const u3, idx_per_axis: []const Tensor, if (ax == idx_axes[0]) { // The first val_ax is special cause this is the place where we insert indices axes. for (0.., indices_shape.tags(), indices_shape.dims()) |id_axis_order, id_axis, id_inserted_dim| { - const is_batching_axis = std.mem.containsAtLeastScalar(i64, idx_batch_axes.constSlice(), 1, @intCast(id_axis_order)); + const is_batching_axis = std.mem.containsAtLeastScalar(i64, idx_batch_axes.constSlice(), @intCast(id_axis_order), 1); // Batching axis is already in self. if (is_batching_axis) continue; @@ -2278,10 +2278,10 @@ fn CustomCallResultTypeFromOutputSpec(comptime OutputSpecT: type) type { .@"struct" => |struct_info| b: { if (OutputSpecT == Shape) break :b Tensor; if (!struct_info.is_tuple) @compileError("Expected tuple output shape spec"); - break :b if (struct_info.fields.len == 1) + break :b if (struct_info.field_names.len == 1) Tensor else - [struct_info.fields.len]Tensor; + [struct_info.field_names.len]Tensor; }, .array => |array_info| b: { break :b if (array_info.len == 1) @@ -2322,20 +2322,20 @@ pub fn customCallOutputOperandAliases( ) ?[]const dialects.stablehlo.CustomCallOpts.OutputOperandAlias { const aliases_ = aliases orelse return null; - const output_fields = @typeInfo(O).@"struct".fields; + const output_field_names = @typeInfo(O).@"struct".field_names; comptime var num_aliases = 0; - inline for (output_fields) |field| { - if (@field(aliases_, field.name) != null) num_aliases += 1; + inline for (output_field_names) |field_name| { + if (@field(aliases_, field_name) != null) num_aliases += 1; } const output_operand_aliases = comptime blk: { var aliases_buffer: [num_aliases]dialects.stablehlo.CustomCallOpts.OutputOperandAlias = undefined; var i = 0; - for (output_fields, 0..) |field, output_index| { - if (@field(aliases_, field.name)) |operand| { + for (output_field_names, 0..) |field_name, output_index| { + if (@field(aliases_, field_name)) |operand| { aliases_buffer[i] = .{ .output_index = @intCast(output_index), - .operand_index = @intCast(@intFromEnum(operand)), + .operand_index = @intCast(@backingInt(operand)), }; i += 1; } @@ -2447,7 +2447,7 @@ pub fn customCall(target_name: [:0]const u8, inputs: anytype, outputs: anytype, break :b &[1]Tensor{inputs}; } if (!struct_info.is_tuple) @compileError("Expected tuple"); - var inputs_: [struct_info.fields.len]Tensor = undefined; + var inputs_: [struct_info.field_names.len]Tensor = undefined; meta.collectBuf((struct { pub fn func(t: Tensor) Tensor { return t; @@ -2471,7 +2471,7 @@ pub fn customCall(target_name: [:0]const u8, inputs: anytype, outputs: anytype, break :b &[1]Shape{outputs}; } if (!struct_info.is_tuple) @compileError("Expected tuple"); - var output_shapes: [struct_info.fields.len]Shape = undefined; + var output_shapes: [struct_info.field_names.len]Shape = undefined; meta.collectBuf((struct { pub fn func(t: Shape) Shape { return t; @@ -2504,14 +2504,14 @@ pub fn customCall(target_name: [:0]const u8, inputs: anytype, outputs: anytype, .@"struct" => |struct_info| b: { if (@TypeOf(outputs) == Shape) break :b outputs_flat[0]; if (!struct_info.is_tuple) @compileError("Expected tuple"); - if (struct_info.fields.len == 1) break :b outputs_flat[0]; - var outputs_: [struct_info.fields.len]Tensor = undefined; + if (struct_info.field_names.len == 1) break :b outputs_flat[0]; + var outputs_: [struct_info.field_names.len]Tensor = undefined; @memcpy(&outputs_, outputs_flat); break :b outputs_; }, .array => |array_info| b: { if (array_info.len == 1) break :b outputs_flat[0]; - var outputs_: [array_info.fields.len]Tensor = undefined; + var outputs_: [array_info.len]Tensor = undefined; @memcpy(&outputs_, outputs_flat); break :b outputs_; }, @@ -2536,7 +2536,7 @@ pub fn manualComputation( break :b &[1]Shape{outputs}; } if (!struct_info.is_tuple) @compileError("Expected tuple output shapes"); - var output_shapes_flat: [struct_info.fields.len]Shape = undefined; + var output_shapes_flat: [struct_info.field_names.len]Shape = undefined; meta.collectBuf((struct { pub fn func(t: Shape) Shape { return t; @@ -2947,7 +2947,7 @@ fn manualComputationOutputShapesArg(comptime OutputShapesT: type, local_output_s if (pointer_info.size != .slice or pointer_info.child != Shape) { @compileError("manualComputation body output shapes must be void, Shape, []Shape, or []const Shape; got " ++ @typeName(OutputShapesT)); } - break :b if (pointer_info.is_const) + break :b if (pointer_info.attrs.@"const") local_output_shapes else @constCast(local_output_shapes); @@ -3001,7 +3001,7 @@ fn metadataFieldToMlirAttribute(mlir_ctx: *mlir.Context, comptime T: type, value return switch (type_info) { .comptime_int => .int(mlir_ctx, .u64, @as(u64, value)), .@"enum" => |enum_field| switch (@typeInfo(enum_field.tag_type)) { - .int => |int_tag| metadataIntegerFieldToMlirAttribute(mlir_ctx, int_tag, @intFromEnum(value)), + .int => |int_tag| metadataIntegerFieldToMlirAttribute(mlir_ctx, int_tag, @backingInt(value)), else => @compileError("Unsupported tag type for enum metadata: " ++ @typeName(enum_field.tag_type)), }, .int => |int_field| metadataIntegerFieldToMlirAttribute(mlir_ctx, int_field, value), @@ -3108,15 +3108,11 @@ pub fn ShapeToTensor(T: type) type { } pub fn CustomCallOutputOperandAliases(I: type, O: type) type { - const output_fields = @typeInfo(O).@"struct".fields; - var field_names: [output_fields.len][]const u8 = undefined; - inline for (output_fields, 0..) |field, i| { - field_names[i] = field.name; - } + const field_names = @typeInfo(O).@"struct".field_names; return @Struct( .auto, null, - &field_names, + field_names, &@splat(?std.meta.FieldEnum(I)), &@splat(.{ .default_value_ptr = &@as(?std.meta.FieldEnum(I), null) }), ); @@ -3133,9 +3129,9 @@ pub fn shardingAwareTypedCustomCall( const Output = @TypeOf(output); const Attributes = @TypeOf(attributes); - var output_shapes: [@typeInfo(Output).@"struct".fields.len]Shape = undefined; - inline for (@typeInfo(Output).@"struct".fields, 0..) |field, i| { - output_shapes[i] = @field(output, field.name); + var output_shapes: [@typeInfo(Output).@"struct".field_names.len]Shape = undefined; + inline for (@typeInfo(Output).@"struct".field_names, 0..) |field_name, i| { + output_shapes[i] = @field(output, field_name); } const Handler = struct { @@ -3154,8 +3150,8 @@ pub fn shardingAwareTypedCustomCall( // Convert the slice back to a struct var out: ShapeToTensor(Output) = undefined; - inline for (@typeInfo(Output).@"struct".fields, 0..) |field, i| { - @field(out, field.name) = output_tensors[i]; + inline for (@typeInfo(Output).@"struct".field_names, 0..) |field_name, i| { + @field(out, field_name) = output_tensors[i]; } return out; } @@ -3178,9 +3174,9 @@ pub fn typedCustomCall( const input_tensors: []const Tensor = switch (@typeInfo(Input)) { .@"struct" => |struct_info| b: { - var input_tensors: [struct_info.fields.len]Tensor = undefined; - inline for (struct_info.fields, 0..) |field, i| { - input_tensors[i] = @field(input, field.name); + var input_tensors: [struct_info.field_names.len]Tensor = undefined; + inline for (struct_info.field_names, 0..) |field_name, i| { + input_tensors[i] = @field(input, field_name); } break :b &input_tensors; }, @@ -3194,9 +3190,9 @@ pub fn typedCustomCall( const output_shapes: []const Shape = switch (@typeInfo(Output)) { .@"struct" => |struct_info| b: { - var output_shapes: [struct_info.fields.len]Shape = undefined; - inline for (struct_info.fields, 0..) |field, i| { - output_shapes[i] = @field(output, field.name); + var output_shapes: [struct_info.field_names.len]Shape = undefined; + inline for (struct_info.field_names, 0..) |field_name, i| { + output_shapes[i] = @field(output, field_name); } break :b &output_shapes; }, @@ -3210,13 +3206,13 @@ pub fn typedCustomCall( var metadata_attribute_list = switch (@typeInfo(Attributes)) { .void => std.ArrayList(mlir.NamedAttribute).initCapacity(allocator, 2) catch unreachable, - .@"struct" => |struct_info| std.ArrayList(mlir.NamedAttribute).initCapacity(allocator, struct_info.fields.len + 2) catch unreachable, + .@"struct" => |struct_info| std.ArrayList(mlir.NamedAttribute).initCapacity(allocator, struct_info.field_names.len + 2) catch unreachable, else => @compileError("Unsupported type: " ++ @typeName(Attributes)), }; if (@typeInfo(Attributes) == .@"struct") { - inline for (@typeInfo(Attributes).@"struct".fields) |field| { - if (metadataFieldToMlirAttribute(ctx.mlir_ctx, field.type, @field(attributes, field.name))) |attribute| { - metadata_attribute_list.appendAssumeCapacity(mlir.NamedAttribute.named(ctx.mlir_ctx, field.name, attribute)); + inline for (@typeInfo(Attributes).@"struct".field_names, @typeInfo(Attributes).@"struct".field_types) |field_name, Field| { + if (metadataFieldToMlirAttribute(ctx.mlir_ctx, Field, @field(attributes, field_name))) |attribute| { + metadata_attribute_list.appendAssumeCapacity(mlir.NamedAttribute.named(ctx.mlir_ctx, field_name, attribute)); } } } @@ -3272,8 +3268,8 @@ pub fn typedCustomCall( switch (@typeInfo(Output)) { .@"struct" => |struct_info| { var out: ShapeToTensor(Output) = undefined; - inline for (output_shapes, struct_info.fields, 0..) |output_shape, field, i| { - @field(out, field.name) = Tensor._result(output_shape, op.result(i)); + inline for (output_shapes, struct_info.field_names, 0..) |output_shape, field_name, i| { + @field(out, field_name) = Tensor._result(output_shape, op.result(i)); } return out; }, @@ -3296,26 +3292,26 @@ fn customCallArgsFromPjrtCallFrame(I: type, O: type, A: type, call_frame: *pjrt. A, } { var input: TensorToCustomCallBuffer(I) = undefined; - inline for (@typeInfo(I).@"struct".fields, 0..) |field, i| { + inline for (@typeInfo(I).@"struct".field_names, 0..) |field_name, i| { const buf = call_frame.args.buffers()[i]; - @field(input, field.name) = .fromPjrt(buf); + @field(input, field_name) = .fromPjrt(buf); } var output: ShapeToCustomCallBuffer(O) = undefined; - inline for (@typeInfo(O).@"struct".fields, 0..) |field, i| { + inline for (@typeInfo(O).@"struct".field_names, 0..) |field_name, i| { const shape_buf = call_frame.results.buffers()[i]; - @field(output, field.name) = .fromPjrt(shape_buf); + @field(output, field_name) = .fromPjrt(shape_buf); } const attributes: A = switch (@typeInfo(A)) { .void => {}, .@"struct" => blk: { var attrs: A = undefined; - inline for (@typeInfo(A).@"struct".fields) |field| { + inline for (@typeInfo(A).@"struct".field_names, @typeInfo(A).@"struct".field_types) |field_name, Field| { // TODO: Use getByIndex instead? - const attribute = call_frame.attrs.getByName(.scalar, field.name) orelse - @panic("Attribute not found: " ++ field.name); - @field(attrs, field.name) = attribute.get(field.type); + const attribute = call_frame.attrs.getByName(.scalar, field_name) orelse + @panic("Attribute not found: " ++ field_name); + @field(attrs, field_name) = attribute.get(Field); } break :blk attrs; }, diff --git a/zml/pjrtx.zig b/zml/pjrtx.zig index f492b120..8543b591 100644 --- a/zml/pjrtx.zig +++ b/zml/pjrtx.zig @@ -117,13 +117,13 @@ pub fn dtypeFromBufferType(pjrt_type: pjrt.BufferType) DataType { } test bufferTypeFromDtype { - inline for (@typeInfo(DataType).@"enum".fields) |field| { - const dt: DataType = @enumFromInt(field.value); + inline for (@typeInfo(DataType).@"enum".field_values) |field_value| { + const dt: DataType = @fromBackingInt(@intCast(field_value)); try std.testing.expectEqual(dt, dtypeFromBufferType(bufferTypeFromDtype(dt))); } - inline for (@typeInfo(pjrt.BufferType).@"enum".fields) |field| { - const dt: pjrt.BufferType = @enumFromInt(field.value); + inline for (@typeInfo(pjrt.BufferType).@"enum".field_values) |field_value| { + const dt: pjrt.BufferType = @fromBackingInt(@intCast(field_value)); if (dt == .invalid) continue; try std.testing.expectEqual(dt, bufferTypeFromDtype(dtypeFromBufferType(dt))); } diff --git a/zml/platform.zig b/zml/platform.zig index 354ec3c1..9e513451 100644 --- a/zml/platform.zig +++ b/zml/platform.zig @@ -216,7 +216,7 @@ pub const Device = struct { } pub fn memory(self: *const Device, memory_kind: Memory.Kind) ?*const Memory { - return self.memory_by_kind.values[@intFromEnum(memory_kind)]; + return self.memory_by_kind.values[@backingInt(memory_kind)]; } }; @@ -238,7 +238,7 @@ fn sortDevicesById(target: Target, devices: []Device) void { std.mem.sort(Device, devices, Context{ .target = target }, Context.lessThan); - if (builtin.mode == .Debug) { + if (builtin.mode == .debug) { for (devices, 0..) |device, expected_id| { std.debug.assert(platformDeviceSortId(target, device) == expected_id); } diff --git a/zml/profiling/profiler.zig b/zml/profiling/profiler.zig index 3f3c8409..d46a0c4c 100644 --- a/zml/profiling/profiler.zig +++ b/zml/profiling/profiler.zig @@ -92,7 +92,7 @@ pub const ProfilerOptions = struct { c.tensorflow_ProfileOptions_set_repository_path(proto, upb.stringView(self.repository_path)); if (self.device_type) |value| { - c.tensorflow_ProfileOptions_set_device_type(proto, @intFromEnum(value)); + c.tensorflow_ProfileOptions_set_device_type(proto, @backingInt(value)); } if (self.include_dataset_ops) |value| { c.tensorflow_ProfileOptions_set_include_dataset_ops(proto, value); diff --git a/zml/profiling/tracer.zig b/zml/profiling/tracer.zig index e3157d10..5aed01df 100644 --- a/zml/profiling/tracer.zig +++ b/zml/profiling/tracer.zig @@ -3,6 +3,7 @@ const builtin = @import("builtin"); const c = @import("c"); const platforms = @import("platforms"); +const stdx = @import("stdx"); const zffi = @import("ffi"); pub const Span = struct { @@ -44,14 +45,14 @@ pub fn span(comptime name: []const u8, metadata: anytype) Span { return .start(name); }, .@"struct" => |info| { - if (info.fields.len == 0) { + if (info.field_names.len == 0) { return .start(name); } var buffer: [computeEncodedNameLen(name, @TypeOf(metadata))]u8 = undefined; var encoded: std.ArrayList(u8) = .initBuffer(&buffer); - appendEncodedName(&encoded, .failing, name, info, metadata) catch unreachable; + appendEncodedName(&encoded, .failing, name, metadata) catch unreachable; return .start(encoded.items); }, else => @compileError("Unsupported metadata."), @@ -62,34 +63,34 @@ pub fn span(comptime name: []const u8, metadata: anytype) Span { /// bounded by `span` at comptime. The caller owns the returned slice. pub fn formatSpanName(allocator: std.mem.Allocator, name: []const u8, metadata: anytype) ![]const u8 { switch (@typeInfo(@TypeOf(metadata))) { - .@"struct" => |info| { + .@"struct" => { var encoded: std.ArrayList(u8) = .empty; errdefer encoded.deinit(allocator); - try appendEncodedName(&encoded, allocator, name, info, metadata); + try appendEncodedName(&encoded, allocator, name, metadata); return try encoded.toOwnedSlice(allocator); }, else => @compileError("trace metadata must be a struct literal like .{ .step_num = 42 }"), } } -fn appendEncodedName(buffer: *std.ArrayList(u8), allocator: std.mem.Allocator, name: []const u8, info: std.builtin.Type.Struct, metadata: anytype) !void { +fn appendEncodedName(buffer: *std.ArrayList(u8), allocator: std.mem.Allocator, name: []const u8, metadata: anytype) !void { try buffer.appendSlice(allocator, name); var field_count: usize = 0; try buffer.append(allocator, '#'); - inline for (info.fields) |field| { - if (shouldEncodeField(field, @field(metadata, field.name))) { + inline for (comptime std.meta.fieldNames(@TypeOf(metadata))) |field_name| { + if (shouldEncodeField(field_name, @field(metadata, field_name))) { if (field_count != 0) { try buffer.append(allocator, ','); } field_count += 1; - const key = comptime metadataKey(field.name); + const key = comptime metadataKey(field_name); validateMetadataToken(key); try buffer.appendSlice(allocator, key); try buffer.append(allocator, '='); - try appendMetadataValue(buffer, allocator, @field(metadata, field.name), field.name); + try appendMetadataValue(buffer, allocator, @field(metadata, field_name), field_name); } } @@ -114,33 +115,38 @@ fn metadataKey(comptime field_name: []const u8) []const u8 { fn computeEncodedNameLen(comptime name: []const u8, comptime Metadata: type) usize { switch (@typeInfo(Metadata)) { .@"struct" => |info| { - if (info.fields.len == 0) return name.len; + if (info.field_names.len == 0) return name.len; // name#[attrs]# var max_len = name.len + 2; - inline for (info.fields) |field| { - const key = comptime metadataKey(field.name); + inline for ( + info.field_names, + info.field_types, + info.field_attrs, + ) |field_name, FieldType, field_attr| { + const key = comptime metadataKey(field_name); validateMetadataToken(key); + const default: ?FieldType = field_attr.defaultValue(FieldType); // [key]=[value], max_len += key.len + 2; - max_len += switch (@typeInfo(field.type)) { + max_len += switch (@typeInfo(FieldType)) { .bool => 1, .int => @max( - std.fmt.comptimePrint("{}", .{std.math.minInt(field.type)}).len, - std.fmt.comptimePrint("{}", .{std.math.maxInt(field.type)}).len, + std.fmt.comptimePrint("{}", .{std.math.minInt(FieldType)}).len, + std.fmt.comptimePrint("{}", .{std.math.maxInt(FieldType)}).len, ), .@"enum" => |ty| b: { var max_enum_len: usize = 0; - for (ty.fields) |enum_field| { - max_enum_len = @max(max_enum_len, enum_field.name.len); + for (ty.field_names) |enum_field_name| { + max_enum_len = @max(max_enum_len, enum_field_name.len); } break :b max_enum_len; }, - .comptime_int => std.fmt.comptimePrint("{}", .{defaultMetadataValue(field).?}).len, - .comptime_float => std.fmt.comptimePrint("{d}", .{defaultMetadataValue(field).?}).len, - .enum_literal => @tagName(defaultMetadataValue(field).?).len, - else => @compileError("trace metadata field '" ++ field.name ++ "' is not statically bounded; use formatspanName"), + .comptime_int => std.fmt.comptimePrint("{}", .{default.?}).len, + .comptime_float => std.fmt.comptimePrint("{d}", .{default.?}).len, + .enum_literal => @tagName(default.?).len, + else => @compileError("trace metadata field '" ++ field_name ++ "' is not statically bounded; use formatspanName"), }; } return max_len; @@ -149,17 +155,11 @@ fn computeEncodedNameLen(comptime name: []const u8, comptime Metadata: type) usi } } -fn defaultMetadataValue(comptime field: std.builtin.Type.StructField) ?field.type { - return if (field.default_value_ptr) |default_opaque| - @as(*const field.type, @ptrCast(@alignCast(default_opaque))).* - else - null; -} - -fn shouldEncodeField(field: std.builtin.Type.StructField, value: anytype) bool { - return switch (@typeInfo(field.type)) { +fn shouldEncodeField(comptime field_name: []const u8, value: anytype) bool { + const FieldType = @TypeOf(value); + return switch (@typeInfo(FieldType)) { .optional => value != null, - .bool => if (comptime std.mem.eql(u8, field.name, "root")) value else true, + .bool => if (comptime std.mem.eql(u8, field_name, "root")) value else true, else => true, }; } diff --git a/zml/quantization.zig b/zml/quantization.zig index b125513a..89e1b210 100644 --- a/zml/quantization.zig +++ b/zml/quantization.zig @@ -474,7 +474,7 @@ test "block FP8 E8M0 scales preserve power-of-two boundaries and nonminor axes" try zml.testing.expectEqualShapes(x.shape().setDim(.k, 8).withDtype(.f32), exe.output_shapes[1]); const fp8_max: f32 = if (dtype == .f8e4m3fn) 448.0 else 224.0; var host: [2 * 256 * 3]f32 = undefined; - var maxima = [_]f32{0} ** (2 * 8 * 3); + var maxima: [2 * 8 * 3]f32 = @splat(0); for (&host, 0..) |*value, i| { const block = (i / 3) % 256 / 32; const scale_index = (i / (256 * 3)) * 24 + block * 3 + i % 3; diff --git a/zml/shape.zig b/zml/shape.zig index 11a3efac..3e3fb56b 100644 --- a/zml/shape.zig +++ b/zml/shape.zig @@ -58,19 +58,19 @@ pub const Shape = struct { if (comptime stdx.meta.isStruct(T)) { var dims_: DimsArray = .empty; var tags_: TagsArray = .empty; - inline for (std.meta.fields(T)) |field| { - const fv = @field(v, field.name); - if (comptime stdx.meta.isInteger(field.type)) { + inline for (comptime std.meta.fieldNames(T), comptime std.meta.fieldTypes(T)) |field_name, Field| { + const fv = @field(v, field_name); + if (comptime stdx.meta.isInteger(Field)) { dims_.appendAssumeCapacity(@intCast(fv)); } else if (@TypeOf(fv) == @EnumLiteral() and comptime isAutoDim(fv)) { dims_.appendAssumeCapacity(-1); } else { - stdx.debug.compileError("Field {s} should be an integer or an auto dimension, got {}", .{ field.name, field.type }); + stdx.debug.compileError("Field {s} should be an integer or an auto dimension, got {}", .{ field_name, Field }); } if (comptime stdx.meta.isTuple(T)) { tags_.appendAssumeCapacity(TagUnknown); } else { - tags_.appendAssumeCapacity(toTag(field)); + tags_.appendAssumeCapacity(toTag(field_name)); } } @@ -107,9 +107,9 @@ pub const Shape = struct { } if (comptime stdx.meta.isTupleOfAny(T, isAxisConvertible)) { - inline for (std.meta.fields(T)) |field| { - axes_.appendAssumeCapacity(self.axis(@field(v, field.name))); - tags_.appendAssumeCapacity(self.tag(@field(v, field.name))); + inline for (comptime std.meta.fieldNames(T)) |field_name| { + axes_.appendAssumeCapacity(self.axis(@field(v, field_name))); + tags_.appendAssumeCapacity(self.tag(@field(v, field_name))); } return .{ axes_, tags_ }; } @@ -191,7 +191,7 @@ pub const Shape = struct { fn isTagConvertible(comptime T: type) bool { return switch (T) { - @EnumLiteral(), std.builtin.Type.StructField, Tag => true, + @EnumLiteral(), [:0]const u8, Tag => true, else => false, }; } @@ -200,14 +200,14 @@ pub const Shape = struct { const T = @TypeOf(v); return switch (T) { @EnumLiteral() => @tagName(v).ptr, - std.builtin.Type.StructField => v.name.ptr, + [:0]const u8 => v.ptr, Tag => v, - else => stdx.debug.compileError("Shape tag should be an @EnumLiteral(), a Shape.Tag or a StructField, got {}", .{T}), + else => stdx.debug.compileError("Shape tag should be an @EnumLiteral(), a Shape.Tag or a field name, got {}", .{T}), }; } fn ensureAttributesAreSync(self: Shape) void { - if (builtin.mode == .Debug) { + if (builtin.mode == .debug) { stdx.debug.assert(self._dims.len == self._tags.len, "Tags, dims and partitioning have diverged! dims={d} tags={d}", .{ self._dims.len, self._tags.len }); } } @@ -312,8 +312,8 @@ pub const Shape = struct { } if (comptime stdx.meta.isStruct(T)) { - inline for (std.meta.fields(T)) |field| { - res.appendAssumeCapacity(self.axis(@field(axes_, field.name))); + inline for (comptime std.meta.fieldNames(T)) |field_name| { + res.appendAssumeCapacity(self.axis(@field(axes_, field_name))); } return res; } @@ -861,11 +861,11 @@ pub const Shape = struct { var res = self; for (0..self.rank()) |ax| { const mesh_axis = self.partition(ax).meshAxis() orelse continue; - inline for (std.meta.fields(T)) |field| { - const old_axis = mesh.resolveLogicalAxis(toTag(field)) orelse - stdx.debug.panic("Mesh '{s}' has no logical axis '{s}'", .{ mesh.name, field.name }); + inline for (comptime std.meta.fieldNames(T)) |field_name| { + const old_axis = mesh.resolveLogicalAxis(toTag(field_name)) orelse + stdx.debug.panic("Mesh '{s}' has no logical axis '{s}'", .{ mesh.name, field_name }); if (mesh_axis == old_axis) { - const new_tag = toTag(@field(mapping, field.name)); + const new_tag = toTag(@field(mapping, field_name)); const new_axis = mesh.resolveLogicalAxis(new_tag) orelse stdx.debug.panic("Mesh '{s}' has no logical axis '{s}'", .{ mesh.name, new_tag }); res._sharding = res._sharding.set(ax, .sharded(@intCast(new_axis))); @@ -1015,10 +1015,10 @@ pub const Shape = struct { const T = @TypeOf(renames); stdx.debug.assertComptime(stdx.meta.isStructOfAny(T, isAxisConvertible), "Must pass a struct of enum literals. Passed: {any}", .{T}); var res = self; - inline for (std.meta.fields(T)) |field| { - const new_field = @field(renames, field.name); + inline for (comptime std.meta.fieldNames(T)) |field_name| { + const new_field = @field(renames, field_name); stdx.debug.assert(self.hasTag(new_field) == null, "{f}.rename({any}) failed because of duplicated axis {any}", .{ self, renames, new_field }); - res._tags.set(self.axis(field), toTag(new_field)); + res._tags.set(self.axis(field_name), toTag(new_field)); } return res; } @@ -1232,8 +1232,8 @@ pub const Shape = struct { stdx.debug.assertComptime(stdx.meta.isStruct(T), "Must pass struct of enum literals like .{ .a = .{ .a1, .a2 } }. Passed: {any}", .{T}); var res = self; - inline for (std.meta.fields(T)) |field| { - res = res.splitAxis(field, @field(axes_, field.name)); + inline for (comptime std.meta.fieldNames(T)) |field_name| { + res = res.splitAxis(field_name, @field(axes_, field_name)); } return res; } @@ -1344,9 +1344,9 @@ pub const Shape = struct { stdx.debug.assertComptime(stdx.meta.isStruct(T), "Must pass struct of enum literals like .{ .a = .{ .a1, .a2 } }. Passed: {any}", .{T}); var res = self; - inline for (std.meta.fields(T)) |field| { - stdx.debug.assertComptime(stdx.meta.isTupleOfAny(field.type, isAxisConvertible) or stdx.meta.isSliceOfAny(field.type, isAxisConvertible), "Must pass struct of axes. Passed: {any}", .{field.type}); - res = res.mergeAxis(field, @field(axes_, field.name)); + inline for (comptime std.meta.fieldNames(T), comptime std.meta.fieldTypes(T)) |field_name, Field| { + stdx.debug.assertComptime(stdx.meta.isTupleOfAny(Field, isAxisConvertible) or stdx.meta.isSliceOfAny(Field, isAxisConvertible), "Must pass struct of axes. Passed: {any}", .{Field}); + res = res.mergeAxis(field_name, @field(axes_, field_name)); } return res; } @@ -1398,14 +1398,14 @@ pub const Shape = struct { } if (comptime stdx.meta.isStruct(V)) { - const fields = std.meta.fields(V); - stdx.debug.assertComptime(fields.len <= constants.MAX_RANK, "Too many fields in struct {} ({d}). Max supported is {d}.", .{ V, fields.len, constants.MAX_RANK }); - inline for (fields) |field| { - const fv = @field(v, field.name); + const field_names = comptime std.meta.fieldNames(V); + stdx.debug.assertComptime(field_names.len <= constants.MAX_RANK, "Too many fields in struct {} ({d}). Max supported is {d}.", .{ V, field_names.len, constants.MAX_RANK }); + inline for (field_names) |field_name| { + const fv = @field(v, field_name); vals_.appendAssumeCapacity(fv); if (!comptime stdx.meta.isTuple(V)) { - tags_.appendAssumeCapacity(toTag(field)); + tags_.appendAssumeCapacity(toTag(field_name)); } } return .{ vals_, tags_ }; @@ -1435,11 +1435,11 @@ pub const Shape = struct { if (comptime stdx.meta.isStruct(V)) { for (0..self.rank()) |_| res.appendAssumeCapacity(default); - const fields = std.meta.fields(V); - stdx.debug.assertComptime(fields.len <= constants.MAX_RANK, "expects up to {} options struct literal, got {}", .{ V, constants.MAX_RANK, fields.len }); - inline for (fields) |field| { - const a = self.axis(field); - res.buffer[a] = @field(options, field.name); + const field_names = comptime std.meta.fieldNames(V); + stdx.debug.assertComptime(field_names.len <= constants.MAX_RANK, "expects up to {} options struct literal, got {}", .{ V, constants.MAX_RANK, field_names.len }); + inline for (field_names) |field_name| { + const a = self.axis(field_name); + res.buffer[a] = @field(options, field_name); } return res; } diff --git a/zml/slice.zig b/zml/slice.zig index f096608b..2deb96d2 100644 --- a/zml/slice.zig +++ b/zml/slice.zig @@ -31,7 +31,7 @@ pub const Slice = struct { const byte_strides = shape.computeByteStrides(); return .{ .bytes = bytes, - .mutable = !type_info.pointer.is_const, + .mutable = !type_info.pointer.attrs.@"const", .shape = shape, .offset_bytes = 0, .byte_strides = byte_strides, @@ -147,12 +147,12 @@ pub const Slice = struct { } pub fn items(slice: Slice, comptime T: type) []T { - stdx.debug.assertComptime(T == bool or @bitSizeOf(T) >= 8, "zml.Slice stores packed sub-bytes type so you need to pass a packed type here like @Vector({}, {}). Got: {}", .{ @divFloor(8, @bitSizeOf(T)), T, T }); + stdx.debug.assertComptime(T == bool or @bitSizeOf(T) >= 8, "zml.Slice stores packed sub-bytes type so you need to pass a packed struct here like stdx.Packed({0}). Got: {0}", .{T}); return @ptrCast(@alignCast(slice.data())); } pub fn constItems(slice: Slice, comptime T: type) []const T { - stdx.debug.assertComptime(T == bool or @bitSizeOf(T) >= 8, "zml.Slice stores packed sub-bytes type so you need to pass a packed type here like @Vector({}, {}). Got: {}", .{ @divFloor(8, @bitSizeOf(T)), T, T }); + stdx.debug.assertComptime(T == bool or @bitSizeOf(T) >= 8, "zml.Slice stores packed sub-bytes type so you need to pass a packed struct here like zml.Float4E2M1.Packed. Got: {}", .{T}); return @ptrCast(@alignCast(slice.constData())); } @@ -289,6 +289,10 @@ pub const Slice = struct { const raw_values: []const T = @ptrCast(@alignCast(slice.bytes[slice.offset_bytes..])); const values = raw_values[0..needed_len]; + if (comptime dt.bitSizeOf() < 8) { + return try stdx.fmt.formatSliceAny(values, options, stride, writer); + } + switch (comptime dt.class()) { .float => try stdx.fmt.formatFloatSlice(values, options, stride, writer), .integer => try stdx.fmt.formatIntSlice(values, options, stride, writer), diff --git a/zml/tensor.zig b/zml/tensor.zig index c2b63f53..275f42d3 100644 --- a/zml/tensor.zig +++ b/zml/tensor.zig @@ -38,7 +38,7 @@ pub const Tensor = struct { } fn nextTensorId() Id { - return @enumFromInt(Tensor.current_id.fetchAdd(1, .seq_cst)); + return @fromBackingInt(@intCast(Tensor.current_id.fetchAdd(1, .seq_cst))); } pub fn fromShape(shape_: Shape) Tensor { @@ -83,7 +83,7 @@ pub const Tensor = struct { var res: Tensor = .{ ._shape = sh, ._value = val, .id = nextTensorId() }; res._shape._sharding.partition = .open(sh.rank()); - if (builtin.mode == .Debug) { + if (builtin.mode == .debug) { // Check that the MLIR value actually have the same shape. const other = fromMlirValue(val); const eql_dtype = sh.dtype() == other.dtype(); @@ -468,7 +468,7 @@ pub const Tensor = struct { const platform = zml.testing.env(); const io = std.testing.io; - const inputs: [6]@Vector(2, i4) = .{ .{ -3.0, -2 }, .{ -1, 1 }, .{ 2, 3 }, .{ 1, 2 }, .{ 3, 4 }, .{ 5, -5 } }; + const inputs: [6]stdx.Packed(i4) = .{ .pack(-3.0, -2), .pack(-1, 1), .pack(2, 3), .pack(1, 2), .pack(3, 4), .pack(5, -5) }; const x_t = Tensor.init(.{ 6, 2 }, .i4); const y_t = Tensor.init(.{ 6, 2 }, .i4); const z_t = Tensor.init(.{ 6, 2 }, .i4); @@ -1432,8 +1432,8 @@ pub const Tensor = struct { test "convert u2 -> u8" { const zml = @import("zml.zig"); const platform = zml.testing.env(); - const x_u2: [2]@Vector(4, u2) = .{ .{ 0, 1, 2, 3 }, .{ 3, 2, 1, 0 } }; - std.debug.assert(@sizeOf(@TypeOf(x_u2)) == 2); + const x_u2: [2]stdx.Packed(u2) = .{ .pack(0, 1, 2, 3), .pack(3, 2, 1, 0) }; + comptime std.debug.assert(@sizeOf(@TypeOf(x_u2)) == 2); const x_u8: [8]u8 = .{ 0, 1, 2, 3, 3, 2, 1, 0 }; const x_u2_t: Tensor = .init(.{8}, .u2); @@ -3809,8 +3809,8 @@ pub const Tensor = struct { const has_name: ?[:0]const u8, const a = switch (@typeInfo(@TypeOf(named_axis_))) { .int, .comptime_int => .{ null, self.axis(@as(i64, @intCast(named_axis_))) }, .@"struct" => |info| blk: { - stdx.debug.assertComptime(info.fields.len == 1, err_msg, .{}); - break :blk .{ info.fields[0].name, self.axis(@field(named_axis_, info.fields[0].name)) }; + stdx.debug.assertComptime(info.field_names.len == 1, err_msg, .{}); + break :blk .{ info.field_names[0], self.axis(@field(named_axis_, info.field_names[0])) }; }, else => stdx.debug.compileError(err_msg, .{}), }; diff --git a/zml/tokenizer/iree/tokenizer.zig b/zml/tokenizer/iree/tokenizer.zig index bc986d4b..0ae25c42 100644 --- a/zml/tokenizer/iree/tokenizer.zig +++ b/zml/tokenizer/iree/tokenizer.zig @@ -577,8 +577,8 @@ pub const Normalizer = struct { ), }, .Strip => |direction| b: { - const strip_left = @intFromEnum(direction) & 0b10 != 0; - const strip_right = @intFromEnum(direction) & 0b01 != 0; + const strip_left = @backingInt(direction) & 0b10 != 0; + const strip_right = @backingInt(direction) & 0b01 != 0; break :b c.iree_tokenizer_normalizer_strip_allocate(strip_left, strip_right, iree_allocator, &norm); }, }; @@ -785,10 +785,10 @@ test "normalizer sequence preserves composition across tiles" { const allocator = std.testing.allocator; var normalizer = try Normalizer.init(allocator, &.{ .NFC, .Lowercase }); defer normalizer.deinit(); - const input = "a" ** 63 ++ "e\u{301}b"; + const input = @as([63]u8, @splat('a')) ++ "e\u{301}b"; const output = try normalizer.normalize(allocator, input); defer allocator.free(output); - try std.testing.expectEqualSlices(u8, "a" ** 63 ++ "éb", output); + try std.testing.expectEqualSlices(u8, @as([63]u8, @splat('a')) ++ "éb", output); } test "normalizer sequence allocation failure retains child ownership" {