Rename LowererImplC to LowererImplImperative and remove some abstract lowerForall* functions from LowererImpl

Author: weiya711

include/taco/lower/lowerer_impl.h

@@ -69,118 +69,6 @@ class LowererImpl : public util::Uncopyable {
   /// Lower a forall statement.
   virtual ir::Stmt lowerForall(Forall forall) = 0;
 
-  /// Lower a forall that needs to be cloned so that one copy does not have guards
-  /// used for vectorized and unrolled loops
-  virtual ir::Stmt lowerForallCloned(Forall forall) = 0;
-
-  /// Lower a forall that iterates over all the coordinates in the forall index
-  /// var's dimension, and locates tensor positions from the locate iterators.
-  virtual ir::Stmt lowerForallDimension(Forall forall,
-                                        std::vector<Iterator> locaters,
-                                        std::vector<Iterator> inserters,
-                                        std::vector<Iterator> appenders,
-                                        std::set<Access> reducedAccesses,
-                                        ir::Stmt recoveryStmt) = 0;
-
-  /// Lower a forall that iterates over all the coordinates in the forall index
-  /// var's dimension, and locates tensor positions from the locate iterators.
-  virtual ir::Stmt lowerForallDenseAcceleration(Forall forall,
-                                                std::vector<Iterator> locaters,
-                                                std::vector<Iterator> inserters,
-                                                std::vector<Iterator> appenders,
-                                                std::set<Access> reducedAccesses,
-                                                ir::Stmt recoveryStmt) = 0;
-
-
-  /// Lower a forall that iterates over the coordinates in the iterator, and
-  /// locates tensor positions from the locate iterators.
-  virtual ir::Stmt lowerForallCoordinate(Forall forall, Iterator iterator,
-                                         std::vector<Iterator> locaters,
-                                         std::vector<Iterator> inserters,
-                                         std::vector<Iterator> appenders,
-                                         std::set<Access> reducedAccesses,
-                                         ir::Stmt recoveryStmt) = 0;
-
-  /// Lower a forall that iterates over the positions in the iterator, accesses
-  /// the iterators coordinate, and locates tensor positions from the locate
-  /// iterators.
-  virtual ir::Stmt lowerForallPosition(Forall forall, Iterator iterator,
-                                       std::vector<Iterator> locaters,
-                                       std::vector<Iterator> inserters,
-                                       std::vector<Iterator> appenders,
-                                       std::set<Access> reducedAccesses,
-                                       ir::Stmt recoveryStmt) = 0;
-
-  virtual ir::Stmt lowerForallFusedPosition(Forall forall, Iterator iterator,
-                                       std::vector<Iterator> locaters,
-                                       std::vector<Iterator> inserters,
-                                       std::vector<Iterator> appenders,
-                                       std::set<Access> reducedAccesses,
-                                       ir::Stmt recoveryStmt) = 0;
-
-  /// Used in lowerForallFusedPosition to generate code to
-  /// search for the start of the iteration of the loop (a separate kernel on GPUs)
-  virtual ir::Stmt searchForFusedPositionStart(Forall forall, Iterator posIterator) = 0;
-
-    /**
-     * Lower the merge lattice to code that iterates over the sparse iteration
-     * space of coordinates and computes the concrete index notation statement.
-     * The merge lattice dictates the code to iterate over the coordinates, by
-     * successively iterating to the exhaustion of each relevant sparse iteration
-     * space region (i.e., the regions in a venn diagram).  The statement is then
-     * computed and/or indices assembled at each point in its sparse iteration
-     * space.
-     *
-     * \param lattice
-     *      A merge lattice that describes the sparse iteration space of the
-     *      concrete index notation statement.
-     * \param coordinate
-     *      An IR expression that resolves to the variable containing the current
-     *      coordinate the merge lattice is at.
-     * \param statement
-     *      A concrete index notation statement to compute at the points in the
-     *      sparse iteration space described by the merge lattice.
-     *
-     * \return
-     *       IR code to compute the forall loop.
-     */
-  virtual ir::Stmt lowerMergeLattice(MergeLattice lattice, IndexVar coordinateVar,
-                                     IndexStmt statement, 
-                                     const std::set<Access>& reducedAccesses) = 0;
-
-  virtual ir::Stmt resolveCoordinate(std::vector<Iterator> mergers, ir::Expr coordinate, bool emitVarDecl) = 0;
-
-    /**
-     * Lower the merge point at the top of the given lattice to code that iterates
-     * until one region of the sparse iteration space of coordinates and computes
-     * the concrete index notation statement.
-     *
-     * \param pointLattice
-     *      A merge lattice whose top point describes a region of the sparse
-     *      iteration space of the concrete index notation statement.
-     * \param coordinate
-     *      An IR expression that resolves to the variable containing the current
-     *      coordinate the merge point is at.
-     *      A concrete index notation statement to compute at the points in the
-     *      sparse iteration space region described by the merge point.
-     */
-  virtual ir::Stmt lowerMergePoint(MergeLattice pointLattice,
-                                   ir::Expr coordinate, IndexVar coordinateVar, IndexStmt statement,
-                                   const std::set<Access>& reducedAccesses, bool resolvedCoordDeclared) = 0;
-
-  /// Lower a merge lattice to cases.
-  virtual ir::Stmt lowerMergeCases(ir::Expr coordinate, IndexVar coordinateVar, IndexStmt stmt,
-                                   MergeLattice lattice,
-                                   const std::set<Access>& reducedAccesses) = 0;
-
-  /// Lower a forall loop body.
-  virtual ir::Stmt lowerForallBody(ir::Expr coordinate, IndexStmt stmt,
-                                   std::vector<Iterator> locaters,
-                                   std::vector<Iterator> inserters,
-                                   std::vector<Iterator> appenders,
-                                   const std::set<Access>& reducedAccesses) = 0;
-
-
   /// Lower a where statement.
   virtual ir::Stmt lowerWhere(Where where) = 0;
 

include/taco/lower/lowerer_impl_C.h renamed to include/taco/lower/lowerer_impl_imperative.h

@@ -49,10 +49,10 @@ class Stmt;
 class Expr;
 }
 
-class LowererImplC : public LowererImpl {
+class LowererImplImperative : public LowererImpl {
 public:
-  LowererImplC();
-  virtual ~LowererImplC() = default;
+  LowererImplImperative();
+  virtual ~LowererImplImperative() = default;
 
   /// Lower an index statement to an IR function.
   ir::Stmt lower(IndexStmt stmt, std::string name, 

src/lower/lower.cpp

@@ -15,7 +15,7 @@
 #include "taco/ir/ir_printer.h"
 
 #include "taco/lower/lowerer_impl.h"
-#include "taco/lower/lowerer_impl_C.h"
+#include "taco/lower/lowerer_impl_imperative.h"
 #include "taco/lower/iterator.h"
 #include "mode_access.h"
 
@@ -34,7 +34,7 @@ namespace taco {
 
 
 // class Lowerer
-Lowerer::Lowerer() : impl(new LowererImplC()) {
+Lowerer::Lowerer() : impl(new LowererImplImperative()) {
 }
 
 Lowerer::Lowerer(LowererImpl* impl) : impl(impl) {