Merge pull request #6708 from ThomasRaoux:main-to-google

PiperOrigin-RevId: 389712115

SUBMODULE_VERSIONS.txt

diff --git a/SUBMODULE_VERSIONS.txt b/SUBMODULE_VERSIONS.txt
index 7358e5a..ee7cb31 100644
--- a/SUBMODULE_VERSIONS.txt
+++ b/SUBMODULE_VERSIONS.txt
@@ -4,7 +4,7 @@
 aa533abfd4232b01f9e57041d70114d5a77e6de0 third_party/googletest
 88b845dee001723c4a0db1fe5477de735b6d3bb0 third_party/liburing
 acd6f6f014c25e46363e718381e0b35205df2d83 third_party/libyaml
-8a7c657c4d65deb13880634823659d9e9d924e4a third_party/llvm-project
+6f85d9e104ca5f785718b25dccb5817b0c6c208d third_party/llvm-project
 874ee7cd2a175492502f677a29ba60f1e7d2d2f0 third_party/mlir-hlo
 4c7697dbe973ed01ae6fbec37d186ebd05982e1f third_party/pybind11
 2e1b5fb39ebc2ef4cb77005f8267e4f3a6241ba1 third_party/spirv_cross

build_tools/python_deploy/setup_dockcross.sh

diff --git a/build_tools/python_deploy/setup_dockcross.sh b/build_tools/python_deploy/setup_dockcross.sh
old mode 100755
new mode 100644

iree/compiler/Dialect/HAL/Target/VulkanSPIRV/VulkanSPIRVTarget.cpp

diff --git a/iree/compiler/Dialect/HAL/Target/VulkanSPIRV/VulkanSPIRVTarget.cpp b/iree/compiler/Dialect/HAL/Target/VulkanSPIRV/VulkanSPIRVTarget.cpp
index 23282c1..1f4b8ea 100644
--- a/iree/compiler/Dialect/HAL/Target/VulkanSPIRV/VulkanSPIRVTarget.cpp
+++ b/iree/compiler/Dialect/HAL/Target/VulkanSPIRV/VulkanSPIRVTarget.cpp
@@ -155,6 +155,9 @@
     buildSPIRVCodegenPassPipeline(passManager, options_.codegenOptions);
   }
 
+  // TODO(antiagainst): Re-enable SPIR-V linking once the tensorflow integration
+  // crash is fixed.
+/*
   LogicalResult linkExecutables(mlir::ModuleOp moduleOp) override {
     // Note: Vulkan flavored SPIR-V does not have linking in the conventional
     // sense. For example, there is no cross-module symbol reference and symbol
@@ -266,6 +269,7 @@
 
     return success();
   }
+*/
 
   LogicalResult serializeExecutable(IREE::HAL::ExecutableVariantOp variantOp,
                                     OpBuilder &executableBuilder) override {

iree/compiler/Dialect/HAL/Target/VulkanSPIRV/test/linking.mlir

diff --git a/iree/compiler/Dialect/HAL/Target/VulkanSPIRV/test/linking.mlir b/iree/compiler/Dialect/HAL/Target/VulkanSPIRV/test/linking.mlir
index 379836e..d333768 100644
--- a/iree/compiler/Dialect/HAL/Target/VulkanSPIRV/test/linking.mlir
+++ b/iree/compiler/Dialect/HAL/Target/VulkanSPIRV/test/linking.mlir
@@ -1,4 +1,7 @@
-// RUN: iree-opt -split-input-file -iree-hal-link-target-executables='target=vulkan-spirv'  %s | IreeFileCheck %s
+// TODO(antiagainst): Re-enable SPIR-V linking once the tensorflow integration
+// crash is fixed.
+// RUN-disabled: iree-opt -split-input-file -iree-hal-link-target-executables='target=vulkan-spirv'  %s | IreeFileCheck %s
+// RUN: iree-opt -split-input-file %s
 
 #executable_target_vulkan_spirv_fb = #hal.executable.target<"vulkan", "vulkan-spirv-fb">
 

llvm-projects/iree-compiler-api/build_tools/build_intree.sh

diff --git a/llvm-projects/iree-compiler-api/build_tools/build_intree.sh b/llvm-projects/iree-compiler-api/build_tools/build_intree.sh
old mode 100755
new mode 100644

llvm-projects/iree-dialects/build_tools/build_standalone.sh

diff --git a/llvm-projects/iree-dialects/build_tools/build_standalone.sh b/llvm-projects/iree-dialects/build_tools/build_standalone.sh
old mode 100755
new mode 100644

third_party/llvm-project

diff --git a/third_party/llvm-project b/third_party/llvm-project
index 8a7c657..6f85d9e 160000
--- a/third_party/llvm-project
+++ b/third_party/llvm-project
@@ -1 +1 @@
-Subproject commit 8a7c657c4d65deb13880634823659d9e9d924e4a
+Subproject commit 6f85d9e104ca5f785718b25dccb5817b0c6c208d