Forgot to check in bug fixes of Tracking benchmark

diff --git a/Robust/src/Benchmarks/Scheduling/Tracking/TrackingBench.java b/Robust/src/Benchmarks/Scheduling/Tracking/TrackingBench.java
index 68abbaeb14d48bde68683bf058f5b0f8a7324eab..a16fbacad2a95ce3dba9abfac558738b405f191f 100644 (file)
--- a/Robust/src/Benchmarks/Scheduling/Tracking/TrackingBench.java
+++ b/Robust/src/Benchmarks/Scheduling/Tracking/TrackingBench.java
@@ -17,7 +17,8 @@ task startup(StartupObject s{initialstate}) {
   for(int i = 0; i < pnum; i++) {
     BlurPiece bp = new BlurPiece(i,
                                  range,
-                                 input){toblur};
+                                 input,
+                                 pnum){toblur};
   }
   tdmo.setBPNum(pnum);
   
@@ -64,7 +65,8 @@ task preresize(TrackDemo tdmo{topreresize}) {
                                range,
                                Icur, 
                                rows, 
-                               cols){toprocess};
+                               cols,
+                               pnum){toprocess};
   }
   ImageXM imageXM = new ImageXM(pnum,
                                 rows,
@@ -75,7 +77,8 @@ task preresize(TrackDemo tdmo{topreresize}) {
                                range,
                                Icur, 
                                rows, 
-                               cols){toprocess};
+                               cols,
+                               pnum){toprocess};
   }
   ImageYM imageYM = new ImageYM(pnum,
                                 rows,
@@ -178,7 +181,8 @@ task calcInd(Lambda lda{tocalcInd}) {
                       data,
                       rows,
                       cols,
-                      r){toprocess};
+                      r,
+                      pnum){toprocess};
   }
                     
   taskexit(lda{!tocalcInd, finish});
@@ -233,12 +237,14 @@ task startTrackingLoop(TrackDemo tdmo{tostartL}) {
                       range,
                       data,
                       rows,
-                      cols){toprocess};
+                      cols,
+                      pnum1){toprocess};
     IYL iyl = new IYL(i,
                       range,
                       data,
                       rows,
-                      cols){toprocess};
+                      cols,
+                      pnum1){toprocess};
   }
   IXLM ixlm1 = new IXLM(pnum1,
                         data,
@@ -258,12 +264,14 @@ task startTrackingLoop(TrackDemo tdmo{tostartL}) {
                         range,
                         data,
                         rows,
-                        cols){toprocess};
+                        cols,
+                        pnum1){toprocess};
     IYLR imy = new IYLR(i,
                         range,
                         data,
                         rows,
-                        cols){toprocess};
+                        cols,
+                        pnum1){toprocess};
   }
   IXLMR ixlm2 = new IXLMR(pnum1,
                           data,
@@ -280,7 +288,8 @@ task startTrackingLoop(TrackDemo tdmo{tostartL}) {
   for(int i = 0; i < pnum2; i++) {
     BlurPieceL bpl = new BlurPieceL(i,
                                     range,
-                                    input){toblur};
+                                    input,
+                                    pnum2){toblur};
   }
   tdmo.setBPLNum(pnum2);  
   tdmo.startTrackingLoop();

diff --git a/Robust/src/Main/Main.java b/Robust/src/Main/Main.java
index 8386342bb533eb1c1b973b142d63bf6bfed932af..33e717ba5205858bbcebb8d4d1fa066a308ec56b 100644 (file)
--- a/Robust/src/Main/Main.java
+++ b/Robust/src/Main/Main.java
@@ -569,15 +569,15 @@ public class Main {
        CallGraph callGraph = new CallGraph(state);
        Liveness liveness = new Liveness();
         ArrayReferencees ar = new ArrayReferencees(state);
-       OwnershipAnalysis oa = null; /*new OwnershipAnalysis(state,
+       OwnershipAnalysis oa = new OwnershipAnalysis(state,
                                                     tu,
                                                     callGraph,
-                                                    liveness,
-                                                     ar,
+                                                 liveness,
+                                                 ar,
                                                     state.OWNERSHIPALLOCDEPTH,
                                                     state.OWNERSHIPWRITEDOTS,
                                                     state.OWNERSHIPWRITEALL,
-                                                    state.OWNERSHIPALIASFILE);*/
+                                                    state.OWNERSHIPALIASFILE);
        
        // synthesis a layout according to target multicore processor
        MCImplSynthesis mcImplSynthesis = new MCImplSynthesis(state,