workspace: fix nightly (#58)

* support linux yq...

* update xla

* Fix setup.sh

* Update @llvm

* no force remote

* Fix dylib

Author: cerisier

.github/workflows/_build.yaml

@@ -17,8 +17,8 @@ on:
         type: string
 
 env:
-  XLA_COMMIT: ${{ inputs.xla_commit || '9caad7b3520548142ccd6a2d528a06be6c474de1' }} # main from 2025-12-23
-  ROCM_XLA_COMMIT: ${{ inputs.rocm_xla_commit || 'a841f7a22e36f856032eed3f4e9e83903d482198' }} # rocm-jaxlib-v0.8.0 from 2025-12-30
+  XLA_COMMIT: ${{ inputs.xla_commit || '9e9a0fb13b164c9875349246d1d8616a267c9bf5' }} # main from 2026-03-12
+  ROCM_XLA_COMMIT: ${{ inputs.rocm_xla_commit || 'c40171e49b63e8a12498fae2b64f90c2406802ec' }} # rocm-jaxlib-v0.8.0 from 2025-12-30
   TF_ROCM_AMDGPU_TARGETS: "gfx900,gfx906,gfx908,gfx90a,gfx942,gfx1030,gfx1100"
   BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }}
 
@@ -45,7 +45,7 @@ jobs:
             bazel_target: //xla/pjrt/c:pjrt_c_api_gpu_plugin
           - target: cpu
             config: "--config=hermetic_macos_arm64 --config=remote --config=bzlmod --remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY"
-            artifact: bazel-bin/xla/pjrt/c/libpjrt_c_api_cpu_plugin.so
+            artifact: bazel-bin/xla/pjrt/c/libpjrt_c_api_cpu_plugin.dylib
             runs_on: ["runs-on", "runner=32cpu-linux-x64", "image=ubuntu22-amd64"]
             renamed_artifact: libpjrt_cpu.dylib
             platform: darwin-arm64
@@ -66,7 +66,7 @@ jobs:
             platform: linux-amd64
             bazel_target: //xla/pjrt/c:pjrt_c_api_cpu_plugin
           - target: cpu
-            config: "--config=hermetic_linux_arm64 --config=remote --config=bzlmod --remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY --platforms @toolchains_llvm_bootstrapped//platforms:linux_arm64"
+            config: "--config=hermetic_linux_arm64 --config=remote --config=bzlmod --remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY --platforms @llvm//platforms:linux_arm64"
             artifact: bazel-bin/xla/pjrt/c/libpjrt_c_api_cpu_plugin.so
             renamed_artifact: libpjrt_cpu.so
             runs_on: ["runs-on", "runner=32cpu-linux-x64", "image=ubuntu22-amd64"]
@@ -97,17 +97,21 @@ jobs:
           xla_commit=$(git rev-parse HEAD)
           echo "XLA_COMMIT_ID=$xla_commit" >> $GITHUB_OUTPUT
           echo ::notice::Applying patches to openxla $xla_commit
