Silence C23 warning, causing error in upb target

ROCm · Feb 11, 2025 · e39fe5f · e39fe5f
1 parent 98f331e
commit e39fe5f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -291,6 +291,7 @@ build:rocm --crosstool_top=@local_config_rocm//crosstool:toolchain
 build:rocm --define=using_rocm_hipcc=true
 build:rocm --define=tensorflow_mkldnn_contraction_kernel=0
 build:rocm --repo_env TF_NEED_ROCM=1
+build:rocm --copt=-Wno-c23-extensions
 
 build:sycl --crosstool_top=@local_config_sycl//crosstool:toolchain
 build:sycl --define=using_sycl=true

diff --git a/build_tools/configure/configure.py b/build_tools/configure/configure.py
@@ -383,6 +383,7 @@ def to_bazelrc_lines(
     if dpav.clang_major_version in (16, 17, 18):
       self.compiler_options.append("-Wno-gnu-offsetof-extensions")
 
+
     rc.append(f"build --action_env PYTHON_BIN_PATH={self.python_bin_path}")
     rc.append(f"build --python_path {self.python_bin_path}")
     rc.append("test --test_env LD_LIBRARY_PATH")

diff --git a/third_party/tsl/third_party/gpus/rocm_configure.bzl b/third_party/tsl/third_party/gpus/rocm_configure.bzl
@@ -234,6 +234,7 @@ def _rocm_include_path(repository_ctx, rocm_config, bash_bin):
         inc_dirs.append(rocm_toolkit_path + "/lib/llvm/lib/clang/18/include")
         inc_dirs.append(rocm_toolkit_path + "/lib/llvm/lib/clang/19/include")
         inc_dirs.append(rocm_toolkit_path + "/lib/llvm/lib/clang/20/include")
+        inc_dirs.append(rocm_toolkit_path + "/llvm/lib/clang/21/include")
 
     # Support hcc based off clang 10.0.0 (for ROCm 3.3)
     inc_dirs.append(rocm_toolkit_path + "/hcc/compiler/lib/clang/10.0.0/include/")

diff --git a/xla/service/gpu/transforms/fusion_merger_test.cc b/xla/service/gpu/transforms/fusion_merger_test.cc
@@ -683,7 +683,7 @@ ENTRY entry {
   // reduction emitter. The cost model queries the reduction emitter regarding
   // the launch dimensions, so it seems likely that it is caused by different
   // launch dimensions.
-  debug_options.set_xla_gpu_mlir_emitter_level(3);
+  //  debug_options.set_xla_gpu_mlir_emitter_level(3);
   EXPECT_TRUE(fusion_merger_.Run(module.get()).value());
 }
 
@@ -995,7 +995,7 @@ ENTRY e {
   )")
                     .value();
   auto& debug_options = module->mutable_config().mutable_debug_options();
-  debug_options.set_xla_gpu_mlir_emitter_level(3);
+  // debug_options.set_xla_gpu_mlir_emitter_level(3);
   EXPECT_FALSE(fusion_merger_.Run(module.get()).value());
 }