Changeset 6582 for branches/2016/dev_HPC_Gyre_benchmark_test/NEMOGCM/TOOLS/COUNTERS/TESTS

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/TESTS

Files:

• Makefile (modified) (2 diffs)
• nemo_test.F90 (modified) (5 diffs)
• run_job (modified) (1 diff)

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