Minor: debug info, comments, etc.

Minor: debug info, comments, etc. Signed-off-by: Uday Reddy <udayreddy@gmail.com>
tajkhan · Apr 16, 2011 · 79e8cb4 · 79e8cb4
1 parent a1eb97d
commit 79e8cb4
Show file tree

Hide file tree

Showing 29 changed files with 61 additions and 30 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -1,5 +1,5 @@
 
-Uday Kumar Bondhugula (US version)
-B Uday Kumar Reddy (Indian version)
+Uday Bondhugula  / Uday Kumar Reddy B
 
 udayreddy@gmail.com
+uday@csa.iisc.ernet.in
diff --git a/examples/adi/.gitignore b/examples/adi/.gitignore
@@ -7,3 +7,4 @@ tiled
 orig
 par
 opt
+orig_par
diff --git a/examples/advect3d/.gitignore b/examples/advect3d/.gitignore
@@ -7,3 +7,4 @@ tiled
 orig
 par
 opt
+orig_par
diff --git a/examples/corcol/.gitignore b/examples/corcol/.gitignore
@@ -7,3 +7,4 @@ tiled
 orig
 par
 opt
+orig_par
diff --git a/examples/covcol/.gitignore b/examples/covcol/.gitignore
@@ -7,3 +7,4 @@ tiled
 orig
 par
 opt
+orig_par
diff --git a/examples/dct/.gitignore b/examples/dct/.gitignore
@@ -7,3 +7,4 @@ tiled
 orig
 par
 opt
+orig_par
diff --git a/examples/doitgen/.gitignore b/examples/doitgen/.gitignore
@@ -7,3 +7,4 @@ tiled
 orig
 par
 opt
+orig_par
diff --git a/examples/dsyr2k/.gitignore b/examples/dsyr2k/.gitignore
@@ -7,3 +7,4 @@ tiled
 orig
 par
 opt
+orig_par
diff --git a/examples/dsyrk/.gitignore b/examples/dsyrk/.gitignore
@@ -7,3 +7,4 @@ tiled
 orig
 par
 opt
+orig_par
diff --git a/examples/fdtd-1d/.gitignore b/examples/fdtd-1d/.gitignore
@@ -7,3 +7,4 @@ tiled
 orig
 par
 opt
+orig_par
diff --git a/examples/fdtd-2d/.gitignore b/examples/fdtd-2d/.gitignore
@@ -7,3 +7,4 @@ tiled
 orig
 par
 opt
+orig_par
diff --git a/examples/gemver/.gitignore b/examples/gemver/.gitignore
@@ -7,3 +7,4 @@ tiled
 orig
 par
 opt
+orig_par
diff --git a/examples/jacobi-1d-imper/.gitignore b/examples/jacobi-1d-imper/.gitignore
@@ -7,3 +7,4 @@ tiled
 orig
 par
 opt
+orig_par
diff --git a/examples/jacobi-2d-imper/.gitignore b/examples/jacobi-2d-imper/.gitignore
@@ -7,3 +7,4 @@ tiled
 orig
 par
 opt
+orig_par
diff --git a/examples/lu/.gitignore b/examples/lu/.gitignore
@@ -7,3 +7,4 @@ tiled
 orig
 par
 opt
+orig_par
diff --git a/examples/matmul-init/.gitignore b/examples/matmul-init/.gitignore
@@ -7,3 +7,4 @@ tiled
 orig
 par
 opt
+orig_par
diff --git a/examples/matmul/.gitignore b/examples/matmul/.gitignore
@@ -7,3 +7,4 @@ tiled
 orig
 par
 opt
+orig_par
diff --git a/examples/mvt/.gitignore b/examples/mvt/.gitignore
@@ -7,3 +7,4 @@ tiled
 orig
 par
 opt
+orig_par
diff --git a/examples/pca/.gitignore b/examples/pca/.gitignore
@@ -7,3 +7,4 @@ tiled
 orig
 par
 opt
+orig_par
diff --git a/examples/seidel/.gitignore b/examples/seidel/.gitignore
@@ -7,3 +7,4 @@ tiled
 orig
 par
 opt
+orig_par
diff --git a/examples/ssymm/.gitignore b/examples/ssymm/.gitignore
@@ -7,3 +7,4 @@ tiled
 orig
 par
 opt
+orig_par
diff --git a/examples/strmm/.gitignore b/examples/strmm/.gitignore
@@ -7,3 +7,4 @@ tiled
 orig
 par
 opt
+orig_par
diff --git a/examples/swim/.gitignore b/examples/swim/.gitignore
@@ -7,3 +7,4 @@ tiled
 orig
 par
 opt
+orig_par
diff --git a/examples/tce/.gitignore b/examples/tce/.gitignore
@@ -7,3 +7,4 @@ tiled
 orig
 par
 opt
