named regions

Author: plavin

src/sst/elements/ariel/api/arielapi.c

@@ -41,6 +41,14 @@ void ariel_output_stats() {
     printf("ARIEL: Request to print statistics.\n");
 }
 
+void ariel_output_stats_begin_region(const char *name) {
+    printf("ARIEL: Request to print statistics and begin region:%s\n", name);
+}
+
+void ariel_output_stats_end_region(const char *name) {
+    printf("ARIEL: Request to print statistics and end region:%s\n", name);
+}
+
 void ariel_malloc_flag(int64_t id, int count, int level) {
     printf("ARIEL: flagging next %d mallocs at id %" PRId64 "\n", count, id);
 }

src/sst/elements/ariel/api/arielapi.h

@@ -46,6 +46,13 @@ uint64_t ariel_cycles();
 /* Trigger the simulation to output statistics */
 void ariel_output_stats();
 
+/* Trigger the simulation to output statistics along with a region name.
+ * This interface may be changed or removed in the future if named
+ * regions are added to sst-core.
+ */
+void ariel_output_stats_begin_region(const char *name);
+void ariel_output_stats_end_region(const char *name);
+
 /* Control which memory pool (level) the next 'count' allocations encountered should map to
  *
  */

src/sst/elements/ariel/ariel_shmem.h

@@ -55,6 +55,8 @@ enum ArielShmemCmd_t {
     ARIEL_SWITCH_POOL = 110,
     ARIEL_NOOP = 128,
     ARIEL_OUTPUT_STATS = 140,
+    ARIEL_OUTPUT_STATS_BEGIN_REGION = 141,
+    ARIEL_OUTPUT_STATS_END_REGION = 142,
     ARIEL_ISSUE_RTL = 150,
     ARIEL_FLUSHLINE_INSTRUCTION = 154,
     ARIEL_FENCE_INSTRUCTION = 155,

src/sst/elements/ariel/arielcore.cc

@@ -412,6 +412,7 @@ bool ArielCore::refillQueue() {
                             coreID, (uint32_t) coreQ->size(), (uint32_t) maxQLength));
 
         ArielCommand ac;
+        char *region_name;
         const bool avail = tunnel->readMessageNB(coreID, &ac);
 
         if ( !avail ) {
@@ -427,6 +428,17 @@ bool ArielCore::refillQueue() {
                 fprintf(stdout, "Performing statistics output at simulation time = %" PRIu64 " cycles\n", getCurrentSimTimeNano());
                 performGlobalStatisticOutput();
                 break;
+            case ARIEL_OUTPUT_STATS_BEGIN_REGION:
+                region_name = (char*)ac.inst.payload;
+                fprintf(stdout, "ARIEL_REGION_BEGIN %s %" PRIu64 "\n", region_name, getCurrentSimTime(getCoreTimeBase().toString()));
+                performGlobalStatisticOutput();
+                break;
+
+            case ARIEL_OUTPUT_STATS_END_REGION:
+                region_name = (char*)ac.inst.payload;
+                fprintf(stdout, "ARIEL_REGION_END %s %" PRIu64 "\n", region_name, getCurrentSimTime(getCoreTimeBase().toString()));
+                performGlobalStatisticOutput();
+                break;
 
             case ARIEL_START_INSTRUCTION:
                 if(ARIEL_INST_SP_FP == ac.inst.instClass) {

src/sst/elements/ariel/frontend/pin3/fesimple.cc

@@ -889,6 +889,28 @@ void mapped_ariel_output_stats()
     tunnel->writeMessage(remap_id[thr], ac);
 }
 
+void mapped_ariel_output_stats_begin_region(const char* name)
+{
+    THREADID thr = PIN_ThreadId();
+    ArielCommand ac;
+    ac.command = ARIEL_OUTPUT_STATS_BEGIN_REGION;
+    ac.instPtr = (uint64_t) 0;
+    strncpy((char*)ac.inst.payload, name, ARIEL_MAX_PAYLOAD_SIZE - 1);
+    ac.inst.payload[ARIEL_MAX_PAYLOAD_SIZE-1]='\0';
+    tunnel->writeMessage(remap_id[thr], ac);
+}
+void mapped_ariel_output_stats_end_region(const char* name)
+
+{
+    THREADID thr = PIN_ThreadId();
+    ArielCommand ac;
+    ac.command = ARIEL_OUTPUT_STATS_END_REGION;
+    ac.instPtr = (uint64_t) 0;
+    strncpy((char*)ac.inst.payload, name, ARIEL_MAX_PAYLOAD_SIZE - 1);
+    ac.inst.payload[ARIEL_MAX_PAYLOAD_SIZE-1]='\0';
+    tunnel->writeMessage(remap_id[thr], ac);
+}
+
 // same effect as mapped_ariel_output_stats(), but it also sends a user-defined reference number back
 void mapped_ariel_output_stats_buoy(uint64_t marker)
 {
@@ -1401,6 +1423,16 @@ VOID InstrumentRoutine(RTN rtn, VOID* args)
         RTN_Replace(rtn, (AFUNPTR) mapped_ariel_output_stats);
         fprintf(stderr, "Replacement complete\n");
         return;
+    } else if (RTN_Name(rtn) == "ariel_output_stats_begin_region" || RTN_Name(rtn) == "_ariel_output_stats_begin_region" || RTN_Name(rtn) == "__arielfort_MOD_ariel_output_stats_begin_region") {
+        fprintf(stderr, "Identified routine: ariel_output_stats_begin_region, replacing with Ariel equivalent..\n");
+        RTN_Replace(rtn, (AFUNPTR) mapped_ariel_output_stats_begin_region);
+        fprintf(stderr, "Replacement complete\n");
+        return;
+    } else if (RTN_Name(rtn) == "ariel_output_stats_end_region" || RTN_Name(rtn) == "_ariel_output_stats_end_region" || RTN_Name(rtn) == "__arielfort_MOD_ariel_output_stats_end_region") {
+        fprintf(stderr, "Identified routine: ariel_output_stats_end_region, replacing with Ariel equivalent..\n");
+        RTN_Replace(rtn, (AFUNPTR) mapped_ariel_output_stats_end_region);
+        fprintf(stderr, "Replacement complete\n");
+        return;
     } else if (RTN_Name(rtn) == "ariel_output_stats_buoy" || RTN_Name(rtn) == "_ariel_output_stats_buoy") {
         fprintf(stderr, "Identified routine: ariel_output_stats_buoy, replacing with Ariel equivalent..\n");
         RTN_Replace(rtn, (AFUNPTR) mapped_ariel_output_stats_buoy);