small changes

[IRC.git] / Robust / src / Main / Main.java

diff --git a/Robust/src/Main/Main.java b/Robust/src/Main/Main.java
index a6b88127cb8bfc8879ae43586581993a1159f6cd..cb8bf768501a1bda095d1cabb30f4c949a924c5f 100644 (file)
--- a/Robust/src/Main/Main.java
+++ b/Robust/src/Main/Main.java
@@ -153,9 +153,14 @@ public class Main {
        state.INSTRUCTIONFAILURE=true;
       else if (option.equals("-abcclose"))
        state.ARRAYBOUNDARYCHECK=false;
-      else if (option.equals("-mlp"))
+      else if (option.equals("-mlp")) {
        state.MLP=true;
-      else if (option.equals("-help")) {
+       state.OWNERSHIP=true;
+      } else if (option.equals("-mlpdebug")) {
+       state.MLP=true;
+       state.MLPDEBUG=true;
+       state.OWNERSHIP=true;
+      } else if (option.equals("-help")) {
        System.out.println("-classlibrary classlibrarydirectory -- directory where classlibrary is located");
        System.out.println("-selfloop task -- this task doesn't self loop its parameters forever");
        System.out.println("-dir outputdirectory -- output code in outputdirectory");
@@ -186,6 +191,7 @@ public class Main {
        System.out.println("-abcclose close the array boundary check");
        System.out.println("-scheduling do task scheduling");
        System.out.println("-mlp build mlp code");
+       System.out.println("-mlp build mlp code, report progress and interim results");
        System.out.println("-multicore generate multi-core version binary");
        System.out.println("-numcore set the number of cores (should be used together with -multicore), defaultly set as 1");
        System.out.println("-raw generate raw version binary (should be used together with -multicore)");
@@ -288,9 +294,6 @@ public class Main {
     }
 
     if (state.MLP) {
-      // gotta run this to have mlp turned on
-      assert state.OWNERSHIP;
-
       CallGraph callGraph = new CallGraph(state);
       OwnershipAnalysis oa = new OwnershipAnalysis(state,
                                                    tu,
@@ -338,13 +341,13 @@ public class Main {
       if (state.SCHEDULING) {
        // Use ownership analysis to get alias information
        CallGraph callGraph = new CallGraph(state);
-       OwnershipAnalysis oa = null;/*new OwnershipAnalysis(state,
+       OwnershipAnalysis oa = new OwnershipAnalysis(state,
                                                     tu,
                                                     callGraph,
                                                     state.OWNERSHIPALLOCDEPTH,
                                                     state.OWNERSHIPWRITEDOTS,
                                                     state.OWNERSHIPWRITEALL,
-                                                    state.OWNERSHIPALIASFILE);*/
+                                                    state.OWNERSHIPALIASFILE);
        
        // synthesis a layout according to target multicore processor
        MCImplSynthesis mcImplSynthesis = new MCImplSynthesis(state,
@@ -353,10 +356,15 @@ public class Main {
        if(isDistributeInfo) {
            mcImplSynthesis.distribution();
        } else {
+           //double timeStartAnalysis = (double) System.nanoTime();
            mcImplSynthesis.setScheduleThreshold(20);
            mcImplSynthesis.setProbThreshold(0);
            mcImplSynthesis.setGenerateThreshold(30);
            Vector<Schedule> scheduling = mcImplSynthesis.synthesis();
+           
+           //double timeEndAnalysis = (double) System.nanoTime();
+           //double dt = (timeEndAnalysis - timeStartAnalysis)/(Math.pow( 10.0, 9.0 ) );
+           //System.err.println("The analysis took" + dt +  "sec.");
 
            // generate multicore codes
            if(state.MULTICORE) {