Integrate LLVM at llvm/llvm-project@a6d932bca8875198fbf34564cda8a8d1640cdcbc (#16944)
IREE-side changes to adapt to MLIR changes:
1. `initializeOptions` changes to adapt to
https://github.com/llvm/llvm-project/pull/87289
2. `enableFastMathMode` removal:
https://github.com/llvm/llvm-project/pull/86578.
3. Bazel changes to adapt to
https://github.com/llvm/llvm-project/pull/86819
IREE-side fixes for preexisting bugs revealed by a MLIR change:
1. `mlp_tosa` test fix: the shapes were inconsistent, used to
accidentally work, until MLIR started catching it since
https://github.com/llvm/llvm-project/pull/85798. See diagnostic in
[87396](https://github.com/llvm/llvm-project/issues/87396#issuecomment-2032929368).
FYI @MaheshRavishankar.
IREE-side fixes accidentally lumped into this:
1. The `iree_copts.cmake` change: It just happens that my bleeding-edge
Clang was updated and started diagnosing some code relying on C++20
semantics. Filed https://github.com/openxla/iree/issues/16946 as TODO.
---------
Co-authored-by: Scott Todd <scott.todd0@gmail.com>
diff --git a/build_tools/cmake/iree_copts.cmake b/build_tools/cmake/iree_copts.cmake
index 0f792e1..e6e858d 100644
--- a/build_tools/cmake/iree_copts.cmake
+++ b/build_tools/cmake/iree_copts.cmake
@@ -189,7 +189,9 @@
# Explicitly enable some additional warnings.
# Some of these aren't on by default, or under -Wall, or are subsets of
# warnings turned off above.
- "-Wc++20-extensions" # Enable until we use C++20 across all compilers
+ #
+ # TODO(#16946): reenable -Wc++20-extensions.
+ # "-Wc++20-extensions" # Enable until we use C++20 across all compilers
"-Wctad-maybe-unsupported"
"-Wfloat-overflow-conversion"
"-Wfloat-zero-conversion"
diff --git a/compiler/plugins/input/StableHLO/Conversion/BUILD.bazel b/compiler/plugins/input/StableHLO/Conversion/BUILD.bazel
index 30d19e6..13581c5 100644
--- a/compiler/plugins/input/StableHLO/Conversion/BUILD.bazel
+++ b/compiler/plugins/input/StableHLO/Conversion/BUILD.bazel
@@ -115,6 +115,7 @@
"@llvm-project//mlir:Support",
"@llvm-project//mlir:TensorDialect",
"@llvm-project//mlir:TensorUtils",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
"@llvm-project//mlir:VectorDialect",
"@stablehlo//:broadcast_utils",
diff --git a/compiler/plugins/input/StableHLO/Conversion/CMakeLists.txt b/compiler/plugins/input/StableHLO/Conversion/CMakeLists.txt
index c750692..6635859 100644
--- a/compiler/plugins/input/StableHLO/Conversion/CMakeLists.txt
+++ b/compiler/plugins/input/StableHLO/Conversion/CMakeLists.txt
@@ -94,6 +94,7 @@
MLIRSupport
MLIRTensorDialect
MLIRTensorUtils
+ MLIRTransformUtils
MLIRTransforms
MLIRVectorDialect
StablehloBroadcastUtils
diff --git a/compiler/plugins/input/StableHLO/Conversion/Preprocessing/BUILD.bazel b/compiler/plugins/input/StableHLO/Conversion/Preprocessing/BUILD.bazel
index 5a19574..1b08fb7 100644
--- a/compiler/plugins/input/StableHLO/Conversion/Preprocessing/BUILD.bazel
+++ b/compiler/plugins/input/StableHLO/Conversion/Preprocessing/BUILD.bazel
@@ -92,6 +92,7 @@
"@llvm-project//mlir:SparseTensorDialect",
"@llvm-project//mlir:Support",
"@llvm-project//mlir:TensorDialect",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
"@stablehlo//:chlo_ops",
"@stablehlo//:stablehlo_ops",
diff --git a/compiler/plugins/input/StableHLO/Conversion/Preprocessing/CMakeLists.txt b/compiler/plugins/input/StableHLO/Conversion/Preprocessing/CMakeLists.txt
index dbaf38d..bc428e3 100644
--- a/compiler/plugins/input/StableHLO/Conversion/Preprocessing/CMakeLists.txt
+++ b/compiler/plugins/input/StableHLO/Conversion/Preprocessing/CMakeLists.txt
@@ -76,6 +76,7 @@
MLIRSparseTensorDialect
MLIRSupport
MLIRTensorDialect
+ MLIRTransformUtils
MLIRTransforms
StablehloOps
PUBLIC
diff --git a/compiler/plugins/input/TOSA/InputConversion/BUILD.bazel b/compiler/plugins/input/TOSA/InputConversion/BUILD.bazel
index d0f0117..1f91a8f 100644
--- a/compiler/plugins/input/TOSA/InputConversion/BUILD.bazel
+++ b/compiler/plugins/input/TOSA/InputConversion/BUILD.bazel
@@ -43,6 +43,7 @@
"@llvm-project//mlir:LinalgDialect",
"@llvm-project//mlir:Pass",
"@llvm-project//mlir:TensorDialect",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
@@ -78,6 +79,7 @@
"@llvm-project//mlir:TosaToMLProgram",
"@llvm-project//mlir:TosaToSCF",
"@llvm-project//mlir:TosaToTensor",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/plugins/input/TOSA/InputConversion/CMakeLists.txt b/compiler/plugins/input/TOSA/InputConversion/CMakeLists.txt
index a1dc1ea..b73fad0 100644
--- a/compiler/plugins/input/TOSA/InputConversion/CMakeLists.txt
+++ b/compiler/plugins/input/TOSA/InputConversion/CMakeLists.txt
@@ -34,6 +34,7 @@
MLIRLinalgDialect
MLIRPass
MLIRTensorDialect
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::LinalgExt::IR
PUBLIC
@@ -67,6 +68,7 @@
MLIRTosaToMLProgram
MLIRTosaToSCF
MLIRTosaToTensor
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::LinalgExt::IR
iree::compiler::InputConversion::Common
diff --git a/compiler/plugins/target/MetalSPIRV/MetalSPIRVTarget.cpp b/compiler/plugins/target/MetalSPIRV/MetalSPIRVTarget.cpp
index 3d5faf1..190f79b 100644
--- a/compiler/plugins/target/MetalSPIRV/MetalSPIRVTarget.cpp
+++ b/compiler/plugins/target/MetalSPIRV/MetalSPIRVTarget.cpp
@@ -187,7 +187,7 @@
if (variantOp.isExternal())
return;
- buildSPIRVCodegenPassPipeline(passManager, /*enableFastMath=*/false);
+ buildSPIRVCodegenPassPipeline(passManager);
}
LogicalResult serializeExecutable(const SerializationOptions &serOptions,
diff --git a/compiler/plugins/target/VulkanSPIRV/VulkanSPIRVTarget.cpp b/compiler/plugins/target/VulkanSPIRV/VulkanSPIRVTarget.cpp
index 73810f6..4d7a013 100644
--- a/compiler/plugins/target/VulkanSPIRV/VulkanSPIRVTarget.cpp
+++ b/compiler/plugins/target/VulkanSPIRV/VulkanSPIRVTarget.cpp
@@ -179,7 +179,7 @@
if (variantOp.isExternal())
return;
- buildSPIRVCodegenPassPipeline(passManager, /*enableFastMath=*/false);
+ buildSPIRVCodegenPassPipeline(passManager);
}
void buildLinkingPassPipeline(OpPassManager &passManager) override {
diff --git a/compiler/plugins/target/WebGPUSPIRV/WebGPUSPIRVTarget.cpp b/compiler/plugins/target/WebGPUSPIRV/WebGPUSPIRVTarget.cpp
index 9293fd2..c8d6901 100644
--- a/compiler/plugins/target/WebGPUSPIRV/WebGPUSPIRVTarget.cpp
+++ b/compiler/plugins/target/WebGPUSPIRV/WebGPUSPIRVTarget.cpp
@@ -145,22 +145,15 @@
passManager.nest<ModuleOp>().nest<func::FuncOp>().addPass(
createWGSLReplacePushConstantsPass());
- // From WGSL spec, "Floating Point Evaluation"
- // (https://www.w3.org/TR/WGSL/#floating-point-evaluation):
- // - Implementations may assume that NaNs and infinities are not present at
- // runtime.
- // - In such an implementation, when an evaluation would produce an
- // infinity or a NaN, an undefined value of the target type is produced
- // instead.
- // So WebGPU effectively assumes fast math mode. We also don't have reliable
- // ways to check whether a floating point number is NaN or infinity.
- // Therefore, just let the SPIR-V CodeGen to avoid generating guards w.r.t.
- // NaN and infinity.
- buildSPIRVCodegenPassPipeline(passManager, /*enableFastMath=*/true);
+ buildSPIRVCodegenPassPipeline(passManager);
- // WGSL does not support extended multiplication:
- // https://github.com/gpuweb/gpuweb/issues/1565. Make sure to lower it to
- // regular multiplication before we convert SPIR-V to WGSL.
+ // Prepare SPIR-V for WebGPU by expanding or removing unsupported ops.
+ // For example,
+ // * WGSL does not support extended multiplication:
+ // https://github.com/gpuweb/gpuweb/issues/1565, so we lower to
+ // regular multiplication
+ // * WGSL does not support NaN or infinities:
+ // https://www.w3.org/TR/WGSL/#floating-point-evaluation
passManager.nest<ModuleOp>().nest<spirv::ModuleOp>().addPass(
spirv::createSPIRVWebGPUPreparePass());
}
diff --git a/compiler/src/iree/compiler/API/Internal/BUILD.bazel b/compiler/src/iree/compiler/API/Internal/BUILD.bazel
index 8c34f0e..4f98de9 100644
--- a/compiler/src/iree/compiler/API/Internal/BUILD.bazel
+++ b/compiler/src/iree/compiler/API/Internal/BUILD.bazel
@@ -118,6 +118,7 @@
"//compiler/src/iree/compiler/Reducer:iree_reduce_lib",
"//compiler/src/iree/compiler/Tools:init_passes_and_dialects",
"@llvm-project//llvm:Support",
+ "@llvm-project//mlir:BytecodeWriter",
"@llvm-project//mlir:IR",
"@llvm-project//mlir:Parser",
"@llvm-project//mlir:Pass",
diff --git a/compiler/src/iree/compiler/API/Internal/CMakeLists.txt b/compiler/src/iree/compiler/API/Internal/CMakeLists.txt
index 8989c65..c25dcb3 100644
--- a/compiler/src/iree/compiler/API/Internal/CMakeLists.txt
+++ b/compiler/src/iree/compiler/API/Internal/CMakeLists.txt
@@ -92,6 +92,7 @@
"IREEReduceToolEntryPoint.cpp"
DEPS
LLVMSupport
+ MLIRBytecodeWriter
MLIRIR
MLIRParser
MLIRPass
diff --git a/compiler/src/iree/compiler/Codegen/Common/BUILD.bazel b/compiler/src/iree/compiler/Codegen/Common/BUILD.bazel
index f6a4938..8d651b6 100644
--- a/compiler/src/iree/compiler/Codegen/Common/BUILD.bazel
+++ b/compiler/src/iree/compiler/Codegen/Common/BUILD.bazel
@@ -40,6 +40,7 @@
"@llvm-project//mlir:LinalgTransforms",
"@llvm-project//mlir:MemRefDialect",
"@llvm-project//mlir:Pass",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
@@ -190,6 +191,7 @@
"@llvm-project//mlir:TensorUtils",
"@llvm-project//mlir:TilingInterface",
"@llvm-project//mlir:TransformDialect",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
"@llvm-project//mlir:ValueBoundsOpInterface",
"@llvm-project//mlir:VectorDialect",
@@ -259,6 +261,7 @@
"@llvm-project//mlir:SCFTransforms",
"@llvm-project//mlir:TensorTransforms",
"@llvm-project//mlir:Transforms",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:VectorTransforms",
# Other Stuff
"//compiler/src/iree/compiler/Utils",
diff --git a/compiler/src/iree/compiler/Codegen/Common/CMakeLists.txt b/compiler/src/iree/compiler/Codegen/Common/CMakeLists.txt
index fc63660..c91f42b 100644
--- a/compiler/src/iree/compiler/Codegen/Common/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Codegen/Common/CMakeLists.txt
@@ -31,6 +31,7 @@
MLIRLinalgTransforms
MLIRMemRefDialect
MLIRPass
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Codegen::Dialect::Codegen::IR::IREECodegenDialect
iree::compiler::Dialect::HAL::IR
@@ -157,6 +158,7 @@
MLIRTensorUtils
MLIRTilingInterface
MLIRTransformDialect
+ MLIRTransformUtils
MLIRTransforms
MLIRValueBoundsOpInterface
MLIRVectorDialect
@@ -230,6 +232,7 @@
MLIRTransformDialect
MLIRTransformDialectTransforms
MLIRTransformLoopExtension
+ MLIRTransformUtils
MLIRTransforms
MLIRVectorDialect
MLIRVectorTransformOps
diff --git a/compiler/src/iree/compiler/Codegen/Common/CPU/BUILD.bazel b/compiler/src/iree/compiler/Codegen/Common/CPU/BUILD.bazel
index ffd2fc2..e711389 100644
--- a/compiler/src/iree/compiler/Codegen/Common/CPU/BUILD.bazel
+++ b/compiler/src/iree/compiler/Codegen/Common/CPU/BUILD.bazel
@@ -87,6 +87,7 @@
"@llvm-project//mlir:Support",
"@llvm-project//mlir:TensorDialect",
"@llvm-project//mlir:TensorTransforms",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
"@llvm-project//mlir:VectorDialect",
"@llvm-project//mlir:VectorToSCF",
diff --git a/compiler/src/iree/compiler/Codegen/Common/CPU/CMakeLists.txt b/compiler/src/iree/compiler/Codegen/Common/CPU/CMakeLists.txt
index 6f219ac..6803138 100644
--- a/compiler/src/iree/compiler/Codegen/Common/CPU/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Codegen/Common/CPU/CMakeLists.txt
@@ -70,6 +70,7 @@
MLIRSupport
MLIRTensorDialect
MLIRTensorTransforms
+ MLIRTransformUtils
MLIRTransforms
MLIRVectorDialect
MLIRVectorToSCF
diff --git a/compiler/src/iree/compiler/Codegen/Common/CPU/CPULowerToUKernels.cpp b/compiler/src/iree/compiler/Codegen/Common/CPU/CPULowerToUKernels.cpp
index 5248777..e82d066 100644
--- a/compiler/src/iree/compiler/Codegen/Common/CPU/CPULowerToUKernels.cpp
+++ b/compiler/src/iree/compiler/Codegen/Common/CPU/CPULowerToUKernels.cpp
@@ -65,8 +65,10 @@
void runOnOperation() override;
- LogicalResult initializeOptions(StringRef options) override {
- if (failed(Pass::initializeOptions(options))) {
+ LogicalResult initializeOptions(
+ StringRef options,
+ function_ref<LogicalResult(const Twine &)> errorHandler) override {
+ if (failed(Pass::initializeOptions(options, errorHandler))) {
return failure();
}
// This option defaults to `true` both in Passes.td and in C++ code.
diff --git a/compiler/src/iree/compiler/Codegen/Common/GPU/BUILD.bazel b/compiler/src/iree/compiler/Codegen/Common/GPU/BUILD.bazel
index cdd6b0f..ebbf7b3 100644
--- a/compiler/src/iree/compiler/Codegen/Common/GPU/BUILD.bazel
+++ b/compiler/src/iree/compiler/Codegen/Common/GPU/BUILD.bazel
@@ -42,6 +42,7 @@
"@llvm-project//mlir:MemRefDialect",
"@llvm-project//mlir:NVGPUDialect",
"@llvm-project//mlir:Pass",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
@@ -122,6 +123,7 @@
"@llvm-project//mlir:Support",
"@llvm-project//mlir:TensorDialect",
"@llvm-project//mlir:TensorTransforms",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
"@llvm-project//mlir:VectorDialect",
"@llvm-project//mlir:VectorToSCF",
diff --git a/compiler/src/iree/compiler/Codegen/Common/GPU/CMakeLists.txt b/compiler/src/iree/compiler/Codegen/Common/GPU/CMakeLists.txt
index 754e6c4..ebb98a1 100644
--- a/compiler/src/iree/compiler/Codegen/Common/GPU/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Codegen/Common/GPU/CMakeLists.txt
@@ -32,6 +32,7 @@
MLIRMemRefDialect
MLIRNVGPUDialect
MLIRPass
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Codegen::Dialect::Codegen::IR::IREECodegenDialect
iree::compiler::Dialect::HAL::IR
@@ -106,6 +107,7 @@
MLIRSupport
MLIRTensorDialect
MLIRTensorTransforms
+ MLIRTransformUtils
MLIRTransforms
MLIRVectorDialect
MLIRVectorToSCF
diff --git a/compiler/src/iree/compiler/Codegen/Common/GPU/WorkgroupReordering.cpp b/compiler/src/iree/compiler/Codegen/Common/GPU/WorkgroupReordering.cpp
index 67ff056..8edbd5c 100644
--- a/compiler/src/iree/compiler/Codegen/Common/GPU/WorkgroupReordering.cpp
+++ b/compiler/src/iree/compiler/Codegen/Common/GPU/WorkgroupReordering.cpp
@@ -187,8 +187,10 @@
void getDependentDialects(DialectRegistry ®istry) const override {
registry.insert<affine::AffineDialect>();
}
- LogicalResult initializeOptions(StringRef options) override {
- if (failed(Pass::initializeOptions(options))) {
+ LogicalResult initializeOptions(
+ StringRef options,
+ function_ref<LogicalResult(const Twine &)> errorHandler) override {
+ if (failed(Pass::initializeOptions(options, errorHandler))) {
return failure();
}
logSwizzleTile = logTile;
diff --git a/compiler/src/iree/compiler/Codegen/Common/OptimizeVectorTransferPass.cpp b/compiler/src/iree/compiler/Codegen/Common/OptimizeVectorTransferPass.cpp
index 2a03b44..331e398 100644
--- a/compiler/src/iree/compiler/Codegen/Common/OptimizeVectorTransferPass.cpp
+++ b/compiler/src/iree/compiler/Codegen/Common/OptimizeVectorTransferPass.cpp
@@ -134,8 +134,10 @@
LDBG("after erasing unused allocs and stores\n" << funcOp);
}
- LogicalResult initializeOptions(StringRef options) override {
- if (failed(Pass::initializeOptions(options))) {
+ LogicalResult initializeOptions(
+ StringRef options,
+ function_ref<LogicalResult(const Twine &)> errorHandler) override {
+ if (failed(Pass::initializeOptions(options, errorHandler))) {
return failure();
}
// `flatten` may have been set to `true` in the constructor already.
diff --git a/compiler/src/iree/compiler/Codegen/Common/TransformExtensions/BUILD.bazel b/compiler/src/iree/compiler/Codegen/Common/TransformExtensions/BUILD.bazel
index 8d985ac..76f01b5 100644
--- a/compiler/src/iree/compiler/Codegen/Common/TransformExtensions/BUILD.bazel
+++ b/compiler/src/iree/compiler/Codegen/Common/TransformExtensions/BUILD.bazel
@@ -100,6 +100,7 @@
"@llvm-project//mlir:TensorTransforms",
"@llvm-project//mlir:TransformDialect",
"@llvm-project//mlir:TransformDialectInterfaces",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
"@llvm-project//mlir:VectorDialect",
"@llvm-project//mlir:VectorToGPU",
diff --git a/compiler/src/iree/compiler/Codegen/Common/TransformExtensions/CMakeLists.txt b/compiler/src/iree/compiler/Codegen/Common/TransformExtensions/CMakeLists.txt
index c53c099..b3f4a08 100644
--- a/compiler/src/iree/compiler/Codegen/Common/TransformExtensions/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Codegen/Common/TransformExtensions/CMakeLists.txt
@@ -60,6 +60,7 @@
MLIRTensorTransforms
MLIRTransformDialect
MLIRTransformDialectInterfaces
+ MLIRTransformUtils
MLIRTransforms
MLIRVectorDialect
MLIRVectorToGPU
diff --git a/compiler/src/iree/compiler/Codegen/LLVMCPU/BUILD.bazel b/compiler/src/iree/compiler/Codegen/LLVMCPU/BUILD.bazel
index da9677b..d030294 100644
--- a/compiler/src/iree/compiler/Codegen/LLVMCPU/BUILD.bazel
+++ b/compiler/src/iree/compiler/Codegen/LLVMCPU/BUILD.bazel
@@ -40,6 +40,7 @@
"@llvm-project//mlir:LinalgTransforms",
"@llvm-project//mlir:MemRefDialect",
"@llvm-project//mlir:Pass",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
@@ -158,6 +159,7 @@
"@llvm-project//mlir:TosaDialect",
"@llvm-project//mlir:TosaToArith",
"@llvm-project//mlir:TransformDialect",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
"@llvm-project//mlir:ValueBoundsOpInterface",
"@llvm-project//mlir:VectorDialect",
diff --git a/compiler/src/iree/compiler/Codegen/LLVMCPU/CMakeLists.txt b/compiler/src/iree/compiler/Codegen/LLVMCPU/CMakeLists.txt
index d003960..f794896 100644
--- a/compiler/src/iree/compiler/Codegen/LLVMCPU/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Codegen/LLVMCPU/CMakeLists.txt
@@ -31,6 +31,7 @@
MLIRLinalgTransforms
MLIRMemRefDialect
MLIRPass
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Codegen::Dialect::Codegen::IR::IREECodegenDialect
iree::compiler::Dialect::HAL::IR
@@ -131,6 +132,7 @@
MLIRTosaDialect
MLIRTosaToArith
MLIRTransformDialect
+ MLIRTransformUtils
MLIRTransforms
MLIRValueBoundsOpInterface
MLIRVectorDialect
diff --git a/compiler/src/iree/compiler/Codegen/LLVMGPU/BUILD.bazel b/compiler/src/iree/compiler/Codegen/LLVMGPU/BUILD.bazel
index 81bf506..1e6e4eb 100644
--- a/compiler/src/iree/compiler/Codegen/LLVMGPU/BUILD.bazel
+++ b/compiler/src/iree/compiler/Codegen/LLVMGPU/BUILD.bazel
@@ -200,6 +200,7 @@
"@llvm-project//mlir:Support",
"@llvm-project//mlir:TensorDialect",
"@llvm-project//mlir:TransformDialect",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
"@llvm-project//mlir:ValueBoundsOpInterface",
"@llvm-project//mlir:VectorDialect",
diff --git a/compiler/src/iree/compiler/Codegen/LLVMGPU/CMakeLists.txt b/compiler/src/iree/compiler/Codegen/LLVMGPU/CMakeLists.txt
index ba93a83..bd99273 100644
--- a/compiler/src/iree/compiler/Codegen/LLVMGPU/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Codegen/LLVMGPU/CMakeLists.txt
@@ -157,6 +157,7 @@
MLIRSupport
MLIRTensorDialect
MLIRTransformDialect
+ MLIRTransformUtils
MLIRTransforms
MLIRValueBoundsOpInterface
MLIRVectorDialect
diff --git a/compiler/src/iree/compiler/Codegen/LLVMGPU/TransformExtensions/BUILD.bazel b/compiler/src/iree/compiler/Codegen/LLVMGPU/TransformExtensions/BUILD.bazel
index f1cb181..9c870dc 100644
--- a/compiler/src/iree/compiler/Codegen/LLVMGPU/TransformExtensions/BUILD.bazel
+++ b/compiler/src/iree/compiler/Codegen/LLVMGPU/TransformExtensions/BUILD.bazel
@@ -71,6 +71,7 @@
"@llvm-project//mlir:ArithDialect",
"@llvm-project//mlir:BufferizationDialect",
"@llvm-project//mlir:BufferizationInterfaces",
+ "@llvm-project//mlir:BytecodeOpInterface",
"@llvm-project//mlir:DialectUtils",
"@llvm-project//mlir:FuncDialect",
"@llvm-project//mlir:FunctionInterfaces",
@@ -89,6 +90,7 @@
"@llvm-project//mlir:TensorTransformOps",
"@llvm-project//mlir:TransformDialect",
"@llvm-project//mlir:TransformDialectInterfaces",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
"@llvm-project//mlir:VectorDialect",
"@llvm-project//mlir:VectorToGPU",
diff --git a/compiler/src/iree/compiler/Codegen/LLVMGPU/TransformExtensions/CMakeLists.txt b/compiler/src/iree/compiler/Codegen/LLVMGPU/TransformExtensions/CMakeLists.txt
index 6c20675..3afc5fa 100644
--- a/compiler/src/iree/compiler/Codegen/LLVMGPU/TransformExtensions/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Codegen/LLVMGPU/TransformExtensions/CMakeLists.txt
@@ -38,6 +38,7 @@
MLIRAffineDialect
MLIRArithDialect
MLIRBufferizationDialect
+ MLIRBytecodeOpInterface
MLIRFuncDialect
MLIRFunctionInterfaces
MLIRGPUDialect
@@ -55,6 +56,7 @@
MLIRTensorTransformOps
MLIRTransformDialect
MLIRTransformDialectInterfaces
+ MLIRTransformUtils
MLIRTransforms
MLIRVectorDialect
MLIRVectorToGPU
diff --git a/compiler/src/iree/compiler/Codegen/SPIRV/BUILD.bazel b/compiler/src/iree/compiler/Codegen/SPIRV/BUILD.bazel
index a46721b..30c56a4 100644
--- a/compiler/src/iree/compiler/Codegen/SPIRV/BUILD.bazel
+++ b/compiler/src/iree/compiler/Codegen/SPIRV/BUILD.bazel
@@ -40,6 +40,7 @@
"@llvm-project//mlir:LinalgTransforms",
"@llvm-project//mlir:MemRefDialect",
"@llvm-project//mlir:Pass",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
@@ -151,6 +152,7 @@
"@llvm-project//mlir:TosaDialect",
"@llvm-project//mlir:TosaToArith",
"@llvm-project//mlir:TransformDialect",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
"@llvm-project//mlir:VectorDialect",
"@llvm-project//mlir:VectorInterfaces",
diff --git a/compiler/src/iree/compiler/Codegen/SPIRV/CMakeLists.txt b/compiler/src/iree/compiler/Codegen/SPIRV/CMakeLists.txt
index 630f5ed..7c608f1 100644
--- a/compiler/src/iree/compiler/Codegen/SPIRV/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Codegen/SPIRV/CMakeLists.txt
@@ -31,6 +31,7 @@
MLIRLinalgTransforms
MLIRMemRefDialect
MLIRPass
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Codegen::Dialect::Codegen::IR::IREECodegenDialect
iree::compiler::Dialect::HAL::IR
@@ -127,6 +128,7 @@
MLIRTosaDialect
MLIRTosaToArith
MLIRTransformDialect
+ MLIRTransformUtils
MLIRTransforms
MLIRVectorDialect
MLIRVectorInterfaces
diff --git a/compiler/src/iree/compiler/Codegen/SPIRV/ConvertToSPIRVPass.cpp b/compiler/src/iree/compiler/Codegen/SPIRV/ConvertToSPIRVPass.cpp
index cdfb6df..4d3e61f 100644
--- a/compiler/src/iree/compiler/Codegen/SPIRV/ConvertToSPIRVPass.cpp
+++ b/compiler/src/iree/compiler/Codegen/SPIRV/ConvertToSPIRVPass.cpp
@@ -483,14 +483,13 @@
registry.insert<spirv::SPIRVDialect>();
}
- explicit ConvertToSPIRVPass(bool enableFastMath, unsigned indexBits)
- : enableFastMath(enableFastMath), indexBits(indexBits) {}
+ explicit ConvertToSPIRVPass(unsigned indexBits) : indexBits(indexBits) {}
- LogicalResult initializeOptions(StringRef options) override {
- if (failed(Pass::initializeOptions(options)))
+ LogicalResult initializeOptions(
+ StringRef options,
+ function_ref<LogicalResult(const Twine &)> errorHandler) override {
+ if (failed(Pass::initializeOptions(options, errorHandler)))
return failure();
- // Use pass option if present.
- enableFastMath |= enableFastMathOption;
indexBits = indexBitsOption;
return success();
}
@@ -498,9 +497,6 @@
void runOnOperation() override;
private:
- // Enable fast math when doing type conversion by assuming no NaN or infinite
- // values.
- bool enableFastMath;
// Use 64 bits for index widths.
unsigned indexBits;
};
@@ -631,7 +627,6 @@
}
SPIRVConversionOptions options = {};
- options.enableFastMathMode = this->enableFastMath;
options.use64bitIndex = use64bitIndex;
SPIRVTypeConverter typeConverter(targetAttr, options);
@@ -746,8 +741,8 @@
//===----------------------------------------------------------------------===//
std::unique_ptr<OperationPass<ModuleOp>>
-createConvertToSPIRVPass(bool enableFastMath, unsigned indexBits) {
- return std::make_unique<ConvertToSPIRVPass>(enableFastMath, indexBits);
+createConvertToSPIRVPass(unsigned indexBits) {
+ return std::make_unique<ConvertToSPIRVPass>(indexBits);
}
} // namespace mlir::iree_compiler
diff --git a/compiler/src/iree/compiler/Codegen/SPIRV/Passes.cpp b/compiler/src/iree/compiler/Codegen/SPIRV/Passes.cpp
index 572ac95..28894a5 100644
--- a/compiler/src/iree/compiler/Codegen/SPIRV/Passes.cpp
+++ b/compiler/src/iree/compiler/Codegen/SPIRV/Passes.cpp
@@ -228,7 +228,7 @@
}
/// Adds passes to perform the final SPIR-V conversion.
-static void addSPIRVLoweringPasses(OpPassManager &pm, bool enableFastMath) {
+static void addSPIRVLoweringPasses(OpPassManager &pm) {
pm.addPass(createCanonicalizerPass());
pm.addPass(createCSEPass());
@@ -248,7 +248,7 @@
pm.addPass(createCanonicalizerPass());
pm.addPass(createCSEPass());
- pm.addPass(createConvertToSPIRVPass(enableFastMath, clSPIRVIndexingBits));
+ pm.addPass(createConvertToSPIRVPass(clSPIRVIndexingBits));
auto getTargetEnv = [](spirv::ModuleOp moduleOp) {
return getSPIRVTargetEnvAttr(moduleOp);
@@ -668,11 +668,11 @@
pm.addPass(createSPIRVSelectLoweringStrategyPass());
}
-void buildSPIRVCodegenPassPipeline(OpPassManager &pm, bool enableFastMath) {
+void buildSPIRVCodegenPassPipeline(OpPassManager &pm) {
pm.addPass(createSPIRVLowerExecutableTargetPass());
addMemRefLoweringPasses(pm.nest<ModuleOp>());
- addSPIRVLoweringPasses(pm.nest<ModuleOp>(), enableFastMath);
+ addSPIRVLoweringPasses(pm.nest<ModuleOp>());
LLVM_DEBUG({
llvm::dbgs() << "Using SPIR-V pass pipeline:\n";
@@ -726,7 +726,7 @@
"iree-codegen-linalg-to-spirv-pipeline",
"Runs the progressive lowering pipeline from linalg to SPIR-V",
[](OpPassManager &passManager) {
- buildSPIRVCodegenPassPipeline(passManager, /*enableFastMath=*/false);
+ buildSPIRVCodegenPassPipeline(passManager);
});
}
diff --git a/compiler/src/iree/compiler/Codegen/SPIRV/Passes.h b/compiler/src/iree/compiler/Codegen/SPIRV/Passes.h
index 8814378..28c4aee 100644
--- a/compiler/src/iree/compiler/Codegen/SPIRV/Passes.h
+++ b/compiler/src/iree/compiler/Codegen/SPIRV/Passes.h
@@ -61,7 +61,7 @@
/// Populates passes needed to lower linalg/arith/math ops to SPIR-V ops via
/// the structured ops path. The pass manager `pm` here operate on the module
/// within the IREE::HAL::ExecutableOp.
-void buildSPIRVCodegenPassPipeline(OpPassManager &pm, bool enableFastMath);
+void buildSPIRVCodegenPassPipeline(OpPassManager &pm);
/// Populates passes needed to link HAL executables across SPIRV targets.
void buildSPIRVLinkingPassPipeline(OpPassManager &passManager);
@@ -76,7 +76,7 @@
/// GPU processor ID ops into SPIR-V global variables, loop/standard ops into
/// corresponding SPIR-V ops.
std::unique_ptr<OperationPass<ModuleOp>>
-createConvertToSPIRVPass(bool enableFastMath = false, unsigned indexWidth = 32);
+createConvertToSPIRVPass(unsigned indexWidth = 32);
/// Annotates the innermost Winograd loops with the spirv distribute attribute.
std::unique_ptr<InterfacePass<mlir::FunctionOpInterface>>
diff --git a/compiler/src/iree/compiler/Codegen/SPIRV/Passes.td b/compiler/src/iree/compiler/Codegen/SPIRV/Passes.td
index 30d6a6b..8990965 100644
--- a/compiler/src/iree/compiler/Codegen/SPIRV/Passes.td
+++ b/compiler/src/iree/compiler/Codegen/SPIRV/Passes.td
@@ -17,8 +17,6 @@
let summary = "Perform the final conversion to SPIR-V dialect";
let constructor = "mlir::iree_compiler::createConvertToSPIRVPass()";
let options = [
- Option<"enableFastMathOption", "enable-fast-math", "bool", /*default=*/"false",
- "Enable fast math mode during type conversion (i.e. assume no NaN/infinity)">,
Option<"indexBitsOption", "index-bits", "unsigned", /*default=*/"32",
"Specify the bit widths for SPIR-V indices">,
];
diff --git a/compiler/src/iree/compiler/Codegen/SPIRV/SPIRVTileAndPromote.cpp b/compiler/src/iree/compiler/Codegen/SPIRV/SPIRVTileAndPromote.cpp
index beba1e2..cead85b 100644
--- a/compiler/src/iree/compiler/Codegen/SPIRV/SPIRVTileAndPromote.cpp
+++ b/compiler/src/iree/compiler/Codegen/SPIRV/SPIRVTileAndPromote.cpp
@@ -115,8 +115,10 @@
registry.insert<gpu::GPUDialect>();
}
- LogicalResult initializeOptions(StringRef options) override {
- if (failed(Pass::initializeOptions(options)))
+ LogicalResult initializeOptions(
+ StringRef options,
+ function_ref<LogicalResult(const Twine &)> errorHandler) override {
+ if (failed(Pass::initializeOptions(options, errorHandler)))
return failure();
// Consider pass option too
promoteCMatrix |= this->promoteC;
diff --git a/compiler/src/iree/compiler/Codegen/Transforms/BUILD.bazel b/compiler/src/iree/compiler/Codegen/Transforms/BUILD.bazel
index 3699c8e..e653ef9 100644
--- a/compiler/src/iree/compiler/Codegen/Transforms/BUILD.bazel
+++ b/compiler/src/iree/compiler/Codegen/Transforms/BUILD.bazel
@@ -41,6 +41,7 @@
"@llvm-project//mlir:Pass",
"@llvm-project//mlir:SCFTransforms",
"@llvm-project//mlir:Support",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
"@llvm-project//mlir:ValueBoundsOpInterface",
"@llvm-project//mlir:VectorDialect",
diff --git a/compiler/src/iree/compiler/Codegen/Transforms/CMakeLists.txt b/compiler/src/iree/compiler/Codegen/Transforms/CMakeLists.txt
index 48b9f48..dfc314e 100644
--- a/compiler/src/iree/compiler/Codegen/Transforms/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Codegen/Transforms/CMakeLists.txt
@@ -34,6 +34,7 @@
MLIRPass
MLIRSCFTransforms
MLIRSupport
+ MLIRTransformUtils
MLIRTransforms
MLIRValueBoundsOpInterface
MLIRVectorDialect
diff --git a/compiler/src/iree/compiler/Codegen/VMVX/BUILD.bazel b/compiler/src/iree/compiler/Codegen/VMVX/BUILD.bazel
index cba8906..52f5005 100644
--- a/compiler/src/iree/compiler/Codegen/VMVX/BUILD.bazel
+++ b/compiler/src/iree/compiler/Codegen/VMVX/BUILD.bazel
@@ -40,6 +40,7 @@
"@llvm-project//mlir:LinalgTransforms",
"@llvm-project//mlir:MemRefDialect",
"@llvm-project//mlir:Pass",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
@@ -88,6 +89,7 @@
"@llvm-project//mlir:Pass",
"@llvm-project//mlir:TensorDialect",
"@llvm-project//mlir:TensorTransforms",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
"@llvm-project//mlir:VectorDialect",
],
diff --git a/compiler/src/iree/compiler/Codegen/VMVX/CMakeLists.txt b/compiler/src/iree/compiler/Codegen/VMVX/CMakeLists.txt
index d5bf95f..391caba 100644
--- a/compiler/src/iree/compiler/Codegen/VMVX/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Codegen/VMVX/CMakeLists.txt
@@ -31,6 +31,7 @@
MLIRLinalgTransforms
MLIRMemRefDialect
MLIRPass
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Codegen::Dialect::Codegen::IR::IREECodegenDialect
iree::compiler::Dialect::HAL::IR
@@ -68,6 +69,7 @@
MLIRPass
MLIRTensorDialect
MLIRTensorTransforms
+ MLIRTransformUtils
MLIRTransforms
MLIRVectorDialect
iree::compiler::Codegen::Common
diff --git a/compiler/src/iree/compiler/Dialect/Flow/Conversion/MeshToFlow/BUILD.bazel b/compiler/src/iree/compiler/Dialect/Flow/Conversion/MeshToFlow/BUILD.bazel
index 32305c5..1bf5038 100644
--- a/compiler/src/iree/compiler/Dialect/Flow/Conversion/MeshToFlow/BUILD.bazel
+++ b/compiler/src/iree/compiler/Dialect/Flow/Conversion/MeshToFlow/BUILD.bazel
@@ -37,6 +37,7 @@
"@llvm-project//mlir:Pass",
"@llvm-project//mlir:Support",
"@llvm-project//mlir:TensorDialect",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Flow/Conversion/MeshToFlow/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Flow/Conversion/MeshToFlow/CMakeLists.txt
index f1028f2..cab6671 100644
--- a/compiler/src/iree/compiler/Dialect/Flow/Conversion/MeshToFlow/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Flow/Conversion/MeshToFlow/CMakeLists.txt
@@ -30,6 +30,7 @@
MLIRPass
MLIRSupport
MLIRTensorDialect
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::Flow::IR
iree::compiler::Dialect::Util::IR
diff --git a/compiler/src/iree/compiler/Dialect/Flow/TransformExtensions/BUILD.bazel b/compiler/src/iree/compiler/Dialect/Flow/TransformExtensions/BUILD.bazel
index c4a45b1..a29e254 100644
--- a/compiler/src/iree/compiler/Dialect/Flow/TransformExtensions/BUILD.bazel
+++ b/compiler/src/iree/compiler/Dialect/Flow/TransformExtensions/BUILD.bazel
@@ -62,6 +62,7 @@
"//llvm-external-projects/iree-dialects:IREEDialectsTransforms",
"//llvm-external-projects/iree-dialects:IREELinalgTransformDialect",
"@llvm-project//mlir:ArithDialect",
+ "@llvm-project//mlir:BytecodeOpInterface",
"@llvm-project//mlir:IR",
"@llvm-project//mlir:PDLDialect",
"@llvm-project//mlir:SCFDialect",
diff --git a/compiler/src/iree/compiler/Dialect/Flow/TransformExtensions/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Flow/TransformExtensions/CMakeLists.txt
index 9911ffd..ea1f131 100644
--- a/compiler/src/iree/compiler/Dialect/Flow/TransformExtensions/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Flow/TransformExtensions/CMakeLists.txt
@@ -34,6 +34,7 @@
IREEDialectsTransforms
IREELinalgTransformDialect
MLIRArithDialect
+ MLIRBytecodeOpInterface
MLIRIR
MLIRPDLDialect
MLIRSCFDialect
diff --git a/compiler/src/iree/compiler/Dialect/Flow/Transforms/TensorPadToTensorInsertSlice.cpp b/compiler/src/iree/compiler/Dialect/Flow/Transforms/TensorPadToTensorInsertSlice.cpp
index 805a073..a3367bd 100644
--- a/compiler/src/iree/compiler/Dialect/Flow/Transforms/TensorPadToTensorInsertSlice.cpp
+++ b/compiler/src/iree/compiler/Dialect/Flow/Transforms/TensorPadToTensorInsertSlice.cpp
@@ -92,8 +92,10 @@
mlir::math::MathDialect, mlir::arith::ArithDialect>();
}
- LogicalResult initializeOptions(StringRef options) override {
- if (failed(Pass::initializeOptions(options))) {
+ LogicalResult initializeOptions(
+ StringRef options,
+ function_ref<LogicalResult(const Twine &)> errorHandler) override {
+ if (failed(Pass::initializeOptions(options, errorHandler))) {
return failure();
}
// `skipSingleLinalgOpUses` may have been set to `true` in the constructor
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Conversion/BUILD.bazel b/compiler/src/iree/compiler/Dialect/HAL/Conversion/BUILD.bazel
index a0f1488..0343df9 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Conversion/BUILD.bazel
+++ b/compiler/src/iree/compiler/Dialect/HAL/Conversion/BUILD.bazel
@@ -30,6 +30,7 @@
"@llvm-project//mlir:FunctionInterfaces",
"@llvm-project//mlir:IR",
"@llvm-project//mlir:MemRefDialect",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Conversion/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/HAL/Conversion/CMakeLists.txt
index 417047c..9f69914 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Conversion/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/HAL/Conversion/CMakeLists.txt
@@ -25,6 +25,7 @@
MLIRFunctionInterfaces
MLIRIR
MLIRMemRefDialect
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::HAL::IR
iree::compiler::Dialect::Util::IR
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToHAL/BUILD.bazel b/compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToHAL/BUILD.bazel
index 028edd5..d3c33fb 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToHAL/BUILD.bazel
+++ b/compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToHAL/BUILD.bazel
@@ -23,6 +23,7 @@
deps = [
"//compiler/src/iree/compiler/Dialect/HAL/IR",
"@llvm-project//mlir:IR",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToHAL/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToHAL/CMakeLists.txt
index fec5123..832a19d 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToHAL/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToHAL/CMakeLists.txt
@@ -19,6 +19,7 @@
"Patterns.cpp"
DEPS
MLIRIR
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::HAL::IR
PUBLIC
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToVM/BUILD.bazel b/compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToVM/BUILD.bazel
index 66ea5af..75732bc 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToVM/BUILD.bazel
+++ b/compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToVM/BUILD.bazel
@@ -45,6 +45,7 @@
"@llvm-project//mlir:FunctionInterfaces",
"@llvm-project//mlir:IR",
"@llvm-project//mlir:Pass",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToVM/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToVM/CMakeLists.txt
index 97b5cc4..1378582 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToVM/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToVM/CMakeLists.txt
@@ -34,6 +34,7 @@
MLIRFunctionInterfaces
MLIRIR
MLIRPass
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::HAL::IR
iree::compiler::Dialect::HAL::hal_imports
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Conversion/StandardToHAL/BUILD.bazel b/compiler/src/iree/compiler/Dialect/HAL/Conversion/StandardToHAL/BUILD.bazel
index 15a68c0..eff99b6 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Conversion/StandardToHAL/BUILD.bazel
+++ b/compiler/src/iree/compiler/Dialect/HAL/Conversion/StandardToHAL/BUILD.bazel
@@ -35,6 +35,7 @@
"@llvm-project//mlir:Pass",
"@llvm-project//mlir:ShapeDialect",
"@llvm-project//mlir:TensorDialect",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Conversion/StandardToHAL/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/HAL/Conversion/StandardToHAL/CMakeLists.txt
index 7cb5fb9..39d1974 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Conversion/StandardToHAL/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/HAL/Conversion/StandardToHAL/CMakeLists.txt
@@ -27,6 +27,7 @@
MLIRPass
MLIRShapeDialect
MLIRTensorDialect
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::HAL::Conversion
iree::compiler::Dialect::HAL::IR
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Conversion/StreamToHAL/BUILD.bazel b/compiler/src/iree/compiler/Dialect/HAL/Conversion/StreamToHAL/BUILD.bazel
index 8386bf9..236a8a2 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Conversion/StreamToHAL/BUILD.bazel
+++ b/compiler/src/iree/compiler/Dialect/HAL/Conversion/StreamToHAL/BUILD.bazel
@@ -35,6 +35,7 @@
"@llvm-project//mlir:IR",
"@llvm-project//mlir:Pass",
"@llvm-project//mlir:SCFDialect",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Conversion/StreamToHAL/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/HAL/Conversion/StreamToHAL/CMakeLists.txt
index 4de634b..95dd8ff 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Conversion/StreamToHAL/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/HAL/Conversion/StreamToHAL/CMakeLists.txt
@@ -26,6 +26,7 @@
MLIRIR
MLIRPass
MLIRSCFDialect
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::HAL::Conversion
iree::compiler::Dialect::HAL::IR
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Conversion/UtilToHAL/BUILD.bazel b/compiler/src/iree/compiler/Dialect/HAL/Conversion/UtilToHAL/BUILD.bazel
index 52c077c..44708df 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Conversion/UtilToHAL/BUILD.bazel
+++ b/compiler/src/iree/compiler/Dialect/HAL/Conversion/UtilToHAL/BUILD.bazel
@@ -27,6 +27,7 @@
"@llvm-project//mlir:FuncDialect",
"@llvm-project//mlir:FunctionInterfaces",
"@llvm-project//mlir:IR",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Conversion/UtilToHAL/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/HAL/Conversion/UtilToHAL/CMakeLists.txt
index 0b739bf..b0cce4c 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Conversion/UtilToHAL/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/HAL/Conversion/UtilToHAL/CMakeLists.txt
@@ -21,6 +21,7 @@
MLIRFuncDialect
MLIRFunctionInterfaces
MLIRIR
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::HAL::IR
iree::compiler::Dialect::Util::Conversion
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Transforms/BUILD.bazel b/compiler/src/iree/compiler/Dialect/HAL/Transforms/BUILD.bazel
index e6f514d..2847a83 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Transforms/BUILD.bazel
+++ b/compiler/src/iree/compiler/Dialect/HAL/Transforms/BUILD.bazel
@@ -81,6 +81,7 @@
"@llvm-project//mlir:SCFToControlFlow",
"@llvm-project//mlir:Support",
"@llvm-project//mlir:TensorDialect",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Transforms/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/HAL/Transforms/CMakeLists.txt
index 4201d37..8c05849 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Transforms/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/HAL/Transforms/CMakeLists.txt
@@ -57,6 +57,7 @@
MLIRSCFToControlFlow
MLIRSupport
MLIRTensorDialect
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Codegen::Common::CPU::CommonCPUPasses
iree::compiler::Codegen::Dialect::Codegen::IR::IREECodegenDialect
diff --git a/compiler/src/iree/compiler/Dialect/Stream/Conversion/BUILD.bazel b/compiler/src/iree/compiler/Dialect/Stream/Conversion/BUILD.bazel
index 92d4dda..3116a86 100644
--- a/compiler/src/iree/compiler/Dialect/Stream/Conversion/BUILD.bazel
+++ b/compiler/src/iree/compiler/Dialect/Stream/Conversion/BUILD.bazel
@@ -25,6 +25,7 @@
"@llvm-project//mlir:FuncDialect",
"@llvm-project//mlir:FunctionInterfaces",
"@llvm-project//mlir:IR",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Stream/Conversion/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Stream/Conversion/CMakeLists.txt
index d6d1391..472fdb9 100644
--- a/compiler/src/iree/compiler/Dialect/Stream/Conversion/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Stream/Conversion/CMakeLists.txt
@@ -21,6 +21,7 @@
MLIRFuncDialect
MLIRFunctionInterfaces
MLIRIR
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::Stream::IR
PUBLIC
diff --git a/compiler/src/iree/compiler/Dialect/Stream/Conversion/FlowToStream/BUILD.bazel b/compiler/src/iree/compiler/Dialect/Stream/Conversion/FlowToStream/BUILD.bazel
index 4f15ece..8d471cf 100644
--- a/compiler/src/iree/compiler/Dialect/Stream/Conversion/FlowToStream/BUILD.bazel
+++ b/compiler/src/iree/compiler/Dialect/Stream/Conversion/FlowToStream/BUILD.bazel
@@ -29,6 +29,7 @@
"@llvm-project//mlir:FunctionInterfaces",
"@llvm-project//mlir:IR",
"@llvm-project//mlir:TensorDialect",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Stream/Conversion/FlowToStream/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Stream/Conversion/FlowToStream/CMakeLists.txt
index 0f14aa1..53fab5f 100644
--- a/compiler/src/iree/compiler/Dialect/Stream/Conversion/FlowToStream/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Stream/Conversion/FlowToStream/CMakeLists.txt
@@ -23,6 +23,7 @@
MLIRFunctionInterfaces
MLIRIR
MLIRTensorDialect
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::Flow::IR
iree::compiler::Dialect::Stream::Conversion
diff --git a/compiler/src/iree/compiler/Dialect/Stream/Conversion/HALToStream/BUILD.bazel b/compiler/src/iree/compiler/Dialect/Stream/Conversion/HALToStream/BUILD.bazel
index e7dec42..6437fef 100644
--- a/compiler/src/iree/compiler/Dialect/Stream/Conversion/HALToStream/BUILD.bazel
+++ b/compiler/src/iree/compiler/Dialect/Stream/Conversion/HALToStream/BUILD.bazel
@@ -28,6 +28,7 @@
"@llvm-project//mlir:FuncDialect",
"@llvm-project//mlir:FunctionInterfaces",
"@llvm-project//mlir:IR",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Stream/Conversion/HALToStream/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Stream/Conversion/HALToStream/CMakeLists.txt
index 1a9f32a..fedd69d 100644
--- a/compiler/src/iree/compiler/Dialect/Stream/Conversion/HALToStream/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Stream/Conversion/HALToStream/CMakeLists.txt
@@ -22,6 +22,7 @@
MLIRFuncDialect
MLIRFunctionInterfaces
MLIRIR
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::HAL::IR
iree::compiler::Dialect::Stream::Conversion
diff --git a/compiler/src/iree/compiler/Dialect/Stream/Conversion/StandardToStream/BUILD.bazel b/compiler/src/iree/compiler/Dialect/Stream/Conversion/StandardToStream/BUILD.bazel
index e5ab347..646d55e 100644
--- a/compiler/src/iree/compiler/Dialect/Stream/Conversion/StandardToStream/BUILD.bazel
+++ b/compiler/src/iree/compiler/Dialect/Stream/Conversion/StandardToStream/BUILD.bazel
@@ -35,6 +35,7 @@
"@llvm-project//mlir:SCFDialect",
"@llvm-project//mlir:ShapeDialect",
"@llvm-project//mlir:TensorDialect",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Stream/Conversion/StandardToStream/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Stream/Conversion/StandardToStream/CMakeLists.txt
index d1462bc..b910c60 100644
--- a/compiler/src/iree/compiler/Dialect/Stream/Conversion/StandardToStream/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Stream/Conversion/StandardToStream/CMakeLists.txt
@@ -30,6 +30,7 @@
MLIRSCFDialect
MLIRShapeDialect
MLIRTensorDialect
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::Stream::Conversion
iree::compiler::Dialect::Stream::IR
diff --git a/compiler/src/iree/compiler/Dialect/Stream/Conversion/UtilToStream/BUILD.bazel b/compiler/src/iree/compiler/Dialect/Stream/Conversion/UtilToStream/BUILD.bazel
index 4a01cc1..a8e3750 100644
--- a/compiler/src/iree/compiler/Dialect/Stream/Conversion/UtilToStream/BUILD.bazel
+++ b/compiler/src/iree/compiler/Dialect/Stream/Conversion/UtilToStream/BUILD.bazel
@@ -27,6 +27,7 @@
"//compiler/src/iree/compiler/Dialect/Util/IR",
"@llvm-project//mlir:FunctionInterfaces",
"@llvm-project//mlir:IR",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Stream/Conversion/UtilToStream/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Stream/Conversion/UtilToStream/CMakeLists.txt
index e3957bb..2dd6fdd 100644
--- a/compiler/src/iree/compiler/Dialect/Stream/Conversion/UtilToStream/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Stream/Conversion/UtilToStream/CMakeLists.txt
@@ -20,6 +20,7 @@
DEPS
MLIRFunctionInterfaces
MLIRIR
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::Stream::Conversion
iree::compiler::Dialect::Stream::IR
diff --git a/compiler/src/iree/compiler/Dialect/Util/Conversion/BUILD.bazel b/compiler/src/iree/compiler/Dialect/Util/Conversion/BUILD.bazel
index 16054b1..56f212b 100644
--- a/compiler/src/iree/compiler/Dialect/Util/Conversion/BUILD.bazel
+++ b/compiler/src/iree/compiler/Dialect/Util/Conversion/BUILD.bazel
@@ -31,6 +31,7 @@
"@llvm-project//mlir:Pass",
"@llvm-project//mlir:SCFDialect",
"@llvm-project//mlir:Support",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Util/Conversion/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Util/Conversion/CMakeLists.txt
index d30daba..42cda39 100644
--- a/compiler/src/iree/compiler/Dialect/Util/Conversion/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Util/Conversion/CMakeLists.txt
@@ -27,6 +27,7 @@
MLIRPass
MLIRSCFDialect
MLIRSupport
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::Util::IR
PUBLIC
diff --git a/compiler/src/iree/compiler/Dialect/Util/IR/BUILD.bazel b/compiler/src/iree/compiler/Dialect/Util/IR/BUILD.bazel
index d7478dd..da0d9ae 100644
--- a/compiler/src/iree/compiler/Dialect/Util/IR/BUILD.bazel
+++ b/compiler/src/iree/compiler/Dialect/Util/IR/BUILD.bazel
@@ -87,11 +87,13 @@
"@llvm-project//mlir:FunctionInterfaces",
"@llvm-project//mlir:IR",
"@llvm-project//mlir:InferTypeOpInterface",
+ "@llvm-project//mlir:InliningUtils",
"@llvm-project//mlir:MemRefDialect",
"@llvm-project//mlir:Parser",
"@llvm-project//mlir:SideEffectInterfaces",
"@llvm-project//mlir:Support",
"@llvm-project//mlir:TensorDialect",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
"@llvm-project//mlir:ViewLikeInterface",
],
diff --git a/compiler/src/iree/compiler/Dialect/Util/IR/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Util/IR/CMakeLists.txt
index e0d1ad7..0365e6d 100644
--- a/compiler/src/iree/compiler/Dialect/Util/IR/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Util/IR/CMakeLists.txt
@@ -61,6 +61,7 @@
MLIRSideEffectInterfaces
MLIRSupport
MLIRTensorDialect
+ MLIRTransformUtils
MLIRTransforms
MLIRViewLikeInterface
PUBLIC
diff --git a/compiler/src/iree/compiler/Dialect/Util/Transforms/BUILD.bazel b/compiler/src/iree/compiler/Dialect/Util/Transforms/BUILD.bazel
index c4b92f5..ed200bd 100644
--- a/compiler/src/iree/compiler/Dialect/Util/Transforms/BUILD.bazel
+++ b/compiler/src/iree/compiler/Dialect/Util/Transforms/BUILD.bazel
@@ -68,6 +68,7 @@
"@llvm-project//mlir:Pass",
"@llvm-project//mlir:SCFDialect",
"@llvm-project//mlir:Support",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
"@llvm-project//mlir:VectorDialect",
],
diff --git a/compiler/src/iree/compiler/Dialect/Util/Transforms/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Util/Transforms/CMakeLists.txt
index 3f77e4d..08dd96e 100644
--- a/compiler/src/iree/compiler/Dialect/Util/Transforms/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Util/Transforms/CMakeLists.txt
@@ -56,6 +56,7 @@
MLIRPass
MLIRSCFDialect
MLIRSupport
+ MLIRTransformUtils
MLIRTransforms
MLIRVectorDialect
iree::compiler::Dialect::Util::Analysis
diff --git a/compiler/src/iree/compiler/Dialect/Util/Transforms/FixedPointIterator.cpp b/compiler/src/iree/compiler/Dialect/Util/Transforms/FixedPointIterator.cpp
index 81b0dc6..ece11e9 100644
--- a/compiler/src/iree/compiler/Dialect/Util/Transforms/FixedPointIterator.cpp
+++ b/compiler/src/iree/compiler/Dialect/Util/Transforms/FixedPointIterator.cpp
@@ -31,7 +31,9 @@
FixedPointIteratorPass(OpPassManager pipeline);
private:
- LogicalResult initializeOptions(StringRef options) override;
+ LogicalResult initializeOptions(
+ StringRef options,
+ function_ref<LogicalResult(const Twine &)> errorHandler) override;
void getDependentDialects(DialectRegistry ®istry) const override;
void runOnOperation() override;
@@ -52,8 +54,10 @@
ss.flush();
}
-LogicalResult FixedPointIteratorPass::initializeOptions(StringRef options) {
- if (failed(Pass::initializeOptions(options)))
+LogicalResult FixedPointIteratorPass::initializeOptions(
+ StringRef options,
+ function_ref<LogicalResult(const Twine &)> errorHandler) {
+ if (failed(Pass::initializeOptions(options, errorHandler)))
return failure();
if (pipeline)
return success();
diff --git a/compiler/src/iree/compiler/Dialect/VM/Conversion/BUILD.bazel b/compiler/src/iree/compiler/Dialect/VM/Conversion/BUILD.bazel
index 313e99d..c99c0a1 100644
--- a/compiler/src/iree/compiler/Dialect/VM/Conversion/BUILD.bazel
+++ b/compiler/src/iree/compiler/Dialect/VM/Conversion/BUILD.bazel
@@ -37,6 +37,7 @@
"@llvm-project//mlir:FunctionInterfaces",
"@llvm-project//mlir:IR",
"@llvm-project//mlir:Parser",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/VM/Conversion/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/VM/Conversion/CMakeLists.txt
index eab429b..58cb03f 100644
--- a/compiler/src/iree/compiler/Dialect/VM/Conversion/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/VM/Conversion/CMakeLists.txt
@@ -31,6 +31,7 @@
MLIRFunctionInterfaces
MLIRIR
MLIRParser
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::Util::IR
iree::compiler::Dialect::VM::IR
diff --git a/compiler/src/iree/compiler/Dialect/VM/Conversion/VMToEmitC/BUILD.bazel b/compiler/src/iree/compiler/Dialect/VM/Conversion/VMToEmitC/BUILD.bazel
index b9e00ca..50b1cde 100644
--- a/compiler/src/iree/compiler/Dialect/VM/Conversion/VMToEmitC/BUILD.bazel
+++ b/compiler/src/iree/compiler/Dialect/VM/Conversion/VMToEmitC/BUILD.bazel
@@ -51,6 +51,7 @@
"@llvm-project//mlir:IR",
"@llvm-project//mlir:MathDialect",
"@llvm-project//mlir:Pass",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/VM/Conversion/VMToEmitC/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/VM/Conversion/VMToEmitC/CMakeLists.txt
index 528f977..bdac150 100644
--- a/compiler/src/iree/compiler/Dialect/VM/Conversion/VMToEmitC/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/VM/Conversion/VMToEmitC/CMakeLists.txt
@@ -38,6 +38,7 @@
MLIRIR
MLIRMathDialect
MLIRPass
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::Util::Conversion
iree::compiler::Dialect::Util::IR
diff --git a/compiler/src/iree/compiler/Dialect/VM/Target/Bytecode/BUILD.bazel b/compiler/src/iree/compiler/Dialect/VM/Target/Bytecode/BUILD.bazel
index 627589a..f407b35 100644
--- a/compiler/src/iree/compiler/Dialect/VM/Target/Bytecode/BUILD.bazel
+++ b/compiler/src/iree/compiler/Dialect/VM/Target/Bytecode/BUILD.bazel
@@ -42,6 +42,7 @@
"@llvm-project//mlir:IR",
"@llvm-project//mlir:Pass",
"@llvm-project//mlir:Support",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
"@llvm-project//mlir:TranslateLib",
],
diff --git a/compiler/src/iree/compiler/Dialect/VM/Target/Bytecode/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/VM/Target/Bytecode/CMakeLists.txt
index e0a587b..c09f1bb 100644
--- a/compiler/src/iree/compiler/Dialect/VM/Target/Bytecode/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/VM/Target/Bytecode/CMakeLists.txt
@@ -29,6 +29,7 @@
MLIRIR
MLIRPass
MLIRSupport
+ MLIRTransformUtils
MLIRTransforms
MLIRTranslateLib
iree::compiler::Dialect::Util::IR
diff --git a/compiler/src/iree/compiler/Dialect/VM/Transforms/BUILD.bazel b/compiler/src/iree/compiler/Dialect/VM/Transforms/BUILD.bazel
index dd3ac6a..b095992 100644
--- a/compiler/src/iree/compiler/Dialect/VM/Transforms/BUILD.bazel
+++ b/compiler/src/iree/compiler/Dialect/VM/Transforms/BUILD.bazel
@@ -50,6 +50,7 @@
"@llvm-project//mlir:FuncDialect",
"@llvm-project//mlir:FunctionInterfaces",
"@llvm-project//mlir:IR",
+ "@llvm-project//mlir:InliningUtils",
"@llvm-project//mlir:MathDialect",
"@llvm-project//mlir:MemRefDialect",
"@llvm-project//mlir:Pass",
diff --git a/compiler/src/iree/compiler/Dialect/VMVX/Conversion/HALToVMVX/BUILD.bazel b/compiler/src/iree/compiler/Dialect/VMVX/Conversion/HALToVMVX/BUILD.bazel
index f5851e9..61f5aa0 100644
--- a/compiler/src/iree/compiler/Dialect/VMVX/Conversion/HALToVMVX/BUILD.bazel
+++ b/compiler/src/iree/compiler/Dialect/VMVX/Conversion/HALToVMVX/BUILD.bazel
@@ -32,6 +32,7 @@
"@llvm-project//mlir:IR",
"@llvm-project//mlir:MemRefDialect",
"@llvm-project//mlir:Pass",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/VMVX/Conversion/HALToVMVX/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/VMVX/Conversion/HALToVMVX/CMakeLists.txt
index f0313f6..75a9c8c 100644
--- a/compiler/src/iree/compiler/Dialect/VMVX/Conversion/HALToVMVX/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/VMVX/Conversion/HALToVMVX/CMakeLists.txt
@@ -24,6 +24,7 @@
MLIRIR
MLIRMemRefDialect
MLIRPass
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::HAL::IR
iree::compiler::Dialect::Util::IR
diff --git a/compiler/src/iree/compiler/Dialect/VMVX/Conversion/StandardToVMVX/BUILD.bazel b/compiler/src/iree/compiler/Dialect/VMVX/Conversion/StandardToVMVX/BUILD.bazel
index 4c17040..878fc3d 100644
--- a/compiler/src/iree/compiler/Dialect/VMVX/Conversion/StandardToVMVX/BUILD.bazel
+++ b/compiler/src/iree/compiler/Dialect/VMVX/Conversion/StandardToVMVX/BUILD.bazel
@@ -33,6 +33,7 @@
"@llvm-project//mlir:MemRefDialect",
"@llvm-project//mlir:Pass",
"@llvm-project//mlir:Support",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/VMVX/Conversion/StandardToVMVX/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/VMVX/Conversion/StandardToVMVX/CMakeLists.txt
index cd19f9e..2270bf2 100644
--- a/compiler/src/iree/compiler/Dialect/VMVX/Conversion/StandardToVMVX/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/VMVX/Conversion/StandardToVMVX/CMakeLists.txt
@@ -27,6 +27,7 @@
MLIRMemRefDialect
MLIRPass
MLIRSupport
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::Util::IR
iree::compiler::Dialect::VMVX::IR
diff --git a/compiler/src/iree/compiler/Dialect/VMVX/Conversion/VMVXToVM/BUILD.bazel b/compiler/src/iree/compiler/Dialect/VMVX/Conversion/VMVXToVM/BUILD.bazel
index 159c98b..267f7d4 100644
--- a/compiler/src/iree/compiler/Dialect/VMVX/Conversion/VMVXToVM/BUILD.bazel
+++ b/compiler/src/iree/compiler/Dialect/VMVX/Conversion/VMVXToVM/BUILD.bazel
@@ -31,6 +31,7 @@
"@llvm-project//mlir:FunctionInterfaces",
"@llvm-project//mlir:IR",
"@llvm-project//mlir:Pass",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/VMVX/Conversion/VMVXToVM/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/VMVX/Conversion/VMVXToVM/CMakeLists.txt
index a7e7da0..78cd5dd 100644
--- a/compiler/src/iree/compiler/Dialect/VMVX/Conversion/VMVXToVM/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/VMVX/Conversion/VMVXToVM/CMakeLists.txt
@@ -23,6 +23,7 @@
MLIRFunctionInterfaces
MLIRIR
MLIRPass
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::Util::IR
iree::compiler::Dialect::VM::Conversion
diff --git a/compiler/src/iree/compiler/Dialect/VMVX/Transforms/BUILD.bazel b/compiler/src/iree/compiler/Dialect/VMVX/Transforms/BUILD.bazel
index d984bba..5093195 100644
--- a/compiler/src/iree/compiler/Dialect/VMVX/Transforms/BUILD.bazel
+++ b/compiler/src/iree/compiler/Dialect/VMVX/Transforms/BUILD.bazel
@@ -35,6 +35,7 @@
deps = [
":PassesIncGen",
"@llvm-project//mlir:Pass",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
@@ -93,6 +94,7 @@
"@llvm-project//mlir:Support",
"@llvm-project//mlir:TensorDialect",
"@llvm-project//mlir:TosaToArith",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
"@llvm-project//mlir:VectorDialect",
"@llvm-project//mlir:VectorToSCF",
diff --git a/compiler/src/iree/compiler/Dialect/VMVX/Transforms/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/VMVX/Transforms/CMakeLists.txt
index b95a902..7036907 100644
--- a/compiler/src/iree/compiler/Dialect/VMVX/Transforms/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/VMVX/Transforms/CMakeLists.txt
@@ -29,6 +29,7 @@
DEPS
::PassesIncGen
MLIRPass
+ MLIRTransformUtils
MLIRTransforms
PUBLIC
)
@@ -69,6 +70,7 @@
MLIRSupport
MLIRTensorDialect
MLIRTosaToArith
+ MLIRTransformUtils
MLIRTransforms
MLIRVectorDialect
MLIRVectorToSCF
diff --git a/compiler/src/iree/compiler/GlobalOptimization/BUILD.bazel b/compiler/src/iree/compiler/GlobalOptimization/BUILD.bazel
index bafbac9..23929f9 100644
--- a/compiler/src/iree/compiler/GlobalOptimization/BUILD.bazel
+++ b/compiler/src/iree/compiler/GlobalOptimization/BUILD.bazel
@@ -37,6 +37,7 @@
deps = [
":PassesIncGen",
"@llvm-project//mlir:Pass",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
@@ -115,6 +116,7 @@
"@llvm-project//mlir:TensorDialect",
"@llvm-project//mlir:TensorTransforms",
"@llvm-project//mlir:TensorUtils",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/GlobalOptimization/CMakeLists.txt b/compiler/src/iree/compiler/GlobalOptimization/CMakeLists.txt
index 66eda40..be8e5bf 100644
--- a/compiler/src/iree/compiler/GlobalOptimization/CMakeLists.txt
+++ b/compiler/src/iree/compiler/GlobalOptimization/CMakeLists.txt
@@ -29,6 +29,7 @@
DEPS
::PassesIncGen
MLIRPass
+ MLIRTransformUtils
MLIRTransforms
PUBLIC
)
@@ -86,6 +87,7 @@
MLIRTensorDialect
MLIRTensorTransforms
MLIRTensorUtils
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Codegen::Common
iree::compiler::Codegen::Common::CPU::CommonCPUPasses
diff --git a/compiler/src/iree/compiler/InputConversion/Common/BUILD.bazel b/compiler/src/iree/compiler/InputConversion/Common/BUILD.bazel
index c214d54..7637c39 100644
--- a/compiler/src/iree/compiler/InputConversion/Common/BUILD.bazel
+++ b/compiler/src/iree/compiler/InputConversion/Common/BUILD.bazel
@@ -37,6 +37,7 @@
deps = [
":PassesIncGen",
"@llvm-project//mlir:Pass",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
@@ -80,6 +81,7 @@
"@llvm-project//mlir:SCFToControlFlow",
"@llvm-project//mlir:TensorDialect",
"@llvm-project//mlir:TensorUtils",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
@@ -103,6 +105,7 @@
"@llvm-project//mlir:FunctionInterfaces",
"@llvm-project//mlir:IR",
"@llvm-project//mlir:Pass",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/InputConversion/Common/CMakeLists.txt b/compiler/src/iree/compiler/InputConversion/Common/CMakeLists.txt
index 1f1dc4f..ab14826 100644
--- a/compiler/src/iree/compiler/InputConversion/Common/CMakeLists.txt
+++ b/compiler/src/iree/compiler/InputConversion/Common/CMakeLists.txt
@@ -29,6 +29,7 @@
DEPS
::PassesIncGen
MLIRPass
+ MLIRTransformUtils
MLIRTransforms
PUBLIC
)
@@ -66,6 +67,7 @@
MLIRSCFToControlFlow
MLIRTensorDialect
MLIRTensorUtils
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::Flow::Conversion::MeshToFlow
iree::compiler::Dialect::Flow::IR
@@ -91,6 +93,7 @@
MLIRFunctionInterfaces
MLIRIR
MLIRPass
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::PluginAPI
iree::compiler::Utils
diff --git a/compiler/src/iree/compiler/Modules/Check/Conversion/BUILD.bazel b/compiler/src/iree/compiler/Modules/Check/Conversion/BUILD.bazel
index 4dcde8c..42d582b 100644
--- a/compiler/src/iree/compiler/Modules/Check/Conversion/BUILD.bazel
+++ b/compiler/src/iree/compiler/Modules/Check/Conversion/BUILD.bazel
@@ -26,6 +26,7 @@
"//compiler/src/iree/compiler/Dialect/VM/Conversion",
"//compiler/src/iree/compiler/Modules/Check/IR",
"@llvm-project//mlir:Pass",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Modules/Check/Conversion/CMakeLists.txt b/compiler/src/iree/compiler/Modules/Check/Conversion/CMakeLists.txt
index c55d771..161a143 100644
--- a/compiler/src/iree/compiler/Modules/Check/Conversion/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/Check/Conversion/CMakeLists.txt
@@ -19,6 +19,7 @@
"ConversionPatterns.cpp"
DEPS
MLIRPass
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::HAL::Conversion
iree::compiler::Dialect::HAL::IR
diff --git a/compiler/src/iree/compiler/Modules/Check/IR/BUILD.bazel b/compiler/src/iree/compiler/Modules/Check/IR/BUILD.bazel
index a77ab61..38fa694 100644
--- a/compiler/src/iree/compiler/Modules/Check/IR/BUILD.bazel
+++ b/compiler/src/iree/compiler/Modules/Check/IR/BUILD.bazel
@@ -64,6 +64,7 @@
"//compiler/src/iree/compiler/Modules/Check/Conversion",
"@llvm-project//mlir:IR",
"@llvm-project//mlir:Parser",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Modules/Check/IR/CMakeLists.txt b/compiler/src/iree/compiler/Modules/Check/IR/CMakeLists.txt
index e192509..34b6c2b 100644
--- a/compiler/src/iree/compiler/Modules/Check/IR/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/Check/IR/CMakeLists.txt
@@ -41,6 +41,7 @@
::check_ops_gen
MLIRIR
MLIRParser
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::HAL::Conversion
iree::compiler::Dialect::HAL::IR::HALDialect
diff --git a/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/BUILD.bazel b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/BUILD.bazel
index 0c0fc1d..8e98f3b 100644
--- a/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/BUILD.bazel
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/BUILD.bazel
@@ -31,6 +31,7 @@
"@llvm-project//mlir:FunctionInterfaces",
"@llvm-project//mlir:IR",
"@llvm-project//mlir:Pass",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/CMakeLists.txt
index 10a7f22..9bb95db 100644
--- a/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/CMakeLists.txt
@@ -23,6 +23,7 @@
MLIRFunctionInterfaces
MLIRIR
MLIRPass
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::Util::IR
iree::compiler::Dialect::VM::Conversion
diff --git a/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/BUILD.bazel b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/BUILD.bazel
index 8754c7c..e9dac83 100644
--- a/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/BUILD.bazel
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/BUILD.bazel
@@ -34,6 +34,7 @@
"@llvm-project//mlir:FunctionInterfaces",
"@llvm-project//mlir:IR",
"@llvm-project//mlir:Pass",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/CMakeLists.txt
index a051a71..ebeb3ea 100644
--- a/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/CMakeLists.txt
@@ -24,6 +24,7 @@
MLIRFunctionInterfaces
MLIRIR
MLIRPass
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::HAL::Conversion
iree::compiler::Dialect::HAL::IR
diff --git a/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/BUILD.bazel b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/BUILD.bazel
index eae08d3..ea60d06 100644
--- a/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/BUILD.bazel
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/BUILD.bazel
@@ -35,6 +35,7 @@
"@llvm-project//mlir:FunctionInterfaces",
"@llvm-project//mlir:IR",
"@llvm-project//mlir:Pass",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/CMakeLists.txt
index 7e3e880..bf9007f 100644
--- a/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/CMakeLists.txt
@@ -24,6 +24,7 @@
MLIRFunctionInterfaces
MLIRIR
MLIRPass
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::HAL::Conversion
iree::compiler::Dialect::HAL::IR
diff --git a/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/BUILD.bazel b/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/BUILD.bazel
index 90c24f5..3d353b4 100644
--- a/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/BUILD.bazel
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/BUILD.bazel
@@ -52,6 +52,7 @@
"@llvm-project//mlir:SCFDialect",
"@llvm-project//mlir:SCFToControlFlow",
"@llvm-project//mlir:Support",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/CMakeLists.txt
index 60bdece..3e40311 100644
--- a/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/CMakeLists.txt
@@ -36,6 +36,7 @@
MLIRSCFDialect
MLIRSCFToControlFlow
MLIRSupport
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::HAL::Conversion
iree::compiler::Dialect::HAL::Conversion::StandardToHAL
diff --git a/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/BUILD.bazel b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/BUILD.bazel
index 64ad88e..7f74941 100644
--- a/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/BUILD.bazel
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/BUILD.bazel
@@ -32,6 +32,7 @@
"@llvm-project//mlir:FunctionInterfaces",
"@llvm-project//mlir:IR",
"@llvm-project//mlir:Pass",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/CMakeLists.txt
index 17224b0..272ab6e 100644
--- a/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/CMakeLists.txt
@@ -23,6 +23,7 @@
MLIRFunctionInterfaces
MLIRIR
MLIRPass
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::HAL::Conversion::HALToVM
iree::compiler::Dialect::Util::IR
diff --git a/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/BUILD.bazel b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/BUILD.bazel
index ac46648..69fdf1a 100644
--- a/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/BUILD.bazel
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/BUILD.bazel
@@ -36,6 +36,7 @@
"@llvm-project//mlir:FunctionInterfaces",
"@llvm-project//mlir:IR",
"@llvm-project//mlir:Pass",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/CMakeLists.txt
index 29afd91..1ab2e63 100644
--- a/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/CMakeLists.txt
@@ -24,6 +24,7 @@
MLIRFunctionInterfaces
MLIRIR
MLIRPass
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::HAL::Conversion
iree::compiler::Dialect::HAL::IR
diff --git a/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/BUILD.bazel b/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/BUILD.bazel
index fee61e4..cee460e 100644
--- a/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/BUILD.bazel
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/BUILD.bazel
@@ -57,6 +57,7 @@
"@llvm-project//mlir:SCFDialect",
"@llvm-project//mlir:SCFToControlFlow",
"@llvm-project//mlir:Support",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/CMakeLists.txt
index d8eb555..39fc73e 100644
--- a/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/CMakeLists.txt
@@ -38,6 +38,7 @@
MLIRSCFDialect
MLIRSCFToControlFlow
MLIRSupport
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::HAL::Conversion
iree::compiler::Dialect::HAL::Conversion::StandardToHAL
diff --git a/compiler/src/iree/compiler/Modules/IO/Parameters/Conversion/ParamsToVM/BUILD.bazel b/compiler/src/iree/compiler/Modules/IO/Parameters/Conversion/ParamsToVM/BUILD.bazel
index dbd20c2..625697b 100644
--- a/compiler/src/iree/compiler/Modules/IO/Parameters/Conversion/ParamsToVM/BUILD.bazel
+++ b/compiler/src/iree/compiler/Modules/IO/Parameters/Conversion/ParamsToVM/BUILD.bazel
@@ -32,6 +32,7 @@
"@llvm-project//mlir:FunctionInterfaces",
"@llvm-project//mlir:IR",
"@llvm-project//mlir:Pass",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Modules/IO/Parameters/Conversion/ParamsToVM/CMakeLists.txt b/compiler/src/iree/compiler/Modules/IO/Parameters/Conversion/ParamsToVM/CMakeLists.txt
index 3cf658e..dc8bcc7 100644
--- a/compiler/src/iree/compiler/Modules/IO/Parameters/Conversion/ParamsToVM/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/IO/Parameters/Conversion/ParamsToVM/CMakeLists.txt
@@ -23,6 +23,7 @@
MLIRFunctionInterfaces
MLIRIR
MLIRPass
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::HAL::Conversion::HALToVM
iree::compiler::Dialect::Util::IR
diff --git a/compiler/src/iree/compiler/Modules/IO/Parameters/Conversion/StreamToParams/BUILD.bazel b/compiler/src/iree/compiler/Modules/IO/Parameters/Conversion/StreamToParams/BUILD.bazel
index 3d47d5a..8920d10 100644
--- a/compiler/src/iree/compiler/Modules/IO/Parameters/Conversion/StreamToParams/BUILD.bazel
+++ b/compiler/src/iree/compiler/Modules/IO/Parameters/Conversion/StreamToParams/BUILD.bazel
@@ -34,6 +34,7 @@
"@llvm-project//mlir:FunctionInterfaces",
"@llvm-project//mlir:IR",
"@llvm-project//mlir:Pass",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Modules/IO/Parameters/Conversion/StreamToParams/CMakeLists.txt b/compiler/src/iree/compiler/Modules/IO/Parameters/Conversion/StreamToParams/CMakeLists.txt
index aab36b4..8047620 100644
--- a/compiler/src/iree/compiler/Modules/IO/Parameters/Conversion/StreamToParams/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/IO/Parameters/Conversion/StreamToParams/CMakeLists.txt
@@ -24,6 +24,7 @@
MLIRFunctionInterfaces
MLIRIR
MLIRPass
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::HAL::Conversion
iree::compiler::Dialect::HAL::Conversion::StreamToHAL::Utils
diff --git a/compiler/src/iree/compiler/Preprocessing/Common/BUILD.bazel b/compiler/src/iree/compiler/Preprocessing/Common/BUILD.bazel
index ebbc221..b5a9090 100644
--- a/compiler/src/iree/compiler/Preprocessing/Common/BUILD.bazel
+++ b/compiler/src/iree/compiler/Preprocessing/Common/BUILD.bazel
@@ -67,6 +67,7 @@
"@llvm-project//mlir:TensorUtils",
"@llvm-project//mlir:TransformDialect",
"@llvm-project//mlir:TransformDialectTransforms",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
diff --git a/compiler/src/iree/compiler/Preprocessing/Common/CMakeLists.txt b/compiler/src/iree/compiler/Preprocessing/Common/CMakeLists.txt
index 9ed7bf4..a86d659 100644
--- a/compiler/src/iree/compiler/Preprocessing/Common/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Preprocessing/Common/CMakeLists.txt
@@ -53,6 +53,7 @@
MLIRTensorUtils
MLIRTransformDialect
MLIRTransformDialectTransforms
+ MLIRTransformUtils
MLIRTransforms
iree::compiler::Dialect::Flow::IR
iree::compiler::Dialect::Flow::Transforms
diff --git a/compiler/src/iree/compiler/Preprocessing/Common/ConvertConvToChannelsLast.cpp b/compiler/src/iree/compiler/Preprocessing/Common/ConvertConvToChannelsLast.cpp
index 966c411..1be1cbd 100644
--- a/compiler/src/iree/compiler/Preprocessing/Common/ConvertConvToChannelsLast.cpp
+++ b/compiler/src/iree/compiler/Preprocessing/Common/ConvertConvToChannelsLast.cpp
@@ -652,8 +652,10 @@
registry.insert<linalg::LinalgDialect>();
registry.insert<tensor::TensorDialect>();
}
- LogicalResult initializeOptions(StringRef options) override {
- if (failed(Pass::initializeOptions(options))) {
+ LogicalResult initializeOptions(
+ StringRef options,
+ function_ref<LogicalResult(const Twine &)> errorHandler) override {
+ if (failed(Pass::initializeOptions(options, errorHandler))) {
return failure();
}
tilingFactor = tileSize;
diff --git a/compiler/src/iree/compiler/Preprocessing/TransformExtensions/PreprocessingExtensions.h b/compiler/src/iree/compiler/Preprocessing/TransformExtensions/PreprocessingExtensions.h
index 87033d0..877695d 100644
--- a/compiler/src/iree/compiler/Preprocessing/TransformExtensions/PreprocessingExtensions.h
+++ b/compiler/src/iree/compiler/Preprocessing/TransformExtensions/PreprocessingExtensions.h
@@ -8,9 +8,9 @@
#define IREE_COMPILER_CODEGEN_PREPROCESSING_TRANSFORMEXTENSIONS_PREPROCESSINGEXTENSIONS_H_
#include "mlir/Bytecode/BytecodeOpInterface.h"
-#include "mlir/Dialect/Transform/IR/MatchInterfaces.h"
#include "mlir/Dialect/Transform/IR/TransformDialect.h"
#include "mlir/Dialect/Transform/IR/TransformOps.h"
+#include "mlir/Dialect/Transform/Interfaces/MatchInterfaces.h"
#include "mlir/Dialect/Transform/Interfaces/TransformInterfaces.h"
namespace mlir {
diff --git a/compiler/src/iree/compiler/Preprocessing/TransformExtensions/PreprocessingExtensionsOps.td b/compiler/src/iree/compiler/Preprocessing/TransformExtensions/PreprocessingExtensionsOps.td
index 4993a47..d6d0fde 100644
--- a/compiler/src/iree/compiler/Preprocessing/TransformExtensions/PreprocessingExtensionsOps.td
+++ b/compiler/src/iree/compiler/Preprocessing/TransformExtensions/PreprocessingExtensionsOps.td
@@ -7,7 +7,7 @@
#ifndef IREE_COMPILER_DIALECT_PREPROCESSING_TRANSFORMEXTENSIONS_PREPROCESSINGEXTENSIONS
#define IREE_COMPILER_DIALECT_PREPROCESSING_TRANSFORMEXTENSIONS_PREPROCESSINGEXTENSIONS
-include "mlir/Dialect/Transform/IR/MatchInterfaces.td"
+include "mlir/Dialect/Transform/Interfaces/MatchInterfaces.td"
include "mlir/Dialect/Transform/IR/TransformDialect.td"
include "mlir/Dialect/Transform/IR/TransformAttrs.td"
include "mlir/Dialect/Transform/IR/TransformTypes.td"
diff --git a/compiler/src/iree/compiler/Reducer/Framework/BUILD.bazel b/compiler/src/iree/compiler/Reducer/Framework/BUILD.bazel
index 3f38c32..235f1a6 100644
--- a/compiler/src/iree/compiler/Reducer/Framework/BUILD.bazel
+++ b/compiler/src/iree/compiler/Reducer/Framework/BUILD.bazel
@@ -29,6 +29,7 @@
deps = [
"//compiler/bindings/c:headers",
"@llvm-project//llvm:Support",
+ "@llvm-project//mlir:BytecodeWriter",
"@llvm-project//mlir:IR",
"@llvm-project//mlir:Pass",
"@llvm-project//mlir:Support",
diff --git a/compiler/src/iree/compiler/Reducer/Framework/CMakeLists.txt b/compiler/src/iree/compiler/Reducer/Framework/CMakeLists.txt
index 61e9550..497921d 100644
--- a/compiler/src/iree/compiler/Reducer/Framework/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Reducer/Framework/CMakeLists.txt
@@ -25,6 +25,7 @@
"WorkItem.cpp"
DEPS
LLVMSupport
+ MLIRBytecodeWriter
MLIRIR
MLIRPass
MLIRSupport
diff --git a/llvm-external-projects/iree-dialects/BUILD.bazel b/llvm-external-projects/iree-dialects/BUILD.bazel
index d3d67c9..4c7b064 100644
--- a/llvm-external-projects/iree-dialects/BUILD.bazel
+++ b/llvm-external-projects/iree-dialects/BUILD.bazel
@@ -190,6 +190,7 @@
"@llvm-project//mlir:TensorDialect",
"@llvm-project//mlir:TransformDialect",
"@llvm-project//mlir:TransformDialectInterfaces",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
@@ -268,6 +269,7 @@
"@llvm-project//mlir:SCFTransforms",
"@llvm-project//mlir:TensorTransformOps",
"@llvm-project//mlir:Transforms",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:VectorToSCF",
# Utils
@@ -485,6 +487,7 @@
"@llvm-project//mlir:IR",
"@llvm-project//mlir:Pass",
"@llvm-project//mlir:Rewrite",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
],
)
@@ -531,6 +534,7 @@
"@llvm-project//mlir:TensorTransformOps",
"@llvm-project//mlir:TransformDialect",
"@llvm-project//mlir:TransformPDLExtension",
+ "@llvm-project//mlir:TransformUtils",
"@llvm-project//mlir:Transforms",
"@llvm-project//mlir:VectorTransformOps",
],
diff --git a/samples/custom_dispatch/cpu/mlp_plugin/mlp_tosa.mlir b/samples/custom_dispatch/cpu/mlp_plugin/mlp_tosa.mlir
index 58990ca..595d08d 100644
--- a/samples/custom_dispatch/cpu/mlp_plugin/mlp_tosa.mlir
+++ b/samples/custom_dispatch/cpu/mlp_plugin/mlp_tosa.mlir
@@ -44,15 +44,15 @@
module @example attributes {hal.device.targets = [#cpu_target]} {
func.func @mlp_invocation(%lhs: tensor<2x4xf32>, %rhs : tensor<4x8xf32>) -> tensor<2x8xf32> {
- %lhs_3D = tosa.reshape %lhs {new_shape = array<i64 : 1, 2, 2>} : (tensor<2x4xf32>) -> tensor<1x2x4xf32>
- %rhs_3D = tosa.reshape %rhs {new_shape = array<i64 : 1, 2, 2>} : (tensor<4x8xf32>) -> tensor<1x4x8xf32>
+ %lhs_3D = tosa.reshape %lhs {new_shape = array<i64 : 1, 2, 4>} : (tensor<2x4xf32>) -> tensor<1x2x4xf32>
+ %rhs_3D = tosa.reshape %rhs {new_shape = array<i64 : 1, 4, 8>} : (tensor<4x8xf32>) -> tensor<1x4x8xf32>
%0 = tosa.matmul %lhs_3D, %rhs_3D : (tensor<1x2x4xf32>, tensor<1x4x8xf32>) -> tensor<1x2x8xf32>
%1 = tosa.clamp %0 {
min_int = 0 : i64, max_int = 9223372036854775807 : i64,
min_fp = 0.0 : f32, max_fp = 3.4028235e+38 : f32}
: (tensor<1x2x8xf32>) -> tensor<1x2x8xf32>
%2 = tosa.negate %1 : (tensor<1x2x8xf32>) -> tensor<1x2x8xf32>
- %3 = tosa.reshape %2 {new_shape = array<i64 : 2, 2>} : (tensor<1x2x8xf32>) -> tensor<2x8xf32>
+ %3 = tosa.reshape %2 {new_shape = array<i64 : 2, 8>} : (tensor<1x2x8xf32>) -> tensor<2x8xf32>
return %3 : tensor<2x8xf32>
}
}
diff --git a/third_party/llvm-project b/third_party/llvm-project
index 35329ad..a6d932b 160000
--- a/third_party/llvm-project
+++ b/third_party/llvm-project
@@ -1 +1 @@
-Subproject commit 35329adfd666d3002257d688d90cf8a6613c1177
+Subproject commit a6d932bca8875198fbf34564cda8a8d1640cdcbc
