Changeset 6582

Timestamp:

2016-05-20T09:47:27+02:00 (8 years ago)

Author:

timgraham

Message:

Commit Martin's changes to COUNTERS tool including a new timing/performance module that does not use string comparisons.

Location:

branches/2016/dev_HPC_Gyre_benchmark_test/NEMOGCM/TOOLS/COUNTERS

Files:

• Makefile (modified) (1 diff)
• TESTS/Makefile (modified) (2 diffs)
• TESTS/nemo_test.F90 (modified) (5 diffs)
• TESTS/run_job (modified) (1 diff)
• count_event.c (modified) (4 diffs)

branches/2016/dev_HPC_Gyre_benchmark_test/NEMOGCM/TOOLS/COUNTERS/Makefile

@@ -1 @@
-MPICC=mpiicc
+#MPICC=mpiicc
+MPICC=gcc
 PAPI_INC=/users/home/opt/papi/papi-5.1.0/include/
 PAPI_LIB=/users/home/opt/papi/papi-5.1.0/lib/
 
-all: count_event.o
-   ar rcs libpm.a count_event.o
+all: libperf_regions.so
+#  ar rcs libpm.a count_event.o
 
-count_event.o : count_event.c
-   ${MPICC} -I${PAPI_INC} -L${PAPI_LIB} -lpapi -c count_event.c -o count_event.o
+libperf_regions.so : count_event.o perf_region_names.o perf_regions.o
+   
+#
+# just create object files
+#
 
-clean :
-   rm count_event.o libpm.a
+#libperf_regions.so : count_event.o perf_region_names.o perf_regions.o
+#  ${MPICC} -I${PAPI_INC} -L${PAPI_LIB} -lpapi -c count_event.c -o count_event.o
+#  ${MPICC} -fPIC -shared -I${PAPI_INC} -L${PAPI_LIB} count_event.o perf_regions.o perf_region_names.o -o libperf_regions.so -lpapi
+
+count_event.o: count_event.c
+   ${MPICC} -c -g -I${PAPI_INC} -L${PAPI_LIB} -c count_event.c -o count_event.o  -lpapi
+   
+perf_region_names.o: perf_region_names.c
+   ${MPICC} -c -g perf_region_names.c -o perf_region_names.o
+
+perf_regions.o: perf_regions.c
+   ${MPICC} -c -g perf_regions.c -o perf_regions.o
+
+clean:
+   rm -f perf_regions.so
+   rm -f count_event.o
+   rm -f perf_region_names.o
+   rm -f perf_regions.o

branches/2016/dev_HPC_Gyre_benchmark_test/NEMOGCM/TOOLS/COUNTERS/TESTS/Makefile

@@ -1 @@
-FC=ifort
+FC=gfortran
 PAPI_INC=/users/home/opt/papi/papi-5.1.0/include/
 PAPI_LIB=/users/home/opt/papi/papi-5.1.0/lib/
@@ -5 +5 @@
 
 all:
