Integrate llvm-project and bump dependencies. (#11741)
LLVM_COMMIT="7504e9a19346b33fd2e0fcdcbd43ecee3d676b86"
MHLO_COMMIT="ae3d50cd6999ab217de5093a3359ffab0a0f806a"
TF_COMMIT="27bbc6fb4049ff97b11c2222c7032004eb2ed330"
diff --git a/compiler/src/iree/compiler/Codegen/Common/FoldAffineMinInDistributedLoops.cpp b/compiler/src/iree/compiler/Codegen/Common/FoldAffineMinInDistributedLoops.cpp
index d26fbd8..10ffb57 100644
--- a/compiler/src/iree/compiler/Codegen/Common/FoldAffineMinInDistributedLoops.cpp
+++ b/compiler/src/iree/compiler/Codegen/Common/FoldAffineMinInDistributedLoops.cpp
@@ -103,9 +103,7 @@
return success();
};
- return scf::canonicalizeMinMaxOpInLoop(
- rewriter, minOp, minOp.getAffineMap(), minOp.getOperands(),
- /*isMin=*/true, loopMatcher);
+ return scf::canonicalizeMinMaxOpInLoop(rewriter, minOp, loopMatcher);
}
};
diff --git a/integrations/tensorflow/WORKSPACE b/integrations/tensorflow/WORKSPACE
index 40e27e3..129bd3a 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 = "3afa34d76e61cdd1de0d70376879e3f45d7fab05"
+TENSORFLOW_COMMIT = "27bbc6fb4049ff97b11c2222c7032004eb2ed330"
git_repository(
name = "org_tensorflow",
diff --git a/tests/e2e/tosa_ops/max_pool.mlir b/tests/e2e/tosa_ops/max_pool.mlir
index 61608be..e5dd9a2 100644
--- a/tests/e2e/tosa_ops/max_pool.mlir
+++ b/tests/e2e/tosa_ops/max_pool.mlir
@@ -1,27 +1,27 @@
func.func @tensor_i8() {
%0 = util.unfoldable_constant dense<[[[[1], [2], [3], [4]], [[5], [6], [7], [8]]]]> : tensor<1x2x4x1xi8>
- %result = "tosa.max_pool2d"(%0) {kernel = [2, 2], stride = [1, 1], pad = [0, 0, 0, 0]} : (tensor<1x2x4x1xi8>) -> tensor<1x1x3x1xi8>
+ %result = "tosa.max_pool2d"(%0) {kernel = array<i64: 2, 2>, stride = array<i64: 1, 1>, pad = array<i64: 0, 0, 0, 0>} : (tensor<1x2x4x1xi8>) -> tensor<1x1x3x1xi8>
check.expect_eq_const(%result, dense<[[[[6], [7], [8]]]]> : tensor<1x1x3x1xi8>) : tensor<1x1x3x1xi8>
return
}
func.func @tensor_i16() {
%0 = util.unfoldable_constant dense<[[[[1], [2], [3], [4]], [[5], [6], [7], [8]]]]> : tensor<1x2x4x1xi16>
- %result = "tosa.max_pool2d"(%0) {kernel = [2, 2], stride = [1, 1], pad = [0, 0, 0, 0]} : (tensor<1x2x4x1xi16>) -> tensor<1x1x3x1xi16>
+ %result = "tosa.max_pool2d"(%0) {kernel = array<i64: 2, 2>, stride = array<i64: 1, 1>, pad = array<i64: 0, 0, 0, 0>} : (tensor<1x2x4x1xi16>) -> tensor<1x1x3x1xi16>
check.expect_eq_const(%result, dense<[[[[6], [7], [8]]]]> : tensor<1x1x3x1xi16>) : tensor<1x1x3x1xi16>
return
}
func.func @tensor_i32() {
%0 = util.unfoldable_constant dense<[[[[1], [2], [3], [4]], [[5], [6], [7], [8]]]]> : tensor<1x2x4x1xi32>
- %result = "tosa.max_pool2d"(%0) {kernel = [2, 2], stride = [1, 1], pad = [0, 0, 0, 0]} : (tensor<1x2x4x1xi32>) -> tensor<1x1x3x1xi32>
+ %result = "tosa.max_pool2d"(%0) {kernel = array<i64: 2, 2>, stride = array<i64: 1, 1>, pad = array<i64: 0, 0, 0, 0>} : (tensor<1x2x4x1xi32>) -> tensor<1x1x3x1xi32>
check.expect_eq_const(%result, dense<[[[[6], [7], [8]]]]> : tensor<1x1x3x1xi32>) : tensor<1x1x3x1xi32>
return
}
func.func @tensor_f32() {
%0 = util.unfoldable_constant dense<[[[[1.], [2.], [3.], [4.]], [[5.], [6.], [7.], [8.]]]]> : tensor<1x2x4x1xf32>
- %result = "tosa.max_pool2d"(%0) {kernel = [2, 2], stride = [1, 1], pad = [0, 0, 0, 0]} : (tensor<1x2x4x1xf32>) -> tensor<1x1x3x1xf32>
+ %result = "tosa.max_pool2d"(%0) {kernel = array<i64: 2, 2>, stride = array<i64: 1, 1>, pad = array<i64: 0, 0, 0, 0>} : (tensor<1x2x4x1xf32>) -> tensor<1x1x3x1xf32>
check.expect_eq_const(%result, dense<[[[[6.], [7.], [8.]]]]> : tensor<1x1x3x1xf32>) : tensor<1x1x3x1xf32>
return
}
diff --git a/third_party/llvm-project b/third_party/llvm-project
index 1ec0214..7504e9a 160000
--- a/third_party/llvm-project
+++ b/third_party/llvm-project
@@ -1 +1 @@
-Subproject commit 1ec021467da65c06cd4aa24ce81898b0759bd16b
+Subproject commit 7504e9a19346b33fd2e0fcdcbd43ecee3d676b86
diff --git a/third_party/mlir-hlo b/third_party/mlir-hlo
index 5865179..ae3d50c 160000
--- a/third_party/mlir-hlo
+++ b/third_party/mlir-hlo
@@ -1 +1 @@
-Subproject commit 5865179291fa3deddcb5d4b5dcf0aad5a8dca8a5
+Subproject commit ae3d50cd6999ab217de5093a3359ffab0a0f806a
