more changes

1 files changed, 62 insertions, 62 deletions

diff --git a/src/transformations/loop_extra.cc b/src/transformations/loop_extra.cc
index dac05bf..ee54815 100644
--- a/src/transformations/loop_extra.cc
+++ b/src/transformations/loop_extra.cc
@@ -25,43 +25,44 @@ void Loop::shift_to(int stmt_num, int level, int absolute_position) {
   // combo
   tile(stmt_num, level, 1, level, CountedTile);
   std::vector<int> lex = getLexicalOrder(stmt_num);
-  std::set<int> active = getStatements(lex, 2*level-2);
+  std::set<int> active = getStatements(lex, 2 * level - 2);
   shift(active, level, absolute_position);
-  
+
   // remove unnecessary tiled loop since tile size is one
   for (std::set<int>::iterator i = active.begin(); i != active.end(); i++) {
     int n = stmt[*i].xform.n_out();
-    Relation mapping(n, n-2);
+    Relation mapping(n, n - 2);
     F_And *f_root = mapping.add_and();
-    for (int j = 1; j <= 2*level; j++) {
+    for (int j = 1; j <= 2 * level; j++) {
       EQ_Handle h = f_root->add_EQ();
       h.update_coef(mapping.output_var(j), 1);
       h.update_coef(mapping.input_var(j), -1);
     }
-    for (int j = 2*level+3; j <= n; j++) {
+    for (int j = 2 * level + 3; j <= n; j++) {
       EQ_Handle h = f_root->add_EQ();
-      h.update_coef(mapping.output_var(j-2), 1);
+      h.update_coef(mapping.output_var(j - 2), 1);
       h.update_coef(mapping.input_var(j), -1);
     }
     stmt[*i].xform = Composition(mapping, stmt[*i].xform);
     stmt[*i].xform.simplify();
-    
+
     for (int j = 0; j < stmt[*i].loop_level.size(); j++)
-      if (j != level-1 &&
+      if (j != level - 1 &&
           stmt[*i].loop_level[j].type == LoopLevelTile &&
           stmt[*i].loop_level[j].payload >= level)
         stmt[*i].loop_level[j].payload--;
-    
-    stmt[*i].loop_level.erase(stmt[*i].loop_level.begin()+level-1);
+
+    stmt[*i].loop_level.erase(stmt[*i].loop_level.begin() + level - 1);
   }
 }
 
 
 std::set<int> Loop::unroll_extra(int stmt_num, int level, int unroll_amount, int cleanup_split_level) {
-  std::set<int> cleanup_stmts = unroll(stmt_num, level, unroll_amount,std::vector< std::vector<std::string> >(), cleanup_split_level);
+  std::set<int> cleanup_stmts = unroll(stmt_num, level, unroll_amount, std::vector<std::vector<std::string> >(),
+                                       cleanup_split_level);
   for (std::set<int>::iterator i = cleanup_stmts.begin(); i != cleanup_stmts.end(); i++)
     unroll(*i, level, 0);
-  
+
   return cleanup_stmts;
 }
 
@@ -71,10 +72,10 @@ void Loop::peel(int stmt_num, int level, int peel_amount) {
     throw std::invalid_argument("invalid statement number " + to_string(stmt_num));
   if (level <= 0 || level > stmt[stmt_num].loop_level.size())
     throw std::invalid_argument("invalid loop level " + to_string(level));
-  
+
   if (peel_amount == 0)
     return;
-  
+
   std::set<int> subloop = getSubLoopNest(stmt_num, level);
   std::vector<Relation> Rs;
   for (std::set<int>::iterator i = subloop.begin(); i != subloop.end(); i++) {
@@ -83,7 +84,7 @@ void Loop::peel(int stmt_num, int level, int peel_amount) {
     F_And *f_root = f.add_and();
     for (int j = 1; j <= level; j++) {
       EQ_Handle h = f_root->add_EQ();
-      h.update_coef(f.input_var(2*j), 1);
+      h.update_coef(f.input_var(2 * j), 1);
       h.update_coef(f.output_var(j), -1);
     }
     r = Composition(f, r);
@@ -91,7 +92,7 @@ void Loop::peel(int stmt_num, int level, int peel_amount) {
     Rs.push_back(r);
   }
   Relation hull = SimpleHull(Rs);
-  
+
   if (peel_amount > 0) {
     GEQ_Handle bound_eq;
     bool found_bound = false;
@@ -120,7 +121,7 @@ void Loop::peel(int stmt_num, int level, int peel_amount) {
         }
     if (!found_bound)
       throw loop_error("can't find lower bound for peeling at loop level " + to_string(level));
-    
+
     for (int i = 1; i <= peel_amount; i++) {
       Relation r(level);
       F_Exists *f_exists = r.add_and()->add_exists();
@@ -129,34 +130,33 @@ void Loop::peel(int stmt_num, int level, int peel_amount) {
       std::map<Variable_ID, Variable_ID> exists_mapping;
       for (Constr_Vars_Iter cvi(bound_eq); cvi; cvi++)
         switch (cvi.curr_var()->kind()) {
-        case Input_Var:
-          h.update_coef(r.set_var(cvi.curr_var()->get_position()), cvi.curr_coef());
-          break;
-        case Wildcard_Var: {
-          Variable_ID v = replicate_floor_definition(hull, cvi.curr_var(), r, f_exists, f_root, exists_mapping);
-          h.update_coef(v, cvi.curr_coef());
-          break;
-        }
-        case Global_Var: {
-          Global_Var_ID g = cvi.curr_var()->get_global_var();
-          Variable_ID v;
-          if (g->arity() == 0)
-            v = r.get_local(g);
-          else
-            v = r.get_local(g, cvi.curr_var()->function_of());
-          h.update_coef(v, cvi.curr_coef());
-          break;
-        }
-        default:
-          assert(false);
+          case Input_Var:
+            h.update_coef(r.set_var(cvi.curr_var()->get_position()), cvi.curr_coef());
+            break;
+          case Wildcard_Var: {
+            Variable_ID v = replicate_floor_definition(hull, cvi.curr_var(), r, f_exists, f_root, exists_mapping);
+            h.update_coef(v, cvi.curr_coef());
+            break;
+          }
+          case Global_Var: {
+            Global_Var_ID g = cvi.curr_var()->get_global_var();
+            Variable_ID v;
+            if (g->arity() == 0)
+              v = r.get_local(g);
+            else
+              v = r.get_local(g, cvi.curr_var()->function_of());
+            h.update_coef(v, cvi.curr_coef());
+            break;
+          }
+          default:
+            assert(false);
         }
       h.update_const(bound_eq.get_const() - i);
       r.simplify();
-      
+
       split(stmt_num, level, r);
     }
-  }
-  else { // peel_amount < 0
+  } else { // peel_amount < 0
     GEQ_Handle bound_eq;
     bool found_bound = false;
     for (GEQ_Iterator e(hull.single_conjunct()->GEQs()); e; e++)
@@ -184,7 +184,7 @@ void Loop::peel(int stmt_num, int level, int peel_amount) {
         }
     if (!found_bound)
       throw loop_error("can't find upper bound for peeling at loop level " + to_string(level));
-    
+
     for (int i = 1; i <= -peel_amount; i++) {
       Relation r(level);
       F_Exists *f_exists = r.add_and()->add_exists();
@@ -193,30 +193,30 @@ void Loop::peel(int stmt_num, int level, int peel_amount) {
       std::map<Variable_ID, Variable_ID> exists_mapping;
       for (Constr_Vars_Iter cvi(bound_eq); cvi; cvi++)
         switch (cvi.curr_var()->kind()) {
-        case Input_Var:
-          h.update_coef(r.set_var(cvi.curr_var()->get_position()), cvi.curr_coef());
-          break;
-        case Wildcard_Var: {
-          Variable_ID v = replicate_floor_definition(hull, cvi.curr_var(), r, f_exists, f_root, exists_mapping);
-          h.update_coef(v, cvi.curr_coef());
-          break;
-        }
-        case Global_Var: {
-          Global_Var_ID g = cvi.curr_var()->get_global_var();
-          Variable_ID v;
-          if (g->arity() == 0)
-            v = r.get_local(g);
-          else
-            v = r.get_local(g, cvi.curr_var()->function_of());
-          h.update_coef(v, cvi.curr_coef());
-          break;
-        }
-        default:
-          assert(false);
+          case Input_Var:
+            h.update_coef(r.set_var(cvi.curr_var()->get_position()), cvi.curr_coef());
+            break;
+          case Wildcard_Var: {
+            Variable_ID v = replicate_floor_definition(hull, cvi.curr_var(), r, f_exists, f_root, exists_mapping);
+            h.update_coef(v, cvi.curr_coef());
+            break;
+          }
+          case Global_Var: {
+            Global_Var_ID g = cvi.curr_var()->get_global_var();
+            Variable_ID v;
+            if (g->arity() == 0)
+              v = r.get_local(g);
+            else
+              v = r.get_local(g, cvi.curr_var()->function_of());
+            h.update_coef(v, cvi.curr_coef());
+            break;
+          }
+          default:
+            assert(false);
         }
       h.update_const(bound_eq.get_const() - i);
       r.simplify();
-      
+
       split(stmt_num, level, r);
     }
   }