first demo of MLIR

PikachuHy · Jan 7, 2024 · a2bfd13 · a2bfd13
1 parent 6adc4aa
commit a2bfd13
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/include/pscm/codegen/codegen.h b/include/pscm/codegen/codegen.h
@@ -1,6 +1,7 @@
 #pragma once
 #include "pscm/Cell.h"
+#include <optional>
 
 namespace pscm {
-Cell mlir_codegen_and_run_jit(Cell expr);
+std::optional<Cell> mlir_codegen_and_run_jit(Cell expr);
 }
diff --git a/src/Scheme.cpp b/src/Scheme.cpp
@@ -474,7 +474,14 @@ Cell Scheme::eval(const UString& code) {
       ret = Evaluator(*this).eval(ret, current_module_->env());
     }
     else if (use_mlir_) {
-      ret = mlir_codegen_and_run_jit(ret);
+      auto run_ret = mlir_codegen_and_run_jit(ret);
+      if (run_ret.has_value()) {
+        ret = run_ret.value();
+      }
+      else {
+        // failback to direct eval
+        ret = eval(ret);
+      }
     }
     else {
       ret = eval(ret);

diff --git a/src/codegen/codegen.cpp b/src/codegen/codegen.cpp
@@ -228,7 +228,7 @@ int create_mlir_add(mlir::MLIRContext& ctx, mlir::OwningOpRef<mlir::ModuleOp>& m
   return 0;
 }
 
-Cell mlir_codegen_and_run_jit(Cell expr) {
+std::optional<Cell> mlir_codegen_and_run_jit(Cell expr) {
   mlir::registerAsmPrinterCLOptions();
   mlir::registerMLIRContextCLOptions();
   mlir::registerPassManagerCLOptions();
@@ -249,20 +249,20 @@ Cell mlir_codegen_and_run_jit(Cell expr) {
     if (auto err = create_mlir_add(context, module, cadr(expr), caddr(expr))) {
       llvm::errs() << "create mlir error"
                    << "\n";
-      return Cell::bool_false();
+      return std::nullopt;
     }
   }
   else {
     llvm::errs() << "not supported now"
                  << "\n";
-    return Cell::bool_false();
+    return std::nullopt;
   }
 
   mlir::PassManager pm(module.get()->getName());
   if (mlir::failed(mlir::applyPassManagerCLOptions(pm))) {
     llvm::errs() << "applyPassManagerCLOptions error"
                  << "\n";
-    return Cell::bool_false();
+    return std::nullopt;
   }
   mlir::OpPassManager& optPM = pm.nest<pscm::FuncOp>();
   optPM.addPass(mlir::createCanonicalizerPass());
@@ -274,13 +274,13 @@ Cell mlir_codegen_and_run_jit(Cell expr) {
   if (mlir::failed(pm.run(*module))) {
     llvm::errs() << "run pass error"
                  << "\n";
-    return Cell::bool_false();
+    return std::nullopt;
   }
   // module->dump();
   if (auto err = run_jit(*module)) {
     llvm::errs() << "run mlir error"
                  << "\n";
-    return Cell::bool_false();
+    return std::nullopt;
   }
   return Cell::none();
 }