1 files changed, 28 insertions, 12 deletions

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();