From a3886552003d031acb9039e920b7c9ddce946ad6 Mon Sep 17 00:00:00 2001
From: Joshua Bakita <jbakita@cs.unc.edu>
Date: Sat, 17 Oct 2020 14:43:46 -0400
Subject: DIS fixes used for (rejected) RTSS'20 submission

- All: Output times to stderr and nothing to stdout
- Field, Update, Pointer: change definition of a job to match other
  stressmark execution times more closely
- Matrix: move all allocations into main()
- Update: Use volatile to prevent computations from being optimized out
- Transitive: Use volatile to prevent computations from being optimized out
- Neighborhood: Use working version of drawLineSegment from original DIS
  sample code
---
 dis/Field/field.c | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'dis/Field/field.c')

diff --git a/dis/Field/field.c b/dis/Field/field.c
index 8565e8c..f83a403 100644
--- a/dis/Field/field.c
+++ b/dis/Field/field.c
@@ -47,7 +47,7 @@ int main(int argc, char** argv){
   int mod_offset;
   unsigned int n;
 
-  time_t startTime;
+  time_t startTime, endTime;
  
   struct tokenS{
   unsigned char delimiter[MAX_TOKEN_LENGTH];
@@ -92,9 +92,9 @@ int main(int argc, char** argv){
   }
   
   startTime = time(NULL);
-  
+  START_LOOP
+
   for (l =0; l<n; l++){
-    START_LOOP
     unsigned int index;
     
     token[l].subfields = 0;
@@ -133,20 +133,25 @@ int main(int argc, char** argv){
 	index++;
     }
     token[l].subfields++;
-    STOP_LOOP
     }
 
-    startTime = time(NULL) - startTime;
+    STOP_LOOP
+    endTime = time(NULL);
 
+    volatile int sumAll = 0;
     for (l = 0; l< n; l++){
       unsigned int ll;
-      fprintf(stdout, "%d subfields for token %d \n", token[l].subfields, l);
-      for ( ll =0; ll<token[l].subfields; ll++)
-	fprintf(stdout, "subfields %d:\tcount = %d\tmin= %x\tsum= %x\n",
-		ll, token[l].stat[ll].count, 
-		token[l].stat[ll].min, token[l].stat[ll].sum);
+      //fprintf(stdout, "%d subfields for token %d \n", token[l].subfields, l);
+      sumAll += token[l].subfields + l;
+      for ( ll =0; ll<token[l].subfields; ll++) {
+        sumAll += ll + token[l].stat[ll].count + token[l].stat[ll].min + token[l].stat[ll].sum;
+        /*fprintf(stdout, "subfields %d:\tcount = %d\tmin= %x\tsum= %x\n",
+            ll, token[l].stat[ll].count, 
+            token[l].stat[ll].min, token[l].stat[ll].sum);*/
+      }
     }
-    fprintf(stdout, "total time = %d seconds.\n", (int)startTime);
+    fprintf(stderr, "time for field stressmark = %f seconds.\n",
+            difftime(endTime, startTime));
     free(field);
     WRITE_TO_FILE
     return(0);
-- 
cgit v1.2.2