From 85426255dfbb9d9f44ee4b3141ec122ce7a8bc2a Mon Sep 17 00:00:00 2001
From: bdemsky <bdemsky>
Date: Tue, 25 Mar 2008 01:08:37 +0000
Subject: [PATCH] set true probability on command line

---
 .../Prefetch/MatrixMultiply/MatrixMultiply.java      |  4 ++--
 .../src/Benchmarks/Prefetch/MatrixMultiply/makefile  |  5 ++++-
 Robust/src/IR/Flat/BuildFlat.java                    | 12 +++++++-----
 Robust/src/IR/State.java                             |  1 +
 Robust/src/buildscript                               |  5 +++++
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiply.java b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiply.java
index 1687dd77..f35dbb25 100644
--- 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 f8bbf4a9..f37a0459 100644
--- 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 af56b60a..2c7ced71 100644
--- 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 eab81282..0e66fe01 100644
--- 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 1cb06015..7ad7dcd5 100755
--- 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"
-- 
2.34.1