[pull] master from tensorflow:master

tensorflow/core/common_runtime/eager/context_distributed_manager.cc

@@ -126,6 +126,11 @@ class XlaKeyValueStore : public xla::KeyValueStoreInterface {
         absl::StrCat(key_prefix_, key), timeout);
   }
 
+  absl::StatusOr<std::string> TryGet(std::string_view key) override {
+    return coordination_service_agent_->TryGetKeyValue(
+        absl::StrCat(key_prefix_, key));
+  }
+
   absl::Status Set(std::string_view key, std::string_view value) override {
     return coordination_service_agent_->InsertKeyValue(
         absl::StrCat(key_prefix_, key), value);

tensorflow/core/profiler/convert/xplane_to_op_stats.cc

@@ -370,10 +370,12 @@ OpStats ConvertXSpaceToOpStats(const XSpace& space,
       auto stat = visitor.GetStat(StatType::kCoreDetails);
       if (stat.has_value()) {
         CoreDetails core_details;
-        // TODO: Switch to StrOrRefValue once protobuf version is updated.
-        core_details.ParseFromString(stat->ToString());
-        core_details.set_hostname(hostname);
-        core_id_to_details[device_plane->id()] = core_details;
+        absl::string_view core_details_bytes = stat->BytesValue();
+        if (core_details.ParseFromArray(core_details_bytes.data(),
+                                        core_details_bytes.size())) {
+          core_details.set_hostname(hostname);
+          core_id_to_details[device_plane->id()] = core_details;
+        }
       }
     }
   }

tensorflow/lite/experimental/litert/runtime/compiled_model.cc

