Bound

include/taco/index_notation/index_notation.h

@@ -601,6 +601,8 @@ class IndexStmt : public util::IntrusivePtr<const IndexStmtNode> {
   /// variable, a \textit{tail strategy} is employed such as emitting a variable
   /// sized loop that handles remaining iterations.
   /// Preconditions: splitFactor is a positive nonzero integer
+  IndexStmt splitUpDown(IndexVar i, IndexVar i1, IndexVar i2, bool split_up, size_t splitFactor) const;
+
   IndexStmt split(IndexVar i, IndexVar i1, IndexVar i2, size_t splitFactor) const; // TODO: TailStrategy
 
   /// The divide transformation splits one index variable into
@@ -736,8 +738,13 @@ class IndexStmt : public util::IntrusivePtr<const IndexStmtNode> {
   /// Preconditions:
   /// The precondition for bound is that the computation bounds supplied are 
   /// correct given the inputs that this code will be run on.
+  // IndexStmt bound(IndexVar i, IndexVar i1, size_t bound, BoundType bound_type) const;
+
   IndexStmt bound(IndexVar i, IndexVar i1, size_t bound, BoundType bound_type) const;
 
+
+  IndexStmt bound(IndexVar i,  size_t bound, BoundType bound_type) const;
+
   /// The unroll primitive unrolls the corresponding loop by a statically-known
   /// integer number of iterations
   /// Preconditions: unrollFactor is a positive nonzero integer
@@ -1031,6 +1038,18 @@ class IndexVar : public IndexExpr, public IndexVarInterface {
   /// Returns the name of the index variable.
   std::string getName() const;
 
+  size_t& getBound() const;
+
+  const BoundType& getBoundType() const;
+
+  void setBoundType(BoundType boundType);
+
+  void setBound(size_t bound);
+
+  void bound(size_t bound, BoundType boundType);
+
+  bool isBound();
+
   // Need these to overshadow the comparisons in for the IndexExpr instrusive pointer
   friend bool operator==(const IndexVar&, const IndexVar&);
   friend bool operator<(const IndexVar&, const IndexVar&);
@@ -1055,6 +1074,9 @@ class IndexVar : public IndexExpr, public IndexVarInterface {
 
 struct IndexVar::Content {
   std::string name;
+  size_t bound;
+  taco::BoundType boundType;
+  bool isbound;
 };
 
 struct WindowedIndexVar::Content {

include/taco/index_notation/provenance_graph.h

@@ -5,7 +5,7 @@
 
 namespace taco {
 struct IndexVarRelNode;
-enum IndexVarRelType {UNDEFINED, SPLIT, DIVIDE, POS, FUSE, BOUND, PRECOMPUTE};
+enum IndexVarRelType {UNDEFINED, SPLIT, DIVIDE, POS, FUSE, PRECOMPUTE};
 
 /// A pointer class for IndexVarRelNodes provides some operations for all IndexVarRelTypes
 class IndexVarRel : public util::IntrusivePtr<const IndexVarRelNode> {
@@ -244,39 +244,6 @@ struct FuseRelNode : public IndexVarRelNode {
 
 bool operator==(const FuseRelNode&, const FuseRelNode&);
 
-/// The bound relation allows expressing a constraint or value known at compile-time that allows for compile-time optimizations
-struct BoundRelNode : public IndexVarRelNode {
-  BoundRelNode(IndexVar parentVar, IndexVar boundVar, size_t bound, BoundType boundType);
-
-  const IndexVar& getParentVar() const;
-  const IndexVar& getBoundVar() const;
-  const size_t& getBound() const;
-  const BoundType& getBoundType() const;
-
-  void print(std::ostream& stream) const;
-  bool equals(const BoundRelNode &rel) const;
-  std::vector<IndexVar> getParents() const; // parentVar
-  std::vector<IndexVar> getChildren() const; // boundVar
-  std::vector<IndexVar> getIrregulars() const; // boundVar
-
-  /// Coordinate bounds remain unchanged, only iteration bounds change
-  std::vector<ir::Expr> computeRelativeBound(std::set<IndexVar> definedVars, std::map<IndexVar, std::vector<ir::Expr>> computedBounds, std::map<IndexVar, ir::Expr> variableExprs, Iterators iterators, ProvenanceGraph provGraph) const;
-
-  /// Constrained depending on bound_type
-  std::vector<ir::Expr> deriveIterBounds(IndexVar indexVar, std::map<IndexVar, std::vector<ir::Expr>> parentIterBounds, std::map<IndexVar, std::vector<ir::Expr>> parentCoordBounds, std::map<taco::IndexVar, taco::ir::Expr> variableNames, Iterators iterators, ProvenanceGraph provGraph) const;
-
-  /// parentVar = boundVar
-  ir::Expr recoverVariable(IndexVar indexVar, std::map<IndexVar, ir::Expr> variableNames, Iterators iterators, std::map<IndexVar, std::vector<ir::Expr>> parentIterBounds, std::map<IndexVar, std::vector<ir::Expr>> parentCoordBounds, ProvenanceGraph provGraph) const;
-
-  /// boundVar = parentVar
-  ir::Stmt recoverChild(IndexVar indexVar, std::map<IndexVar, ir::Expr> relVariables, bool emitVarDecl, Iterators iterators, ProvenanceGraph provGraph) const;
-private:
-  struct Content;
-  std::shared_ptr<Content> content;
-};
-
-bool operator==(const BoundRelNode&, const BoundRelNode&);
-
 /// The precompute relation allows creating a new precomputeVar that is iterated over for the precompute loop and shares same sizes as parentVar
 /// This allows precomputeVar to be scheduled separately from the parentVar
 struct PrecomputeRelNode : public IndexVarRelNode {
@@ -310,6 +277,7 @@ class ProvenanceGraph {
 public:
   ProvenanceGraph() {}
   ProvenanceGraph(IndexStmt concreteStmt);
+
 
   /// Returns the children of a given index variable, {} if no children or if indexVar is not in graph
   std::vector<IndexVar> getChildren(IndexVar indexVar) const;
@@ -390,6 +358,10 @@ class ProvenanceGraph {
   /// does the index variable have an exact bound known at compile-time
   bool hasExactBound(IndexVar indexVar) const;
 
+  void printGraphParent(void) const;
+
+   void printGraphChild(void) const;
+
   /// Once indexVar is defined what new variables become recoverable
   /// returned in order of recovery (ie if parent being recovered allows its parent to also be recovered then parent comes first)
   std::vector<IndexVar> newlyRecoverableParents(IndexVar indexVar, std::set<IndexVar> previouslyDefined) const;
@@ -411,6 +383,8 @@ class ProvenanceGraph {
   /// a `.divide` scheduling operation.
   bool isDivided(IndexVar indexVar) const;
 
+
+
 private:
   std::map<IndexVar, IndexVarRel> childRelMap;
   std::map<IndexVar, IndexVarRel> parentRelMap;