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

* c9e5da3 Merge pull request iree-org#5078 from ThomasRaoux:main-to-google * 284e68c Synchronize submodules with LLVM at llvm/llvm-project@720a828 * c0ae7a2 Integrate LLVM at llvm/llvm-project@720a828 * 0aebce2 Merge pull request iree-org#5062 from ThomasRaoux:main-to-google * 56e4fd1 Merge pull request iree-org#5060 from google:llvm-dependent-submodule-update * 0f70af6 Integrate LLVM at llvm/llvm-project@4c973ae * f156c24 Synchronize submodules with LLVM at llvm/llvm-project@4c973ae * 894c758 Synchronize submodules with LLVM at llvm/llvm-project@df6d057
hanhanW · Mar 12, 2021 · a5a0f1d · a5a0f1d
2 parents 1ef76ba + c9e5da3
commit a5a0f1d
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/SUBMODULE_VERSIONS.txt b/SUBMODULE_VERSIONS.txt
@@ -4,16 +4,16 @@ daff5fead3fbe22c6fc58310ca3f49caf117f185 third_party/benchmark
 4fb0ff7069bd88ee85902f4d0bb62794e5f6d021 third_party/flatcc
 b1fbd33c06cdb0024c67733c6fdec2009d17b384 third_party/googletest
 88b845dee001723c4a0db1fe5477de735b6d3bb0 third_party/liburing
-37bd064d4f2793bb8b3974233aa39bb227ba2364 third_party/llvm-bazel
-4c973ae51b859dca9792e1ad87a6673c49815a8d third_party/llvm-project
+4e9c6abfb047b811efd606ed42ed92ac5c66285d third_party/llvm-bazel
+720a828045e1095ec7bd69c84fa1cd9c431a3179 third_party/llvm-project
 e691ab9fc49d728f6632408d534b82cb3d137b3f third_party/mlir-emitc
-9902e6ee329ba10cb0e2145ce1aa7299d7a60405 third_party/mlir-hlo
+d16860d26dffb8eabf0c8ab004c2d70d115dfc2f third_party/mlir-hlo
 2b2bd45bbf9be04fd22ece5cc1f54679202e9257 third_party/pffft
 d8c7ee00a687ac369e62e2032514a93a9b413502 third_party/pybind11
 2887692065c38ef6617f423feafc6b69dd0a0681 third_party/ruy
 685f86471e9d26b3eb7676695a2e2cefb4551ae9 third_party/spirv_cross
 f8bf11a0253a32375c32cad92c841237b96696c0 third_party/spirv_headers
-888eae61f875e23a27e368f59915ed95ebafde72 third_party/tensorflow
+c968e5fb8723ba005d728a56306cb4c915eba11d third_party/tensorflow
 9c3dac3ed2bd647b8d63f197fed058fee97a7e1e third_party/tracy
 9bd3f561bcee3f01d22912de10bb07ce4e23d378 third_party/vulkan_headers
 3528e2aed3e8808f33e1e7d63eeb1560456a605a third_party/vulkan_memory_allocator
diff --git a/iree/compiler/Conversion/Common/Transforms.cpp b/iree/compiler/Conversion/Common/Transforms.cpp
@@ -185,7 +185,7 @@ static Optional<linalg::TiledAndFusedLinalgOps> tileAndFuseLinalgOps(
   // over to linalg on tensors.
   linalg::LinalgOp rootOp = fusableOps.back();
   Optional<SmallVector<int64_t, 4>> staticLoopRange =
-      linalg::getStaticLoopRanges(rootOp);
+      rootOp.getStaticLoopRanges();
   if (!staticLoopRange ||
       llvm::any_of(staticLoopRange.getValue(),
                    [](int64_t d) { return d == ShapedType::kDynamicSize; })) {

diff --git a/iree/compiler/Conversion/LinalgToSPIRV/ConvertToGPUPass.cpp b/iree/compiler/Conversion/LinalgToSPIRV/ConvertToGPUPass.cpp
@@ -700,7 +700,7 @@ struct MapLinalgOpToGlobalInvocationId
       // TODO (GH-4901): Only support static shapes on this path. This should be
       // removed when moved to linalg on tensors.
       Optional<SmallVector<int64_t, 4>> staticLoopRange =
-          linalg::getStaticLoopRanges(linalgOp);
+          linalgOp.getStaticLoopRanges();
       if (!staticLoopRange ||
           llvm::any_of(staticLoopRange.getValue(), [](int64_t d) {
             return d == ShapedType::kDynamicSize;

diff --git a/third_party/llvm-bazel b/third_party/llvm-bazel
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
+57 −0		llvm-bazel/llvm-project-overlay/clang/BUILD
+23 −78		llvm-bazel/llvm-project-overlay/mlir/BUILD
+1 −0		llvm-bazel/llvm-project-overlay/mlir/test/BUILD
+1 −1		third_party/llvm-project
+2 −2		WORKSPACE
+1 −1		build_tools/llvm_version.txt
+5 −18		include/mlir-hlo/Dialect/mhlo/IR/lhlo_ops.td
+5 −13		lib/Dialect/mhlo/IR/hlo_ops.cc
+1 −0		lib/Dialect/mhlo/transforms/hlo_legalize_to_lhlo.cc
+285 −10		lib/Dialect/mhlo/transforms/legalize_to_linalg.cc
+4 −1		lib/Dialect/mhlo/transforms/move_up_dynamic_broadcasts_for_fusion.cc
+2 −10		tests/hlo-legalize-to-lhlo.mlir
+220 −0		tests/hlo-legalize-to-linalg.mlir
+18 −19		tests/lhlo_ops.mlir
+2 −8		tests/mhlo_infer_shape_type_methods.mlir
+7 −4		tests/move_up_dynamic_broadcasts_for_fusion.mlir