diff options
| -rw-r--r-- | mlir/test/Transforms/test-legalizer-analysis.mlir | 2 | ||||
| -rw-r--r-- | mlir/test/Transforms/test-legalizer-full.mlir | 2 | ||||
| -rw-r--r-- | mlir/test/lib/Dialect/Test/TestPatterns.cpp | 35 |
3 files changed, 17 insertions, 22 deletions
diff --git a/mlir/test/Transforms/test-legalizer-analysis.mlir b/mlir/test/Transforms/test-legalizer-analysis.mlir index 19a1310..5b07055 100644 --- a/mlir/test/Transforms/test-legalizer-analysis.mlir +++ b/mlir/test/Transforms/test-legalizer-analysis.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-opt -allow-unregistered-dialect -test-legalize-patterns -verify-diagnostics -test-legalize-mode=analysis %s | FileCheck %s +// RUN: mlir-opt -allow-unregistered-dialect -test-legalize-patterns="test-legalize-mode=analysis" -verify-diagnostics %s | FileCheck %s // expected-remark@-2 {{op 'builtin.module' is legalizable}} // expected-remark@+1 {{op 'func.func' is legalizable}} diff --git a/mlir/test/Transforms/test-legalizer-full.mlir b/mlir/test/Transforms/test-legalizer-full.mlir index 5f1148c..dcd0172 100644 --- a/mlir/test/Transforms/test-legalizer-full.mlir +++ b/mlir/test/Transforms/test-legalizer-full.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-opt -allow-unregistered-dialect -test-legalize-patterns -test-legalize-mode=full -split-input-file -verify-diagnostics %s | FileCheck %s +// RUN: mlir-opt -allow-unregistered-dialect -test-legalize-patterns="test-legalize-mode=full" -split-input-file -verify-diagnostics %s | FileCheck %s // CHECK-LABEL: func @multi_level_mapping func.func @multi_level_mapping() { diff --git a/mlir/test/lib/Dialect/Test/TestPatterns.cpp b/mlir/test/lib/Dialect/Test/TestPatterns.cpp index 5fcd92e..eda618f 100644 --- a/mlir/test/lib/Dialect/Test/TestPatterns.cpp +++ b/mlir/test/lib/Dialect/Test/TestPatterns.cpp @@ -1361,6 +1361,10 @@ struct TestLegalizePatternDriver : public PassWrapper<TestLegalizePatternDriver, OperationPass<>> { MLIR_DEFINE_EXPLICIT_INTERNAL_INLINE_TYPE_ID(TestLegalizePatternDriver) + TestLegalizePatternDriver() = default; + TestLegalizePatternDriver(const TestLegalizePatternDriver &other) + : PassWrapper(other) {} + StringRef getArgument() const final { return "test-legalize-patterns"; } StringRef getDescription() const final { return "Run test dialect legalization patterns"; @@ -1368,8 +1372,6 @@ struct TestLegalizePatternDriver /// The mode of conversion to use with the driver. enum class ConversionMode { Analysis, Full, Partial }; - TestLegalizePatternDriver(ConversionMode mode) : mode(mode) {} - void getDependentDialects(DialectRegistry ®istry) const override { registry.insert<func::FuncDialect, test::TestDialect>(); } @@ -1498,24 +1500,19 @@ struct TestLegalizePatternDriver op->emitRemark() << "op '" << op->getName() << "' is legalizable"; } - /// The mode of conversion to use. - ConversionMode mode; + Option<ConversionMode> mode{ + *this, "test-legalize-mode", + llvm::cl::desc("The legalization mode to use with the test driver"), + llvm::cl::init(ConversionMode::Partial), + llvm::cl::values( + clEnumValN(ConversionMode::Analysis, "analysis", + "Perform an analysis conversion"), + clEnumValN(ConversionMode::Full, "full", "Perform a full conversion"), + clEnumValN(ConversionMode::Partial, "partial", + "Perform a partial conversion"))}; }; } // namespace -static llvm::cl::opt<TestLegalizePatternDriver::ConversionMode> - legalizerConversionMode( - "test-legalize-mode", - llvm::cl::desc("The legalization mode to use with the test driver"), - llvm::cl::init(TestLegalizePatternDriver::ConversionMode::Partial), - llvm::cl::values( - clEnumValN(TestLegalizePatternDriver::ConversionMode::Analysis, - "analysis", "Perform an analysis conversion"), - clEnumValN(TestLegalizePatternDriver::ConversionMode::Full, "full", - "Perform a full conversion"), - clEnumValN(TestLegalizePatternDriver::ConversionMode::Partial, - "partial", "Perform a partial conversion"))); - //===----------------------------------------------------------------------===// // ConversionPatternRewriter::getRemappedValue testing. This method is used // to get the remapped value of an original value that was replaced using @@ -2201,9 +2198,7 @@ void registerPatternsTestPass() { PassRegistration<TestStrictPatternDriver>(); PassRegistration<TestWalkPatternDriver>(); - PassRegistration<TestLegalizePatternDriver>([] { - return std::make_unique<TestLegalizePatternDriver>(legalizerConversionMode); - }); + PassRegistration<TestLegalizePatternDriver>(); PassRegistration<TestRemappedValue>(); |