From 7c6d5a6772303665f0df7a6dfd3aec3555c3547b Mon Sep 17 00:00:00 2001 From: jjenista Date: Fri, 6 Jan 2012 18:13:30 +0000 Subject: [PATCH] tweaks for running definite reach --- .../Analysis/Disjoint/DefiniteReachState.java | 5 +++-- .../Analysis/Disjoint/DisjointAnalysis.java | 4 ++-- Robust/src/Benchmarks/oooJava/barneshut/rund | 1 + Robust/src/Benchmarks/oooJava/crypt/rund | 1 + Robust/src/Benchmarks/oooJava/kmeans/rund | 1 + .../oooJava/labyrinth/rund-512first | 1 + Robust/src/Benchmarks/oooJava/master-makefile | 19 +++++++++++++++---- Robust/src/Benchmarks/oooJava/mergesort/rund | 1 + Robust/src/Benchmarks/oooJava/moldyn/rund | 1 + Robust/src/Benchmarks/oooJava/monte/rund | 1 + Robust/src/Benchmarks/oooJava/power/rund | 1 + Robust/src/Benchmarks/oooJava/raytracer/rund | 2 ++ Robust/src/Benchmarks/oooJava/sor/rund | 1 + Robust/src/Benchmarks/oooJava/tracking/rund | 1 + 14 files changed, 32 insertions(+), 8 deletions(-) create mode 100755 Robust/src/Benchmarks/oooJava/barneshut/rund create mode 100755 Robust/src/Benchmarks/oooJava/crypt/rund create mode 100755 Robust/src/Benchmarks/oooJava/kmeans/rund create mode 100755 Robust/src/Benchmarks/oooJava/labyrinth/rund-512first create mode 100755 Robust/src/Benchmarks/oooJava/mergesort/rund create mode 100755 Robust/src/Benchmarks/oooJava/moldyn/rund create mode 100755 Robust/src/Benchmarks/oooJava/monte/rund create mode 100755 Robust/src/Benchmarks/oooJava/power/rund create mode 100755 Robust/src/Benchmarks/oooJava/raytracer/rund create mode 100755 Robust/src/Benchmarks/oooJava/sor/rund create mode 100755 Robust/src/Benchmarks/oooJava/tracking/rund diff --git a/Robust/src/Analysis/Disjoint/DefiniteReachState.java b/Robust/src/Analysis/Disjoint/DefiniteReachState.java index 321d290e..0848f668 100644 --- a/Robust/src/Analysis/Disjoint/DefiniteReachState.java +++ b/Robust/src/Analysis/Disjoint/DefiniteReachState.java @@ -424,8 +424,9 @@ public class DefiniteReachState { public void copyRs( TempDescriptor x, TempDescriptor y ) { DefReachKnown valRs = Rs.get( y ); - assert( valRs != null ); - Rs.put( x, valRs ); + if( valRs != null ) { + Rs.put( x, valRs ); + } } public void loadRs( TempDescriptor x, diff --git a/Robust/src/Analysis/Disjoint/DisjointAnalysis.java b/Robust/src/Analysis/Disjoint/DisjointAnalysis.java index 99eb4f62..b8dac1f9 100644 --- a/Robust/src/Analysis/Disjoint/DisjointAnalysis.java +++ b/Robust/src/Analysis/Disjoint/DisjointAnalysis.java @@ -2039,10 +2039,10 @@ public class DisjointAnalysis implements HeapAnalysis { true, // write labels (variables) true, // selectively hide intermediate temp vars true, // prune unreachable heap regions - true, // hide reachability altogether + false, // hide reachability altogether true, // hide subset reachability states true, // hide predicates - false); // hide edge taints + true); // hide edge taints } } diff --git a/Robust/src/Benchmarks/oooJava/barneshut/rund b/Robust/src/Benchmarks/oooJava/barneshut/rund new file mode 100755 index 00000000..6014cbc6 --- /dev/null +++ b/Robust/src/Benchmarks/oooJava/barneshut/rund @@ -0,0 +1 @@ +time ./Barneshutd.bin ./inputs/BarnesHutLarge.in diff --git a/Robust/src/Benchmarks/oooJava/crypt/rund b/Robust/src/Benchmarks/oooJava/crypt/rund new file mode 100755 index 00000000..feaf68b9 --- /dev/null +++ b/Robust/src/Benchmarks/oooJava/crypt/rund @@ -0,0 +1 @@ +time ./JGFCryptBenchd.bin 2 23 diff --git a/Robust/src/Benchmarks/oooJava/kmeans/rund b/Robust/src/Benchmarks/oooJava/kmeans/rund new file mode 100755 index 00000000..a7b9f71b --- /dev/null +++ b/Robust/src/Benchmarks/oooJava/kmeans/rund @@ -0,0 +1 @@ +time ./KMeansd.bin -m 40 -n 40 -t 0.00001 -i inputs/random-n65536-d32-c16.txt -nthreads 1 diff --git a/Robust/src/Benchmarks/oooJava/labyrinth/rund-512first b/Robust/src/Benchmarks/oooJava/labyrinth/rund-512first new file mode 100755 index 00000000..22e812fb --- /dev/null +++ b/Robust/src/Benchmarks/oooJava/labyrinth/rund-512first @@ -0,0 +1 @@ +time numactl --interleave=all ./Labyrinthd.bin -w 23 -i ./inputs/random-x512-y512-z7-n512.txt diff --git a/Robust/src/Benchmarks/oooJava/master-makefile b/Robust/src/Benchmarks/oooJava/master-makefile index a5ab907e..16ed5f2a 100644 --- a/Robust/src/Benchmarks/oooJava/master-makefile +++ b/Robust/src/Benchmarks/oooJava/master-makefile @@ -76,8 +76,8 @@ DISJOINT= -disjoint -disjoint-k 1 -enable-assertions $(DRELEASEMODE) #-disjoint- # EX: (skip first 10 visits, capture the next 3, then halt) # -disjoint-debug-snap-method Remove 10 3 true -DISJOINTDEBUG= -disjoint -disjoint-k 1 -enable-assertions $(DRELEASEMODE) -# -disjoint-write-dots final +DISJOINTDEBUG= -disjoint -disjoint-k 1 -enable-assertions $(DRELEASEMODE) \ + -disjoint-write-dots final # -disjoint-debug-scheduling # -disjoint-debug-callsite Barneshut.Insert Barneshut.run 50 500 true # -disjoint-debug-snap-method ArrayIndexedGraph.createNode 1 100 true \ @@ -127,6 +127,17 @@ $(PROGRAM)c.bin: $(SOURCE_FILES) ../master-makefile +disjoint: $(SOURCE_FILES) ../master-makefile + $(BUILDSCRIPT) $(BMFLAGS) $(BSFLAGS) $(DISJOINT) -justanalyze $(SOURCE_FILES) + +disjoint-defreach: $(SOURCE_FILES) ../master-makefile + $(BUILDSCRIPT) $(BMFLAGS) $(BSFLAGS) $(DISJOINT) -justanalyze -do-definite-reach-analysis $(SOURCE_FILES) + +ooo-defreach: $(SOURCE_FILES) ../master-makefile + $(BUILDSCRIPT) $(BMFLAGS) $(BSFLAGS) $(USECOREPROF) $(USEOOO) $(DISJOINTDEBUG) -do-definite-reach-analysis -o $(PROGRAM)d -builddir def $(SOURCE_FILES) + + + ooo: $(PROGRAM)p.bin $(PROGRAM)p.bin: $(SOURCE_FILES) ../master-makefile @@ -157,8 +168,8 @@ rcr-debug-v: $(SOURCE_FILES) ../master-makefile $(BUILDSCRIPT) $(BMFLAGS) $(BSFLAGS) $(USECOREPROF) $(USERCR) $(RCRDEBUGV) $(DISJOINT) -o $(PROGRAM)r -builddir rcr $(SOURCE_FILES) clean: - rm -f $(PROGRAM)p.bin $(PROGRAM)s.bin $(PROGRAM)r.bin $(PROGRAM)c.bin - rm -fr par sing rcr chk + rm -f $(PROGRAM)p.bin $(PROGRAM)s.bin $(PROGRAM)r.bin $(PROGRAM)c.bin $(PROGRAM)d.bin + rm -fr par sing rcr chk def rm -f tmp.c rm -f *~ rm -f *.dot diff --git a/Robust/src/Benchmarks/oooJava/mergesort/rund b/Robust/src/Benchmarks/oooJava/mergesort/rund new file mode 100755 index 00000000..2c6010e6 --- /dev/null +++ b/Robust/src/Benchmarks/oooJava/mergesort/rund @@ -0,0 +1 @@ +./MergeSort4d.bin 134217728 32 diff --git a/Robust/src/Benchmarks/oooJava/moldyn/rund b/Robust/src/Benchmarks/oooJava/moldyn/rund new file mode 100755 index 00000000..05798295 --- /dev/null +++ b/Robust/src/Benchmarks/oooJava/moldyn/rund @@ -0,0 +1 @@ +time ./JGFMolDynBenchSizeBd.bin 1 200 diff --git a/Robust/src/Benchmarks/oooJava/monte/rund b/Robust/src/Benchmarks/oooJava/monte/rund new file mode 100755 index 00000000..b0d18237 --- /dev/null +++ b/Robust/src/Benchmarks/oooJava/monte/rund @@ -0,0 +1 @@ +time ./JGFMonteCarloBenchd.bin 1 26 \ No newline at end of file diff --git a/Robust/src/Benchmarks/oooJava/power/rund b/Robust/src/Benchmarks/oooJava/power/rund new file mode 100755 index 00000000..789ddaf3 --- /dev/null +++ b/Robust/src/Benchmarks/oooJava/power/rund @@ -0,0 +1 @@ +time ./Powerd.bin \ No newline at end of file diff --git a/Robust/src/Benchmarks/oooJava/raytracer/rund b/Robust/src/Benchmarks/oooJava/raytracer/rund new file mode 100755 index 00000000..3e0cf290 --- /dev/null +++ b/Robust/src/Benchmarks/oooJava/raytracer/rund @@ -0,0 +1,2 @@ +#!/bin/bash +time ./testd.bin 1 diff --git a/Robust/src/Benchmarks/oooJava/sor/rund b/Robust/src/Benchmarks/oooJava/sor/rund new file mode 100755 index 00000000..2d578725 --- /dev/null +++ b/Robust/src/Benchmarks/oooJava/sor/rund @@ -0,0 +1 @@ +time numactl --interleave=all ./JGFSORBenchSizeDd.bin diff --git a/Robust/src/Benchmarks/oooJava/tracking/rund b/Robust/src/Benchmarks/oooJava/tracking/rund new file mode 100755 index 00000000..679ff251 --- /dev/null +++ b/Robust/src/Benchmarks/oooJava/tracking/rund @@ -0,0 +1 @@ +time ./TrackingBenchd.bin \ No newline at end of file -- 2.34.1