[Mlir-commits] [mlir] c8f2139 - [mlir][linalg] Add decompose to CodegenStrategy.
llvmlistbot at llvm.org
llvmlistbot at llvm.org
Tue Nov 30 07:54:51 PST 2021
Author: gysit
Date: 2021-11-30T15:48:29Z
New Revision: c8f2139eb0de70eec16901d2a7ddfdec62659685
URL: https://github.com/llvm/llvm-project/commit/c8f2139eb0de70eec16901d2a7ddfdec62659685
DIFF: https://github.com/llvm/llvm-project/commit/c8f2139eb0de70eec16901d2a7ddfdec62659685.diff
LOG: [mlir][linalg] Add decompose to CodegenStrategy.
Add the decompose patterns that lower higher dimensional convolutions to lower dimensional ones to CodegenStrategy and use CodegenStrategy to test the decompose patterns. Additionally, remove the assertion that checks the anchor op name is set in the CodegenStrategyTest pass. Removing the assertion allows us to simplify the pipelines used in the interchange and decompose tests.
Depends On D114797
Reviewed By: nicolasvasilache
Differential Revision: https://reviews.llvm.org/D114798
Added:
Modified:
mlir/include/mlir/Dialect/Linalg/Transforms/CodegenStrategy.h
mlir/test/Dialect/Linalg/decompose-convolution.mlir
mlir/test/Dialect/Linalg/interchange.mlir
mlir/test/lib/Dialect/Linalg/TestLinalgCodegenStrategy.cpp
mlir/test/lib/Dialect/Linalg/TestLinalgTransforms.cpp
Removed:
################################################################################
diff --git a/mlir/include/mlir/Dialect/Linalg/Transforms/CodegenStrategy.h b/mlir/include/mlir/Dialect/Linalg/Transforms/CodegenStrategy.h
index 7c812f4e54037..9a32279f84216 100644
--- a/mlir/include/mlir/Dialect/Linalg/Transforms/CodegenStrategy.h
+++ b/mlir/include/mlir/Dialect/Linalg/Transforms/CodegenStrategy.h
@@ -125,6 +125,17 @@ struct Interchange : public Transformation {
SmallVector<int64_t> iteratorInterchange;
};
+/// Represent one application of createLinalgStrategyDecomposePass.
+struct Decompose : public Transformation {
+ explicit Decompose(LinalgTransformationFilter::FilterFunction f = nullptr)
+ : Transformation(f) {}
+
+ void addToPassPipeline(OpPassManager &pm,
+ LinalgTransformationFilter m) const override {
+ pm.addPass(createLinalgStrategyDecomposePass(m));
+ }
+};
+
/// Represent one application of createLinalgStrategyVectorizePass.
struct Vectorize : public Transformation {
explicit Vectorize(linalg::LinalgVectorizationOptions options,
@@ -263,6 +274,18 @@ struct CodegenStrategy {
return b ? interchange(iteratorInterchange, f) : *this;
return *this;
}
+ /// Append patterns to decompose convolutions.
+ CodegenStrategy &
+ decompose(LinalgTransformationFilter::FilterFunction f = nullptr) {
+ transformationSequence.emplace_back(std::make_unique<Decompose>(f));
+ return *this;
+ }
+ /// Conditionally append patterns to decompose convolutions.
+ CodegenStrategy &
+ decomposeIf(bool b, LinalgTransformationFilter::FilterFunction f = nullptr) {
+ return b ? decompose(f) : *this;
+ return *this;
+ }
/// Append a pattern to rewrite `LinalgOpType` as a vector operation.
CodegenStrategy &
vectorize(StringRef opName,
diff --git a/mlir/test/Dialect/Linalg/decompose-convolution.mlir b/mlir/test/Dialect/Linalg/decompose-convolution.mlir
index 2eb79ec8935f8..f8007df84f479 100644
--- a/mlir/test/Dialect/Linalg/decompose-convolution.mlir
+++ b/mlir/test/Dialect/Linalg/decompose-convolution.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-opt -split-input-file -test-linalg-transform-patterns=test-decompose-convolution-patterns %s | FileCheck %s
+// RUN: mlir-opt -test-linalg-codegen-strategy="decompose" -split-input-file %s | FileCheck %s
// CHECK-LABEL: func @conv2d_nhwc_4x1x2x8_tensor
// CHECK-SAME: (%[[INPUT:.+]]: tensor<4x1x6x3xf32>, %[[FILTER:.+]]: tensor<1x2x3x8xf32>, %[[INIT:.+]]: tensor<4x1x2x8xf32>)
diff --git a/mlir/test/Dialect/Linalg/interchange.mlir b/mlir/test/Dialect/Linalg/interchange.mlir
index 12fb7865821a9..b767867df0c5f 100644
--- a/mlir/test/Dialect/Linalg/interchange.mlir
+++ b/mlir/test/Dialect/Linalg/interchange.mlir
@@ -1,5 +1,5 @@
-// RUN: mlir-opt %s -test-linalg-codegen-strategy="anchor-op=linalg.generic iterator-interchange=4,0,3,1,2" | FileCheck %s
-// RUN: mlir-opt %s -test-linalg-codegen-strategy="anchor-op=linalg.generic iterator-interchange=4,0,3,1,2" -test-linalg-codegen-strategy="anchor-op=linalg.generic iterator-interchange=1,3,4,2,0" | FileCheck --check-prefix=CANCEL-OUT %s
+// RUN: mlir-opt %s -test-linalg-codegen-strategy="iterator-interchange=4,0,3,1,2" | FileCheck %s
+// RUN: mlir-opt %s -test-linalg-codegen-strategy="iterator-interchange=4,0,3,1,2" -test-linalg-codegen-strategy="iterator-interchange=1,3,4,2,0" | FileCheck --check-prefix=CANCEL-OUT %s
#map0 = affine_map<(d0, d1, d2, d3, d4) -> (d0, d1, d2, d3, d4)>
#map1 = affine_map<(d0, d1, d2, d3, d4) -> (d0, d1, d3)>
diff --git a/mlir/test/lib/Dialect/Linalg/TestLinalgCodegenStrategy.cpp b/mlir/test/lib/Dialect/Linalg/TestLinalgCodegenStrategy.cpp
index 8a0ce70d203c9..9424046f8e85c 100644
--- a/mlir/test/lib/Dialect/Linalg/TestLinalgCodegenStrategy.cpp
+++ b/mlir/test/lib/Dialect/Linalg/TestLinalgCodegenStrategy.cpp
@@ -112,6 +112,10 @@ struct TestLinalgCodegenStrategy
ListOption<int64_t> iteratorInterchange{
*this, "iterator-interchange", llvm::cl::MiscFlags::CommaSeparated,
llvm::cl::desc("Specifies the iterator interchange.")};
+ Option<bool> decompose{
+ *this, "decompose",
+ llvm::cl::desc("Decompose convolutions to lower dimensional ones."),
+ llvm::cl::init(false)};
Option<bool> vectorize{
*this, "vectorize",
llvm::cl::desc("Rewrite the linalg op as a vector operation."),
@@ -163,7 +167,6 @@ void TestLinalgCodegenStrategy::runStrategy(
LinalgPaddingOptions paddingOptions,
vector::VectorContractLowering vectorContractLowering,
vector::VectorTransferSplit vectorTransferSplit) {
- assert(!anchorOpName.empty());
CodegenStrategy strategy;
strategy
.tileAndFuseIf(fuse && !tileSizes.empty(), anchorOpName,
@@ -180,6 +183,7 @@ void TestLinalgCodegenStrategy::runStrategy(
.setAlignment(16)
.setUseFullTileBuffersByDefault(registerPromoteFullTile))
.padIf(pad, "", paddingOptions)
+ .decomposeIf(decompose)
.generalizeIf(generalize, "")
.interchangeIf(!iteratorInterchange.empty(), iteratorInterchange)
.vectorizeIf(vectorize, "")
diff --git a/mlir/test/lib/Dialect/Linalg/TestLinalgTransforms.cpp b/mlir/test/lib/Dialect/Linalg/TestLinalgTransforms.cpp
index c9ae47d6d975e..20219de10748c 100644
--- a/mlir/test/lib/Dialect/Linalg/TestLinalgTransforms.cpp
+++ b/mlir/test/lib/Dialect/Linalg/TestLinalgTransforms.cpp
@@ -128,11 +128,6 @@ struct TestLinalgTransforms
llvm::cl::desc("Specify the type of loops to generate: for, parallel or "
"tiled_loop"),
llvm::cl::init("for")};
- Option<bool> testDecomposeConvolutionPattern{
- *this, "test-decompose-convolution-patterns",
- llvm::cl::desc("Test a set of patterns to rewrite high-D convolution ops "
- "into low-D ones"),
- llvm::cl::init(false)};
};
} // end anonymous namespace
@@ -721,13 +716,6 @@ void TestLinalgTransforms::runOnFunction() {
if (testTileScalarizeDynamicDims)
return applyTilePattern(getFunction(), loopType, tileSizes,
/*peeledLoops=*/{}, /*scalarizeDynamicDims=*/true);
- if (testDecomposeConvolutionPattern) {
- // TODO: thread all tests through LinalgStrategy passes.
- OpPassManager dynamicPM("builtin.func");
- dynamicPM.addPass(createLinalgStrategyDecomposePass());
- if (failed(runPipeline(dynamicPM, getFunction())))
- return signalPassFailure();
- }
}
namespace mlir {
More information about the Mlir-commits
mailing list