-   ${FC} -o nemo_test nemo_test.F90 -I${PAPI_INC} -L${PAPI_LIB} -lpapi -L${COUNTERS_LIB} -lpm
+#  ${FC} -I${PAPI_INC} -L${PAPI_LIB} -L${COUNTERS_LIB} -lperf_regions -o nemo_test nemo_test.F90  -lpapi
+   ${FC} -g -I${PAPI_INC} -L${PAPI_LIB} -L${COUNTERS_LIB} ../*.o -o nemo_test nemo_test.F90  -lpapi
 
 clean :
    rm nemo_test
+

branches/2016/dev_HPC_Gyre_benchmark_test/NEMOGCM/TOOLS/COUNTERS/TESTS/nemo_test.F90

@@ +1 @@
+#include "../perf_region_defines.h"
+
 PROGRAM nemo
 
      interface
-        subroutine counting_init ( ) bind ( C,       &
-     & name ="counting_init" )
-                use iso_c_binding
-        end subroutine counting_init
-
-        subroutine counting_start ( ) bind ( C,       &
-     & name ="counting_start" )
-                use iso_c_binding
-        end subroutine counting_start
-
-        subroutine counting_stop ( ) bind ( C,        &
-     & name ="counting_stop" )
-                use iso_c_binding
-        end subroutine counting_stop
+        subroutine perf_regions_init ( ) bind ( C,       &
+     & name ="perf_regions_init" )
+                use iso_c_binding
+        end subroutine perf_regions_init
+
+
+        subroutine perf_regions_finalize ( ) bind ( C,       &
+     & name ="perf_regions_finalize" )
+                use iso_c_binding
+        end subroutine perf_regions_finalize
+
+
+        subroutine perf_region_start (id, measure_type) bind ( C,       &
+     & name ="perf_region_start" )
+                use iso_c_binding
+                INTEGER, VALUE, INTENT(IN) ::id
+                INTEGER, VALUE, INTENT(IN) ::measure_type
+        end subroutine perf_region_start
+
+        subroutine perf_region_stop (id) bind ( C,        &
+     & name ="perf_region_stop" )
+                use iso_c_binding
+                INTEGER, VALUE, INTENT(IN) ::id
+        end subroutine perf_region_stop
+
       end interface
 
+     call perf_regions_init()
+
      CALL test
+     CALL test
+
+     call perf_regions_finalize()
 
 CONTAINS
@@ -35 +53 @@
    INTEGER                                   :: ji, jj, jk
    CHARACTER(len=10)                         :: env
+
+   call perf_region_start (PERF_REGIONS_FOO,  IOR(PERF_TIMINGS, PERF_COUNTERS))
 
    CALL get_environment_variable("JPI", env)
@@ -94 +114 @@
 !***********************
 
-   call counting_init()
-   call counting_start ()
    DO jk = 1, jpk
      DO jj = 1, jpj
@@ -239 +257 @@
        END DO
      END DO
-   
-     call counting_stop()
 
      DEALLOCATE(mydomain)
@@ -260 +276 @@
      DEALLOCATE(tsn)
 
+     call perf_region_stop(PERF_REGIONS_FOO)
+
      end subroutine test
 

branches/2016/dev_HPC_Gyre_benchmark_test/NEMOGCM/TOOLS/COUNTERS/TESTS/run_job

@@ -5 +5 @@
 export JPK=72
 
+#
+# Use papi_avail command to check available performance counters
+# These are part of papi-tools package
+#
 export NUM_COUNTERS=2
 export LIST_COUNTERS=FP_COMP_OPS_EXE,PAPI_L3_TCM
 
+export NUM_COUNTERS=1
+export LIST_COUNTERS=PAPI_L3_TCM
+
 ./nemo_test

branches/2016/dev_HPC_Gyre_benchmark_test/NEMOGCM/TOOLS/COUNTERS/count_event.c

@@ -1 +1 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include "papi.h"
-
-static int retval;
-
-static long long *values;
-static int EventSet = PAPI_NULL;
-static char **event;
-static int *event_code;
-static int numcount;
-static char *listcount;
+#include  "count_event.h"
 
 
-int counting_init() {
+static long long *count_values;
+static char **count_event;
+static int *count_event_code;
+static int count_numcount;
+static char *count_listcount;
 
-  int i=0;
-  char *events;
+
+/**
+ * Initialize performance counters based on environment variables
+ *
+ * TODO: add more documentation
+ */
+int count_init() {
 
   if(getenv("NUM_COUNTERS")==NULL)
   {
     printf("NUM_COUNTERS is not defined!\n");
-    return 1;
+    exit(1);
   }
   else
   {
-    numcount=atoi(getenv("NUM_COUNTERS"));
+    count_numcount=atoi(getenv("NUM_COUNTERS"));
   }
 
@@ -31 +33 @@
   {
     printf("LIST_COUNTERS is not defined!\n");
-    return 1;
+    exit(1);
   }
   else
   {
-    listcount=getenv("LIST_COUNTERS");
+    count_listcount = getenv("LIST_COUNTERS");
   }
 
-
-  values = (long long *) malloc(numcount*sizeof(long long));
-  event = (char **) malloc(numcount*sizeof(char*));
-  event_code = (int *) malloc(numcount*sizeof(int));
+  count_values = (long long *) malloc(count_numcount*sizeof(long long));
+  count_event = (char **) malloc(count_numcount*sizeof(char*));
+  count_event_code = (int *) malloc(count_numcount*sizeof(int));
 
   // PAPI init
+  int retval;
   if (PAPI_is_initialized() == PAPI_NOT_INITED) {
     if ((retval = PAPI_library_init(PAPI_VER_CURRENT)) != PAPI_VER_CURRENT) {
@@ -50 +52 @@
     }
   }
-  
-  events=strtok(strdup(listcount), ",");
+ 
+  char *events=strtok(strdup(count_listcount), ",");
+
+  int i = 0;
   while(events!=NULL)
   {
-    event[i]=events;
+    count_event[i]=events;
     i++;
     events = strtok(NULL, ",");
   }
-  
-  for (i=0; i<numcount;i++)
+
+  for (int i=0; i < count_numcount;i++)
   {
     // get the PAPI event code related to a PAPI event name
-    if ((retval = PAPI_event_name_to_code(event[i], &event_code[i])) != PAPI_OK)
+    if ((retval = PAPI_event_name_to_code(count_event[i], &count_event_code[i])) != PAPI_OK)
       printf("PAPI_event_name_to_code failed! Line: %d File: %s - retval: %d\n", __LINE__, __FILE__, retval);
   }
 
+  if (count_numcount > PERF_COUNTERS_MAX)
+  {
+    printf("Maximum number of performance counters (%i) reached\n", PERF_COUNTERS_MAX);
+    exit(1);
+  }
+
   return 0;
-
 }
 
