From 3d3a0ea463426f9734806cab8ab15ba8c4016f0e Mon Sep 17 00:00:00 2001 From: Tarry Singh Date: Tue, 11 Nov 2025 13:02:40 +0000 Subject: [PATCH] Enable -fllvm flag for CUDA runtime, upb, and ZML Bazel targets. --- MODULE.bazel.lock | 91 ++++++++++++++++++++------------------- runtimes/cuda/BUILD.bazel | 2 +- upb/BUILD.bazel | 4 ++ zml/BUILD.bazel | 7 ++- zml/tokenizer/BUILD.bazel | 4 ++ 5 files changed, 62 insertions(+), 46 deletions(-) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 3bec3fe..fe78fb1 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -171,6 +171,7 @@ "https://bazel-registry.zml.ai/modules/rules_shell/0.4.1/MODULE.bazel": "not found", "https://bazel-registry.zml.ai/modules/rules_swift/1.16.0/MODULE.bazel": "not found", "https://bazel-registry.zml.ai/modules/rules_swift/2.1.1/MODULE.bazel": "not found", + "https://bazel-registry.zml.ai/modules/rules_zig/0.12.1/MODULE.bazel": "not found", "https://bazel-registry.zml.ai/modules/stardoc/0.5.1/MODULE.bazel": "not found", "https://bazel-registry.zml.ai/modules/stardoc/0.5.3/MODULE.bazel": "not found", "https://bazel-registry.zml.ai/modules/stardoc/0.5.4/MODULE.bazel": "not found", @@ -398,6 +399,8 @@ "https://bcr.bazel.build/modules/rules_swift/1.16.0/MODULE.bazel": "4a09f199545a60d09895e8281362b1ff3bb08bbde69c6fc87aff5b92fcc916ca", "https://bcr.bazel.build/modules/rules_swift/2.1.1/MODULE.bazel": "494900a80f944fc7aa61500c2073d9729dff0b764f0e89b824eb746959bc1046", "https://bcr.bazel.build/modules/rules_swift/2.1.1/source.json": "40fc69dfaac64deddbb75bd99cdac55f4427d9ca0afbe408576a65428427a186", + "https://bcr.bazel.build/modules/rules_zig/0.12.1/MODULE.bazel": "5953094b681c212eebe3dd4275809c52b9177aeaa058d8f1bff433822c0dcd01", + "https://bcr.bazel.build/modules/rules_zig/0.12.1/source.json": "d880cdc3473bfcf172c9aad9292e856430496e198d805539bb8be98e79f58a7c", "https://bcr.bazel.build/modules/stardoc/0.5.1/MODULE.bazel": "1a05d92974d0c122f5ccf09291442580317cdd859f07a8655f1db9a60374f9f8", "https://bcr.bazel.build/modules/stardoc/0.5.3/MODULE.bazel": "c7f6948dae6999bf0db32c1858ae345f112cacf98f174c7a8bb707e41b974f1c", "https://bcr.bazel.build/modules/stardoc/0.5.4/MODULE.bazel": "6569966df04610b8520957cb8e97cf2e9faac2c0309657c537ab51c16c18a2a4", @@ -2811,89 +2814,89 @@ "@@rules_zig+//zig:extensions.bzl%zig": { "general": { "bzlTransitiveDigest": "wV3euhBZSI0D2ZlqbY1YW592mghFY88d9H6zBMQRaJY=", - "usagesDigest": "FR3I3Uy7g7MHBta/AuDtKPMdikDVo0hgQZNdLunZDX4=", + "usagesDigest": "PFS+UEa30JWWU52AUTNHD1nDzqpwjSts6jIKzD7gVJU=", "recordedFileInputs": { - "@@//bazel/zig_index.json": "42ea73420b15741770d5d8d0ded1311a2dfda1f963f0802dea3418f6e060ffef", + "@@//bazel/zig_index.json": "e6c6b29fa227fa9b1806dc03af2b6dab00f52f34d39878557074e1626027259f", "@@rules_zig+//zig/private/versions.json": "6eb85ebaee72c4e6fbc82d8ad73f69e0899d839b70a7e19caa792ab6a5fa0c36" }, "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { - "zig_0.15.1_aarch64-linux": { + "zig_0.15.2_aarch64-linux": { "repoRuleId": "@@rules_zig+//zig/private/repo:zig_repository.bzl%zig_repository", "attributes": { - "url": "https://ziglang.org/download/0.15.1/zig-aarch64-linux-0.15.1.tar.xz", + "url": "https://ziglang.org/download/0.15.2/zig-aarch64-linux-0.15.2.tar.xz", "mirrors": [ "https://mirror.zml.ai/zig", "https://ziglang.org/builds/" ], - "sha256": "bb4a8d2ad735e7fba764c497ddf4243cb129fece4148da3222a7046d3f1f19fe", - "zig_version": "0.15.1", + "sha256": "958ed7d1e00d0ea76590d27666efbf7a932281b3d7ba0c6b01b0ff26498f667f", + "zig_version": "0.15.2", "platform": "aarch64-linux" } }, - "zig_0.15.1_aarch64-macos": { + "zig_0.15.2_aarch64-macos": { "repoRuleId": "@@rules_zig+//zig/private/repo:zig_repository.bzl%zig_repository", "attributes": { - "url": "https://ziglang.org/download/0.15.1/zig-aarch64-macos-0.15.1.tar.xz", + "url": "https://ziglang.org/download/0.15.2/zig-aarch64-macos-0.15.2.tar.xz", "mirrors": [ "https://mirror.zml.ai/zig", "https://ziglang.org/builds/" ], - "sha256": "c4bd624d901c1268f2deb9d8eb2d86a2f8b97bafa3f118025344242da2c54d7b", - "zig_version": "0.15.1", + "sha256": "3cc2bab367e185cdfb27501c4b30b1b0653c28d9f73df8dc91488e66ece5fa6b", + "zig_version": "0.15.2", "platform": "aarch64-macos" } }, - "zig_0.15.1_aarch64-windows": { + "zig_0.15.2_aarch64-windows": { "repoRuleId": "@@rules_zig+//zig/private/repo:zig_repository.bzl%zig_repository", "attributes": { - "url": "https://ziglang.org/download/0.15.1/zig-aarch64-windows-0.15.1.zip", + "url": "https://ziglang.org/download/0.15.2/zig-aarch64-windows-0.15.2.zip", "mirrors": [ "https://mirror.zml.ai/zig", "https://ziglang.org/builds/" ], - "sha256": "1f1bf16228b0ffcc882b713dc5e11a6db4219cb30997e13c72e8e723c2104ec6", - "zig_version": "0.15.1", + "sha256": "b926465f8872bf983422257cd9ec248bb2b270996fbe8d57872cca13b56fc370", + "zig_version": "0.15.2", "platform": "aarch64-windows" } }, - "zig_0.15.1_x86_64-linux": { + "zig_0.15.2_x86_64-linux": { "repoRuleId": "@@rules_zig+//zig/private/repo:zig_repository.bzl%zig_repository", "attributes": { - "url": "https://ziglang.org/download/0.15.1/zig-x86_64-linux-0.15.1.tar.xz", + "url": "https://ziglang.org/download/0.15.2/zig-x86_64-linux-0.15.2.tar.xz", "mirrors": [ "https://mirror.zml.ai/zig", "https://ziglang.org/builds/" ], - "sha256": "c61c5da6edeea14ca51ecd5e4520c6f4189ef5250383db33d01848293bfafe05", - "zig_version": "0.15.1", + "sha256": "02aa270f183da276e5b5920b1dac44a63f1a49e55050ebde3aecc9eb82f93239", + "zig_version": "0.15.2", "platform": "x86_64-linux" } }, - "zig_0.15.1_x86_64-macos": { + "zig_0.15.2_x86_64-macos": { "repoRuleId": "@@rules_zig+//zig/private/repo:zig_repository.bzl%zig_repository", "attributes": { - "url": "https://ziglang.org/download/0.15.1/zig-x86_64-macos-0.15.1.tar.xz", + "url": "https://ziglang.org/download/0.15.2/zig-x86_64-macos-0.15.2.tar.xz", "mirrors": [ "https://mirror.zml.ai/zig", "https://ziglang.org/builds/" ], - "sha256": "9919392e0287cccc106dfbcbb46c7c1c3fa05d919567bb58d7eb16bca4116184", - "zig_version": "0.15.1", + "sha256": "375b6909fc1495d16fc2c7db9538f707456bfc3373b14ee83fdd3e22b3d43f7f", + "zig_version": "0.15.2", "platform": "x86_64-macos" } }, - "zig_0.15.1_x86_64-windows": { + "zig_0.15.2_x86_64-windows": { "repoRuleId": "@@rules_zig+//zig/private/repo:zig_repository.bzl%zig_repository", "attributes": { - "url": "https://ziglang.org/download/0.15.1/zig-x86_64-windows-0.15.1.zip", + "url": "https://ziglang.org/download/0.15.2/zig-x86_64-windows-0.15.2.zip", "mirrors": [ "https://mirror.zml.ai/zig", "https://ziglang.org/builds/" ], - "sha256": "91e69e887ca8c943ce9a515df3af013d95a66a190a3df3f89221277ebad29e34", - "zig_version": "0.15.1", + "sha256": "3a0ed1e8799a2f8ce2a6e6290a9ff22e6906f8227865911fb7ddedc3cc14cb0c", + "zig_version": "0.15.2", "platform": "x86_64-windows" } }, @@ -2901,28 +2904,28 @@ "repoRuleId": "@@rules_zig+//zig/private/repo:toolchains_repo.bzl%toolchains_repo", "attributes": { "names": [ - "zig_0.15.1_aarch64-linux", - "zig_0.15.1_aarch64-macos", - "zig_0.15.1_aarch64-windows", - "zig_0.15.1_x86_64-linux", - "zig_0.15.1_x86_64-macos", - "zig_0.15.1_x86_64-windows" + "zig_0.15.2_aarch64-linux", + "zig_0.15.2_aarch64-macos", + "zig_0.15.2_aarch64-windows", + "zig_0.15.2_x86_64-linux", + "zig_0.15.2_x86_64-macos", + "zig_0.15.2_x86_64-windows" ], "labels": [ - "@zig_0.15.1_aarch64-linux//:zig_toolchain", - "@zig_0.15.1_aarch64-macos//:zig_toolchain", - "@zig_0.15.1_aarch64-windows//:zig_toolchain", - "@zig_0.15.1_x86_64-linux//:zig_toolchain", - "@zig_0.15.1_x86_64-macos//:zig_toolchain", - "@zig_0.15.1_x86_64-windows//:zig_toolchain" + "@zig_0.15.2_aarch64-linux//:zig_toolchain", + "@zig_0.15.2_aarch64-macos//:zig_toolchain", + "@zig_0.15.2_aarch64-windows//:zig_toolchain", + "@zig_0.15.2_x86_64-linux//:zig_toolchain", + "@zig_0.15.2_x86_64-macos//:zig_toolchain", + "@zig_0.15.2_x86_64-windows//:zig_toolchain" ], "zig_versions": [ - "0.15.1", - "0.15.1", - "0.15.1", - "0.15.1", - "0.15.1", - "0.15.1" + "0.15.2", + "0.15.2", + "0.15.2", + "0.15.2", + "0.15.2", + "0.15.2" ], "exec_lengths": [ 2, diff --git a/runtimes/cuda/BUILD.bazel b/runtimes/cuda/BUILD.bazel index 19eecbc..cf266d7 100644 --- a/runtimes/cuda/BUILD.bazel +++ b/runtimes/cuda/BUILD.bazel @@ -5,7 +5,7 @@ zig_shared_library( name = "zmlxcuda", # Use Clang's compiler-rt, but disable stack checking # to avoid requiring on the _zig_probe_stack symbol. - zigopts = ["-fno-stack-check", "-fllvm"], + zigopts = ["-fno-stack-check"], main = "zmlxcuda.zig", shared_lib_name = "libzmlxcuda.so.0", visibility = ["@libpjrt_cuda//:__subpackages__"], diff --git a/upb/BUILD.bazel b/upb/BUILD.bazel index ebf973f..3273aeb 100644 --- a/upb/BUILD.bazel +++ b/upb/BUILD.bazel @@ -14,4 +14,8 @@ zig_library( main = "upb.zig", visibility = ["//visibility:public"], deps = [":upb_c"], + zigopts = [ + #TODO(cerisier): Remove me when this is done inside rules_zig. + "-fllvm", + ], ) diff --git a/zml/BUILD.bazel b/zml/BUILD.bazel index 47a3b5c..be9d555 100644 --- a/zml/BUILD.bazel +++ b/zml/BUILD.bazel @@ -54,7 +54,12 @@ zig_library( "torch.zig", "zml.zig", ], - zigopts = ["-lc", "-freference-trace=20"], + zigopts = [ + "-lc", + "-freference-trace=20", + #TODO(cerisier): Remove me when this is done inside rules_zig. + "-fllvm", + ], main = "zml.zig", visibility = ["//visibility:public"], deps = [ diff --git a/zml/tokenizer/BUILD.bazel b/zml/tokenizer/BUILD.bazel index 012e218..d7c8f6d 100644 --- a/zml/tokenizer/BUILD.bazel +++ b/zml/tokenizer/BUILD.bazel @@ -19,6 +19,10 @@ zig_binary( name = "main", main = "main.zig", visibility = ["//visibility:public"], + zigopts = [ + #TODO(cerisier): Remove me when this is done inside rules_zig. + "-fllvm" + ], deps = [ ":tokenizer", "//async",