Merge google -> main (iree-org#6796)

* 1166794 Merge pull request iree-org#6794 from GMNGeoffrey:main-to-google * 565ff30 Synchronize submodules with LLVM at llvm/llvm-project@45ac5f544181 * bec44a2 Integrate LLVM at llvm/llvm-project@45ac5f544181 * 5a808c0 Integrate LLVM at llvm/llvm-project@25ec252537bc * 8d1d73b Integrate LLVM at llvm/llvm-project@b41bfb819d0c * 81e7b51 Integrate LLVM at llvm/llvm-project@0bfe614bc254 * 6a6e5e1 Integrate LLVM at llvm/llvm-project@0d822da2bdda
Young768 · Aug 18, 2021 · 50e3507 · 50e3507
2 parents bc5d4ac + 1166794
commit 50e3507
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 13 deletions.
diff --git a/SUBMODULE_VERSIONS.txt b/SUBMODULE_VERSIONS.txt
@@ -4,14 +4,14 @@
 aa533abfd4232b01f9e57041d70114d5a77e6de0 third_party/googletest
 88b845dee001723c4a0db1fe5477de735b6d3bb0 third_party/liburing
 acd6f6f014c25e46363e718381e0b35205df2d83 third_party/libyaml
-7256c05ecb76137f1e4ac255e128fb9c73d6b4a5 third_party/llvm-project
-c15bb9027fd3b690882d55e711a23d68d6dd4e69 third_party/mlir-hlo
+45ac5f5441818afa1b0ee4a3734583c8cc915a79 third_party/llvm-project
+ccd4d7221a961c3ae1c51a5181827e883b938f61 third_party/mlir-hlo
 3f701faace7addc75d16dea8a6cd769fa5b3f260 third_party/musl
 4c7697dbe973ed01ae6fbec37d186ebd05982e1f third_party/pybind11
 2e1b5fb39ebc2ef4cb77005f8267e4f3a6241ba1 third_party/spirv_cross
 f5417a4b6633c3217c9a1bc2f0c70b1454975ba7 third_party/spirv_headers
 b42009b3b9d4ca35bc703f5310eedc74f584be58 third_party/stblib
-3d2e2c88fc805ca5a0dd523ce23182e3173ad887 third_party/tensorflow
+0bcdd2e4189d16c3edadeddaebc5a4818e1eac91 third_party/tensorflow
 50f7deb1a389bd3785c12fbe0be74128343f11f7 third_party/tracy
 9d10a96f2d57c3c37e167f2e73c9a31ac2e51fa5 third_party/vulkan_headers
 8d4a9e9174a9c6ad6a3a3ae981b915ef13fc12c4 third_party/vulkan_memory_allocator

diff --git a/build_tools/third_party/mlir-hlo/CMakeLists.txt b/build_tools/third_party/mlir-hlo/CMakeLists.txt
@@ -20,7 +20,7 @@ external_cc_library(
     ${TF_MLIR_HLO_SOURCE_DIR}
   DEPS
     MhloDialect
-    MhloInferFusibilityOpInterface
+    MhloInferShapeEqualityOpInterface
     LmhloDialect
     ChloPasses
     MhloToStandard

diff --git a/iree/compiler/Codegen/Utils/Utils.cpp b/iree/compiler/Codegen/Utils/Utils.cpp
@@ -21,9 +21,8 @@ bool isEntryPoint(FuncOp func) { return func.isPublic(); }
 unsigned getNumOuterParallelLoops(linalg::LinalgOp op) {
   return op.iterator_types()
       .getValue()
-      .take_while([](Attribute attr) -> bool {
-        return linalg::isParallelIteratorType(attr);
-      })
+      .take_while(
+          [](Attribute attr) -> bool { return isParallelIterator(attr); })
       .size();
 }
 

diff --git a/iree/compiler/Dialect/Flow/Transforms/DispatchLinalgOnTensors.cpp b/iree/compiler/Dialect/Flow/Transforms/DispatchLinalgOnTensors.cpp
@@ -140,9 +140,8 @@ static void removeFusionGroupsAttribute(Operation *op) {
 static size_t getNumOuterParallelLoops(linalg::LinalgOp op) {
   return op.iterator_types()
       .getValue()
-      .take_while([](Attribute attr) -> bool {
-        return linalg::isParallelIteratorType(attr);
-      })
+      .take_while(
+          [](Attribute attr) -> bool { return isParallelIterator(attr); })
       .size();
 }
 

diff --git a/third_party/llvm-project b/third_party/llvm-project
diff --git a/third_party/mlir-hlo b/third_party/mlir-hlo
diff --git a/third_party/tensorflow b/third_party/tensorflow
+11 −11		BUILD
+2 −2		WORKSPACE
+1 −1		build_tools/llvm_version.txt
+1 −1		include/mlir-hlo/Dialect/mhlo/IR/CMakeLists.txt
+1 −1		include/mlir-hlo/Dialect/mhlo/IR/chlo_ops.h
+2 −2		include/mlir-hlo/Dialect/mhlo/IR/chlo_ops.td
+1 −1		include/mlir-hlo/Dialect/mhlo/IR/hlo_ops.h
+7 −22		include/mlir-hlo/Dialect/mhlo/IR/hlo_ops.td
+4 −4		include/mlir-hlo/Dialect/mhlo/IR/infer_shape_equality_op_interface.h
+8 −56		include/mlir-hlo/Dialect/mhlo/IR/infer_shape_equality_op_interface.td
+1 −1		include/mlir-hlo/Dialect/mhlo/IR/lhlo_gpu_ops.h
+5 −5		lib/Dialect/mhlo/IR/CMakeLists.txt
+2 −2		lib/Dialect/mhlo/IR/infer_shape_equality_op_interface.cc
+94 −0		lib/Dialect/mhlo/transforms/legalize_to_linalg.cc
+30 −29		lib/Dialect/mhlo/transforms/mhlo_fusion.cc
+126 −0		tests/hlo-legalize-to-linalg.mlir