[pull] master from tensorflow:master

MODULE.bazel

@@ -20,7 +20,7 @@ bazel_dep(name = "nlohmann_json", version = "3.12.0.bcr.1", repo_name = "nlohman
 bazel_dep(name = "abseil-py", version = "2.1.0", repo_name = "absl_py")
 bazel_dep(name = "rules_python", version = "1.6.1")
 bazel_dep(name = "rules_shell", version = "0.6.1")
-bazel_dep(name = "bazel_skylib", version = "1.8.1")
+bazel_dep(name = "bazel_skylib", version = "1.9.0")
 bazel_dep(name = "platforms", version = "1.0.0")
 bazel_dep(name = "rules_license", version = "1.0.0")
 bazel_dep(name = "rules_pkg", version = "1.0.1")
@@ -35,7 +35,7 @@ single_version_override(
 bazel_dep(name = "google_cloud_cpp", version = "3.0.0-rc1", repo_name = "com_github_googlecloudplatform_google_cloud_cpp")
 bazel_dep(name = "crc32c", version = "1.1.0", repo_name = "com_github_google_crc32c")
 bazel_dep(name = "brotli", version = "1.1.0", repo_name = "org_brotli")
-bazel_dep(name = "rules_cc", version = "0.2.11")
+bazel_dep(name = "rules_cc", version = "0.2.20")
 bazel_dep(name = "curl", version = "8.11.0.bcr.5")
 bazel_dep(name = "rules_webtesting", version = "0.4.1", repo_name = "io_bazel_rules_webtesting")
 bazel_dep(name = "rules_closure", version = "0.15.0", repo_name = "io_bazel_rules_closure")

WORKSPACE

@@ -44,6 +44,10 @@ load("@bazel_features//:deps.bzl", "bazel_features_deps")
 
 bazel_features_deps()
 
+load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo")
+
+compatibility_proxy_repo()
+
 load("@rules_shell//shell:repositories.bzl", "rules_shell_dependencies", "rules_shell_toolchains")
 
 rules_shell_dependencies()

tensorflow/compiler/mlir/tools/kernel_gen/kernel_creator.cc

@@ -249,8 +249,12 @@ absl::Status LowerHlotoLoops(mlir::ModuleOp module,
   pm.addNestedPass<FuncOp>(::mlir::createCSEPass());
   // Collapse and tile parallel loops for GPU only.
   pm.addNestedPass<FuncOp>(mlir::createCollapseParallelLoopsTo1DPass());
-  pm.addNestedPass<FuncOp>(
-      mlir::createTileLoopsPass(tile_sizes, unroll_factors));
+  mlir::TileLoopsPassOptions tile_loops_options;
+  tile_loops_options.tile_sizes_ =
+      llvm::SmallVector<int64_t>(tile_sizes.begin(), tile_sizes.end());
+  tile_loops_options.unroll_factors_ =
+      llvm::SmallVector<int64_t>(unroll_factors.begin(), unroll_factors.end());
+  pm.addNestedPass<FuncOp>(mlir::createTileLoopsPass(tile_loops_options));
 
   pm.addNestedPass<FuncOp>(::mlir::createCanonicalizerPass());
   pm.addNestedPass<FuncOp>(::mlir::createCSEPass());

tensorflow/lite/experimental/acceleration/mini_benchmark/gpu_module_plugin.cc

@@ -75,6 +75,10 @@ GpuModulePlugin::GpuModulePlugin(const TFLiteSettings& tflite_settings) {
                        ->c_str(),
                    dlopen_flags);
   if (!module_) {
+    TFLITE_LOG_PROD(TFLITE_LOG_WARNING, "Failed to load Gpu Module from %s",
+                    tflite_settings_->stable_delegate_loader_settings()
+                        ->delegate_path()
+                        ->c_str());
     error_code_ = kMinibenchmarkCannotLoadGpuModule;
     return;
   }

tensorflow/lite/experimental/acceleration/mini_benchmark/gpu_module_plugin_test.cc

@@ -65,16 +65,34 @@ void VerifyPluginCanLoadAndCreateDelegate(const TFLiteSettings& settings) {
 }
 
 // Verifies that the plugin initialization handles dlopen failures gracefully
-// when provided with an invalid path (i.e. it doesn't crash).
+// when provided with an invalid path (i.e. it doesn't crash) and logs a
+// warning.
 TEST_F(GpuModulePluginTest, DlopenFlags) {
   const ComputeSettings* settings = nullptr;
   auto fbb =
       CreateGpuSettings("invalid_path_to_force_dlopen_fail.so", &settings);
   ASSERT_NE(settings, nullptr);
   ASSERT_NE(settings->tflite_settings(), nullptr);
 
+  // Stderr capture using GTest is only reliable on host platforms. While
+  // TFLITE_LOG_PROD also writes to stderr on Android, GTest's stream capture
+  // relies on creating a temporary file. Android does not have /tmp and
+  // /data/local/tmp may not be writable, so CaptureStderr silently fails
+  // unless TMPDIR is explicitly set to a writable location.
+#if !defined(__ANDROID__)
+  testing::internal::CaptureStderr();
+#endif
   auto plugin = GpuModulePlugin::New(*settings->tflite_settings());
-  ASSERT_NE(plugin.get(), nullptr);
+#if !defined(__ANDROID__)
+  std::string captured_stderr = testing::internal::GetCapturedStderr();
+#endif
+
+  ASSERT_NE(plugin, nullptr);
+#if !defined(__ANDROID__)
+  EXPECT_NE(captured_stderr.find("Failed to load Gpu Module from "
+                                 "invalid_path_to_force_dlopen_fail.so"),
+            std::string::npos);
+#endif
 }
 
 // Verifies that the plugin can be successfully loaded from a shared library

tensorflow/tools/gcs_test/Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 # ==============================================================================
 
-FROM ubuntu:26.04@sha256:b7f48194d4d8b763a478a621cdc81c27be222ba2206ca3ca6bc42b49685f3d9e
+FROM ubuntu:26.04@sha256:2260313b31c8c011cd2eebe728008efac1b3982be73eb71348ea2648d2c0e09b
 
 LABEL maintainer="Shanqing Cai <cais@google.com>"
 

tensorflow/workspace1.bzl

@@ -18,6 +18,7 @@
 load("@com_google_benchmark//:bazel/benchmark_deps.bzl", "benchmark_deps")
 load("@grpc//bazel:grpc_deps.bzl", "grpc_deps")
 load("@io_bazel_rules_closure//closure:defs.bzl", "closure_repositories")
+load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo")
 load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
 load("@xla//third_party/llvm:setup.bzl", "llvm_setup")
 load("//third_party:repo.bzl", "tf_http_archive", "tf_mirror_urls")
@@ -33,6 +34,8 @@ def workspace(with_rules_cc = True):
     llvm_setup(name = "llvm-project")
     native.register_toolchains("@local_config_python//:py_toolchain")
     rules_pkg_dependencies()
+    if "cc_compatibility_proxy" not in native.existing_rules():
+        compatibility_proxy_repo()
 
     closure_repositories()
 

tensorflow/workspace3.bzl

@@ -36,9 +36,9 @@ def workspace():
     # https://github.com/bazelbuild/bazel-skylib/releases
     tf_http_archive(
         name = "bazel_skylib",
-        sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f",
+        sha256 = "3b5b49006181f5f8ff626ef8ddceaa95e9bb8ad294f7b5d7b11ea9f7ddaf8c59",
         urls = tf_mirror_urls(
-            "https://github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz",
+            "https://github.com/bazelbuild/bazel-skylib/releases/download/1.9.0/bazel-skylib-1.9.0.tar.gz",
         ),
     )
 
@@ -67,6 +67,15 @@ def workspace():
         ),
     )
 
+    tf_http_archive(
+        name = "rules_cc",
+        sha256 = "69e05df29f0010ba248ef8dafc1f084c8fd2f5c553da634422d8167f5c4b277b",
+        strip_prefix = "rules_cc-0.2.20",
+        urls = tf_mirror_urls(
+            "https://github.com/bazelbuild/rules_cc/releases/download/0.2.20/rules_cc-0.2.20.tar.gz",
+        ),
+    )
+
     # Toolchains for ML projects hermetic builds.
     # Details: https://github.com/google-ml-infra/rules_ml_toolchain
     tf_http_archive(

third_party/googleapis/build_rules.bzl

@@ -16,8 +16,8 @@
 Utilities for building grpc and proto libraries from googleapis.
 """
 
+load("@com_google_protobuf//bazel:cc_proto_library.bzl", native_cc_proto_library = "cc_proto_library")
 load("@grpc//bazel:generate_cc.bzl", "generate_cc")
-load("@rules_cc//cc:defs.bzl", native_cc_proto_library = "cc_proto_library")
 
 def _tf_cc_headers(ctx):
     if len(ctx.attr.deps) != 1:

third_party/xla/third_party/llvm/build.patch

@@ -13,10 +13,9 @@
 # limitations under the License.
 # ==============================================================================
 diff --git a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
-index a7e652c..5b8ac5e 100644
 --- a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
 +++ b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
-@@ -234,19 +234,19 @@ write_file(
+@@ -317,19 +317,19 @@
  config_setting(
      name = "is_windows_clang_mingw",
      constraint_values = ["@platforms//os:windows"],
@@ -39,16 +38,52 @@ index a7e652c..5b8ac5e 100644
  )
 
  config_setting(
-@@ -255,7 +255,7 @@ config_setting(
+@@ -338,7 +338,7 @@
+         "@platforms//cpu:aarch64",
+         "@platforms//os:windows",
+     ],
+-    flag_values = {"@rules_cc//cc/compiler:compiler": "clang"},
++    flag_values = {"@rules_cc//cc/private/toolchain:compiler": "clang"},
+ )
+
+ config_setting(
+@@ -347,7 +347,7 @@
+         "@platforms//cpu:aarch64",
+         "@platforms//os:windows",
+     ],
+-    flag_values = {"@rules_cc//cc/compiler:compiler": "clang-cl"},
++    flag_values = {"@rules_cc//cc/private/toolchain:compiler": "clang-cl"},
+ )
+
+ config_setting(
+@@ -356,7 +356,7 @@
+         "@platforms//cpu:aarch64",
+         "@platforms//os:windows",
+     ],
+-    flag_values = {"@rules_cc//cc/compiler:compiler": "msvc-cl"},
++    flag_values = {"@rules_cc//cc/private/toolchain:compiler": "msvc-cl"},
+ )
+
+ config_setting(
+@@ -365,7 +365,7 @@
          "@platforms//cpu:x86_64",
          "@platforms//os:windows",
      ],
 -    flag_values = {"@rules_cc//cc/compiler:compiler": "clang"},
 +    flag_values = {"@rules_cc//cc/private/toolchain:compiler": "clang"},
  )
 
+ config_setting(
+@@ -374,7 +374,7 @@
+         "@platforms//cpu:x86_64",
+         "@platforms//os:windows",
+     ],
+-    flag_values = {"@rules_cc//cc/compiler:compiler": "clang-cl"},
++    flag_values = {"@rules_cc//cc/private/toolchain:compiler": "clang-cl"},
+ )
+
  BLAKE3_x86_64_ASM_SOURCE_PATTERNS = [
-@@ -308,7 +308,8 @@ cc_library(
+@@ -430,7 +430,8 @@
          "@platforms//cpu:aarch64": [
              "lib/Support/BLAKE3/blake3_neon.c",
          ],
@@ -58,7 +93,7 @@ index a7e652c..5b8ac5e 100644
          "//conditions:default": [
          ],
      }),
-@@ -337,8 +338,9 @@ cc_library(
+@@ -459,8 +460,9 @@
          ],
          "//conditions:default": ["BLAKE3_USE_NEON=0"],
      }) + select({

third_party/xla/third_party/llvm/toolchains.patch

@@ -13,13 +13,13 @@
 # limitations under the License.
 # ==============================================================================
 diff --git a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
-index 9affa75801b7..2f681c82c298 100644
 --- a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
 +++ b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
-@@ -42,6 +42,36 @@ exports_files([
+@@ -57,6 +57,36 @@
+     # This one is needed for building and vendoring out lldb from off tree.
      "utils/lldbDataFormatters.py",
  ])
- 
++
 +config_setting(
 +    name = "macos_arm64",
 +    constraint_values = [
@@ -49,23 +49,21 @@ index 9affa75801b7..2f681c82c298 100644
 +        "@platforms//cpu:x86_64",
 +    ],
 +)
-+
+ 
  config_setting(
      name = "darwin_arm64",
-     constraint_values = [
 diff --git a/utils/bazel/llvm-project-overlay/llvm/config.bzl b/utils/bazel/llvm-project-overlay/llvm/config.bzl
-index d592f9e5bfcc..7b87dad91e1b 100644
 --- a/utils/bazel/llvm-project-overlay/llvm/config.bzl
 +++ b/utils/bazel/llvm-project-overlay/llvm/config.bzl
-@@ -100,8 +100,9 @@ builtin_thread_pointer = select({
-
- # TODO: We should split out host vs. target here.
- llvm_config_defines = os_defines + builtin_thread_pointer + select({
+@@ -147,8 +147,9 @@
+     Label("//llvm:is_aarch64_windows_clang_cl"): native_arch_defines("AArch64", "aarch64-pc-windows-msvc"),
+     Label("//llvm:is_aarch64_windows_msvc"): native_arch_defines("AArch64", "aarch64-pc-windows-msvc"),
+     Label("//llvm:is_x86_64_windows_clang_mingw"): native_arch_defines("X86", "x86_64-w64-windows-gnu"),
 -    Label("//llvm:darwin_arm64"): native_arch_defines("AArch64", "arm64-apple-darwin"),
 -    Label("//llvm:darwin_x86_64"): native_arch_defines("X86", "x86_64-unknown-darwin"),
 +    Label("//llvm:macos_arm64"): native_arch_defines("AArch64", "arm64-apple-darwin"),
 +    Label("//llvm:macos_x86_64"): native_arch_defines("X86", "x86_64-unknown-darwin"),
 +    Label("//llvm:macos_x86_64_default"): native_arch_defines("X86", "x86_64-unknown-darwin"),
      Label("//llvm:linux_aarch64"): native_arch_defines("AArch64", "aarch64-unknown-linux-gnu"),
+     Label("//llvm:linux_armv7"): native_arch_defines("ARM", "armv7-linux-gnueabihf"),
      Label("//llvm:linux_ppc64le"): native_arch_defines("PowerPC", "powerpc64le-unknown-linux-gnu"),
-     Label("//llvm:linux_riscv64"): native_arch_defines("RISCV", "riscv64-unknown-linux-gnu"),