Integrate llvm-project at 30628b0eccf89c36dbd176e925c7fc5c3bfa519d (#9187)
* Integrate llvm-project at 30628b0eccf89c36dbd176e925c7fc5c3bfa519d
* Explicit set default printer/parser for Stream, Flow and Util, IREECodegen, IREEInput, pydm dialects
* Fix transform roundtrip test
diff --git a/compiler/src/iree/compiler/Codegen/Dialect/IREECodegenDialect.td b/compiler/src/iree/compiler/Codegen/Dialect/IREECodegenDialect.td
index b1233e4..e12501a 100644
--- a/compiler/src/iree/compiler/Codegen/Dialect/IREECodegenDialect.td
+++ b/compiler/src/iree/compiler/Codegen/Dialect/IREECodegenDialect.td
@@ -39,6 +39,7 @@
StringRef mnemonic, Type type, Attribute &value) const;
LogicalResult printCodegenAttrs(Attribute attr, DialectAsmPrinter &p) const;
}];
+ let useDefaultAttributePrinterParser = 1;
}
#endif // IREE_CODEGEN_DIALECT_IREECODEGEN_DIALECT
\ No newline at end of file
diff --git a/compiler/src/iree/compiler/Dialect/Flow/IR/FlowBase.td b/compiler/src/iree/compiler/Dialect/Flow/IR/FlowBase.td
index 120b77d..6035396 100644
--- a/compiler/src/iree/compiler/Dialect/Flow/IR/FlowBase.td
+++ b/compiler/src/iree/compiler/Dialect/Flow/IR/FlowBase.td
@@ -62,6 +62,7 @@
}];
let useDefaultTypePrinterParser = 0;
+ let useDefaultAttributePrinterParser = 1;
}
//===----------------------------------------------------------------------===//
diff --git a/compiler/src/iree/compiler/Dialect/Stream/IR/StreamBase.td b/compiler/src/iree/compiler/Dialect/Stream/IR/StreamBase.td
index 154dfb4..9225835 100644
--- a/compiler/src/iree/compiler/Dialect/Stream/IR/StreamBase.td
+++ b/compiler/src/iree/compiler/Dialect/Stream/IR/StreamBase.td
@@ -103,6 +103,8 @@
established in the IR it's possible to induce aliasing of resources without
breaking execution correctness.
}];
+ let useDefaultTypePrinterParser = 1;
+ let useDefaultAttributePrinterParser = 1;
}
//===----------------------------------------------------------------------===//
diff --git a/compiler/src/iree/compiler/Dialect/Util/IR/UtilBase.td b/compiler/src/iree/compiler/Dialect/Util/IR/UtilBase.td
index c7611e4..44af757 100644
--- a/compiler/src/iree/compiler/Dialect/Util/IR/UtilBase.td
+++ b/compiler/src/iree/compiler/Dialect/Util/IR/UtilBase.td
@@ -21,6 +21,8 @@
let summary = [{
A dialect used for types common across IREE subdialects.
}];
+ let useDefaultTypePrinterParser = 1;
+ let useDefaultAttributePrinterParser = 1;
}
//===----------------------------------------------------------------------===//
diff --git a/integrations/tensorflow/WORKSPACE b/integrations/tensorflow/WORKSPACE
index 4462625..dca6b2b 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 = "fe15774895bbf037d1b6ecee10dced03176015fc"
+TENSORFLOW_COMMIT = "38dcd191cef71d23c37e200962876e001838087b"
git_repository(
name = "org_tensorflow",
diff --git a/integrations/tensorflow/iree-dialects/include/iree-dialects/Dialect/Input/InputBase.td b/integrations/tensorflow/iree-dialects/include/iree-dialects/Dialect/Input/InputBase.td
index 0d6565d..d5f786a 100644
--- a/integrations/tensorflow/iree-dialects/include/iree-dialects/Dialect/Input/InputBase.td
+++ b/integrations/tensorflow/iree-dialects/include/iree-dialects/Dialect/Input/InputBase.td
@@ -27,6 +27,7 @@
LLVM/MLIR's API surface is itself unstable.
}];
let cppNamespace = "::mlir::iree_compiler::IREE::Input";
+ let useDefaultTypePrinterParser = 1;
}
class IREEInput_Op<string mnemonic, list<Trait> traits = []> :
diff --git a/integrations/tensorflow/iree-dialects/include/iree-dialects/Dialect/PyDM/IR/PyDMBase.td b/integrations/tensorflow/iree-dialects/include/iree-dialects/Dialect/PyDM/IR/PyDMBase.td
index c1d53cb..f0057b7 100644
--- a/integrations/tensorflow/iree-dialects/include/iree-dialects/Dialect/PyDM/IR/PyDMBase.td
+++ b/integrations/tensorflow/iree-dialects/include/iree-dialects/Dialect/PyDM/IR/PyDMBase.td
@@ -32,6 +32,7 @@
}];
let cppNamespace = "::mlir::iree_compiler::IREE::PYDM";
let hasConstantMaterializer = 1;
+ let useDefaultTypePrinterParser = 1;
}
class IREEPyDM_Op<string mnemonic, list<Trait> traits = []> :
diff --git a/integrations/tensorflow/iree-dialects/test/Dialect/linalg_transform/roundtrip.mlir b/integrations/tensorflow/iree-dialects/test/Dialect/linalg_transform/roundtrip.mlir
index b7f21ae..7735a83 100644
--- a/integrations/tensorflow/iree-dialects/test/Dialect/linalg_transform/roundtrip.mlir
+++ b/integrations/tensorflow/iree-dialects/test/Dialect/linalg_transform/roundtrip.mlir
@@ -5,24 +5,24 @@
^bb0(%arg0: !pdl.operation):
// CHECK: %[[OPS:.*]] = pdl_match @match1 in %{{.*}}
%0 = pdl_match @match1 in %arg0
- // CHECK: %[[TILED:.*]], %{{.*}}:3 = structured.tile %[[OPS]] {
+ // CHECK: %[[TILED:.*]], %{{.*}}:3 = transform.structured.tile %[[OPS]] {
// CHECK-DAG: sizes = [4, 4, 4]
// CHECK: }
%1, %loops1:3 = transform.structured.tile %0 {sizes = [4, 4, 4]}
- // CHECK: %[[TILED2:.*]], %{{.*}}:3 = structured.tile %[[TILED]]
+ // CHECK: %[[TILED2:.*]], %{{.*}}:3 = transform.structured.tile %[[TILED]]
%2, %loops2:3 = transform.structured.tile %1 {sizes = [2, 2, 2]}
- // CHECK: %[[PADDED:.*]] = structured.pad %[[TILED2]] {pack_paddings = [1, 1, 0]}
+ // CHECK: %[[PADDED:.*]] = transform.structured.pad %[[TILED2]] {pack_paddings = [1, 1, 0]}
%3 = transform.structured.pad %2 {pack_paddings = [1, 1, 0]}
- // CHECK: decompose
+ // CHECK: transform.structured.decompose
transform.structured.decompose
- // CHECK: %{{.*}} = structured.vectorize %[[PADDED]] {vectorize_padding = true}
+ // CHECK: %{{.*}} = transform.structured.vectorize %[[PADDED]] {vectorize_padding = true}
%4 = transform.structured.vectorize %3 {vectorize_padding = true}
// CHECK: %[[OPS2:.*]] = pdl_match @{{.*}}
%5 = pdl_match @match2 in %arg0
- // CHECK: %{{.*}} = structured.vectorize %[[OPS2]]
+ // CHECK: %{{.*}} = transform.structured.vectorize %[[OPS2]]
transform.structured.vectorize %5
// CHECK-NOT: %
- // CHECK: structured.vectorize
+ // CHECK: transform.structured.vectorize
// CHECK-NOT: %
transform.structured.vectorize
// CHECK: bufferize
diff --git a/llvm-external-projects/iree-dialects/include/iree-dialects/Dialect/Input/InputBase.td b/llvm-external-projects/iree-dialects/include/iree-dialects/Dialect/Input/InputBase.td
index 0d6565d..d5f786a 100644
--- a/llvm-external-projects/iree-dialects/include/iree-dialects/Dialect/Input/InputBase.td
+++ b/llvm-external-projects/iree-dialects/include/iree-dialects/Dialect/Input/InputBase.td
@@ -27,6 +27,7 @@
LLVM/MLIR's API surface is itself unstable.
}];
let cppNamespace = "::mlir::iree_compiler::IREE::Input";
+ let useDefaultTypePrinterParser = 1;
}
class IREEInput_Op<string mnemonic, list<Trait> traits = []> :
diff --git a/llvm-external-projects/iree-dialects/include/iree-dialects/Dialect/PyDM/IR/PyDMBase.td b/llvm-external-projects/iree-dialects/include/iree-dialects/Dialect/PyDM/IR/PyDMBase.td
index c1d53cb..f0057b7 100644
--- a/llvm-external-projects/iree-dialects/include/iree-dialects/Dialect/PyDM/IR/PyDMBase.td
+++ b/llvm-external-projects/iree-dialects/include/iree-dialects/Dialect/PyDM/IR/PyDMBase.td
@@ -32,6 +32,7 @@
}];
let cppNamespace = "::mlir::iree_compiler::IREE::PYDM";
let hasConstantMaterializer = 1;
+ let useDefaultTypePrinterParser = 1;
}
class IREEPyDM_Op<string mnemonic, list<Trait> traits = []> :
diff --git a/llvm-external-projects/iree-dialects/test/Dialect/linalg_transform/roundtrip.mlir b/llvm-external-projects/iree-dialects/test/Dialect/linalg_transform/roundtrip.mlir
index b7f21ae..7735a83 100644
--- a/llvm-external-projects/iree-dialects/test/Dialect/linalg_transform/roundtrip.mlir
+++ b/llvm-external-projects/iree-dialects/test/Dialect/linalg_transform/roundtrip.mlir
@@ -5,24 +5,24 @@
^bb0(%arg0: !pdl.operation):
// CHECK: %[[OPS:.*]] = pdl_match @match1 in %{{.*}}
%0 = pdl_match @match1 in %arg0
- // CHECK: %[[TILED:.*]], %{{.*}}:3 = structured.tile %[[OPS]] {
+ // CHECK: %[[TILED:.*]], %{{.*}}:3 = transform.structured.tile %[[OPS]] {
// CHECK-DAG: sizes = [4, 4, 4]
// CHECK: }
%1, %loops1:3 = transform.structured.tile %0 {sizes = [4, 4, 4]}
- // CHECK: %[[TILED2:.*]], %{{.*}}:3 = structured.tile %[[TILED]]
+ // CHECK: %[[TILED2:.*]], %{{.*}}:3 = transform.structured.tile %[[TILED]]
%2, %loops2:3 = transform.structured.tile %1 {sizes = [2, 2, 2]}
- // CHECK: %[[PADDED:.*]] = structured.pad %[[TILED2]] {pack_paddings = [1, 1, 0]}
+ // CHECK: %[[PADDED:.*]] = transform.structured.pad %[[TILED2]] {pack_paddings = [1, 1, 0]}
%3 = transform.structured.pad %2 {pack_paddings = [1, 1, 0]}
- // CHECK: decompose
+ // CHECK: transform.structured.decompose
transform.structured.decompose
- // CHECK: %{{.*}} = structured.vectorize %[[PADDED]] {vectorize_padding = true}
+ // CHECK: %{{.*}} = transform.structured.vectorize %[[PADDED]] {vectorize_padding = true}
%4 = transform.structured.vectorize %3 {vectorize_padding = true}
// CHECK: %[[OPS2:.*]] = pdl_match @{{.*}}
%5 = pdl_match @match2 in %arg0
- // CHECK: %{{.*}} = structured.vectorize %[[OPS2]]
+ // CHECK: %{{.*}} = transform.structured.vectorize %[[OPS2]]
transform.structured.vectorize %5
// CHECK-NOT: %
- // CHECK: structured.vectorize
+ // CHECK: transform.structured.vectorize
// CHECK-NOT: %
transform.structured.vectorize
// CHECK: bufferize
diff --git a/third_party/llvm-project b/third_party/llvm-project
index ec76c2c..30628b0 160000
--- a/third_party/llvm-project
+++ b/third_party/llvm-project
@@ -1 +1 @@
-Subproject commit ec76c2c0d663f4f3a4fad87ea7ca6a751969d171
+Subproject commit 30628b0eccf89c36dbd176e925c7fc5c3bfa519d
diff --git a/third_party/mlir-hlo b/third_party/mlir-hlo
index 6cc16a2..f8e8a95 160000
--- a/third_party/mlir-hlo
+++ b/third_party/mlir-hlo
@@ -1 +1 @@
-Subproject commit 6cc16a2eae09b838b0c824247f2e77344d3e5a3e
+Subproject commit f8e8a9546b66b49c54e8c596f8c23b2af457065a
