Ad ptr merge

.gitignore

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

dialects/CMakeLists.txt

@@ -11,6 +11,26 @@ add_thorin_dialect(core
     INSTALL
 )
 
+add_thorin_dialect(mem
+    SOURCES
+        mem/mem.cpp
+        mem/mem.h
+        mem/normalizers.cpp
+        mem/passes/fp/copy_prop.cpp
+        mem/passes/fp/copy_prop.h
+        mem/passes/fp/ssa_constr.cpp
+        mem/passes/fp/ssa_constr.h
+        mem/passes/rw/alloc2malloc.cpp
+        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
+    HEADER_DEPENDS
+        core
+    INSTALL
+)
+
 add_thorin_dialect(clos
     SOURCES
         clos/clos.cpp
@@ -24,11 +44,13 @@ 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
     DEPENDS
         mem
         affine
@@ -37,14 +59,6 @@ add_thorin_dialect(clos
     INSTALL
 )
 
-add_thorin_dialect(demo
-    SOURCES
-        demo/demo.cpp
-        demo/demo.h
-        demo/normalizers.cpp
-    INSTALL
-)
-
 add_thorin_dialect(direct
     SOURCES
         direct/direct.cpp
@@ -57,34 +71,25 @@ add_thorin_dialect(direct
     INSTALL
 )
 
-add_thorin_dialect(mem
-    SOURCES
-        mem/mem.cpp
-        mem/mem.h
-        mem/normalizers.cpp
-        mem/passes/fp/copy_prop.cpp
-        mem/passes/fp/copy_prop.h
-        mem/passes/fp/ssa_constr.cpp
-        mem/passes/fp/ssa_constr.h
-        mem/passes/rw/alloc2malloc.cpp
-        mem/passes/rw/alloc2malloc.h
-        mem/passes/rw/remem_elim.cpp
-        mem/passes/rw/remem_elim.h
-    HEADER_DEPENDS
-        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
 )
 
+add_thorin_dialect(demo
+    SOURCES
+        demo/demo.cpp
+        demo/demo.h
+        demo/normalizers.cpp
+    INSTALL
+)
+
 add_thorin_dialect(affine
     SOURCES
         affine/affine.cpp
@@ -112,7 +117,11 @@ add_thorin_dialect(autodiff
         autodiff/auxiliary/autodiff_aux.h
         autodiff/auxiliary/autodiff_rewrite_inner.cpp
         autodiff/auxiliary/autodiff_rewrite_toplevel.cpp
+        autodiff/auxiliary/autodiff_mem.cpp
+        autodiff/auxiliary/autodiff_mem.h
         autodiff/normalizers.cpp
+        affine/passes/lower_for.cpp
+        mem/passes/rw/reshape.cpp
     DEPENDS
         mem
         core

dialects/affine/affine.cpp

@@ -1,15 +1,16 @@
+#include "dialects/affine/affine.h"
+
 #include <thorin/config.h>
 #include <thorin/pass/pass.h>
 
 #include "thorin/dialects.h"
 
-#include "dialects/affine/affine.h"
 #include "dialects/affine/passes/lower_for.h"
 
 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>(); });
+                builder.extend_opt_phase(106, [](thorin::PassMan& man) { man.add<thorin::affine::LowerFor>(); });
             },
             nullptr, nullptr};
 }

dialects/affine/affine.h

@@ -15,14 +15,14 @@ inline const Def* fn_for(World& w, Defs params) {
 /// Returns a fully applied affine_for axiom.
 /// See documentation for %affine.For axiom in @ref affine.
 inline const Def* op_for(World& w,
-                         const Def* mem,
                          const Def* begin,
                          const Def* end,
                          const Def* step,
                          Defs inits,
                          const Def* body,
                          const Def* brk) {
     DefArray types(inits.size(), [&](size_t i) { return inits[i]->type(); });
-    return w.app(fn_for(w, types), {mem, begin, end, step, w.tuple(inits), body, brk});
+    auto fn = fn_for(w, types);
+    return w.app(fn, {begin, end, step, w.tuple(inits), body, brk});
 }
 } // namespace thorin::affine

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

@@ -5,11 +5,13 @@
 
 #include "thorin/dialects.h"
 
+#include "dialects/affine/passes/lower_for.h"
 #include "dialects/autodiff/passes/autodiff_eval.h"
 #include "dialects/autodiff/passes/autodiff_ext_cleanup.h"
 #include "dialects/autodiff/passes/autodiff_zero.h"
 #include "dialects/autodiff/passes/autodiff_zero_cleanup.h"
 #include "dialects/direct/passes/ds2cps.h"
+#include "dialects/mem/passes/rw/reshape.h"
 
 using namespace thorin;
 
@@ -18,22 +20,27 @@ using namespace thorin;
 /// * perform ad [105]
 /// * resolve unsolved zeros (not added) [111]
 /// * optimize further, cleanup direct style [115-120] (in direct)
-/// * cleanup (zeros, externals) [299]
+/// * cleanup (zeros, externals) [126]
 extern "C" THORIN_EXPORT thorin::DialectInfo thorin_get_dialect_info() {
     return {"autodiff",
             [](thorin::PipelineBuilder& builder) {
                 builder.add_opt(110);
+
+                builder.extend_opt_phase(104, [](PassMan& man) { man.add<mem::Reshape>(mem::Reshape::Arg); });
                 builder.extend_opt_phase(105, [](thorin::PassMan& man) { man.add<thorin::autodiff::AutoDiffEval>(); });
-                builder.extend_opt_phase(111, [](thorin::PassMan& man) {
+                builder.extend_opt_phase(106, [](thorin::PassMan& man) { man.add<thorin::affine::LowerFor>(); });
+                builder.extend_opt_phase(107, [](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) {
+                builder.extend_opt_phase(126, [](PassMan& man) {
                     man.add<thorin::autodiff::AutoDiffZeroCleanup>();
                     man.add<thorin::autodiff::AutoDiffExternalCleanup>();
                 });
+
+                builder.add_opt(125);
             },
             nullptr, [](Normalizers& normalizers) { autodiff::register_normalizers(normalizers); }};
 }

dialects/autodiff/autodiff.thorin

@@ -99,6 +99,24 @@
         };
         inner_cmp
     };
+/// core.icmp.ul
+.lam .extern internal_diff_core_icmp_XygLe
+    ![w: .Nat] ->
+    (.Cn[[.Idx w, .Idx w], .Cn[.Idx 2, .Cn[.Idx 2, .Cn[.Idx w, .Idx w]]]])
+    = { 
+        .cn inner_cmp 
+        ![[a: .Idx w, b: .Idx w], ret:.Cn[.Idx 2, .Cn[.Idx 2, .Cn[.Idx w, .Idx w]]]]
+        = { 
+            .let result = %core.icmp.ul (w) (a,b);
+            .cn cmp_pb ![s: .Idx 2, pb_ret:.Cn[.Idx w, .Idx w]]
+            = { 
+                .let z = 0:(.Idx w);
+                pb_ret (z, z)
+            };
+            ret (result,cmp_pb)
+        };
+        inner_cmp
+    };
 /// core.icmp.e
 .lam .extern internal_diff_core_icmp_xyglE 
     ![w: .Nat] ->