Add DIS benchmarks and scripts as they were used for Joshua's PRP

Note that Neighborhood has been modified to use less space

10 files changed, 111 insertions, 10 deletions

diff --git a/dis/original/Field/field.c b/dis/original/Field/field.c
index 7d26d37..a561f72 100644
--- a/dis/original/Field/field.c
+++ b/dis/original/Field/field.c
@@ -18,6 +18,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include "DISstressmarkRNG.h"
+#include "extra.h"
 
 
 #define MIN_FIELD_SIZE 16
@@ -38,8 +39,8 @@
  * main()
  */
 
-int main(){
-  
+int main(int argc, char** argv){
+  SET_UP
   unsigned char *field;
   unsigned int f;
   int seed;
@@ -93,6 +94,7 @@ int main(){
   startTime = time(NULL);
   
   for (l =0; l<n; l++){
+    START_LOOP
     unsigned int index;
     
     token[l].subfields = 0;
@@ -130,6 +132,7 @@ int main(){
         }            
         index++;
     }
+    STOP_LOOP
     }
 
     startTime = time(NULL) - startTime;
@@ -144,5 +147,6 @@ int main(){
     }
     fprintf(stdout, "total time = %d seconds.\n", (int)startTime);
     free(field);
+    WRITE_TO_FILE
     return(0);
   }
diff --git a/dis/original/Neighborhood/neighborhood.c b/dis/original/Neighborhood/neighborhood.c
index e3d4f69..2d50336 100644
--- a/dis/original/Neighborhood/neighborhood.c
+++ b/dis/original/Neighborhood/neighborhood.c
@@ -19,11 +19,12 @@
 #include<assert.h>
 #include "DISstressmarkRNG.h"
 #include "utili.h"
+#include "extra.h"
 
 /* 
  * main()
  */
-int main()
+int main(int argc, char** argv)
 {
   long int seed;
   int dimension;
@@ -39,6 +40,7 @@ int main()
 
   time_t beginTime;
   time_t endTime;
+  SET_UP
 
   fscanf(stdin, "%ld %d %d %d %d %d %d %d", 
         &seed, &bitDepth, &dimension, &numberLines,
@@ -61,11 +63,12 @@ int main()
   assert (image != NULL);
 
   beginTime = time(NULL);
-
+  START_LOOP
   neighborhoodCalculation(image, dimension,
                           distanceShort, distanceLong, &values, maxPixel);
-
+  STOP_LOOP
   endTime = time(NULL);
+  WRITE_TO_FILE
 
   printf(" end time is %d\n", endTime);
 
diff --git a/dis/original/Neighborhood/utili.h b/dis/original/Neighborhood/utili.h
index 2a8e2a0..87a481c 100644
--- a/dis/original/Neighborhood/utili.h
+++ b/dis/original/Neighborhood/utili.h
@@ -54,7 +54,7 @@ typedef struct {
   Angeles distLong;
 }Neighborhood;
 
-typedef short int Pixel; /* short int;*/
+typedef char Pixel; /* short int;*/
 
 
 void drawLineSegment(Pixel *image,
diff --git a/dis/original/Pointer/pointer.c b/dis/original/Pointer/pointer.c
index 0c4966f..a0aa62e 100644
--- a/dis/original/Pointer/pointer.c
+++ b/dis/original/Pointer/pointer.c
@@ -17,6 +17,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include "DISstressmarkRNG.h"
+#include "extra.h"
 
 #define MIN_FIELD_SIZE 16
 #define MAX_FIELD_SIZE 16777216
@@ -34,7 +35,7 @@
 /*
  * main()
  */
-int main(){
+int main(int argc, char** argv){
 
   unsigned int *field;
   unsigned int f;
@@ -53,6 +54,7 @@ int main(){
   }*thread;
 
   unsigned int l;
+  SET_UP
 
  fscanf(stdin, "%lu %u %lu %ld %u", 
         &f, &l, &maxhops, &seed, &n);
@@ -84,12 +86,12 @@ int main(){
  for (l=0; l<f; l++){
    field[l] = randInt(0, f-w);
 }
-
 startTime = time(NULL);
 clock();
 
 for (l=0; l<n; l++)
 {
+ START_LOOP
  unsigned int index;
  unsigned int minStop, maxStop;
  unsigned int hops;
@@ -140,6 +142,7 @@ for (l=0; l<n; l++)
   hops++;
  }/* end loop ll */
   thread[l].hops = hops;
+ STOP_LOOP
 } /* end while */
 
  startTime = time(NULL) - startTime;
@@ -151,5 +154,6 @@ for (l=0; l<n; l++)
  fprintf(stderr, "total time = %u seconds.\n", (unsigned int)startTime);
  free (field);
  free (thread);
+ WRITE_TO_FILE