set true probability on command line

diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiply.java b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiply.java
index 1687dd77307f35a5e2f7882765d74fc24a6b9357..f35dbb25d79b0200dc30117fa08b13397ea8179e 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiply.java
+++ b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiply.java
@@ -54,7 +54,7 @@ public class MatrixMultiply extends Thread{
                MMul matrix;
 
                atomic {
-                       matrix = global new MMul(200, 200, 200);
+                       matrix = global new MMul(400, 400, 400);
                        matrix.setValues();
                        matrix.transpose();
                }
@@ -64,7 +64,7 @@ public class MatrixMultiply extends Thread{
                }
 
                atomic {
-                       mm[0] = global new MatrixMultiply(matrix,0,0,199,199);
+                       mm[0] = global new MatrixMultiply(matrix,0,0,399,399);
                }
 
                atomic {

diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile
index f8bbf4a9b98fd990ba6675029d920fea4db57e81..f37a045996bd5ec30d7b67e2db1b931ae38db834 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile
+++ b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile
@@ -1,8 +1,11 @@
 MAINCLASS=MatrixMultiply
 SRC=${MAINCLASS}.java
-FLAGS=-dsm -prefetch -nooptimize -printflat -debug -excprefetch MatrixMultiply.main -excprefetch MMul.setValues -excprefetch MMul.transpose -mainclass ${MAINCLASS} -o ${MAINCLASS}
+FLAGS=-dsm -prefetch -optimize -printflat -profile -debug -excprefetch MatrixMultiply.main -excprefetch MMul.setValues -excprefetch MMul.transpose -mainclass ${MAINCLASS} -o ${MAINCLASS} -trueprob 0.8
+FLAGS2=-dsm -optimize -printflat -profile -debug -excprefetch MatrixMultiply.main -excprefetch MMul.setValues -excprefetch MMul.transpose -mainclass ${MAINCLASS} -o ${MAINCLASS}NP
 default:
+       ../../../buildscript ${FLAGS2} ${SRC}
        ../../../buildscript ${FLAGS} ${SRC}
+
 clean:
        rm *.bin
        rm -rf tmpbuilddirectory

diff --git a/Robust/src/IR/Flat/BuildFlat.java b/Robust/src/IR/Flat/BuildFlat.java
index af56b60afb12f051be320e2b35b7c26c0b69c00b..2c7ced718157a9d12ab424892fa6b4397089a02f 100644 (file)
--- a/Robust/src/IR/Flat/BuildFlat.java
+++ b/Robust/src/IR/Flat/BuildFlat.java
@@ -282,7 +282,7 @@ public class BuildFlat {
 
        FlatOpNode fcomp=new FlatOpNode(tmpbool,index,temparray[i],new Operation(Operation.LT));
        FlatCondBranch fcb=new FlatCondBranch(tmpbool);
-       fcb.setTrueProb(0.8);
+       fcb.setTrueProb(State.TRUEPROB);
        //is index<temp[i]
        TempDescriptor new_tmp=TempDescriptor.tempFactory("tmp",td);
        FlatNew fn=new FlatNew(td, new_tmp, temparray[i+1], isglobal);
@@ -845,11 +845,13 @@ public class BuildFlat {
            NodePair body=flattenBlockNode(ln.getBody());
            FlatNode begin=initializer.getBegin();
            FlatCondBranch fcb=new FlatCondBranch(cond_temp);
-           fcb.setTrueProb(0.8);
+           fcb.setTrueProb(State.TRUEPROB);
            FlatNop nopend=new FlatNop();
            FlatBackEdge backedge=new FlatBackEdge();
 
-           initializer.getEnd().addNext(condition.getBegin());
+           FlatNop nop2=new FlatNop();
+           initializer.getEnd().addNext(nop2);
+           nop2.addNext(condition.getBegin());
            body.getEnd().addNext(update.getBegin());
            update.getEnd().addNext(backedge);
            backedge.addNext(condition.getBegin());
@@ -863,7 +865,7 @@ public class BuildFlat {
            NodePair body=flattenBlockNode(ln.getBody());
            FlatNode begin=condition.getBegin();
            FlatCondBranch fcb=new FlatCondBranch(cond_temp);
-           fcb.setTrueProb(0.8);
+           fcb.setTrueProb(State.TRUEPROB);
            FlatNop nopend=new FlatNop();
            FlatBackEdge backedge=new FlatBackEdge();
 
@@ -880,7 +882,7 @@ public class BuildFlat {
            NodePair body=flattenBlockNode(ln.getBody());
            FlatNode begin=body.getBegin();
            FlatCondBranch fcb=new FlatCondBranch(cond_temp);
-           fcb.setTrueProb(0.8);
+           fcb.setTrueProb(State.TRUEPROB);
            FlatNop nopend=new FlatNop();
            FlatBackEdge backedge=new FlatBackEdge();
 

diff --git a/Robust/src/IR/State.java b/Robust/src/IR/State.java
index eab812821d0f1d2f99e93b054ed382e0a88af2fb..0e66fe016930577e2f3e19635495b905acacee76 100644 (file)
--- a/Robust/src/IR/State.java
+++ b/Robust/src/IR/State.java
@@ -58,6 +58,7 @@ public class State {
     public boolean THREAD=false;
     public boolean CONSCHECK=false;
     public boolean INSTRUCTIONFAILURE=false;
+    public static double TRUEPROB=0.8;
     public static boolean PRINTFLAT=false;
     public String structfile;
     public String main;

diff --git a/Robust/src/buildscript b/Robust/src/buildscript
index 1cb060150ecdb6e2f36d4171cfe55c13877cafb4..7ad7dcd5c998f9782f6bd73d2b940fc443cc00bf 100755 (executable)
--- a/Robust/src/buildscript
+++ b/Robust/src/buildscript
@@ -2,6 +2,7 @@
 
 printhelp() {
 echo -dsm distributed shared memory
+echo -trueprob double - probabiltiy of true branch
 echo -mac distributed shared memory mac support
 echo -check generate check code
 echo -dmalloc link in dmalloc
@@ -85,6 +86,10 @@ JAVAOPTS="$JAVAOPTS -prefetch"
 elif [[ $1 = '-printflat' ]]
 then
 JAVAOPTS="$JAVAOPTS -printflat"
+elif [[ $1 = '-trueprob' ]]
+then
+JAVAOPTS="$JAVAOPTS -trueprob $2"
+shift
 elif [[ $1 = '-mac' ]]
 then
 EXTRAOPTIONS="$EXTRAOPTIONS -DMAC"