LLVM code generation

include/taco/target.h

@@ -24,7 +24,7 @@ struct Target {
   Target(const std::string &s);
 
   Target(Arch a, OS o) : arch(a), os(o) {
-    taco_tassert(a == C99 && o != Windows && o != OSUnknown)
+    taco_tassert(o != Windows && o != OSUnknown)
         << "Unsupported target.";
   }
 
@@ -40,3 +40,4 @@ struct Target {
 } // namespace taco
 
 #endif
+

src/CMakeLists.txt

@@ -6,6 +6,17 @@ else()
   message("-- Static library")
 endif()
 
+find_package(LLVM REQUIRED CONFIG)
+message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
+message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
+
+include_directories(${LLVM_INCLUDE_DIRS})
+add_definitions(${LLVM_DEFINITIONS})
+
+# Find the libraries that correspond to the LLVM components
+# that we wish to use
+llvm_map_components_to_libnames(llvm_libs core mcjit bitwriter linker X86 passes)
+
 set(TACO_SRC_DIRS . parser index_notation lower ir codegen storage error util)
 
 foreach(dir ${TACO_SRC_DIRS})
@@ -23,7 +34,8 @@ add_library(taco ${TACO_LIBRARY_TYPE} ${TACO_HEADERS} ${TACO_SOURCES})
 install(TARGETS taco DESTINATION lib)
 
 if (LINUX)
-  target_link_libraries(taco PRIVATE ${TACO_LIBRARIES} dl)
+  target_link_libraries(taco PRIVATE ${TACO_LIBRARIES} dl ${llvm_libs})
 else()
-  target_link_libraries(taco PRIVATE ${TACO_LIBRARIES})
+  target_link_libraries(taco PRIVATE ${TACO_LIBRARIES} ${llvm_libs})
 endif()
+

src/codegen/codegen_c.cpp

@@ -49,98 +49,8 @@ const string cHeaders =
   "#endif\n"
   "#endif\n";
 
-// find variables for generating declarations
-// also only generates a single var for each GetProperty
-class FindVars : public IRVisitor {
-public:
-  map<Expr, string, ExprCompare> varMap;
-
-  // the variables for which we need to add declarations
-  map<Expr, string, ExprCompare> varDecls;
-
-  // this maps from tensor, property, mode, index to the unique var
-  map<tuple<Expr, TensorProperty, int, int>, string> canonicalPropertyVar;
-
-  // this is for convenience, recording just the properties unpacked
-  // from the output tensor so we can re-save them at the end
-  map<tuple<Expr, TensorProperty, int, int>, string> outputProperties;
-
-  // TODO: should replace this with an unordered set
-  vector<Expr> outputTensors;
-
-  // copy inputs and outputs into the map
-  FindVars(vector<Expr> inputs, vector<Expr> outputs)  {
-    for (auto v: inputs) {
-      auto var = v.as<Var>();
-      taco_iassert(var) << "Inputs must be vars in codegen";
-      taco_iassert(varMap.count(var) == 0) <<
-          "Duplicate input found in codegen";
-      varMap[var] = var->name;
-    }
-    for (auto v: outputs) {
-      auto var = v.as<Var>();
-      taco_iassert(var) << "Outputs must be vars in codegen";
-      taco_iassert(varMap.count(var) == 0) <<
-          "Duplicate output found in codegen";
-
-      outputTensors.push_back(v);
-      varMap[var] = var->name;
-    }
-    inVarAssignLHSWithDecl = false;
-  }
-
-protected:
-  bool inVarAssignLHSWithDecl;
-  using IRVisitor::visit;
 
-  virtual void visit(const For *op) {
-    // Don't need to find/initialize loop bounds
-    inVarAssignLHSWithDecl = true;
-    op->var.accept(this);
-    op->start.accept(this);
-    op->end.accept(this);
-    op->increment.accept(this);
-    inVarAssignLHSWithDecl = false;
-
-    op->contents.accept(this);
-  }
-
-  virtual void visit(const Var *op) {
-    if (varMap.count(op) == 0) {
-      varMap[op] = CodeGen_C::genUniqueName(op->name);
-      if (!inVarAssignLHSWithDecl) {
-        varDecls[op] = varMap[op];
-      }
-    }
-  }
-
-  virtual void visit(const VarDecl *op) {
-    inVarAssignLHSWithDecl = true;
-    op->var.accept(this);
-    inVarAssignLHSWithDecl = false;
-    op->rhs.accept(this);
-  }
-
-  virtual void visit(const GetProperty *op) {
-    if (varMap.count(op) == 0) {
-      auto key =
-          tuple<Expr,TensorProperty,int,int>(op->tensor,op->property,
-                                             (size_t)op->mode,
-                                             (size_t)op->index);
-      if (canonicalPropertyVar.count(key) > 0) {
-        varMap[op] = canonicalPropertyVar[key];
-      } else {
-        auto unique_name = CodeGen_C::genUniqueName(op->name);
-        canonicalPropertyVar[key] = unique_name;
-        varMap[op] = unique_name;
-        varDecls[op] = unique_name;
-        if (util::contains(outputTensors, op->tensor)) {
-          outputProperties[key] = unique_name;
-        }
-      }
-    }
-  }
-};
+
 
 
 // helper to translate from taco type to C type
@@ -437,6 +347,76 @@ string printFuncName(const Function *func) {
 
 } // anonymous namespace
 
+
+// copy inputs and outputs into the map
+CodeGen_C::FindVars::FindVars(vector<Expr> inputs, vector<Expr> outputs)  {
+  for (auto v: inputs) {
+    auto var = v.as<Var>();
+    taco_iassert(var) << "Inputs must be vars in codegen";
+    taco_iassert(varMap.count(var) == 0) <<
+        "Duplicate input found in codegen";
+    varMap[var] = var->name;
+  }
+  for (auto v: outputs) {
+    auto var = v.as<Var>();
+    taco_iassert(var) << "Outputs must be vars in codegen";
+    taco_iassert(varMap.count(var) == 0) <<
+        "Duplicate output found in codegen";
+
+    outputTensors.push_back(v);
+    varMap[var] = var->name;
+  }
+  inVarAssignLHSWithDecl = false;
+}
+
+
+void CodeGen_C::FindVars::visit(const For *op) {
+// Don't need to find/initialize loop bounds
+    inVarAssignLHSWithDecl = true;
+    op->var.accept(this);
+    op->start.accept(this);
+    op->end.accept(this);
+    op->increment.accept(this);
+    inVarAssignLHSWithDecl = false;
+
+    op->contents.accept(this);
+}
+
+void CodeGen_C::FindVars::visit(const Var *op) {
+  if (varMap.count(op) == 0) {
+    varMap[op] = CodeGen_C::genUniqueName(op->name);
+    if (!inVarAssignLHSWithDecl) {
+      varDecls[op] = varMap[op];
+    }
+  }
+}
+
+void CodeGen_C::FindVars::visit(const VarDecl *op) {
+  inVarAssignLHSWithDecl = true;
+  op->var.accept(this);
+  inVarAssignLHSWithDecl = false;
+  op->rhs.accept(this);
+}
+
+void CodeGen_C::FindVars::visit(const GetProperty *op) {
+  if (varMap.count(op) == 0) {
+    auto key =
+        tuple<Expr,TensorProperty,int,int>(op->tensor,op->property,
+                                           (size_t)op->mode,
+                                           (size_t)op->index);
+    if (canonicalPropertyVar.count(key) > 0) {
+      varMap[op] = canonicalPropertyVar[key];
+    } else {
+      auto unique_name = CodeGen_C::genUniqueName(op->name);
+      canonicalPropertyVar[key] = unique_name;
+      varMap[op] = unique_name;
+      varDecls[op] = unique_name;
+      if (util::contains(outputTensors, op->tensor)) {
+        outputProperties[key] = unique_name;
+      }
+    }
+  }
+}
 
 string CodeGen_C::genUniqueName(string name) {
   stringstream os;

src/codegen/codegen_c.h

@@ -31,6 +31,36 @@ class CodeGen_C : public IRPrinter {
   /// a mix of taco_tensor_t* and scalars into a function call
   static void generateShim(const Stmt& func, std::stringstream &stream);
 
+  // find variables for generating declarations
+  // also only generates a single var for each GetProperty
+  class FindVars : public IRVisitor {
+  public:
+    FindVars(std::vector<Expr> inputs, std::vector<Expr> outputs);
+
+    std::map<Expr, std::string, ExprCompare> varMap;
+
+    // the variables for which we need to add declarations
+    std::map<Expr, std::string, ExprCompare> varDecls;
+
+    // this maps from tensor, property, mode, index to the unique var
+    std::map<std::tuple<Expr, TensorProperty, int, int>, std::string> canonicalPropertyVar;
+
+    // this is for convenience, recording just the properties unpacked
+    // from the output tensor so we can re-save them at the end
+    std::map<std::tuple<Expr, TensorProperty, int, int>, std::string> outputProperties;
+
+    // TODO: should replace this with an unordered set
+    std::vector<Expr> outputTensors;
+  protected:
+    bool inVarAssignLHSWithDecl;
+    using IRVisitor::visit;
+
+    virtual void visit(const For *op);
+    virtual void visit(const Var *op);
+    virtual void visit(const VarDecl *op);
+    virtual void visit(const GetProperty *op);
+  };
+
 protected:
   using IRPrinter::visit;
   void visit(const Function*);
@@ -47,6 +77,8 @@ class CodeGen_C : public IRPrinter {
   std::ostream &out;
 
   OutputKind outputKind;
+
+
 };
 
 } // namespace ir