+orig_par
diff --git a/examples/template/.gitignore b/examples/template/.gitignore
@@ -7,3 +7,4 @@ tiled
 orig
 par
 opt
+orig_par
diff --git a/examples/tmm/.gitignore b/examples/tmm/.gitignore
@@ -7,3 +7,4 @@ tiled
 orig
 par
 opt
+orig_par
diff --git a/src/framework.c b/src/framework.c
@@ -542,15 +542,19 @@ static void eliminate_farkas_multipliers(PlutoConstraints *farkas_cst, int num_e
     int i;
     int best_elim;
 
-    /* printf("To start with: %d constraints, %d to be eliminated out of %d\n", 
-            farkas_cst->nrows, num_elim, farkas_cst->ncols-1); */
+    if (options->moredebug) {
+        printf("To start with: %d constraints, %d to be eliminated out of %d vars\n", 
+                farkas_cst->nrows, num_elim, farkas_cst->ncols-1);
+    }
 
     for (i=0; i<num_elim; i++)  {
         best_elim = best_elim_candidate(farkas_cst, num_elim-i);
         fourier_motzkin_eliminate(farkas_cst, best_elim);
-        /* printf("After elimination of %d variable: %d constraints\n", 
-                num_elim-i, farkas_cst->nrows); */
-        /* constraints_print(stdout, farkas_cst); */
+        if (options->moredebug) {
+            printf("After elimination of %d variable: %d constraints\n", 
+                    num_elim-i, farkas_cst->nrows); 
+        }
+        // pluto_constraints_print(stdout, farkas_cst);
     }
 
 }

diff --git a/src/pluto.c b/src/pluto.c
@@ -1027,23 +1027,25 @@ void normalize_domains(PlutoProg *prog)
 			pluto_constraints_print(stdout, context );
 		}
 
+#if 0
 		/* Add context to every dep polyhedron */
 		for (i=0; i<prog->ndeps; i++) {
 			PlutoConstraints *dpolytope = prog->deps[i].dpolytope;
 
 			for (k=0; k<context->nrows; k++) {
 				pluto_constraints_add_inequality(dpolytope, dpolytope->nrows);
 
-				/* already initialized to zero */
+				/* Already initialized to zero */
 
 				for (j=0; j<npar+1; j++){
 					dpolytope->val[dpolytope->nrows-1][j+dpolytope->ncols-(npar+1)] = 
 						context->val[k][j];
 				}
 			}
-			/* update the reference, add_row can resize */
+			/* Update reference, add_row can resize */
 			prog->deps[i].dpolytope = dpolytope;
 		}
+#endif
 		pluto_constraints_free(context);
 	}else{
 		IF_DEBUG(printf("No global context\n"));

diff --git a/src/program.c b/src/program.c
@@ -972,27 +972,27 @@ PlutoProg *scop_to_pluto_prog(scoplib_scop_p scop, PlutoOptions *options)
         clan_stmt = clan_stmt->next;
     }
 
-	// hack for linearized accesses
-	FILE *lfp = fopen(".linearized", "r");
-	FILE *nlfp = fopen(".nonlinearized", "r");
-	char tmpstr[256];
-	char linearized[256];
-       if (lfp && nlfp) {
-               for (i=0; i<prog->nstmts; i++)    {
-                       rewind(lfp);
-                       rewind(nlfp);
-                       while (!feof(lfp))      {
-                               fgets(tmpstr, 256, nlfp);
-                               fgets(linearized, 256, lfp);
-                               if (strstr(tmpstr, prog->stmts[i].text))        {
-                                       prog->stmts[i].text = (char *) realloc(prog->stmts[i].text, sizeof(char)*(strlen(linearized)+1));
-                                       strcpy(prog->stmts[i].text, linearized);
-                               }
-			}
-		}
-               fclose(lfp);
-               fclose(nlfp);
-	}
+    // hack for linearized accesses
+    FILE *lfp = fopen(".linearized", "r");
+    FILE *nlfp = fopen(".nonlinearized", "r");
+    char tmpstr[256];
+    char linearized[256];
+    if (lfp && nlfp) {
+        for (i=0; i<prog->nstmts; i++)    {
+            rewind(lfp);
+            rewind(nlfp);
+            while (!feof(lfp) && !feof(nlfp))      {
+                fgets(tmpstr, 256, nlfp);
+                fgets(linearized, 256, lfp);
+                if (strstr(tmpstr, prog->stmts[i].text))        {
+                    prog->stmts[i].text = (char *) realloc(prog->stmts[i].text, sizeof(char)*(strlen(linearized)+1));
+                    strcpy(prog->stmts[i].text, linearized);
+                }
+            }
+        }
+        fclose(lfp);
+        fclose(nlfp);
+    }
 
     return prog;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,3 +7,4 @@ tiled @@
     orig
     par
     opt
+    orig_par