From 03412b9f841f140b9b7410a1890298e3ac2835db Mon Sep 17 00:00:00 2001
From: Joshua Bakita <jbakita@cs.unc.edu>
Date: Tue, 20 Oct 2020 13:35:52 -0400
Subject: 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
---
 all_pairs/source/epic/epic.c                 | 25 +++++++++++++++----------
 all_pairs/source/rijndael_enc/rijndael_enc.c | 24 +++++++++++++++---------
 2 files changed, 30 insertions(+), 19 deletions(-)

(limited to 'all_pairs/source')

diff --git a/all_pairs/source/epic/epic.c b/all_pairs/source/epic/epic.c
index a1e344c..ed08040 100644
--- a/all_pairs/source/epic/epic.c
+++ b/all_pairs/source/epic/epic.c
@@ -598,7 +598,7 @@ void epic_main( void );
   Declaration of global variables
 */
 
-float epic_filtertemp[FILTER_SIZE];
+float epic_filtertemp[FILTER_SIZE*2]; // *2 to work around memory corruption issue
 float epic_hi_imagetemp[X_SIZE * Y_SIZE / 2];
 float epic_lo_imagetemp[X_SIZE * Y_SIZE / 2];
 
@@ -1129,13 +1129,18 @@ int epic_return(){
 
 int main( int argc, char **argv )
 {
-	SET_UP
-	for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-		START_LOOP
-  		epic_init();
-  		epic_main();
-		STOP_LOOP
-	}
-	WRITE_TO_FILE
-  return epic_return();
+  int exit_code = -1;
+  SET_UP
+  for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
+    START_LOOP
+    epic_init();
+    epic_main();
+    // This checks the checksum is as expected.
+    // This is `&` as only the first job will match
+    // (image state persists between jobs).
+    exit_code &= epic_return();
+    STOP_LOOP
+  }
+  WRITE_TO_FILE
+  return exit_code;
 }
diff --git a/all_pairs/source/rijndael_enc/rijndael_enc.c b/all_pairs/source/rijndael_enc/rijndael_enc.c
index 6c85eee..21d7e67 100644
--- a/all_pairs/source/rijndael_enc/rijndael_enc.c
+++ b/all_pairs/source/rijndael_enc/rijndael_enc.c
@@ -68,6 +68,7 @@ void rijndael_enc_init( void )
   rijndael_enc_fin.data = rijndael_enc_data;
   rijndael_enc_fin.size = 31369;
   rijndael_enc_fin.cur_pos = 0;
+  rijndael_enc_checksum = 0;
 
   unsigned i;
   volatile int x = 0;
@@ -225,14 +226,19 @@ void _Pragma( "entrypoint" ) rijndael_enc_main( void )
 
 int main( int argc, char** argv )
 {
-	SET_UP
-	for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-		START_LOOP
-  		rijndael_enc_init();
-  		rijndael_enc_main();
-		STOP_LOOP
-	}
-	WRITE_TO_FILE
-  return ( rijndael_enc_return() );
+  int exit_code = -1;
+  SET_UP
+  for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
+    START_LOOP
+    rijndael_enc_init();
+    rijndael_enc_main();
+    // This checks the checksum is as expected.
+    // This is `&` as only the first job will match
+    // (PRNG state persists between jobs).
+    exit_code &= rijndael_enc_return();
+    STOP_LOOP
+  }
+  WRITE_TO_FILE
+  return ( exit_code );
 }
 
-- 
cgit v1.2.2