From a53139956c36dc09fc494ef61967bbecc1ee529d Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 23 Jan 2024 12:14:21 -0800
Subject: [PATCH] Changed Version of Bazel to version 6.5.0

PiperOrigin-RevId: 600868265
---
 .bazelversion                                            | 2 +-
 tensorflow/core/kernels/mlir_generated/build_defs.bzl    | 9 +++++----
 tensorflow/tools/ci_build/install/install_bazel.sh       | 2 +-
 .../tools/ci_build/install/install_bazel_from_source.sh  | 2 +-
 tensorflow/tools/ci_build/release/common.sh              | 2 +-
 third_party/xla/.bazelversion                            | 2 +-
 third_party/xla/third_party/tsl/.bazelversion            | 2 +-
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.bazelversion b/.bazelversion
index b536fbc5061..f3c238740e5 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1,2 +1,2 @@
-6.1.0
+6.5.0
 # NOTE: Update Bazel version in tensorflow/tools/ci_build/release/common.sh.oss
\ No newline at end of file
diff --git a/tensorflow/core/kernels/mlir_generated/build_defs.bzl b/tensorflow/core/kernels/mlir_generated/build_defs.bzl
index fe071b2375e..3ed387826e1 100644
--- a/tensorflow/core/kernels/mlir_generated/build_defs.bzl
+++ b/tensorflow/core/kernels/mlir_generated/build_defs.bzl
@@ -1,14 +1,14 @@
 """Generates cubin headers for TF dialect ops."""
 
 load("@local_config_cuda//cuda:build_defs.bzl", "cuda_gpu_architectures")
-load(
-    "@local_config_rocm//rocm:build_defs.bzl",
-    "rocm_gpu_architectures",
-)
 load(
     "@local_xla//xla/stream_executor:build_defs.bzl",
     "if_gpu_is_configured",
 )
+load(
+    "@local_config_rocm//rocm:build_defs.bzl",
+    "rocm_gpu_architectures",
+)
 load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
 
 def _lookup_file(filegroup, path):
@@ -217,6 +217,7 @@ _gen_kernel_bin_rule = rule(
     outputs = {"kernel": "%{name}_kernel.o"},
     toolchains = use_cpp_toolchain(),
     implementation = _gen_kernel_bin_impl,
+    provides = [CcInfo],
 )
 
 # Returns the shape string (e.g. "4x4" or "16Bx2") as comma-separated integers.
diff --git a/tensorflow/tools/ci_build/install/install_bazel.sh b/tensorflow/tools/ci_build/install/install_bazel.sh
index 8a3fce78657..97abb5718d9 100755
--- a/tensorflow/tools/ci_build/install/install_bazel.sh
+++ b/tensorflow/tools/ci_build/install/install_bazel.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 # ==============================================================================
 
-BAZEL_VERSION="6.1.0"
+BAZEL_VERSION="6.5.0"
 
 set +e
 local_bazel_ver=$(bazel version 2>&1 | grep -i label | awk '{print $3}')
diff --git a/tensorflow/tools/ci_build/install/install_bazel_from_source.sh b/tensorflow/tools/ci_build/install/install_bazel_from_source.sh
index d571859e001..78bdf70d9ee 100755
--- a/tensorflow/tools/ci_build/install/install_bazel_from_source.sh
+++ b/tensorflow/tools/ci_build/install/install_bazel_from_source.sh
@@ -17,7 +17,7 @@
 # This script is to be used to install bzel on non x86_64 systems
 # It will compile bazel from source and install it in /usr/local/bin
 
-BAZEL_VERSION="6.1.0"
+BAZEL_VERSION="6.5.0"
 
 set +e
 local_bazel_ver=$(bazel version 2>&1 | grep -i label | awk '{print $3}')
diff --git a/tensorflow/tools/ci_build/release/common.sh b/tensorflow/tools/ci_build/release/common.sh
index 84eb4611478..741bc643409 100644
--- a/tensorflow/tools/ci_build/release/common.sh
+++ b/tensorflow/tools/ci_build/release/common.sh
@@ -17,7 +17,7 @@
 
 # Keeps Bazel versions of the build scripts.
 # LINT.IfChange
-LATEST_BAZEL_VERSION=6.1.0
+LATEST_BAZEL_VERSION=6.5.0
 # LINT.ThenChange(
 #   //tensorflow/opensource_only/.bazelversion,
 #   //tensorflow/tools/ci_build/install/install_bazel.sh,
diff --git a/third_party/xla/.bazelversion b/third_party/xla/.bazelversion
index b536fbc5061..f3c238740e5 100644
--- a/third_party/xla/.bazelversion
+++ b/third_party/xla/.bazelversion
@@ -1,2 +1,2 @@
-6.1.0
+6.5.0
 # NOTE: Update Bazel version in tensorflow/tools/ci_build/release/common.sh.oss
\ No newline at end of file
diff --git a/third_party/xla/third_party/tsl/.bazelversion b/third_party/xla/third_party/tsl/.bazelversion
index b536fbc5061..f3c238740e5 100644
--- a/third_party/xla/third_party/tsl/.bazelversion
+++ b/third_party/xla/third_party/tsl/.bazelversion
@@ -1,2 +1,2 @@
-6.1.0
+6.5.0
 # NOTE: Update Bazel version in tensorflow/tools/ci_build/release/common.sh.oss
\ No newline at end of file