Integrate llvm-project and bump dependencies. (#8097)

* llvm-project: c490f8feb71e
* mlir-hlo: f9f696890acbe198b6164a7ca43523e2bddd630a
* tensorflow: a20bfc24dfbc34ef4de644e6bf46b41e6e57b878
* Adapt to upstream changes by adding bufferization models for std.
* Update SUBMODULE_VERSIONS.txt (should remove this entirely).
* Test case fixes for upstream D115520.

(submitting around integration breaks that are being fixed at head)

SUBMODULE_VERSIONS.txt

diff --git a/SUBMODULE_VERSIONS.txt b/SUBMODULE_VERSIONS.txt
index e437363..d85f2be 100644
--- a/SUBMODULE_VERSIONS.txt
+++ b/SUBMODULE_VERSIONS.txt
@@ -4,8 +4,8 @@
 aa533abfd4232b01f9e57041d70114d5a77e6de0 third_party/googletest
 88b845dee001723c4a0db1fe5477de735b6d3bb0 third_party/liburing
 f8f760f7387d2cc56a2fc7b1be313a3bf3f7f58c third_party/libyaml
-f96ab6cc1b2016374a6e8500774f8cb2c3725b04 third_party/llvm-project
-2e2f5f5ac8fd84555bddfe45a4c4f6037cbb63d3 third_party/mlir-hlo
+c490f8feb71e837dd7011e7a7d8a7928507c9c76 third_party/llvm-project
+f9f696890acbe198b6164a7ca43523e2bddd630a third_party/mlir-hlo
 3f701faace7addc75d16dea8a6cd769fa5b3f260 third_party/musl
 59aa99860c60bd171b9565e9920f125fdb749267 third_party/pybind11
 e9cc6403341baf0edd430a4027b074d0a06b782f third_party/spirv_cross

integrations/tensorflow/WORKSPACE

diff --git a/integrations/tensorflow/WORKSPACE b/integrations/tensorflow/WORKSPACE
index 9ab0803..c03480a 100644
--- a/integrations/tensorflow/WORKSPACE
+++ b/integrations/tensorflow/WORKSPACE
@@ -7,7 +7,7 @@
 
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
-TENSORFLOW_COMMIT = "baa6d31a0af6adb7058e229001931a1fdd6f81bb"
+TENSORFLOW_COMMIT = "a20bfc24dfbc34ef4de644e6bf46b41e6e57b878"
 
 git_repository(
     name = "org_tensorflow",

iree/compiler/Codegen/Interfaces/BUILD

diff --git a/iree/compiler/Codegen/Interfaces/BUILD b/iree/compiler/Codegen/Interfaces/BUILD
index b6941f5..426f613 100644
--- a/iree/compiler/Codegen/Interfaces/BUILD
+++ b/iree/compiler/Codegen/Interfaces/BUILD
@@ -62,6 +62,7 @@
         "@llvm-project//mlir:LinalgBufferizableOpInterfaceImpl",
         "@llvm-project//mlir:MemRefDialect",
         "@llvm-project//mlir:SCFBufferizableOpInterfaceImpl",
+        "@llvm-project//mlir:StdBufferizableOpInterfaceImpl",
         "@llvm-project//mlir:Support",
         "@llvm-project//mlir:TensorBufferizableOpInterfaceImpl",
         "@llvm-project//mlir:VectorBufferizableOpInterfaceImpl",

iree/compiler/Codegen/Interfaces/BufferizationInterfaces.cpp

diff --git a/iree/compiler/Codegen/Interfaces/BufferizationInterfaces.cpp b/iree/compiler/Codegen/Interfaces/BufferizationInterfaces.cpp
index 3988482..e69b8a9 100644
--- a/iree/compiler/Codegen/Interfaces/BufferizationInterfaces.cpp
+++ b/iree/compiler/Codegen/Interfaces/BufferizationInterfaces.cpp
@@ -18,6 +18,7 @@
 #include "mlir/Dialect/Linalg/ComprehensiveBufferize/LinalgInterfaceImpl.h"
 #include "mlir/Dialect/Linalg/ComprehensiveBufferize/ModuleBufferization.h"
 #include "mlir/Dialect/Linalg/ComprehensiveBufferize/SCFInterfaceImpl.h"
+#include "mlir/Dialect/Linalg/ComprehensiveBufferize/StdInterfaceImpl.h"
 #include "mlir/Dialect/Linalg/ComprehensiveBufferize/TensorInterfaceImpl.h"
 #include "mlir/Dialect/Linalg/ComprehensiveBufferize/VectorInterfaceImpl.h"
 #include "mlir/Dialect/MemRef/IR/MemRef.h"
@@ -283,6 +284,8 @@
   linalg::comprehensive_bufferize::scf_ext::
       registerBufferizableOpInterfaceExternalModels(registry);
   linalg::comprehensive_bufferize::std_ext::
+      registerModuleBufferizationExternalModels(registry);
+  linalg::comprehensive_bufferize::std_ext::
       registerBufferizableOpInterfaceExternalModels(registry);
   linalg::comprehensive_bufferize::tensor_ext::
       registerBufferizableOpInterfaceExternalModels(registry);

iree/compiler/Codegen/Interfaces/CMakeLists.txt

diff --git a/iree/compiler/Codegen/Interfaces/CMakeLists.txt b/iree/compiler/Codegen/Interfaces/CMakeLists.txt
index 208341c..9efc1b8 100644
--- a/iree/compiler/Codegen/Interfaces/CMakeLists.txt
+++ b/iree/compiler/Codegen/Interfaces/CMakeLists.txt
@@ -38,6 +38,7 @@
     MLIRLinalgBufferizableOpInterfaceImpl
     MLIRMemRef
     MLIRSCFBufferizableOpInterfaceImpl
+    MLIRStdBufferizableOpInterfaceImpl
     MLIRSupport
     MLIRTensorBufferizableOpInterfaceImpl
     MLIRVectorBufferizableOpInterfaceImpl

iree/compiler/Codegen/SPIRV/test/config_default_linalg_ops.mlir

diff --git a/iree/compiler/Codegen/SPIRV/test/config_default_linalg_ops.mlir b/iree/compiler/Codegen/SPIRV/test/config_default_linalg_ops.mlir
index efeb06f..4b8f188 100644
--- a/iree/compiler/Codegen/SPIRV/test/config_default_linalg_ops.mlir
+++ b/iree/compiler/Codegen/SPIRV/test/config_default_linalg_ops.mlir
@@ -267,7 +267,7 @@
   }
 }
 