@@ -275,7 +275,7 @@ Expected<void> LiteRtCompiledModelT::RegisterBuffer(
 
   if (backend_requires_cpu_buffer) {
     // When backend requires CPU buffer.
-    bool bufer_is_cpu_compatible =
+    bool buffer_is_cpu_compatible =
         buffer->buffer_type() == kLiteRtTensorBufferTypeHostMemory;
 #if defined(__ANDROID__)
     if (buffer->buffer_type() == kLiteRtTensorBufferTypeAhwb) {
@@ -286,12 +286,12 @@ Expected<void> LiteRtCompiledModelT::RegisterBuffer(
           // CPU compatible.
           AHardwareBuffer_Desc desc;
           AHardwareBuffer_describe(*ahwb, &desc);
-          bufer_is_cpu_compatible = true;
+          buffer_is_cpu_compatible = true;
         }
       }
     }
 #endif
-    if (bufer_is_cpu_compatible) {
+    if (buffer_is_cpu_compatible) {
       auto lock_and_addr = TensorBufferScopedLock::Create(buffer);
       if (!lock_and_addr) {
         return Unexpected(kLiteRtStatusErrorRuntimeFailure,

third_party/llvm/generated.patch

@@ -1,67 +1 @@
 Auto generated patch. Do not edit or delete it, even if empty.
-diff -ruN --strip-trailing-cr a/clang/test/Driver/spirv-openmp-toolchain.c b/clang/test/Driver/spirv-openmp-toolchain.c
---- a/clang/test/Driver/spirv-openmp-toolchain.c
-+++ b/clang/test/Driver/spirv-openmp-toolchain.c
-@@ -1,4 +1,4 @@
--// RUN: %clang -### --target=x86_64-unknown-linux-gnu -fopenmp -fopenmp-targets=spirv64-intel \
-+// RUN: %clang -### --target=x86_64-unknown-linux-gnu -fopenmp=libomp -fopenmp-targets=spirv64-intel \
- // RUN:        --libomptarget-spirv-bc-path=%t/ -nogpulib %s 2>&1 \
- // RUN: | FileCheck %s
-
-diff -ruN --strip-trailing-cr a/libc/src/stdlib/qsort_pivot.h b/libc/src/stdlib/qsort_pivot.h
---- a/libc/src/stdlib/qsort_pivot.h
-+++ b/libc/src/stdlib/qsort_pivot.h
-@@ -9,7 +9,7 @@
- #ifndef LLVM_LIBC_SRC_STDLIB_QSORT_PIVOT_H
- #define LLVM_LIBC_SRC_STDLIB_QSORT_PIVOT_H
-
--#include <stdint.h>
-+#include <stddef.h>  // For size_t
-
- namespace LIBC_NAMESPACE_DECL {
- namespace internal {
-diff -ruN --strip-trailing-cr a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
---- a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
-+++ b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
-@@ -3481,11 +3481,13 @@
-     hdrs = [
-         "src/stdlib/heap_sort.h",
-         "src/stdlib/qsort_data.h",
-+        "src/stdlib/qsort_pivot.h",
-         "src/stdlib/qsort_util.h",
-         "src/stdlib/quick_sort.h",
-     ],
-     deps = [
-         ":__support_common",
-+        ":__support_cpp_bit",
-         ":__support_cpp_cstddef",
-         ":__support_macros_attributes",
-     ],
-diff -ruN --strip-trailing-cr a/utils/bazel/llvm-project-overlay/libc/test/src/stdlib/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/src/stdlib/BUILD.bazel
---- a/utils/bazel/llvm-project-overlay/libc/test/src/stdlib/BUILD.bazel
-+++ b/utils/bazel/llvm-project-overlay/libc/test/src/stdlib/BUILD.bazel
-@@ -115,7 +115,7 @@
-     hdrs = ["SortingTest.h"],
-     deps = [
-         "//libc:__support_macros_config",
--        "//libc:qsort_util",
-+        "//libc:qsort",
-         "//libc/test/UnitTest:LibcUnitTest",
-     ],
- )
-@@ -126,6 +126,7 @@
-     libc_function_deps = ["//libc:qsort"],
-     deps = [
-         ":qsort_test_helper",
-+        "//libc:qsort_util",
-         "//libc:types_size_t",
-     ],
- )
-@@ -136,6 +137,7 @@
-     libc_function_deps = ["//libc:qsort"],
-     deps = [
-         ":qsort_test_helper",
-+        "//libc:qsort_util",
-         "//libc:types_size_t",
-     ],
- )

third_party/llvm/workspace.bzl

@@ -4,8 +4,8 @@ load("//third_party:repo.bzl", "tf_http_archive")
 
 def repo(name):
     """Imports LLVM."""
-    LLVM_COMMIT = "743aee4951d452c7795e4e829a6cbf704340cd1c"
-    LLVM_SHA256 = "f329a4573217959086f25791acc788f35b72a5cd86f396d29579b3cbdac53faf"
+    LLVM_COMMIT = "faa3f752896903c2d09d389970d3d0ebf50a1073"
+    LLVM_SHA256 = "2c8b76b370dca2a70dac1036244598d357867071217074c5cdf15c43295b0042"
 
     tf_http_archive(
         name = name,

third_party/shardy/temporary.patch

@@ -1,87 +1,87 @@
 diff --git a/third_party/llvm/generated.patch b/third_party/llvm/generated.patch
-index 509398d..19931f2 100644
+index 19931f2..509398d 100644
 --- a/third_party/llvm/generated.patch
 +++ b/third_party/llvm/generated.patch
-@@ -1 +1,67 @@
+@@ -1,67 +1 @@
  Auto generated patch. Do not edit or delete it, even if empty.
-+diff -ruN --strip-trailing-cr a/clang/test/Driver/spirv-openmp-toolchain.c b/clang/test/Driver/spirv-openmp-toolchain.c
-+--- a/clang/test/Driver/spirv-openmp-toolchain.c
-++++ b/clang/test/Driver/spirv-openmp-toolchain.c
-+@@ -1,4 +1,4 @@
-+-// RUN: %clang -### --target=x86_64-unknown-linux-gnu -fopenmp -fopenmp-targets=spirv64-intel \
-++// RUN: %clang -### --target=x86_64-unknown-linux-gnu -fopenmp=libomp -fopenmp-targets=spirv64-intel \
-+ // RUN:        --libomptarget-spirv-bc-path=%t/ -nogpulib %s 2>&1 \
-+ // RUN: | FileCheck %s
-+ 
-+diff -ruN --strip-trailing-cr a/libc/src/stdlib/qsort_pivot.h b/libc/src/stdlib/qsort_pivot.h
-+--- a/libc/src/stdlib/qsort_pivot.h
-++++ b/libc/src/stdlib/qsort_pivot.h
-+@@ -9,7 +9,7 @@
-+ #ifndef LLVM_LIBC_SRC_STDLIB_QSORT_PIVOT_H
-+ #define LLVM_LIBC_SRC_STDLIB_QSORT_PIVOT_H
-+ 
-+-#include <stdint.h>
-++#include <stddef.h>  // For size_t
-+ 
-+ namespace LIBC_NAMESPACE_DECL {
-+ namespace internal {
-+diff -ruN --strip-trailing-cr a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
-+--- a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
-++++ b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
-+@@ -3481,11 +3481,13 @@
-+     hdrs = [
-+         "src/stdlib/heap_sort.h",
-+         "src/stdlib/qsort_data.h",
-++        "src/stdlib/qsort_pivot.h",
-+         "src/stdlib/qsort_util.h",
-+         "src/stdlib/quick_sort.h",
-+     ],
-+     deps = [
-+         ":__support_common",
-++        ":__support_cpp_bit",
-+         ":__support_cpp_cstddef",
-+         ":__support_macros_attributes",
-+     ],
-+diff -ruN --strip-trailing-cr a/utils/bazel/llvm-project-overlay/libc/test/src/stdlib/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/src/stdlib/BUILD.bazel
-+--- a/utils/bazel/llvm-project-overlay/libc/test/src/stdlib/BUILD.bazel
-++++ b/utils/bazel/llvm-project-overlay/libc/test/src/stdlib/BUILD.bazel
-+@@ -115,7 +115,7 @@
-+     hdrs = ["SortingTest.h"],
-+     deps = [
-+         "//libc:__support_macros_config",
-+-        "//libc:qsort_util",
-++        "//libc:qsort",
-+         "//libc/test/UnitTest:LibcUnitTest",
-+     ],
-+ )
-+@@ -126,6 +126,7 @@
-+     libc_function_deps = ["//libc:qsort"],
-+     deps = [
-+         ":qsort_test_helper",
-++        "//libc:qsort_util",
-+         "//libc:types_size_t",
-+     ],
-+ )
-+@@ -136,6 +137,7 @@
-+     libc_function_deps = ["//libc:qsort"],
-+     deps = [
-+         ":qsort_test_helper",
-++        "//libc:qsort_util",
-+         "//libc:types_size_t",
-+     ],
-+ )
+-diff -ruN --strip-trailing-cr a/clang/test/Driver/spirv-openmp-toolchain.c b/clang/test/Driver/spirv-openmp-toolchain.c
+---- a/clang/test/Driver/spirv-openmp-toolchain.c
+-+++ b/clang/test/Driver/spirv-openmp-toolchain.c
+-@@ -1,4 +1,4 @@
+--// RUN: %clang -### --target=x86_64-unknown-linux-gnu -fopenmp -fopenmp-targets=spirv64-intel \
+-+// RUN: %clang -### --target=x86_64-unknown-linux-gnu -fopenmp=libomp -fopenmp-targets=spirv64-intel \
+- // RUN:        --libomptarget-spirv-bc-path=%t/ -nogpulib %s 2>&1 \
+- // RUN: | FileCheck %s
+- 
+-diff -ruN --strip-trailing-cr a/libc/src/stdlib/qsort_pivot.h b/libc/src/stdlib/qsort_pivot.h
+---- a/libc/src/stdlib/qsort_pivot.h
+-+++ b/libc/src/stdlib/qsort_pivot.h
+-@@ -9,7 +9,7 @@
+- #ifndef LLVM_LIBC_SRC_STDLIB_QSORT_PIVOT_H
+- #define LLVM_LIBC_SRC_STDLIB_QSORT_PIVOT_H
+- 
+--#include <stdint.h>
+-+#include <stddef.h>  // For size_t
+- 
+- namespace LIBC_NAMESPACE_DECL {
+- namespace internal {
+-diff -ruN --strip-trailing-cr a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
+---- a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
+-+++ b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
+-@@ -3481,11 +3481,13 @@
+-     hdrs = [
+-         "src/stdlib/heap_sort.h",
+-         "src/stdlib/qsort_data.h",
+-+        "src/stdlib/qsort_pivot.h",
+-         "src/stdlib/qsort_util.h",
+-         "src/stdlib/quick_sort.h",
+-     ],
+-     deps = [
+-         ":__support_common",
+-+        ":__support_cpp_bit",
+-         ":__support_cpp_cstddef",
+-         ":__support_macros_attributes",
+-     ],
+-diff -ruN --strip-trailing-cr a/utils/bazel/llvm-project-overlay/libc/test/src/stdlib/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/src/stdlib/BUILD.bazel
+---- a/utils/bazel/llvm-project-overlay/libc/test/src/stdlib/BUILD.bazel
+-+++ b/utils/bazel/llvm-project-overlay/libc/test/src/stdlib/BUILD.bazel
+-@@ -115,7 +115,7 @@
+-     hdrs = ["SortingTest.h"],
+-     deps = [
+-         "//libc:__support_macros_config",
+--        "//libc:qsort_util",
+-+        "//libc:qsort",
+-         "//libc/test/UnitTest:LibcUnitTest",
+-     ],
+- )
+-@@ -126,6 +126,7 @@
+-     libc_function_deps = ["//libc:qsort"],
+-     deps = [
+-         ":qsort_test_helper",
+-+        "//libc:qsort_util",
+-         "//libc:types_size_t",
+-     ],
+- )
+-@@ -136,6 +137,7 @@
+-     libc_function_deps = ["//libc:qsort"],
+-     deps = [
+-         ":qsort_test_helper",
+-+        "//libc:qsort_util",
+-         "//libc:types_size_t",
+-     ],
+- )
 diff --git a/third_party/llvm/workspace.bzl b/third_party/llvm/workspace.bzl
-index 33b3b01..d9f463e 100644
+index d9f463e..b6db01e 100644
 --- a/third_party/llvm/workspace.bzl
 +++ b/third_party/llvm/workspace.bzl
 @@ -4,8 +4,8 @@ load("//third_party:repo.bzl", "tf_http_archive")
 
  def repo(name):
      """Imports LLVM."""
--    LLVM_COMMIT = "f739aa4004165dc64d3a1f418d5ad3c84886f01a"
--    LLVM_SHA256 = "85da134e7ba044ef50ebc009d1a57a87fb0e2db208a04650ef2fe564e9564aa7"
-+    LLVM_COMMIT = "743aee4951d452c7795e4e829a6cbf704340cd1c"
-+    LLVM_SHA256 = "f329a4573217959086f25791acc788f35b72a5cd86f396d29579b3cbdac53faf"
+-    LLVM_COMMIT = "743aee4951d452c7795e4e829a6cbf704340cd1c"
+-    LLVM_SHA256 = "f329a4573217959086f25791acc788f35b72a5cd86f396d29579b3cbdac53faf"
++    LLVM_COMMIT = "faa3f752896903c2d09d389970d3d0ebf50a1073"
++    LLVM_SHA256 = "2c8b76b370dca2a70dac1036244598d357867071217074c5cdf15c43295b0042"
 
      tf_http_archive(
          name = name,

third_party/shardy/workspace.bzl

@@ -3,8 +3,8 @@
 load("//third_party:repo.bzl", "tf_http_archive", "tf_mirror_urls")
 
 def repo():
-    SHARDY_COMMIT = "b9cee4e1b1929649152fad501f187709402040ee"
-    SHARDY_SHA256 = "810eafa532cffb99bc5686e529b585b767a5b659cc36cbecbd80a9892b1d5016"
+    SHARDY_COMMIT = "f759dcb6af2a9ab0753bda2efa905d315d790f07"
+    SHARDY_SHA256 = "6ef3ebd3f2f0102ac0ea5101b5ea5a4e4fc2ebd3534da649d1151f94cf3329cd"
 
     tf_http_archive(
         name = "shardy",