From 917499f6257ac51c05e8302af877d56a22f28cb5 Mon Sep 17 00:00:00 2001
From: Joshua Bakita <jbakita@cs.unc.edu>
Date: Sat, 17 Oct 2020 00:52:09 -0400
Subject: Cleanup in extra.h for non-paired benchmarks

- No parameter or output format changes
- Better error messages
- Auto-detect core
- Fix off-by-one error in job counting
- Explicitly invoke the scheduler with sched_yield() between jobs
  so that there's less work to do when (if) the scheduling timer
  interrupt comes around. (This has a surprisingly significant
  impact on timings.)
---
 baseline/source/adpcm_dec/adpcm_dec.c           |  2 +-
 baseline/source/adpcm_enc/adpcm_enc.c           |  2 +-
 baseline/source/ammunition/ammunition.c         |  2 +-
 baseline/source/anagram/anagram.c               |  2 +-
 baseline/source/audiobeam/audiobeam.c           |  2 +-
 baseline/source/cjpeg_transupp/cjpeg_transupp.c |  2 +-
 baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c       |  2 +-
 baseline/source/dijkstra/dijkstra.c             |  2 +-
 baseline/source/epic/epic.c                     |  2 +-
 baseline/source/extra.h                         | 40 +++++++++++++++++--------
 baseline/source/fmref/fmref.c                   |  2 +-
 baseline/source/g723_enc/g723_enc.c             |  2 +-
 baseline/source/gsm_dec/gsm_dec.c               |  2 +-
 baseline/source/gsm_enc/gsm_enc.c               |  2 +-
 baseline/source/h264_dec/h264_dec.c             |  2 +-
 baseline/source/huff_dec/huff_dec.c             |  2 +-
 baseline/source/huff_enc/huff_enc.c             |  2 +-
 baseline/source/mpeg2/mpeg2.c                   |  2 +-
 baseline/source/ndes/ndes.c                     |  2 +-
 baseline/source/petrinet/petrinet.c             |  2 +-
 baseline/source/rijndael_dec/rijndael_dec.c     |  2 +-
 baseline/source/rijndael_enc/rijndael_enc.c     |  2 +-
 baseline/source/statemate/statemate.c           |  2 +-
 baseline/source/susan/susan.c                   |  2 +-
 24 files changed, 51 insertions(+), 35 deletions(-)

