TACLe and DIS benchmark fixes

- Use consistent approach to prevent computations from being
  optimized out in the DIS benchmarks
- Don't print results in the DIS benchmarks
- Fix a memory corruption in TACLe's "epic" benchmark reflect1()
- Fix return codes for all benchmarks
- Rename run_baseline.sh to run_bench.sh in preperation for this
  being the main benchmarking script

1 files changed, 20 insertions, 13 deletions

diff --git a/dis/Neighborhood/neighborhood.c b/dis/Neighborhood/neighborhood.c
index 2d401d3..ea1c658 100644
--- a/dis/Neighborhood/neighborhood.c
+++ b/dis/Neighborhood/neighborhood.c
@@ -74,23 +74,30 @@ int main(int argc, char **argv) {
   endTime = time(NULL);
   WRITE_TO_FILE
 
-  //  printf(" end time is %d\n", endTime);
+  volatile double _stop_optimizer = values.distShort.deg0.entropy
+          + values.distShort.deg0.energy + values.distShort.deg45.entropy
+          + values.distShort.deg45.energy + values.distShort.deg90.entropy
+          + values.distShort.deg90.energy + values.distShort.deg135.entropy
+          + values.distShort.deg135.energy + values.distLong.deg0.entropy
+          + values.distLong.deg0.energy + values.distShort.deg45.entropy
+          + values.distLong.deg45.energy + values.distLong.deg90.entropy
+          + values.distLong.deg90.energy + values.distLong.deg135.entropy
+          + values.distLong.deg135.energy;
+  //fprintf(stdout, "%9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e",
+  //        values.distShort.deg0.entropy, values.distShort.deg0.energy,
+  //        values.distShort.deg45.entropy, values.distShort.deg45.energy,
+  //        values.distShort.deg90.entropy, values.distShort.deg90.energy,
+  //        values.distShort.deg135.entropy, values.distShort.deg135.energy);
 
-  fprintf(stdout, "%9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e",
-          values.distShort.deg0.entropy, values.distShort.deg0.energy,
-          values.distShort.deg45.entropy, values.distShort.deg45.energy,
-          values.distShort.deg90.entropy, values.distShort.deg90.energy,
-          values.distShort.deg135.entropy, values.distShort.deg135.energy);
-
-  fprintf(stdout, "%9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e",
-          values.distLong.deg0.entropy, values.distLong.deg0.energy,
-          values.distShort.deg45.entropy, values.distLong.deg45.energy,
-          values.distLong.deg90.entropy, values.distLong.deg90.energy,
-          values.distLong.deg135.entropy, values.distLong.deg135.energy);
+  //fprintf(stdout, "%9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e",
+  //        values.distLong.deg0.entropy, values.distLong.deg0.energy,
+  //        values.distShort.deg45.entropy, values.distLong.deg45.energy,
+  //        values.distLong.deg90.entropy, values.distLong.deg90.energy,
+  //        values.distLong.deg135.entropy, values.distLong.deg135.energy);
 
   fprintf(stderr, "time for neghborhood stressmark = %f seconds.\n",
           difftime(endTime, beginTime));
 
   free((Pixel *)image);
-  return (SUCCESS);
+  return (0);
 }