From 29b47051a2a180f35fde3bc64980380175e8e542 Mon Sep 17 00:00:00 2001 From: adash Date: Wed, 14 Oct 2009 00:03:11 +0000 Subject: [PATCH] check-in benchmark changes for ipdps paper --- Robust/src/Analysis/Locality/LocalityAnalysis.java | 9 ++++++--- Robust/src/Benchmarks/Prefetch/2DConv/dsm/Makefile | 2 +- Robust/src/Benchmarks/Prefetch/2DFFT/dsm/Makefile | 2 +- Robust/src/Benchmarks/Prefetch/Chase/makefile | 5 +++-- Robust/src/Benchmarks/Prefetch/KMeans/makefile | 6 ++++-- .../src/Benchmarks/Prefetch/MatrixMultiply/dsm/makefile | 9 +++++++-- Robust/src/Benchmarks/Prefetch/Moldyn/dsm/makefile | 2 +- 7 files changed, 23 insertions(+), 12 deletions(-) diff --git a/Robust/src/Analysis/Locality/LocalityAnalysis.java b/Robust/src/Analysis/Locality/LocalityAnalysis.java index 27c0c9c9..265fce75 100644 --- a/Robust/src/Analysis/Locality/LocalityAnalysis.java +++ b/Robust/src/Analysis/Locality/LocalityAnalysis.java @@ -991,8 +991,9 @@ public class LocalityAnalysis { throw new Error("Joining thread on local object not allowed in context:\n"+currlb.getExplanation()); if(thistype.equals(CONFLICT)) throw new Error("Using type that can be either local or global in context:\n"+currlb.getExplanation()); - if(runmethodset==null&&thistype.equals(GLOBAL)&&!isatomic && !isjoin && executemethodset == null) + if(runmethodset==null&&thistype.equals(GLOBAL)&&!isatomic && !isjoin && executemethodset == null) { throw new Error("Using global object outside of transaction in context:\n"+currlb.getExplanation()); + } if (runmethodset==null&&isnative&&thistype.equals(GLOBAL) && !isjoin && executemethodset == null && !isObjectgetType && !isObjecthashCode) throw new Error("Potential call to native method "+md+" on global objects:\n"+currlb.getExplanation()); lb.setGlobalThis(thistype); @@ -1066,8 +1067,9 @@ public class LocalityAnalysis { if (!(srctype.equals(GLOBAL)||srctype.equals(EITHER))) throw new Error("Writing possible local reference to global field in context: \n"+lb.getExplanation()); } else { - if (!(srctype.equals(LOCAL)||srctype.equals(EITHER))) + if (!(srctype.equals(LOCAL)||srctype.equals(EITHER))) { throw new Error("Writing possible global reference to local object in context: \n"+lb.getExplanation()); + } } } else if (dsttype.equals(GLOBAL)) { if (!transaction) @@ -1136,8 +1138,9 @@ public class LocalityAnalysis { Integer dsttype=currtable.get(fsen.getDst()); if (dsttype.equals(LOCAL)) { - if (!(srctype.equals(LOCAL)||srctype.equals(EITHER))) + if (!(srctype.equals(LOCAL)||srctype.equals(EITHER))) { throw new Error("Writing possible global reference to local object in context:\n"+lb.getExplanation()+fsen); + } } else if (dsttype.equals(GLOBAL)) { if (srctype.equals(LOCAL) && fsen.getDst().getType().dereference().isPrimitive() && !fsen.getDst().getType().dereference().isArray()) return; diff --git a/Robust/src/Benchmarks/Prefetch/2DConv/dsm/Makefile b/Robust/src/Benchmarks/Prefetch/2DConv/dsm/Makefile index c7c2b407..e90a6954 100644 --- a/Robust/src/Benchmarks/Prefetch/2DConv/dsm/Makefile +++ b/Robust/src/Benchmarks/Prefetch/2DConv/dsm/Makefile @@ -2,7 +2,7 @@ MAINCLASS=Convolution SRC=${MAINCLASS}.java SRC1=${MAINCLASS}SizeB.java SRC2=${MAINCLASS}SizeC.java -FLAGS =-dsm -transstats -dsmcaching -prefetch -optimize -excprefetch Image.initKernel -excprefetch Image.setValues -excprefetch Convolution.main -trueprob 0.98 -mainclass ${MAINCLASS} +FLAGS =-dsm -dsmcaching -prefetch -optimize -excprefetch Image.initKernel -excprefetch Image.setValues -excprefetch Convolution.main -trueprob 0.95 -mainclass ${MAINCLASS} FLAGS1=-dsm -optimize -mainclass ${MAINCLASS} FLAGS2=-dsm -optimize -dsmcaching -mainclass ${MAINCLASS} diff --git a/Robust/src/Benchmarks/Prefetch/2DFFT/dsm/Makefile b/Robust/src/Benchmarks/Prefetch/2DFFT/dsm/Makefile index 38963d9f..b95f68c3 100644 --- a/Robust/src/Benchmarks/Prefetch/2DFFT/dsm/Makefile +++ b/Robust/src/Benchmarks/Prefetch/2DFFT/dsm/Makefile @@ -9,7 +9,7 @@ FLAGS2=-dsm -optimize -dsmcaching -mainclass ${MAINCLASS} default: ../../../../buildscript ${FLAGS1} ${SRC} -o ${MAINCLASS}NPNC - ../../../../buildscript ${FLAGS2} ${SRC} -o ${MAINCLASS}NPC +# ../../../../buildscript ${FLAGS2} ${SRC} -o ${MAINCLASS}NPC ../../../../buildscript ${FLAGS} ${SRC} -o ${MAINCLASS}N clean: diff --git a/Robust/src/Benchmarks/Prefetch/Chase/makefile b/Robust/src/Benchmarks/Prefetch/Chase/makefile index fb0146bd..f9b6ce6a 100644 --- a/Robust/src/Benchmarks/Prefetch/Chase/makefile +++ b/Robust/src/Benchmarks/Prefetch/Chase/makefile @@ -1,13 +1,14 @@ MAINCLASS=Chase SRC1=${MAINCLASS}.java -#FLAGS=-dsm -prefetch -dsmcaching -optimize -excprefetch Chase.main -excprefetch Chase.Chase -mainclass ${MAINCLASS} -trueprob 0.98 +FLAGS=-dsm -prefetch -dsmcaching -optimize -excprefetch Chase.main -excprefetch Chase.Chase -mainclass ${MAINCLASS} -trueprob 0.98 FLAGS2=-dsm -dsmcaching -optimize -mainclass ${MAINCLASS} -trueprob 0.99 FLAGS3=-dsm -optimize -mainclass ${MAINCLASS} -trueprob 0.99 #for testing no java option #FLAGS=-dsm -prefetch -optimize -debug -excprefetch Chase.main -excprefetch Chase.Chase -mainclass ${MAINCLASS} -trueprob 0.99 -nojava default: ../../../buildscript ${FLAGS3} -o ${MAINCLASS}NPNC ${SRC1} - ../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPC ${SRC1} +# ../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPC ${SRC1} + ../../../buildscript ${FLAGS} -o ${MAINCLASS}N ${SRC1} clean: rm -rf tmpbuilddirectory diff --git a/Robust/src/Benchmarks/Prefetch/KMeans/makefile b/Robust/src/Benchmarks/Prefetch/KMeans/makefile index 926b14ff..0b7b61bd 100644 --- a/Robust/src/Benchmarks/Prefetch/KMeans/makefile +++ b/Robust/src/Benchmarks/Prefetch/KMeans/makefile @@ -7,10 +7,12 @@ SRC=${MAINCLASS}.java \ GlobalArgs.java \ ../../../ClassLibrary/JavaDSM/Barrier.java -FLAGSSTATS=-mainclass ${MAINCLASS} -dsm -optimize -debug -transstats +FLAGS=-mainclass ${MAINCLASS} -dsm -optimize -transstats +FLAGS1=-mainclass ${MAINCLASS} -dsm -dsmcaching -optimize -transstats dsm: - ../../../buildscript ${FLAGSSTATS} -o ${MAINCLASS} ${SRC} + ../../../buildscript ${FLAGS} -o ${MAINCLASS}NPNC ${SRC} + ../../../buildscript ${FLAGS1} -o ${MAINCLASS}NPC ${SRC} prep: diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/dsm/makefile b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/dsm/makefile index fb7c4ba7..4c5d91f0 100644 --- a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/dsm/makefile +++ b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/dsm/makefile @@ -1,11 +1,16 @@ MAINCLASS=MatrixMultiply SRC1=${MAINCLASS}N.java +SRC2=MatrixMultiplyD3.java \ + ../../../../ClassLibrary/JavaDSM/Barrier.java FLAGS=-dsm -dsmcaching -prefetch -optimize -excprefetch MatrixMultiply.main -excprefetch MMul.setValues -excprefetch MMul.transpose -mainclass ${MAINCLASS} -trueprob 0.98 FLAGS1=-dsm -optimize -dsmcaching -mainclass ${MAINCLASS} FLAGS2=-dsm -optimize -mainclass ${MAINCLASS} -FLAGS3= -dsm -32bit -nooptimize -recovery -debug -mainclass ${MAINCLASS} default: - ../../../../buildscript ${FLAGS3} -o ${MAINCLASS} ${SRC1} + ../../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPNC ${SRC2} +# ../../../../buildscript ${FLAGS1} -o ${MAINCLASS}NPC ${SRC2} + ../../../../buildscript ${FLAGS} -o ${MAINCLASS}N ${SRC2} +# ../../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPNC200 ${SRC2} +# ../../../../buildscript ${FLAGS} -o ${MAINCLASS}N200 ${SRC2} clean: rm -rf tmpbuilddirectory diff --git a/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/makefile b/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/makefile index 108bee9e..b4cd4e25 100644 --- a/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/makefile +++ b/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/makefile @@ -14,7 +14,7 @@ FLAGS1=-dsm -dsmcaching -optimize -mainclass ${MAINCLASS} -trueprob 0.75 default: ../../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPNC ${SRC} - ../../../../buildscript ${FLAGS1} -o ${MAINCLASS}NPC ${SRC} +# ../../../../buildscript ${FLAGS1} -o ${MAINCLASS}NPC ${SRC} ../../../../buildscript ${FLAGS} -o ${MAINCLASS}N ${SRC} clean: -- 2.34.1