Integrate at llvm/llvm-project@61aed52c and bump dependencies (#11393)
LLVM: 61aed52c9ec0bca9979922ed2762785ec1f39755
MHLO: 00cbb603af9179ab6b792b583f4eb7999c0c7cc8
TF: cfe950a3f9b48555816aeece894ed6a7a2271749
carried cherry-pick:
4c23f93b2fae3fb76dc841d6e875ac598100c074
78c792324c5ecf32e1ddd44ce306429667c2cec5
dd6655376816622ffa9a344c651c7ea7be5cb2e7
Additional change:
remove usage of enableLowerPermutationMaps
diff --git a/compiler/src/iree/compiler/Codegen/Sandbox/LinalgTensorCodegenDriver.cpp b/compiler/src/iree/compiler/Codegen/Sandbox/LinalgTensorCodegenDriver.cpp
index d87203a..0102a49 100644
--- a/compiler/src/iree/compiler/Codegen/Sandbox/LinalgTensorCodegenDriver.cpp
+++ b/compiler/src/iree/compiler/Codegen/Sandbox/LinalgTensorCodegenDriver.cpp
@@ -736,9 +736,7 @@
.setVectorMultiReductionLowering(vectorMultiReductionLowering)
.setVectorTransferSplit(vectorTransferSplit);
VectorTransferToSCFOptions vectorTransferToSCFOptions =
- VectorTransferToSCFOptions()
- .enableFullUnroll(unrollVectorTransfers)
- .enableLowerPermutationMaps();
+ VectorTransferToSCFOptions().enableFullUnroll(unrollVectorTransfers);
LinalgVectorLoweringOptions vectorLoweringOptions =
LinalgVectorLoweringOptions()
diff --git a/integrations/tensorflow/WORKSPACE b/integrations/tensorflow/WORKSPACE
index 71eb993..5e9d4dd 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 = "2116b012412b274f1471496ed15852175d90628b"
+TENSORFLOW_COMMIT = "cfe950a3f9b48555816aeece894ed6a7a2271749"
git_repository(
name = "org_tensorflow",
diff --git a/integrations/tensorflow/iree-dialects/lib/Dialect/LinalgTransform/IR/StructuredTransformOpsExt.cpp b/integrations/tensorflow/iree-dialects/lib/Dialect/LinalgTransform/IR/StructuredTransformOpsExt.cpp
index e31c0b9..dc013b2 100644
--- a/integrations/tensorflow/iree-dialects/lib/Dialect/LinalgTransform/IR/StructuredTransformOpsExt.cpp
+++ b/integrations/tensorflow/iree-dialects/lib/Dialect/LinalgTransform/IR/StructuredTransformOpsExt.cpp
@@ -1061,9 +1061,7 @@
.setVectorTransferSplit(vectorTransferSplit);
VectorTransferToSCFOptions vectorTransferToSCFOptions =
- VectorTransferToSCFOptions()
- .enableFullUnroll(getUnrollVectorTransfers())
- .enableLowerPermutationMaps();
+ VectorTransferToSCFOptions().enableFullUnroll(getUnrollVectorTransfers());
int maxTransferRank = 1;
diff --git a/llvm-external-projects/iree-dialects/lib/Dialect/LinalgTransform/IR/StructuredTransformOpsExt.cpp b/llvm-external-projects/iree-dialects/lib/Dialect/LinalgTransform/IR/StructuredTransformOpsExt.cpp
index e31c0b9..dc013b2 100644
--- a/llvm-external-projects/iree-dialects/lib/Dialect/LinalgTransform/IR/StructuredTransformOpsExt.cpp
+++ b/llvm-external-projects/iree-dialects/lib/Dialect/LinalgTransform/IR/StructuredTransformOpsExt.cpp
@@ -1061,9 +1061,7 @@
.setVectorTransferSplit(vectorTransferSplit);
VectorTransferToSCFOptions vectorTransferToSCFOptions =
- VectorTransferToSCFOptions()
- .enableFullUnroll(getUnrollVectorTransfers())
- .enableLowerPermutationMaps();
+ VectorTransferToSCFOptions().enableFullUnroll(getUnrollVectorTransfers());
int maxTransferRank = 1;
diff --git a/third_party/llvm-project b/third_party/llvm-project
index dd66553..3d22047 160000
--- a/third_party/llvm-project
+++ b/third_party/llvm-project
@@ -1 +1 @@
-Subproject commit dd6655376816622ffa9a344c651c7ea7be5cb2e7
+Subproject commit 3d2204760a89def9b6412e0737905d93babeb112
diff --git a/third_party/mlir-hlo b/third_party/mlir-hlo
index 312c01c..8d929fc 160000
--- a/third_party/mlir-hlo
+++ b/third_party/mlir-hlo
@@ -1 +1 @@
-Subproject commit 312c01cb1221431c18103f31c68f2439928f7abe
+Subproject commit 8d929fcdd31e269371f00192958754c02f8bc7df