-int counting_start() {
 
+
+/**
+ * start performance counting. Existing performance counters are overwritten! (TODO: Check this)
+ */
+int count_start() {
   // start the event
-  if (PAPI_start_counters(event_code,numcount) != PAPI_OK) {
+  if (PAPI_start_counters(count_event_code,count_numcount) != PAPI_OK) {
     PAPI_perror("PAPI_start\n");
   } 
@@ -81 +94 @@
 }
 
-int counting_stop() {
 
-   int i;
-
+/** 
+ * stop performance counters and store everything to array values
+ */
+int count_stop() {
    // stop the event
-   if ( PAPI_stop_counters(values,numcount) != PAPI_OK ) {
+   if ( PAPI_stop_counters(count_values, count_numcount) != PAPI_OK ) {
       PAPI_perror("PAPI_stop\n");
       return 0;
     } 
 
-    for (i=0; i<numcount; i++)
-    {
-      printf("%s: %lld\n", event[i], values[i]);
-    }
+//    for (int i=0; i<count_numcount; i++)
+//    {
+//      printf("COUNT_STOP_OUTPUT: %s: %lld\n", count_event[i], count_values[i]);
+//    }
+}
 
-    free(values);
-    free(event);
-    free(event_code);
+/**
+ * shutdown performance counters
+ */
+int count_finalize()
+{
+    free(count_values);
+    free(count_event);
+    free(count_event_code);
 
     return 0;
-
 }
 
+
+/**
+ * return pointer to array of counter values
+ */
+long long *count_get_valueptr()
+{
+    return count_values;
+}
+
+
+
+/**
+ * return pointer to array of event names
+ */
+char **count_get_event_names()
+{
+    return count_event;
+}
+
+/**
+ * return number of performance counters
+ */
+int count_get_num()
+{
+    return count_numcount;
+}