diff --git a/mlir/lib/IR/Dialect.cpp b/mlir/lib/IR/Dialect.cpp --- a/mlir/lib/IR/Dialect.cpp +++ b/mlir/lib/IR/Dialect.cpp @@ -31,7 +31,7 @@ DialectRegistry &mlir::getGlobalDialectRegistry() { return *dialectRegistry; } // Note: deprecated, will be removed soon. -static bool isGlobalDialectRegistryEnabledFlag = true; +static bool isGlobalDialectRegistryEnabledFlag = false; void mlir::enableGlobalDialectRegistry(bool enable) { isGlobalDialectRegistryEnabledFlag = enable; } diff --git a/mlir/tools/mlir-reduce/CMakeLists.txt b/mlir/tools/mlir-reduce/CMakeLists.txt --- a/mlir/tools/mlir-reduce/CMakeLists.txt +++ b/mlir/tools/mlir-reduce/CMakeLists.txt @@ -13,6 +13,18 @@ TransformUtils ) +if(MLIR_INCLUDE_TESTS) + set(test_libs + MLIRAffineTransformsTestPasses + MLIRSPIRVTestPasses + MLIRTestDialect + MLIRTestIR + MLIRTestPass + MLIRTestReducer + MLIRTestTransforms + ) +endif() + set(LIBS ${dialect_libs} ${conversion_libs} diff --git a/mlir/tools/mlir-reduce/mlir-reduce.cpp b/mlir/tools/mlir-reduce/mlir-reduce.cpp --- a/mlir/tools/mlir-reduce/mlir-reduce.cpp +++ b/mlir/tools/mlir-reduce/mlir-reduce.cpp @@ -32,6 +32,10 @@ using namespace mlir; +namespace mlir { +void registerTestDialect(DialectRegistry &); +} + static llvm::cl::opt inputFilename(llvm::cl::Positional, llvm::cl::Required, llvm::cl::desc("")); @@ -85,9 +89,12 @@ llvm::report_fatal_error(errorMessage); mlir::MLIRContext context; - mlir::OwningModuleRef moduleRef; - context.allowUnregisteredDialects(true); + registerAllDialects(context.getDialectRegistry()); +#ifdef MLIR_INCLUDE_TESTS + mlir::registerTestDialect(context.getDialectRegistry()); +#endif + mlir::OwningModuleRef moduleRef; if (failed(loadModule(context, moduleRef, inputFilename))) llvm::report_fatal_error("Input test case can't be parsed");