From 50035ffe5ea04fab93a4e0ee4e68f068efbe2b3d Mon Sep 17 00:00:00 2001
From: jjenista <jjenista>
Date: Thu, 14 Oct 2010 17:48:32 +0000
Subject: [PATCH] coreprof updates, nothing huge

---
 Robust/src/Benchmarks/oooJava/master-makefile |  5 +++--
 Robust/src/Benchmarks/oooJava/sor/runp        |  2 +-
 Robust/src/IR/Flat/BuildCode.java             | 16 ++++++++--------
 Robust/src/Runtime/coreprof/coreprof.h        |  4 ++++
 Robust/src/buildscript                        |  2 +-
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Robust/src/Benchmarks/oooJava/master-makefile b/Robust/src/Benchmarks/oooJava/master-makefile
index df12093a..ec42371c 100644
--- a/Robust/src/Benchmarks/oooJava/master-makefile
+++ b/Robust/src/Benchmarks/oooJava/master-makefile
@@ -13,12 +13,13 @@ BUILDSCRIPT=../../../buildscript
 
 
 COREPROFOVERFLOW= #-coreprof-checkoverflow
-USECOREPROF= #coreprof $(COREPROFOVERFLOW) \
+USECOREPROF= #-coreprof $(COREPROFOVERFLOW) \
 	-coreprof-eventwords 1024*1024*128 \
 	-coreprof-enable cpe_main \
 	-coreprof-enable cpe_runmalloc \
 	-coreprof-enable cpe_taskexecute \
-	-coreprof-enable cpe_taskdispatch
+	-coreprof-enable cpe_taskdispatch \
+	-coreprof-enable cpe_poolalloc
 #	-coreprof-enable cpe_preparememq
 #	-coreprof-enable cpe_runfree \
 #	-coreprof-enable cpe_count_poolalloc \
diff --git a/Robust/src/Benchmarks/oooJava/sor/runp b/Robust/src/Benchmarks/oooJava/sor/runp
index 398cad57..dbe36f63 100755
--- a/Robust/src/Benchmarks/oooJava/sor/runp
+++ b/Robust/src/Benchmarks/oooJava/sor/runp
@@ -1,2 +1,2 @@
 #!/bin/sh
-time ./JGFSORBenchSizeDp.bin
+time numactl --interleave=all ./JGFSORBenchSizeDp.bin
diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index 3e119b9f..1dff0ddb 100644
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -3725,26 +3725,28 @@ public class BuildCode {
     }
 
 
-
-
     // allocate the space for this record
     output.println( "#ifndef OOO_DISABLE_TASKMEMPOOL" );
+
+    output.println( "#ifdef CP_EVENTID_POOLALLOC");
+    output.println( "     CP_LOGEVENT( CP_EVENTID_POOLALLOC, CP_EVENTTYPE_BEGIN );");
+    output.println( "#endif");
     if( (state.MLP     && fsen != mlpa.getMainSESE()) || 
         (state.OOOJAVA && fsen != oooa.getMainSESE())
         ) {
-
-      //output.println("     CP_LOGEVENT( CP_EVENTID_DEBUG_B, CP_EVENTTYPE_BEGIN );");    
       output.println("     "+
                      fsen.getSESErecordName()+"* seseToIssue = ("+
                      fsen.getSESErecordName()+"*) poolalloc( runningSESE->taskRecordMemPool );");
-      //output.println("     CP_LOGEVENT( CP_EVENTID_DEBUG_B, CP_EVENTTYPE_END );");
-
     } else {
       output.println("     "+
                      fsen.getSESErecordName()+"* seseToIssue = ("+
                      fsen.getSESErecordName()+"*) mlpAllocSESErecord( sizeof( "+
                      fsen.getSESErecordName()+" ) );");
     }
+    output.println( "#ifdef CP_EVENTID_POOLALLOC");
+    output.println( "     CP_LOGEVENT( CP_EVENTID_POOLALLOC, CP_EVENTTYPE_END );");
+    output.println( "#endif");
+
     output.println( "#else // OOO_DISABLE_TASKMEMPOOL" );
       output.println("     "+
                      fsen.getSESErecordName()+"* seseToIssue = ("+
@@ -3755,8 +3757,6 @@ public class BuildCode {
 
 
 
-
-
     // set up the SESE in-set and out-set objects, which look
     // like a garbage list
     output.println("     struct garbagelist * gl= (struct garbagelist *)&(((SESEcommon*)(seseToIssue))[1]);");
diff --git a/Robust/src/Runtime/coreprof/coreprof.h b/Robust/src/Runtime/coreprof/coreprof.h
index f44002a8..cb294e1e 100644
--- a/Robust/src/Runtime/coreprof/coreprof.h
+++ b/Robust/src/Runtime/coreprof/coreprof.h
@@ -48,6 +48,10 @@
 #define CP_EVENTID_RUNFREE            0x11
 #endif
 
+#ifdef cpe_poolalloc
+#define CP_EVENTID_POOLALLOC          0x14
+#endif
+
 #ifdef cpe_count_poolalloc
 #define CP_EVENTID_COUNT_POOLALLOC    0x15
 #endif
diff --git a/Robust/src/buildscript b/Robust/src/buildscript
index d1a13169..0d03fb31 100755
--- a/Robust/src/buildscript
+++ b/Robust/src/buildscript
@@ -21,7 +21,7 @@ echo -coreprof, turn on profiling API
 echo -coreprof-eventwords NUM, space in words/thread for coreprof events
 echo -coreprof-checkoverflow, ONLY use for debugging event overflow
 echo -coreprof-enable EVENTNAME, only enable desired events to reduce overhead
-echo   EVENTNAME can be: cpe_main, cpe_runmalloc, cpe_runfree, cpe_count_poolalloc, cpe_count_poolreuse, cpe_workschedgrab, cpe_taskdispatch, cpe_preparememq, cpe_taskexecute, cpe_taskretire, cpe_taskstallvar, cpe_taskstallmem 
+echo   EVENTNAME can be: cpe_main, cpe_runmalloc, cpe_runfree, cpe_poolalloc, cpe_count_poolalloc, cpe_count_poolreuse, cpe_workschedgrab, cpe_taskdispatch, cpe_preparememq, cpe_taskexecute, cpe_taskretire, cpe_taskstallvar, cpe_taskstallmem 
 echo "-ooojava <numberofcores> <maxseseage>"
 echo -ooodebug general OOOJava debugging messages
 echo -ooodebug-disable-task-mem-pool this is a tricky module, disable for simpler runtime
-- 
2.34.1