Merge branch 'sd-vbs' of ssh://rtsrv.cs.unc.edu/public/mc2-scripts-and-benchmarks into sd-vbs

3 files changed, 17 insertions, 12 deletions

diff --git a/baseline/source/audiobeam/audiobeam.c b/baseline/source/audiobeam/audiobeam.c
index 50ebfff..5f23daf 100644
--- a/baseline/source/audiobeam/audiobeam.c
+++ b/baseline/source/audiobeam/audiobeam.c
@@ -104,6 +104,8 @@ void audiobeam_init()
   unsigned int i;
   unsigned char *p;
   volatile char bitmask = 0;
+  // Reset heap
+  audiobeam_free_all();
 
   /*
     Apply volatile XOR-bitmask to entire input array.
@@ -577,17 +579,13 @@ void _Pragma( "entrypoint" ) audiobeam_main( void )
 
 
 int main( int argc, char **argv )
-{       
-        //SET_UP
-        int jobsComplete;
-        int maxJobs=100;
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-        //      START_LOOP
-                audiobeam_init();
-                audiobeam_main();
-        //      STOP_LOOP
-        }
-        //WRITE_TO_FILE
+{
+  SET_UP
+  for_each_job {
+    audiobeam_init();
+    audiobeam_main();
+  }
+  WRITE_TO_FILE
 
   return ( audiobeam_return() );
 }
diff --git a/baseline/source/audiobeam/audiobeamlibmalloc.c b/baseline/source/audiobeam/audiobeamlibmalloc.c
index 50c3073..a81b634 100644
--- a/baseline/source/audiobeam/audiobeamlibmalloc.c
+++ b/baseline/source/audiobeam/audiobeamlibmalloc.c
@@ -11,4 +11,9 @@ void *audiobeam_malloc( unsigned int numberOfBytes )
   /* Get a 4-byte address for alignment purposes */
   audiobeam_freeHeapPos += ( ( numberOfBytes + 4 ) & ( unsigned int )0xfffffffc );
   return currentPos;
-}
\ No newline at end of file
+}
+
+void audiobeam_free_all( void )
+{
+  audiobeam_freeHeapPos = 0;
+}
diff --git a/baseline/source/audiobeam/audiobeamlibmalloc.h b/baseline/source/audiobeam/audiobeamlibmalloc.h
index eccbdb9..354bf0e 100644
--- a/baseline/source/audiobeam/audiobeamlibmalloc.h
+++ b/baseline/source/audiobeam/audiobeamlibmalloc.h
@@ -24,4 +24,6 @@
 
 void *audiobeam_malloc( unsigned int numberOfBytes );
 
+void audiobeam_free_all( void );
+
 #endif