Refactoring

chlict · Apr 6, 2020 · dd66147 · dd66147
1 parent fe90f17
commit dd66147
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/src/includes/ExprCompiler.hpp b/src/includes/ExprCompiler.hpp
@@ -13,7 +13,7 @@ struct ExprCompiler {
     static constexpr auto compile(AST &&ast) {
         auto ir1 = GenIR().transform(ast);
         auto ir2 = AllocTensor().transform(ir1);
-        auto codes = CodeGenPass().transform(ir2);
+        auto codes = CodeGen().transform(ir2);
         return codes;
     }
 };
diff --git a/src/includes/xforms/CodeGen.hpp b/src/includes/xforms/CodeGen.hpp
@@ -46,7 +46,7 @@ struct CodeGenXform {
     }
 };
 
-struct CodeGenPass : StaticTransform {
+struct CodeGen : StaticTransform {
     using tag = xform_pass_tag;
 
     // Given an IRList, returns the codes generated

diff --git a/test/TestCodeGen.cpp b/test/TestCodeGen.cpp
@@ -3,6 +3,7 @@
 #include "xforms/GenIR.hpp"
 #include "xforms/AllocTensor.hpp"
 #include "xforms/CodeGen.hpp"
+#include "ExprCompiler.hpp"
 
 struct TestCodeGen : public ::testing::Test {
 private:
@@ -76,17 +77,7 @@ TEST_F(TestCodeGen, StaticShape1) {
     auto term2 = yap::make_terminal(tensor2);
     auto term3 = yap::make_terminal(tensor3);
     auto expr1 = (term1 + term2) * term3;
-    auto gen = yap::transform(expr1, GenIRXform{hana::make_tuple(), hana::make_tuple()});
-//    printf("After GenIR:\n");
-//    print_ir_list_simple(gen.mIRList);
 
-    auto at = AllocTensor();
-    auto ir2 = at.transform(gen.mIRList);
-//    printf("AllocTensor\n");
-//    print_ir_list_simple(ir2);
-
-    auto codes = hana::transform(ir2, [](auto &&ir) {
-        return yap::transform(ir, CodeGenXform());
-    });
+    auto codes = ExprCompiler::compile(expr1);
     launch(codes);
 }