[JitRunner] add support for i32 output

[stephenneuendorffer]

Summary

Depends on D80609

[bondhugula]

mlir/lib/ExecutionEngine/JitRunner.cpp

56

-> "Function result type" ?

215

Should this be int32_t?

297–302

Conflict markers.

[stephenneuendorffer]

Changes were merged in a separate diff.

mlir/lib/ExecutionEngine/JitRunner.cpp

struct Options {
   llvm::cl::opt<std::string> inputFilename{llvm::cl::Positional,
                                            llvm::cl::desc("<input file>"),
                                            llvm::cl::init("-")};
   llvm::cl::opt<std::string> mainFuncName{
       "e", llvm::cl::desc("The function to be called"),
       llvm::cl::value_desc("<function name>"), llvm::cl::init("main")};
   llvm::cl::opt<std::string> mainFuncType{
       "entry-point-result",
       llvm::cl::desc("Textual description of the function type to be called"),
-      llvm::cl::value_desc("f32 | void"), llvm::cl::init("f32")};
+      llvm::cl::value_desc("f32 | i32 | void"), llvm::cl::init("f32")};
 
   llvm::cl::OptionCategory optFlags{"opt-like flags"};
 
   // CLI list of pass information
   llvm::cl::list<const llvm::PassInfo *, bool, llvm::PassNameParser> llvmPasses{
       llvm::cl::desc("LLVM optimizing passes to run"), llvm::cl::cat(optFlags)};
 
   // CLI variables for -On options.
if (auto error = compileAndExecute(options, module, entryPoint, transformer,
                                      (void **)&data))
     return error;
 
   // Intentional printing of the output so we can test.
   llvm::outs() << res << '\n';
   return Error::success();
 }
 
-/// Entry point for all CPU runners. Expects the common argc/argv arguments for
-/// standard C++ main functions and an mlirTransformer.
-/// The latter is applied after parsing the input into MLIR IR and before
-/// passing the MLIR module to the ExecutionEngine.
+static Error compileAndExecuteSingleIntReturnFunction(
+    ModuleOp module, StringRef entryPoint,
+    std::function<llvm::Error(llvm::Module *)> transformer) {
+  auto mainFunction = module.lookupSymbol<LLVM::LLVMFuncOp>(entryPoint);
+  if (!mainFunction || mainFunction.isExternal())
+    return make_string_error("entry point not found");
+
+  if (mainFunction.getType().getFunctionNumParams() != 0)
+    return make_string_error("function inputs not supported");
+
+  if (!mainFunction.getType().getFunctionResultType().isIntegerTy())
+    return make_string_error("only single llvm.i32 function result supported");
+
+  int res;
+  struct {
+    void *data;
+  } data;
+  data.data = &res;
+  if (auto error =
+          compileAndExecute(module, entryPoint, transformer, (void **)&data))
+    return error;
+
+  // Intentional printing of the output so we can test.
+  llvm::outs() << res << '\n';
+
+  return Error::success();
+}
+
+// Entry point for all CPU runners. Expects the common argc/argv arguments for
+// standard C++ main functions and an mlirTransformer.
+// The latter is applied after parsing the input into MLIR IR and before passing
+// the MLIR module to the ExecutionEngine.
 int mlir::JitRunnerMain(
     int argc, char **argv,
     function_ref<LogicalResult(mlir::ModuleOp)> mlirTransformer) {
   // Create the options struct containing the command line options for the
   // runner. This must come before the command line options are parsed.
   Options options;
   llvm::cl::ParseCommandLineOptions(argc, argv, "MLIR CPU execution driver\n");
 
int mlir::JitRunnerMain(
   auto transformer = mlir::makeLLVMPassesTransformer(
       passes, optLevel, /*targetMachine=*/tmOrError->get(), optPosition);
 
   // Get the function used to compile and execute the module.
   using CompileAndExecuteFnT =
       Error (*)(Options &, ModuleOp, StringRef,
                 std::function<llvm::Error(llvm::Module *)>);
   auto compileAndExecuteFn =
+<<<<<<< HEAD:mlir/lib/ExecutionEngine/JitRunner.cpp
       llvm::StringSwitch<CompileAndExecuteFnT>(options.mainFuncType.getValue())
+=======
+      llvm::StringSwitch<CompileAndExecuteFnT>(mainFuncType.getValue())
+          .Case("i32", compileAndExecuteSingleIntReturnFunction)
+>>>>>>> 124f2402e0d... [JitRunner] add support for i32 output:mlir/lib/Support/JitRunner.cpp
           .Case("f32", compileAndExecuteSingleFloatReturnFunction)
           .Case("void", compileAndExecuteVoidFunction)
           .Default(nullptr);
 
   Error error =
       compileAndExecuteFn
           ? compileAndExecuteFn(options, m.get(),
                                 options.mainFuncName.getValue(), transformer)