From 3d35075cef6b0f14691ab8d9daf084a66c9b257b Mon Sep 17 00:00:00 2001 From: bdemsky Date: Wed, 19 Nov 2008 08:38:24 +0000 Subject: [PATCH] change mid arrays --- .../Prefetch/2DConv/dsm/Convolution.java | 16 ++++++++-------- .../Prefetch/2DConv/javasingle/makefile | 2 +- .../Benchmarks/Prefetch/2DFFT/dsm/fft2d.java | 17 +++++++++-------- .../src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java | 16 ++++++++-------- .../MatrixMultiply/MatrixMultiplyN.java | 17 +++++++++-------- .../MatrixMultiply/MatrixMultiplyNrun.java | 17 +++++++++-------- .../Prefetch/Moldyn/dsm/JGFMolDynBench.java | 16 ++++++++-------- .../Prefetch/SOR/dsm/JGFSORBench.java | 16 ++++++++-------- 8 files changed, 60 insertions(+), 57 deletions(-) diff --git a/Robust/src/Benchmarks/Prefetch/2DConv/dsm/Convolution.java b/Robust/src/Benchmarks/Prefetch/2DConv/dsm/Convolution.java index 5e3fb1e8..8ee01406 100644 --- a/Robust/src/Benchmarks/Prefetch/2DConv/dsm/Convolution.java +++ b/Robust/src/Benchmarks/Prefetch/2DConv/dsm/Convolution.java @@ -51,14 +51,14 @@ public class Convolution extends Thread { } int[] mid = new int[8]; - mid[0] = (128<<24)|(195<<16)|(175<<8)|84; //dw-10 - mid[1] = (128<<24)|(195<<16)|(175<<8)|85; //dw-11 - mid[2] = (128<<24)|(195<<16)|(175<<8)|86; //dw-12 - mid[3] = (128<<24)|(195<<16)|(175<<8)|87; //dw-13 - mid[4] = (128<<24)|(195<<16)|(175<<8)|88; //dw-14 - mid[5] = (128<<24)|(195<<16)|(175<<8)|89; //dw-15 - mid[6] = (128<<24)|(195<<16)|(175<<8)|90; //dw-16 - mid[7] = (128<<24)|(195<<16)|(175<<8)|91; //dw-17 + mid[0] = (128<<24)|(195<<16)|(136<<8)|162; //dw-10 + mid[1] = (128<<24)|(195<<16)|(136<<8)|163; //dw-11 + mid[2] = (128<<24)|(195<<16)|(136<<8)|164; //dw-12 + mid[3] = (128<<24)|(195<<16)|(136<<8)|165; //dw-13 + mid[4] = (128<<24)|(195<<16)|(136<<8)|166; //dw-14 + mid[5] = (128<<24)|(195<<16)|(136<<8)|167; //dw-15 + mid[6] = (128<<24)|(195<<16)|(136<<8)|168; //dw-16 + mid[7] = (128<<24)|(195<<16)|(136<<8)|169; //dw-17 Image img; Convolution[] conv; diff --git a/Robust/src/Benchmarks/Prefetch/2DConv/javasingle/makefile b/Robust/src/Benchmarks/Prefetch/2DConv/javasingle/makefile index df608250..15c03979 100644 --- a/Robust/src/Benchmarks/Prefetch/2DConv/javasingle/makefile +++ b/Robust/src/Benchmarks/Prefetch/2DConv/javasingle/makefile @@ -1,7 +1,7 @@ MAINCLASS=Convolution SRC=${MAINCLASS}.java default: - ../../../../buildscript -optimize -mainclass ${MAINCLASS} ${SRC} -o ${MAINCLASS} + ../../../../buildscript -nooptimize -debug -mainclass ${MAINCLASS} ${SRC} -o ${MAINCLASS} clean: rm -rf tmpbuilddirectory diff --git a/Robust/src/Benchmarks/Prefetch/2DFFT/dsm/fft2d.java b/Robust/src/Benchmarks/Prefetch/2DFFT/dsm/fft2d.java index 3c7a6563..90a1978d 100644 --- a/Robust/src/Benchmarks/Prefetch/2DFFT/dsm/fft2d.java +++ b/Robust/src/Benchmarks/Prefetch/2DFFT/dsm/fft2d.java @@ -100,14 +100,15 @@ public class fft2d extends Thread { System.printString("Num threads = " + NUM_THREADS + " SIZE= " + SIZE + "\n"); int[] mid = new int[8]; - mid[0] = (128<<24)|(195<<16)|(175<<8)|84; //dw-10 - mid[1] = (128<<24)|(195<<16)|(175<<8)|85; //dw-11 - mid[2] = (128<<24)|(195<<16)|(175<<8)|86; //dw-12 - mid[3] = (128<<24)|(195<<16)|(175<<8)|87; //dw-13 - mid[4] = (128<<24)|(195<<16)|(175<<8)|88; //dw-14 - mid[5] = (128<<24)|(195<<16)|(175<<8)|89; //dw-15 - mid[6] = (128<<24)|(195<<16)|(175<<8)|90; //dw-16 - mid[7] = (128<<24)|(195<<16)|(175<<8)|91; //dw-17 + mid[0] = (128<<24)|(195<<16)|(136<<8)|162; //dw-10 + mid[1] = (128<<24)|(195<<16)|(136<<8)|163; //dw-11 + mid[2] = (128<<24)|(195<<16)|(136<<8)|164; //dw-12 + mid[3] = (128<<24)|(195<<16)|(136<<8)|165; //dw-13 + mid[4] = (128<<24)|(195<<16)|(136<<8)|166; //dw-14 + mid[5] = (128<<24)|(195<<16)|(136<<8)|167; //dw-15 + mid[6] = (128<<24)|(195<<16)|(136<<8)|168; //dw-16 + mid[7] = (128<<24)|(195<<16)|(136<<8)|169; //dw-17 + // Start Barrier Server BarrierServer mybarr; diff --git a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java index d04cbe19..1d68cbf1 100644 --- a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java +++ b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java @@ -138,14 +138,14 @@ public class Em3d extends Thread { long start0 = System.currentTimeMillis(); int numThreads = em.numThreads; int[] mid = new int[8]; - mid[0] = (128<<24)|(195<<16)|(175<<8)|84;//dw-10 - mid[1] = (128<<24)|(195<<16)|(175<<8)|85;//dw-11 - mid[2] = (128<<24)|(195<<16)|(175<<8)|86;//dw-12 - mid[3] = (128<<24)|(195<<16)|(175<<8)|87;//dw-13 - mid[4] = (128<<24)|(195<<16)|(175<<8)|88;//dw-14 - mid[5] = (128<<24)|(195<<16)|(175<<8)|89;//dw-15 - mid[6] = (128<<24)|(195<<16)|(175<<8)|90;//dw-16 - mid[7] = (128<<24)|(195<<16)|(175<<8)|91;//dw-17 + mid[0] = (128<<24)|(195<<16)|(136<<8)|162; //dw-10 + mid[1] = (128<<24)|(195<<16)|(136<<8)|163; //dw-11 + mid[2] = (128<<24)|(195<<16)|(136<<8)|164; //dw-12 + mid[3] = (128<<24)|(195<<16)|(136<<8)|165; //dw-13 + mid[4] = (128<<24)|(195<<16)|(136<<8)|166; //dw-14 + mid[5] = (128<<24)|(195<<16)|(136<<8)|167; //dw-15 + mid[6] = (128<<24)|(195<<16)|(136<<8)|168; //dw-16 + mid[7] = (128<<24)|(195<<16)|(136<<8)|169; //dw-17 System.printString("DEBUG -> numThreads = " + numThreads+"\n"); BarrierServer mybarr; diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyN.java b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyN.java index 9a5eb0b9..077f04fb 100644 --- a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyN.java +++ b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyN.java @@ -42,14 +42,15 @@ public class MatrixMultiply extends Thread{ } int[] mid = new int[8]; - mid[0] = (128<<24)|(195<<16)|(175<<8)|84; //dw-10 - mid[1] = (128<<24)|(195<<16)|(175<<8)|85; //dw-11 - mid[2] = (128<<24)|(195<<16)|(175<<8)|86; //dw-12 - mid[3] = (128<<24)|(195<<16)|(175<<8)|87; //dw-13 - mid[4] = (128<<24)|(195<<16)|(175<<8)|88; //dw-14 - mid[5] = (128<<24)|(195<<16)|(175<<8)|89; //dw-15 - mid[6] = (128<<24)|(195<<16)|(175<<8)|90; //dw-16 - mid[7] = (128<<24)|(195<<16)|(175<<8)|91; //dw-17 + mid[0] = (128<<24)|(195<<16)|(136<<8)|162; //dw-10 + mid[1] = (128<<24)|(195<<16)|(136<<8)|163; //dw-11 + mid[2] = (128<<24)|(195<<16)|(136<<8)|164; //dw-12 + mid[3] = (128<<24)|(195<<16)|(136<<8)|165; //dw-13 + mid[4] = (128<<24)|(195<<16)|(136<<8)|166; //dw-14 + mid[5] = (128<<24)|(195<<16)|(136<<8)|167; //dw-15 + mid[6] = (128<<24)|(195<<16)|(136<<8)|168; //dw-16 + mid[7] = (128<<24)|(195<<16)|(136<<8)|169; //dw-17 + int p, q, r; MatrixMultiply[] mm; MatrixMultiply tmp; diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyNrun.java b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyNrun.java index 2e1118f5..998c383d 100644 --- a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyNrun.java +++ b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyNrun.java @@ -52,14 +52,15 @@ public class MatrixMultiply extends Thread{ } int[] mid = new int[8]; - mid[0] = (128<<24)|(195<<16)|(175<<8)|84;//dw-10 - mid[1] = (128<<24)|(195<<16)|(175<<8)|85;//dw-11 - mid[2] = (128<<24)|(195<<16)|(175<<8)|86;//dw-12 - mid[3] = (128<<24)|(195<<16)|(175<<8)|87;//dw-13 - mid[4] = (128<<24)|(195<<16)|(175<<8)|88;//dw-14 - mid[5] = (128<<24)|(195<<16)|(175<<8)|89;//dw-15 - mid[6] = (128<<24)|(195<<16)|(175<<8)|90;//dw-16 - mid[7] = (128<<24)|(195<<16)|(175<<8)|91;//dw-17 + int[] mid = new int[8]; + mid[0] = (128<<24)|(195<<16)|(136<<8)|162; //dw-10 + mid[1] = (128<<24)|(195<<16)|(136<<8)|163; //dw-11 + mid[2] = (128<<24)|(195<<16)|(136<<8)|164; //dw-12 + mid[3] = (128<<24)|(195<<16)|(136<<8)|165; //dw-13 + mid[4] = (128<<24)|(195<<16)|(136<<8)|166; //dw-14 + mid[5] = (128<<24)|(195<<16)|(136<<8)|167; //dw-15 + mid[6] = (128<<24)|(195<<16)|(136<<8)|168; //dw-16 + mid[7] = (128<<24)|(195<<16)|(136<<8)|169; //dw-17 int p, q, r; MatrixMultiply[] mm; diff --git a/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFMolDynBench.java b/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFMolDynBench.java index e654ee60..20a0948d 100644 --- a/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFMolDynBench.java +++ b/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFMolDynBench.java @@ -70,14 +70,14 @@ public class JGFMolDynBench { // Create new arrays BarrierServer mybarr; int[] mid = new int[8]; - mid[0] = (128<<24)|(195<<16)|(175<<8)|84;//dw-10 - mid[1] = (128<<24)|(195<<16)|(175<<8)|85;//dw-11 - mid[2] = (128<<24)|(195<<16)|(175<<8)|86;//dw-12 - mid[3] = (128<<24)|(195<<16)|(175<<8)|87;//dw-13 - mid[4] = (128<<24)|(195<<16)|(175<<8)|88;//dw-14 - mid[5] = (128<<24)|(195<<16)|(175<<8)|89;//dw-15 - mid[6] = (128<<24)|(195<<16)|(175<<8)|90;//dw-16 - mid[7] = (128<<24)|(195<<16)|(175<<8)|91;//dw-17 + mid[0] = (128<<24)|(195<<16)|(136<<8)|162; //dw-10 + mid[1] = (128<<24)|(195<<16)|(136<<8)|163; //dw-11 + mid[2] = (128<<24)|(195<<16)|(136<<8)|164; //dw-12 + mid[3] = (128<<24)|(195<<16)|(136<<8)|165; //dw-13 + mid[4] = (128<<24)|(195<<16)|(136<<8)|166; //dw-14 + mid[5] = (128<<24)|(195<<16)|(136<<8)|167; //dw-15 + mid[6] = (128<<24)|(195<<16)|(136<<8)|168; //dw-16 + mid[7] = (128<<24)|(195<<16)|(136<<8)|169; //dw-17 double sh_force [][]; double sh_force2 [][][]; diff --git a/Robust/src/Benchmarks/Prefetch/SOR/dsm/JGFSORBench.java b/Robust/src/Benchmarks/Prefetch/SOR/dsm/JGFSORBench.java index b54530bb..6e13994d 100644 --- a/Robust/src/Benchmarks/Prefetch/SOR/dsm/JGFSORBench.java +++ b/Robust/src/Benchmarks/Prefetch/SOR/dsm/JGFSORBench.java @@ -47,14 +47,14 @@ public class JGFSORBench { BarrierServer mybarr; int[] mid = new int[8]; - mid[0] = (128<<24)|(195<<16)|(175<<8)|84;//dw-10 - mid[1] = (128<<24)|(195<<16)|(175<<8)|85;//dw-11 - mid[2] = (128<<24)|(195<<16)|(175<<8)|86;//dw-12 - mid[3] = (128<<24)|(195<<16)|(175<<8)|87;//dw-13 - mid[4] = (128<<24)|(195<<16)|(175<<8)|88;//dw-14 - mid[5] = (128<<24)|(195<<16)|(175<<8)|89;//dw-15 - mid[6] = (128<<24)|(195<<16)|(175<<8)|90;//dw-16 - mid[7] = (128<<24)|(195<<16)|(175<<8)|91;//dw-17 + mid[0] = (128<<24)|(195<<16)|(136<<8)|162; //dw-10 + mid[1] = (128<<24)|(195<<16)|(136<<8)|163; //dw-11 + mid[2] = (128<<24)|(195<<16)|(136<<8)|164; //dw-12 + mid[3] = (128<<24)|(195<<16)|(136<<8)|165; //dw-13 + mid[4] = (128<<24)|(195<<16)|(136<<8)|166; //dw-14 + mid[5] = (128<<24)|(195<<16)|(136<<8)|167; //dw-15 + mid[6] = (128<<24)|(195<<16)|(136<<8)|168; //dw-16 + mid[7] = (128<<24)|(195<<16)|(136<<8)|169; //dw-17 double[][] G; int num_iterations; -- 2.34.1