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
---
 baseline/source/epic/epic.c | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'baseline/source/epic')

diff --git a/baseline/source/epic/epic.c b/baseline/source/epic/epic.c
index a1e344c..ed08040 100644
--- a/baseline/source/epic/epic.c
+++ b/baseline/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;
 }
-- 
cgit v1.2.2


From 2e4b1efc7e46b1278e162cb63632546af8f3e0e9 Mon Sep 17 00:00:00 2001
From: Joshua Bakita <jbakita@cs.unc.edu>
Date: Tue, 20 Oct 2020 16:26:25 -0400
Subject: Convert TACLeBench to use new libextra API

No other changes.
---
 baseline/source/epic/epic.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'baseline/source/epic')

diff --git a/baseline/source/epic/epic.c b/baseline/source/epic/epic.c
index ed08040..e31e54e 100644
--- a/baseline/source/epic/epic.c
+++ b/baseline/source/epic/epic.c
@@ -1131,15 +1131,13 @@ int main( int argc, char **argv )
 {
   int exit_code = -1;
   SET_UP
-  for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-    START_LOOP
+  for_each_job {
     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;
-- 
cgit v1.2.2