-          for patch in $(ls ../pjrt-artifacts/openxla/patches/$PATCH_DIRECTORY/*.patch | sort); do
-              echo "Applying patch $patch"
-              git apply "$patch"
-          done
-          # apply patches from upstream-cpu if target = cpu
-          if [ "${{ matrix.pjrt.target }}" = "cpu" ]; then
-            for patch in $(ls ../pjrt-artifacts/openxla/patches/upstream-cpu/*.patch | sort); do
+          if compgen -G "../pjrt-artifacts/openxla/patches/$PATCH_DIRECTORY/*.patch" > /dev/null; then
+            for patch in ../pjrt-artifacts/openxla/patches/$PATCH_DIRECTORY/*.patch; do
                 echo "Applying patch $patch"
                 git apply "$patch"
             done
           fi
+          # apply patches from upstream-cpu if target = cpu
+          if [ "${{ matrix.pjrt.target }}" = "cpu" ]; then
+            if compgen -G "../pjrt-artifacts/openxla/patches/upstream-cpu/*.patch" > /dev/null; then
+              for patch in ../pjrt-artifacts/openxla/patches/upstream-cpu/*.patch; do
+                  echo "Applying patch $patch"
+                  git apply "$patch"
+              done
+            fi
+          fi
 
       - uses: runs-on/snapshot@v1
         if: matrix.pjrt.target != 'cpu'

openxla/bazelrc/upstream/.bazelrc

@@ -32,8 +32,8 @@ common:remote --experimental_remote_execution_keepalive
 common:remote --grpc_keepalive_time=30s
 common:remote --remote_executor=grpcs://remote.buildbuddy.io
 common:remote --jobs=800
-common:remote --extra_execution_platforms=@toolchains_llvm_bootstrapped//:rbe_platform
-common:remote --spawn_strategy=remote
+common:remote --extra_execution_platforms=@llvm//:rbe_platform
+# common:remote --spawn_strategy=remote
 
 # Additive-only configs for hermetic/custom cc toolchain flows.
 common:hermetic_clang --repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
@@ -46,11 +46,11 @@ common:hermetic_clang --@rules_python//python/config_settings:bootstrap_impl=scr
 
 common:hermetic_linux_x86 --config=hermetic_clang
 common:hermetic_linux_x86 --config=avx_linux
-common:hermetic_linux_x86 --platforms @toolchains_llvm_bootstrapped//platforms:linux_x86_64
+common:hermetic_linux_x86 --platforms @llvm//platforms:linux_x86_64
 common:hermetic_linux_x86 --cpu=k8
 
 common:hermetic_linux_arm64 --config=hermetic_clang
-common:hermetic_linux_arm64 --platforms @toolchains_llvm_bootstrapped//platforms:linux_arm64
+common:hermetic_linux_arm64 --platforms @llvm//platforms:linux_aarch64
 common:hermetic_linux_arm64 --cpu=aarch64
 
 ### OSX

openxla/patches/upstream/0001-Drop-the-.so-suffix-for-PjRt-plugin-targets-.dylib-o.patch

@@ -9,10 +9,10 @@ Subject: [PATCH 1/3] Drop the .so suffix for PjRt plugin targets (.dylib on
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/xla/pjrt/c/BUILD b/xla/pjrt/c/BUILD
-index 39192ab24d..8fb2e34c21 100644
+index 37f8cb73ce..ffd95b50c8 100644
 --- a/xla/pjrt/c/BUILD
 +++ b/xla/pjrt/c/BUILD
-@@ -390,7 +390,7 @@ cc_library(
+@@ -510,7 +510,7 @@ cc_library(
 
  # PJRT CPU plugin.
  xla_cc_binary(
@@ -21,7 +21,7 @@ index 39192ab24d..8fb2e34c21 100644
      additional_linker_inputs = [
          ":pjrt_c_api_cpu_version_script.lds",
      ],
-@@ -486,7 +486,7 @@ cc_library(
+@@ -613,7 +613,7 @@ cc_library(
 
  # PJRT GPU plugin. Can be configured to be built for CUDA or ROCM.
  xla_cc_binary(
@@ -32,4 +32,3 @@ index 39192ab24d..8fb2e34c21 100644
      ],
 -- 
 2.50.1 (Apple Git-155)
-

openxla/patches/upstream/0002-Custom-install-name.patch

@@ -1,8 +1,17 @@
+From 174a8d1f0a596227db6ac281499c57133d1557cb Mon Sep 17 00:00:00 2001
+From: Corentin Kerisit <corentin.kerisit@gmail.com>
+Date: Thu, 12 Mar 2026 11:00:00 +0000
+Subject: [PATCH 2/3] Custom install name
+
+---
+ xla/pjrt/c/BUILD | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 diff --git a/xla/pjrt/c/BUILD b/xla/pjrt/c/BUILD
-index aece9b02cb..28aa1d182e 100644
+index ea48989303..525b8c8f93 100644
 --- a/xla/pjrt/c/BUILD
 +++ b/xla/pjrt/c/BUILD
-@@ -410,7 +410,7 @@ xla_cc_binary(
+@@ -519,7 +519,7 @@ xla_cc_binary(
      linkopts = if_macos(
          [
              "-Wl,-exported_symbol,_GetPjrtApi",
@@ -11,4 +20,5 @@ index aece9b02cb..28aa1d182e 100644
              "-Wl,-undefined,error",
          ],
          [
----
+-- 
+2.48.1

openxla/patches/upstream/0002-Hermetic-cc-toolchain.patch

@@ -0,0 +1,28 @@
+diff --git a/MODULE.bazel b/MODULE.bazel
+index d6866a2..7d82e18 100644
+--- a/MODULE.bazel
++++ b/MODULE.bazel
+@@ -6,6 +6,7 @@ module(name = "xla")
+ # go/keep-sorted start
+ bazel_dep(name = "abseil-cpp", version = "20250814.1", repo_name = "com_google_absl")
+ bazel_dep(name = "abseil-py", version = "2.1.0", repo_name = "absl_py")
++bazel_dep(name = "apple_support", version = "1.24.4", repo_name = "build_bazel_apple_support")
+ bazel_dep(name = "bazel_features", version = "1.36.0")
+ bazel_dep(name = "bazel_skylib", version = "1.8.2")
+ bazel_dep(name = "boringssl", version = "0.20250818.0")
+@@ -28,10 +29,15 @@ bazel_dep(name = "rules_license", version = "1.0.0")
+ bazel_dep(name = "rules_python", version = "1.8.4")
+ bazel_dep(name = "rules_shell", version = "0.6.1")
+ bazel_dep(name = "snappy", version = "1.2.1")
++bazel_dep(name = "llvm", version = "0.6.7")
+ bazel_dep(name = "xxd", version = "9.1.0917")
+ bazel_dep(name = "zlib", version = "1.3.1.bcr.5")
+ # go/keep-sorted end
+ 
++register_toolchains(
++    "@llvm//toolchain:all",
++)
++
+ # Only for compatibility, not directly used, change repo_name to None after upgrading Bazel to latest 7.x
+ bazel_dep(name = "eigen", version = "4.0.0-20241125.bcr.3", repo_name = "DO_NOT_USE_eigen")
+ bazel_dep(name = "grpc-java", version = "1.75.0", repo_name = "DO_NOT_USE_grpc_java")

openxla/patches/upstream/0003-Hermetic-cc-toolchain.patch

@@ -201,7 +201,7 @@ fi
 echo ""
 echo "=== Build commands (from $WORKFLOW_FILE) ==="
 
-matrix_entries=$(yq_read '.jobs["pjrt-artifacts"].strategy.matrix.pjrt[] | [.target,.platform,.config,.bazel_target] | @tsv')
+matrix_entries=$(yq_read '.jobs["pjrt-artifacts"].strategy.matrix.pjrt[] | [.target,.platform,.bazel_opts,.config,.bazel_target] | @tsv')
 
 while IFS=$'\t' read -r target platform config bazel_target; do
   if [[ -z "$target" ]]; then