Improved backend support

.gitignore

@@ -7,5 +7,5 @@
 *.s
 .DS_Store
 .cache
-build*
+build*/
 vgcore.*

cli/main.cpp

@@ -20,7 +20,7 @@
 using namespace thorin;
 using namespace std::literals;
 
-enum Backends { Dot, H, LL, Md, Thorin, Num_Backends };
+enum Backends { Dot, H, LL, CustBE, Custom, Md, Thorin, Num_Backends };
 
 int main(int argc, char** argv) {
     try {
@@ -48,6 +48,8 @@ int main(int argc, char** argv) {
             | lyra::opt(dialect_paths,  "path"   )["-D"]["--dialect-path"      ]("Path to search dialects in.")
             | lyra::opt(inc_verbose              )["-V"]["--verbose"           ]("Verbose mode. Multiple -V options increase the verbosity. The maximum is 4.").cardinality(0, 4)
             | lyra::opt(opt,            "level"  )["-O"]["--optimize"          ]("Optimization level (default: 2).")
+            | lyra::opt(output[CustBE ], "dialect")      ["--backend"           ]("Sets the backend to use.")
+            | lyra::opt(output[Custom ], "file"   )      ["--output"            ]("Output file for the custom backend.")
             | lyra::opt(output[Dot   ], "file"   )      ["--output-dot"        ]("Emits the Thorin program as a graph using Graphviz' DOT language.")
             | lyra::opt(output[H     ], "file"   )      ["--output-h"          ]("Emits a header file to be used to interface with a dialect in C++.")
             | lyra::opt(output[LL    ], "file"   )      ["--output-ll"         ]("Compiles the Thorin program to LLVM.")
@@ -88,6 +90,7 @@ int main(int argc, char** argv) {
         std::array<std::ostream*, Num_Backends> os;
         os.fill(nullptr);
         for (size_t be = 0; be != Num_Backends; ++be) {
+            if (be == CustBE) continue;
             if (output[be].empty()) continue;
             if (output[be] == "-") {
                 os[be] = &std::cout;
@@ -98,7 +101,7 @@ int main(int argc, char** argv) {
         }
 
         // we always need core and mem, as long as we are not in bootstrap mode..
-        if (!os[H]) dialect_plugins.insert(dialect_plugins.end(), {"core", "mem", "compile"});
+        if (!os[H]) dialect_plugins.insert(dialect_plugins.end(), {"core", "mem", "compile", "opt"});
 
         std::vector<Dialect> dialects;
         thorin::Backends backends;
@@ -129,18 +132,16 @@ int main(int argc, char** argv) {
         fe::Parser parser(world, input, ifs, dialect_paths, &normalizers, os[Md]);
         parser.parse_module();
 
-        if (os[H]) parser.bootstrap(*os[H]);
-
-        PipelineBuilder builder;
-        for (const auto& dialect : dialects) dialect.add_passes(builder);
-
-        if (os[H]) opt = std::min(opt, 1);
+        if (os[H]) {
+            parser.bootstrap(*os[H]);
+            opt = std::min(opt, 1);
+        }
 
         // clang-format off
         switch (opt) {
             case 0:                             break;
             case 1: Phase::run<Cleanup>(world); break;
-            case 2: optimize(world, passes, builder);   break;
+            case 2: optimize(world, passes, dialects);   break;
             default: errln("error: illegal optimization level '{}'", opt);
         }
         // clang-format on
@@ -149,10 +150,19 @@ int main(int argc, char** argv) {
         if (os[Dot]) dot::emit(world, *os[Dot]);
 
         if (os[LL]) {
-            if (auto it = backends.find("ll"); it != backends.end()) {
-                it->second(world, *os[LL]);
+            os[Custom]     = os[LL];
+            output[CustBE] = "ll";
+        }
+
+        if (os[Custom]) {
+            auto backendId = output[CustBE];
+            if (auto it = backends.find(backendId); it != backends.end()) {
+                auto backend = it->second;
+                // auto backendExtensions = extensions["ll"];
+                backend(world, *os[Custom]);
+                //, extensions.contains(backendId) ? (extensions[backendId]) : Extensions{});
             } else
-                errln("error: 'll' emitter not loaded. Try loading 'mem' dialect.");
+                errln("error: '{}' emitter not loaded.", backendId);
         }
     } catch (const std::exception& e) {
         errln("{}", e.what());

dialects/CMakeLists.txt

@@ -54,11 +54,14 @@ add_thorin_dialect(clos
         clos/pass/rw/clos2sjlj.h
         clos/pass/rw/clos_conv_prep.cpp
         clos/pass/rw/clos_conv_prep.h
+        clos/pass/rw/phase_wrapper.h
         clos/phase/clos_conv.cpp
         clos/phase/clos_conv.h
         clos/phase/lower_typed_clos.cpp
         clos/phase/lower_typed_clos.h
         mem/passes/fp/copy_prop.cpp
+        mem/passes/rw/reshape.cpp
+        mem/phases/rw/add_mem.cpp
     DEPENDS
         mem
         affine
@@ -74,6 +77,8 @@ add_thorin_dialect(compile
         compile/normalizers.cpp
         compile/passes/debug_print.cpp
         compile/passes/debug_print.h
+        compile/passes/internal_cleanup.cpp
+        compile/passes/internal_cleanup.h
     INSTALL
 )
 
@@ -110,6 +115,25 @@ add_thorin_dialect(direct
     INSTALL
 )
 
+add_thorin_dialect(backend
+    SOURCES
+        backend/backend.cpp
+        backend/backend.h
+        backend/be/ocaml_emit.h
+        backend/be/ocaml_emit.cpp
+        backend/be/ocaml_emitter.cpp
+        backend/be/haskell_emit.h
+        backend/be/haskell_emit.cpp
+        backend/be/rust_emit.h
+        backend/be/rust_emit.cpp
+    DEPENDS
+        compile
+        core
+        math
+        mem
+    INSTALL
+)
+
 add_thorin_dialect(math
     SOURCES
         math/math.cpp
@@ -131,6 +155,8 @@ add_thorin_dialect(mem
         mem/passes/rw/alloc2malloc.h
         mem/passes/rw/remem_elim.cpp
         mem/passes/rw/remem_elim.h
+        mem/passes/rw/reshape.cpp
+        mem/passes/rw/reshape.h
         mem/phases/rw/add_mem.cpp
         mem/phases/rw/add_mem.h
     DEPENDS
@@ -140,12 +166,25 @@ add_thorin_dialect(mem
     INSTALL
 )
 
+add_thorin_dialect(opt
+    SOURCES
+        opt/opt.cpp
+        opt/opt.h
+        opt/normalizers.cpp
+    DEPENDS
+        compile
+        mem
+        core
+    INSTALL
+)
+
 add_thorin_dialect(refly
     SOURCES
         refly/refly.h
         refly/refly.cpp
         refly/passes/remove_perm.h
         refly/passes/remove_perm.cpp
+        refly/passes/debug_dump.h
         refly/normalizers.cpp
     INSTALL
 )

dialects/affine/affine.cpp

@@ -10,9 +10,6 @@
 using namespace thorin;
 
 extern "C" THORIN_EXPORT thorin::DialectInfo thorin_get_dialect_info() {
-    return {"affine",
-            [](thorin::PipelineBuilder& builder) {
-                builder.extend_opt_phase([](thorin::PassMan& man) { man.add<thorin::affine::LowerFor>(); });
-            },
-            [](Passes& passes) { register_pass<affine::lower_for_pass, affine::LowerFor>(passes); }, nullptr, nullptr};
+    return {"affine", [](Passes& passes) { register_pass<affine::lower_for_pass, affine::LowerFor>(passes); }, nullptr,
+            nullptr};
 }

dialects/affine/passes/lower_for.cpp

@@ -37,16 +37,16 @@ const Def* LowerFor::rewrite(const Def* def) {
 
             // reduce the body to remove the cn parameter
             auto nom_body = body->as_nom<Lam>();
-            auto new_body = nom_body->stub(w, w.cn(w.sigma()), body->dbg());
-            new_body->set(nom_body->reduce(w.tuple({iter, acc, yield_lam})));
+            auto new_body = nom_body->stub(w, w.cn(acc->type()), body->dbg());
+            new_body->set(nom_body->reduce(w.tuple({iter, new_body->var(), yield_lam})));
 
             // break
-            auto if_else_cn = w.cn(w.sigma());
+            auto if_else_cn = w.cn(acc->type());
             auto if_else    = w.nom_lam(if_else_cn, nullptr);
-            if_else->app(false, brk, acc);
+            if_else->app(false, brk, if_else->var());
 
             auto cmp = core::op(core::icmp::ul, iter, end);
-            for_lam->branch(false, cmp, new_body, if_else, w.tuple());
+            for_lam->branch(false, cmp, new_body, if_else, acc);
         }
 
         DefArray for_args{for_ax->num_args() - 2, [&](size_t i) { return for_ax->arg(i); }};

dialects/autodiff/autodiff.cpp

@@ -13,28 +13,8 @@
 
 using namespace thorin;
 
-/// optimization idea:
-/// * optimize [100]
-/// * perform ad [105]
-/// * resolve unsolved zeros (not added) [111]
-/// * optimize further, cleanup direct style [115-120] (in direct)
-/// * cleanup (zeros, externals) [299]
 extern "C" THORIN_EXPORT thorin::DialectInfo thorin_get_dialect_info() {
     return {"autodiff",
-            [](thorin::PipelineBuilder& builder) {
-                builder.add_opt(110);
-                builder.extend_opt_phase(105, [](thorin::PassMan& man) { man.add<thorin::autodiff::AutoDiffEval>(); });
-                builder.extend_opt_phase(111, [](thorin::PassMan& man) {
-                    // in theory only after partial eval (beta, ...)
-                    // but before other simplification
-                    // zero and add need to be close together
-                    man.add<thorin::autodiff::AutoDiffZero>();
-                });
-                builder.extend_opt_phase(299, [](PassMan& man) {
-                    man.add<thorin::autodiff::AutoDiffZeroCleanup>();
-                    man.add<thorin::autodiff::AutoDiffExternalCleanup>();
-                });
-            },
             [](Passes& passes) {
                 register_pass<autodiff::ad_eval_pass, autodiff::AutoDiffEval>(passes);
                 register_pass<autodiff::ad_zero_pass, autodiff::AutoDiffZero>(passes);

dialects/backend/backend.cpp

@@ -0,0 +1,26 @@
+#include "dialects/backend/backend.h"
+
+#include <thorin/config.h>
+#include <thorin/pass/pass.h>
+
+#include "thorin/dialects.h"
+
+#include "dialects/backend/be/haskell_emit.h"
+#include "dialects/backend/be/ocaml_emit.h"
+#include "dialects/backend/be/rust_emit.h"
+
+using namespace thorin;
+
+extern "C" THORIN_EXPORT DialectInfo thorin_get_dialect_info() {
+    return {"backend",
+            [](Passes& passes) {
+                register_phase<backend::ocaml_phase, backend::OCamlEmitter>(passes); //, std::cout);
+            },
+            [](Backends& backends) {
+                // backends["ml"] = &backend::ocaml::emit;
+                backends["ml"] = &backend::ocaml::emit2;
+                backends["hs"] = &backend::haskell::emit;
+                backends["rs"] = &backend::rust::emit;
+            },
+            nullptr};
+}

dialects/backend/backend.h

@@ -0,0 +1,5 @@
+#pragma once
+
+#include <thorin/world.h>
+
+#include "dialects/backend/autogen.h"

dialects/backend/backend.thorin

@@ -0,0 +1,15 @@
+/// # The backend Dialect {#backend}
+///
+/// TODO:
+///
+/// [TOC]
+///
+/// ## Dependencies
+///
+.import compile;
+///
+/// ## Compilation Passes and Phases
+/// 
+/// ### Phases
+/// 
+.ax %backend.ocaml_phase: %compile.Phase;