diff --git a/baseline/source/adpcm_dec/adpcm_dec.c b/baseline/source/adpcm_dec/adpcm_dec.c
index 6811e69..04a5746 100644
--- a/baseline/source/adpcm_dec/adpcm_dec.c
+++ b/baseline/source/adpcm_dec/adpcm_dec.c
@@ -708,7 +708,7 @@ void _Pragma( "entrypoint" ) adpcm_dec_main( void )
 int main(int argc, char **argv)
 {
   SET_UP
-  for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+  for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
   	START_LOOP
 	adpcm_dec_init();
   	adpcm_dec_main();
diff --git a/baseline/source/adpcm_enc/adpcm_enc.c b/baseline/source/adpcm_enc/adpcm_enc.c
index d9fb09a..464768f 100644
--- a/baseline/source/adpcm_enc/adpcm_enc.c
+++ b/baseline/source/adpcm_enc/adpcm_enc.c
@@ -747,7 +747,7 @@ void _Pragma( "entrypoint" ) adpcm_enc_main(void)
 int main(int argc, char **argv)
 {
 	SET_UP
-	for(jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+	for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
 		START_LOOP
 		adpcm_enc_init();
   		adpcm_enc_main();
diff --git a/baseline/source/ammunition/ammunition.c b/baseline/source/ammunition/ammunition.c
index 224babd..269f4c0 100644
--- a/baseline/source/ammunition/ammunition.c
+++ b/baseline/source/ammunition/ammunition.c
@@ -1174,7 +1174,7 @@ void _Pragma( "entrypoint" ) ammunition_main( void )
 int main( int argc, char **argv )
 {
   	SET_UP
-	for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+	for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
 		START_LOOP
   		ammunition_init();
   		ammunition_main();
diff --git a/baseline/source/anagram/anagram.c b/baseline/source/anagram/anagram.c
index 8f140a3..b458fd2 100644
--- a/baseline/source/anagram/anagram.c
+++ b/baseline/source/anagram/anagram.c
@@ -659,7 +659,7 @@ int main(int argc, char **argv)
 	SET_UP
 	//int jobsComplete;
 	//int maxJobs=100;
-	//for(jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+	//for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
   		START_LOOP
 		anagram_init();
   		anagram_main();
diff --git a/baseline/source/audiobeam/audiobeam.c b/baseline/source/audiobeam/audiobeam.c
index ed5d656..208de80 100644
--- a/baseline/source/audiobeam/audiobeam.c
+++ b/baseline/source/audiobeam/audiobeam.c
@@ -581,7 +581,7 @@ int main( int argc, char **argv )
 	//SET_UP
 	int jobsComplete;
 	int maxJobs=100;
-	for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+	for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
   	//	START_LOOP
 		audiobeam_init();
   		audiobeam_main();
diff --git a/baseline/source/cjpeg_transupp/cjpeg_transupp.c b/baseline/source/cjpeg_transupp/cjpeg_transupp.c
index e77d15b..3f48539 100644
--- a/baseline/source/cjpeg_transupp/cjpeg_transupp.c
+++ b/baseline/source/cjpeg_transupp/cjpeg_transupp.c
@@ -707,7 +707,7 @@ void _Pragma ( "entrypoint" ) cjpeg_transupp_main( void )
 int main(int argc, char **argv)
 {
 	SET_UP
-	for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+	for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
   		START_LOOP
 		cjpeg_transupp_init();
   		cjpeg_transupp_main();
diff --git a/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c b/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c
index 7bef7ab..278725c 100644
--- a/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c
+++ b/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c
@@ -211,7 +211,7 @@ int cjpeg_wrbmp_return()
 int main(int argc, char **argv)
 {
 	SET_UP
-	for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+	for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
 		START_LOOP
 		cjpeg_wrbmp_init();
   		cjpeg_wrbmp_main();
diff --git a/baseline/source/dijkstra/dijkstra.c b/baseline/source/dijkstra/dijkstra.c
index af86ea6..1b6a52f 100644
--- a/baseline/source/dijkstra/dijkstra.c
+++ b/baseline/source/dijkstra/dijkstra.c
@@ -193,7 +193,7 @@ void _Pragma( "entrypoint" ) dijkstra_main( void )
 int main(int argc, char** argv )
 {
 	SET_UP
-	for(jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+	for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
 		START_LOOP
   		dijkstra_init();
   		dijkstra_main();
diff --git a/baseline/source/epic/epic.c b/baseline/source/epic/epic.c
index 13ba442..e258a4a 100644
--- a/baseline/source/epic/epic.c
+++ b/baseline/source/epic/epic.c
@@ -1130,7 +1130,7 @@ int epic_return(){
 int main( int argc, char **argv )
 {
 	SET_UP
-	for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+	for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
 		START_LOOP
   		epic_init();
   		epic_main();
diff --git a/baseline/source/extra.h b/baseline/source/extra.h
index 3f6df32..02e97af 100644
--- a/baseline/source/extra.h
+++ b/baseline/source/extra.h
@@ -3,6 +3,7 @@
  *
  * This header provides facilities by which to separably run and time TACLeBench
  **/
+#define _GNU_SOURCE
 #include <time.h>
 #include <sys/mman.h>
 #include <stdlib.h>
@@ -12,6 +13,12 @@
 #include <limits.h>
 #include <fcntl.h>
 #include <stdint.h>
+#include <sched.h>
+
+// This is only visible if _GNU_SOURCE is defined, and that define does not
+// come along to places where this file is included. Address this by manually
+// forcing it into the global namespace.
+extern int sched_getcpu();
 
 // These constants correspond to the imx6q-sabredb platform
 #define LINE_SIZE 32
@@ -47,15 +54,24 @@
 #endif
 
 #define LOAD_PARAMS_ITRL \
-    if (argc < 6) { \
-        printf("Usage: %s <name> <loops> <my core> <runID> <save results?>\n", argv[0]);\
+    if (argc != 6) { \
+        fprintf(stderr, "Usage: %s <name> <loops> <my core> <runID> <save results?>\n", argv[0]);\
+        fprintf(stderr, " <loops> integer number of iterations. -1 for infitite.\n");\
+        fprintf(stderr, " <save results?> 1 to save results, 0 to discard.\n");\
         exit(1);\
     }\
     char *thisProgram=argv[1];\
-    int maxJobs=atoi(argv[2]);\
-    char *thisCore=argv[3];\
+    int parsedMaxJobs=atoi(argv[2]);\
+    unsigned int thisCore=atoi(argv[3]);\
+    thisCore = sched_getcpu();\
     char *runID=argv[4];\
     int output=atoi(argv[5]);\
+    if (parsedMaxJobs < 0 && output != 0){\
+        fprintf(stderr, "Infinite loops only supported when output is disabled!\n");\
+        exit(1);\
+    }\
+    /* Cheat. -1 is larger than jobsComplete can ever reach. */\
+    unsigned int maxJobs = parsedMaxJobs;\
     struct timespec _start, _end;\
     int jobsComplete;\
     int jobs_complete = -1;\
@@ -163,10 +179,10 @@
 #if MMDC_PROF
 #define SAVE_RESULTS \
     if(jobs_complete >= maxJobs) {\
-        fprintf(stderr, "Max jobs setting too small! Exiting...\n");\
+        fprintf(stderr, "Max jobs setting too small! Trying to record job #%d when we only have space for %d jobs. Exiting...\n", jobs_complete, maxJobs);\
         exit(1);\
     }\
-    if(jobs_complete>-1 && output) {\
+    if(jobs_complete > -1 && output) {\
         progTime[jobs_complete] = _end.tv_sec - _start.tv_sec;\
         progTime[jobs_complete] *= 1000000000;\
         progTime[jobs_complete] += _end.tv_nsec - _start.tv_nsec;\
@@ -176,10 +192,10 @@
 #else
 #define SAVE_RESULTS \
     if(jobs_complete >= maxJobs) {\
-        fprintf(stderr, "Max jobs setting too small! Exiting...\n");\
+        fprintf(stderr, "Max jobs setting too small! Trying to record job #%d when we only have space for %d jobs. Exiting...\n", jobs_complete, maxJobs);\
         exit(1);\
     }\
-    if(jobs_complete>-1 && output) {\
+    if(jobs_complete > -1 && output) {\
         progTime[jobs_complete] = _end.tv_sec - _start.tv_sec;\
         progTime[jobs_complete] *= 1000000000;\
         progTime[jobs_complete] += _end.tv_nsec - _start.tv_nsec;\
@@ -200,8 +216,8 @@
         perror("Unable to open output file");\
         exit(1);\
     }\
-    for(int i = 0; i <= jobs_complete; i++){\
-        fprintf(fp, "%s none %s none %d %.f %s %d %.f %.f \n",\
+    for (int i = 0; i <= jobs_complete; i++){\
+        fprintf(fp, "%s none %u none %d %.f %s %d %.f %.f \n",\
         thisProgram, thisCore, maxJobs,\
         progTime[i], runID, i, mmdc_read[i], mmdc_write[i]);\
     }\
@@ -260,7 +276,7 @@
     } \
     FLUSH_CACHES START_TIMER
 #else
-#define START_LOOP FLUSH_CACHES START_TIMER
+#define START_LOOP sched_yield(); FLUSH_CACHES START_TIMER
 #endif
 
 #define STOP_LOOP STOP_TIMER jobs_complete++; SAVE_RESULTS
@@ -272,7 +288,7 @@ Intended structure
 main
 SET_UP
 notice that STOP LOOP negates the ++ if outout=0
-for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
     START_LOOP
     tacleInit();
     tacleMain();
diff --git a/baseline/source/fmref/fmref.c b/baseline/source/fmref/fmref.c
index 6be1436..bcc7ce6 100644
--- a/baseline/source/fmref/fmref.c
+++ b/baseline/source/fmref/fmref.c
@@ -78,7 +78,7 @@ int fmref_return(void)
 int main(int argc, char **argv){
 
 	SET_UP
-	for(jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+	for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
 		START_LOOP
   		fmref_init();
   		fmref_main();
diff --git a/baseline/source/g723_enc/g723_enc.c b/baseline/source/g723_enc/g723_enc.c
index 6f31210..331c821 100644
--- a/baseline/source/g723_enc/g723_enc.c
+++ b/baseline/source/g723_enc/g723_enc.c
@@ -875,7 +875,7 @@ int main( int argc, char **argv )
 	//SET_UP
 	int jobsComplete;
 	int maxJobs=9;
-	for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+	for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
 	//	START_LOOP
   		g723_enc_init();
   		g723_enc_main();
diff --git a/baseline/source/gsm_dec/gsm_dec.c b/baseline/source/gsm_dec/gsm_dec.c
index 7a0a1bd..06d24d5 100644
--- a/baseline/source/gsm_dec/gsm_dec.c
+++ b/baseline/source/gsm_dec/gsm_dec.c
@@ -753,7 +753,7 @@ void _Pragma( "entrypoint" ) gsm_dec_main( void )
 int main( int argc, char **argv)
 {
 	SET_UP
-	for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+	for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
 		START_LOOP
   		gsm_dec_init();
   		gsm_dec_main();
diff --git a/baseline/source/gsm_enc/gsm_enc.c b/baseline/source/gsm_enc/gsm_enc.c
index cdac899..3f051ec 100644
--- a/baseline/source/gsm_enc/gsm_enc.c
+++ b/baseline/source/gsm_enc/gsm_enc.c
@@ -2061,7 +2061,7 @@ void gsm_enc_main( void )
 int main( int argc, char** argv )
 {
 	SET_UP
-	for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+	for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
 		START_LOOP
   		gsm_enc_init();
   		gsm_enc_main();
diff --git a/baseline/source/h264_dec/h264_dec.c b/baseline/source/h264_dec/h264_dec.c
index 76af705..1fed68b 100644
--- a/baseline/source/h264_dec/h264_dec.c
+++ b/baseline/source/h264_dec/h264_dec.c
@@ -598,7 +598,7 @@ void _Pragma( "entrypoint" )  h264_dec_main( void )
 int main( int argc, char** argv )
 {
 	SET_UP
-	for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+	for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
 		START_LOOP
   		h264_dec_init();
   		h264_dec_main();
diff --git a/baseline/source/huff_dec/huff_dec.c b/baseline/source/huff_dec/huff_dec.c
index 48bdf4b..b83b99d 100644
--- a/baseline/source/huff_dec/huff_dec.c
+++ b/baseline/source/huff_dec/huff_dec.c
@@ -382,7 +382,7 @@ int main( int argc, char **argv )
 	//SET_UP
 	int jobsComplete;
 	int maxJobs=5;
-	for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+	for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
 	//	START_LOOP
   		huff_dec_init();
   		huff_dec_main();
diff --git a/baseline/source/huff_enc/huff_enc.c b/baseline/source/huff_enc/huff_enc.c
index 2e739e6..133fe95 100644
--- a/baseline/source/huff_enc/huff_enc.c
+++ b/baseline/source/huff_enc/huff_enc.c
@@ -578,7 +578,7 @@ void _Pragma( "entrypoint" ) huff_enc_main()
 int main( int argc, char **argv )
 {
 	SET_UP
-	for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+	for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
 		START_LOOP
   		huff_enc_init();
   		huff_enc_main();
diff --git a/baseline/source/mpeg2/mpeg2.c b/baseline/source/mpeg2/mpeg2.c
index e89e1f9..a810744 100644
--- a/baseline/source/mpeg2/mpeg2.c
+++ b/baseline/source/mpeg2/mpeg2.c
@@ -13206,7 +13206,7 @@ void _Pragma ( "entrypoint" ) mpeg2_main( void )
 int main( int argc, char **argv )
 {
 	SET_UP
-	for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+	for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
 		START_LOOP
   		mpeg2_init();
   		mpeg2_main();
diff --git a/baseline/source/ndes/ndes.c b/baseline/source/ndes/ndes.c
index e56906f..b0f494c 100644
--- a/baseline/source/ndes/ndes.c
+++ b/baseline/source/ndes/ndes.c
@@ -366,7 +366,7 @@ void _Pragma( "entrypoint" ) ndes_main()
 int main( int argc, char **argv )
 {
 	SET_UP
-	for(jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+	for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
 		START_LOOP
   		ndes_init();
   		ndes_main();
diff --git a/baseline/source/petrinet/petrinet.c b/baseline/source/petrinet/petrinet.c
index 7c9e1a0..cabb40d 100644
--- a/baseline/source/petrinet/petrinet.c
+++ b/baseline/source/petrinet/petrinet.c
@@ -977,7 +977,7 @@ int main( int argc, char **argv )
 {
   SET_UP
 
-   for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){	
+   for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){	
   	
 	START_LOOP
 	petrinet_main();
diff --git a/baseline/source/rijndael_dec/rijndael_dec.c b/baseline/source/rijndael_dec/rijndael_dec.c
index 4082eff..93bb424 100644
--- a/baseline/source/rijndael_dec/rijndael_dec.c
+++ b/baseline/source/rijndael_dec/rijndael_dec.c
@@ -183,7 +183,7 @@ void _Pragma( "entrypoint" ) rijndael_dec_main( void )
 int main(int argc, char** argv)
 {
 	SET_UP
-	for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+	for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
 		START_LOOP
   		rijndael_dec_init();
   		rijndael_dec_main();
diff --git a/baseline/source/rijndael_enc/rijndael_enc.c b/baseline/source/rijndael_enc/rijndael_enc.c
index f74d595..0c10353 100644
--- a/baseline/source/rijndael_enc/rijndael_enc.c
+++ b/baseline/source/rijndael_enc/rijndael_enc.c
@@ -226,7 +226,7 @@ void _Pragma( "entrypoint" ) rijndael_enc_main( void )
 int main( int argc, char** argv )
 {
 	SET_UP
-	for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+	for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
 		START_LOOP
   		rijndael_enc_init();
   		rijndael_enc_main();
diff --git a/baseline/source/statemate/statemate.c b/baseline/source/statemate/statemate.c
index 379366a..00491e5 100644
--- a/baseline/source/statemate/statemate.c
+++ b/baseline/source/statemate/statemate.c
@@ -1274,7 +1274,7 @@ void _Pragma ( "entrypoint" ) statemate_main( void )
 int main ( int argc, char **argv )
 {
 	SET_UP
-	for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+	for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
 		START_LOOP
   		statemate_init();
   		statemate_main();
diff --git a/baseline/source/susan/susan.c b/baseline/source/susan/susan.c
index fb990b1..4bc4cb8 100644
--- a/baseline/source/susan/susan.c
+++ b/baseline/source/susan/susan.c
@@ -2002,7 +2002,7 @@ int susan_return( void )
 int main( int argc, char **argv )
 {
 	SET_UP
-	for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+	for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
 		START_LOOP
   		susan_init();
   		susan_main();
-- 
cgit v1.2.2