diff --git a/mlir/examples/standalone/standalone-translate/standalone-translate.cpp b/mlir/examples/standalone/standalone-translate/standalone-translate.cpp index 31ddef415530..94277c178610 100644 --- a/mlir/examples/standalone/standalone-translate/standalone-translate.cpp +++ b/mlir/examples/standalone/standalone-translate/standalone-translate.cpp @@ -12,7 +12,6 @@ //===----------------------------------------------------------------------===// #include "Standalone/StandaloneDialect.h" -#include "mlir/IR/BuiltinOps.h" #include "mlir/InitAllTranslations.h" #include "mlir/Support/LogicalResult.h" #include "mlir/Tools/mlir-translate/MlirTranslateMain.h" @@ -24,7 +23,7 @@ int main(int argc, char **argv) { // TODO: Register standalone translations here. mlir::TranslateFromMLIRRegistration withdescription( "option", "different from option", - [](mlir::ModuleOp op, llvm::raw_ostream &output) { + [](mlir::Operation *op, llvm::raw_ostream &output) { return mlir::LogicalResult::success(); }, [](mlir::DialectRegistry &a) {}); diff --git a/mlir/include/mlir/Tools/mlir-translate/Translation.h b/mlir/include/mlir/Tools/mlir-translate/Translation.h index c8b5b70a3587..bc4636c3c98d 100644 --- a/mlir/include/mlir/Tools/mlir-translate/Translation.h +++ b/mlir/include/mlir/Tools/mlir-translate/Translation.h @@ -13,40 +13,31 @@ #ifndef MLIR_TOOLS_MLIRTRANSLATE_TRANSLATION_H #define MLIR_TOOLS_MLIRTRANSLATE_TRANSLATION_H +#include "mlir/IR/Operation.h" #include "llvm/Support/CommandLine.h" -namespace llvm { -class MemoryBuffer; -class SourceMgr; -class StringRef; -} // namespace llvm - namespace mlir { -class DialectRegistry; -struct LogicalResult; -class MLIRContext; -class ModuleOp; template class OwningOpRef; /// Interface of the function that translates the sources managed by `sourceMgr` /// to MLIR. The source manager has at least one buffer. The implementation -/// should create a new MLIR ModuleOp in the given context and return a pointer -/// to it, or a nullptr in case of any error. -using TranslateSourceMgrToMLIRFunction = std::function( +/// should create a new MLIR Operation in the given context and return a +/// pointer to it, or a nullptr in case of any error. +using TranslateSourceMgrToMLIRFunction = std::function( llvm::SourceMgr &sourceMgr, MLIRContext *)>; /// Interface of the function that translates the given string to MLIR. The -/// implementation should create a new MLIR ModuleOp in the given context. If +/// implementation should create a new MLIR Operation in the given context. If /// source-related error reporting is required from within the function, use /// TranslateSourceMgrToMLIRFunction instead. using TranslateStringRefToMLIRFunction = - std::function(llvm::StringRef, MLIRContext *)>; + std::function(llvm::StringRef, MLIRContext *)>; /// Interface of the function that translates MLIR to a different format and -/// outputs the result to a stream. It is allowed to modify the module. +/// outputs the result to a stream. It is allowed to modify the operation. using TranslateFromMLIRFunction = - std::function; + std::function; /// Interface of the function that performs file-to-file translation involving /// MLIR. The input file is held in the given MemoryBuffer; the output file @@ -83,6 +74,23 @@ struct TranslateFromMLIRRegistration { const TranslateFromMLIRFunction &function, const std::function &dialectRegistration = [](DialectRegistry &) {}); + + template , + typename = std::enable_if_t>> + TranslateFromMLIRRegistration( + llvm::StringRef name, llvm::StringRef description, FuncTy function, + const std::function &dialectRegistration = + [](DialectRegistry &) {}) + : TranslateFromMLIRRegistration( + name, description, + [function](Operation *op, raw_ostream &os) -> LogicalResult { + if (auto casted = dyn_cast(op)) + return function(casted, os); + return emitError(op->getLoc()) + << "expected a '" << OpTy::getOperationName() + << "' op, got '" << op->getName().getStringRef() << "'"; + }, + dialectRegistration){}; }; struct TranslateRegistration { TranslateRegistration(llvm::StringRef name, llvm::StringRef description, diff --git a/mlir/lib/Target/Cpp/TranslateRegistration.cpp b/mlir/lib/Target/Cpp/TranslateRegistration.cpp index 7eb393ffbe03..b486e5429ea6 100644 --- a/mlir/lib/Target/Cpp/TranslateRegistration.cpp +++ b/mlir/lib/Target/Cpp/TranslateRegistration.cpp @@ -34,9 +34,9 @@ void registerToCppTranslation() { TranslateFromMLIRRegistration reg( "mlir-to-cpp", "translate from mlir to cpp", - [](ModuleOp module, raw_ostream &output) { + [](Operation *op, raw_ostream &output) { return emitc::translateToCpp( - module, output, + op, output, /*declareVariablesAtTop=*/declareVariablesAtTop); }, [](DialectRegistry ®istry) { diff --git a/mlir/lib/Target/LLVMIR/ConvertFromLLVMIR.cpp b/mlir/lib/Target/LLVMIR/ConvertFromLLVMIR.cpp index 2995ad33e57f..865add93f965 100644 --- a/mlir/lib/Target/LLVMIR/ConvertFromLLVMIR.cpp +++ b/mlir/lib/Target/LLVMIR/ConvertFromLLVMIR.cpp @@ -1152,8 +1152,8 @@ mlir::translateLLVMIRToModule(std::unique_ptr llvmModule, // Deserializes the LLVM bitcode stored in `input` into an MLIR module in the // LLVM dialect. -OwningOpRef translateLLVMIRToModule(llvm::SourceMgr &sourceMgr, - MLIRContext *context) { +static OwningOpRef +translateLLVMIRToModule(llvm::SourceMgr &sourceMgr, MLIRContext *context) { llvm::SMDiagnostic err; llvm::LLVMContext llvmContext; std::unique_ptr llvmModule = llvm::parseIR( diff --git a/mlir/lib/Target/LLVMIR/ConvertToLLVMIR.cpp b/mlir/lib/Target/LLVMIR/ConvertToLLVMIR.cpp index 1ae7b83c3ab8..4f44770ec7f0 100644 --- a/mlir/lib/Target/LLVMIR/ConvertToLLVMIR.cpp +++ b/mlir/lib/Target/LLVMIR/ConvertToLLVMIR.cpp @@ -25,9 +25,9 @@ namespace mlir { void registerToLLVMIRTranslation() { TranslateFromMLIRRegistration registration( "mlir-to-llvmir", "translate mlir to llvmir", - [](ModuleOp module, raw_ostream &output) { + [](Operation *op, raw_ostream &output) { llvm::LLVMContext llvmContext; - auto llvmModule = translateModuleToLLVMIR(module, llvmContext); + auto llvmModule = translateModuleToLLVMIR(op, llvmContext); if (!llvmModule) return failure(); diff --git a/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp b/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp index e409b665c30d..5e27dab3521c 100644 --- a/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp +++ b/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp @@ -1189,8 +1189,10 @@ prepareLLVMModule(Operation *m, llvm::LLVMContext &llvmContext, std::unique_ptr mlir::translateModuleToLLVMIR(Operation *module, llvm::LLVMContext &llvmContext, StringRef name) { - if (!satisfiesLLVMModule(module)) + if (!satisfiesLLVMModule(module)) { + module->emitOpError("can not be translated to an LLVMIR module"); return nullptr; + } std::unique_ptr llvmModule = prepareLLVMModule(module, llvmContext, name); diff --git a/mlir/lib/Target/SPIRV/TranslateRegistration.cpp b/mlir/lib/Target/SPIRV/TranslateRegistration.cpp index d24e5785a27d..b293d87ca05c 100644 --- a/mlir/lib/Target/SPIRV/TranslateRegistration.cpp +++ b/mlir/lib/Target/SPIRV/TranslateRegistration.cpp @@ -36,8 +36,8 @@ using namespace mlir; // Deserializes the SPIR-V binary module stored in the file named as // `inputFilename` and returns a module containing the SPIR-V module. -static OwningOpRef deserializeModule(const llvm::MemoryBuffer *input, - MLIRContext *context) { +static OwningOpRef +deserializeModule(const llvm::MemoryBuffer *input, MLIRContext *context) { context->loadDialect(); // Make sure the input stream can be treated as a stream of SPIR-V words @@ -61,7 +61,7 @@ static OwningOpRef deserializeModule(const llvm::MemoryBuffer *input, context, input->getBufferIdentifier(), /*line=*/0, /*column=*/0))); module->getBody()->push_front(spirvModule.release()); - return module; + return std::move(module); } namespace mlir { diff --git a/mlir/lib/Tools/mlir-translate/Translation.cpp b/mlir/lib/Tools/mlir-translate/Translation.cpp index 7517ae00ffc2..9e97e1b841f3 100644 --- a/mlir/lib/Tools/mlir-translate/Translation.cpp +++ b/mlir/lib/Tools/mlir-translate/Translation.cpp @@ -16,6 +16,7 @@ #include "mlir/IR/Dialect.h" #include "mlir/IR/Verifier.h" #include "mlir/Parser/Parser.h" +#include "mlir/Tools/ParseUtilties.h" #include "llvm/Support/SourceMgr.h" using namespace mlir; @@ -65,10 +66,10 @@ static void registerTranslateToMLIRFunction( const TranslateSourceMgrToMLIRFunction &function) { auto wrappedFn = [function](llvm::SourceMgr &sourceMgr, raw_ostream &output, MLIRContext *context) { - OwningOpRef module = function(sourceMgr, context); - if (!module || failed(verify(*module))) + OwningOpRef op = function(sourceMgr, context); + if (!op || failed(verify(*op))) return failure(); - module->print(output); + op.get()->print(output); return success(); }; registerTranslation(name, description, wrappedFn); @@ -101,6 +102,12 @@ TranslateFromMLIRRegistration::TranslateFromMLIRRegistration( StringRef name, StringRef description, const TranslateFromMLIRFunction &function, const std::function &dialectRegistration) { + + static llvm::cl::opt noImplicitModule{ + "no-implicit-module", + llvm::cl::desc("Disable the parsing of an implicit top-level module op"), + llvm::cl::init(false)}; + registerTranslation(name, description, [function, dialectRegistration]( llvm::SourceMgr &sourceMgr, raw_ostream &output, @@ -108,11 +115,11 @@ TranslateFromMLIRRegistration::TranslateFromMLIRRegistration( DialectRegistry registry; dialectRegistration(registry); context->appendDialectRegistry(registry); - auto module = - parseSourceFile(sourceMgr, context); - if (!module || failed(verify(*module))) + OwningOpRef op = parseSourceFileForTool( + sourceMgr, context, !noImplicitModule); + if (!op || failed(verify(*op))) return failure(); - return function(module.get(), output); + return function(op.get(), output); }); } diff --git a/mlir/test/Target/LLVMIR/invalid-module.mlir b/mlir/test/Target/LLVMIR/invalid-module.mlir new file mode 100644 index 000000000000..7fd5f26998a0 --- /dev/null +++ b/mlir/test/Target/LLVMIR/invalid-module.mlir @@ -0,0 +1,6 @@ +// RUN: mlir-translate -verify-diagnostics -mlir-to-llvmir --no-implicit-module %s + +// expected-error@below {{'llvm.func' op can not be translated to an LLVMIR module}} +llvm.func @foo() { + llvm.return +} diff --git a/mlir/test/Target/SPIRV/invalid-module.mlir b/mlir/test/Target/SPIRV/invalid-module.mlir new file mode 100644 index 000000000000..e388a036fdd8 --- /dev/null +++ b/mlir/test/Target/SPIRV/invalid-module.mlir @@ -0,0 +1,4 @@ +// RUN: mlir-translate %s -serialize-spirv -no-implicit-module -verify-diagnostics + +// expected-error@below {{expected a 'builtin.module' op, got 'spirv.module'}} +spirv.module Logical Simple {}