-//  CHECK-DAG: #[[CONFIG:.+]] = #iree_codegen.lowering.config<tile_sizes = {{\[}}[0, 2, 2, 0, 0, 8], [0, 1, 1, 0, 0, 1]{{\]}}, native_vector_size = []>
+//  CHECK-DAG: #[[CONFIG:.+]] = #iree_codegen.lowering.config<tile_sizes = {{\[}}[0, 2, 2, 8], [0, 1, 1, 1]{{\]}}, native_vector_size = []>
 //  CHECK-DAG: #[[MAP0:.+]] = affine_map<()[s0] -> (s0 ceildiv 8)>
 //  CHECK-DAG: #[[MAP1:.+]] = affine_map<()[s0] -> (s0 ceildiv 2)>
 //  CHECK-DAG: #[[TRANSLATION:.+]] = #iree_codegen.translation.info<"SPIRVDistribute", workload_per_wg = [8, 2, 2]>

third_party/llvm-project

diff --git a/third_party/llvm-project b/third_party/llvm-project
index f96ab6c..c490f8f 160000
--- a/third_party/llvm-project
+++ b/third_party/llvm-project
@@ -1 +1 @@
-Subproject commit f96ab6cc1b2016374a6e8500774f8cb2c3725b04
+Subproject commit c490f8feb71e837dd7011e7a7d8a7928507c9c76

third_party/mlir-hlo

diff --git a/third_party/mlir-hlo b/third_party/mlir-hlo
index 2e2f5f5..f9f6968 160000
--- a/third_party/mlir-hlo
+++ b/third_party/mlir-hlo
@@ -1 +1 @@
-Subproject commit 2e2f5f5ac8fd84555bddfe45a4c4f6037cbb63d3
+Subproject commit f9f696890acbe198b6164a7ca43523e2bddd630a