Changeset 7230

Timestamp:

2016-11-15T13:56:09+01:00 (8 years ago)

Author:

timgraham

Message:

Added modifications to instrument code and use perf_regions in GYRE_BENCHMARK

Location:

branches/2016/dev_HPC_Gyre_benchmark_test/NEMOGCM/BENCHMARK

Files:

• BATCH_TEMPLATE (added)
• BATCH_TEMPLATE/batch-XC40_METO (added)
• BATCH_TEMPLATE/batch-XC40_METO_perf_tools (added)
• GYRE_benchmark.sh (modified) (4 diffs)
• MY_SRC (added)
• perf_regions_instrumentation.py (added)
• prepare_job.sh (modified) (1 diff)

branches/2016/dev_HPC_Gyre_benchmark_test/NEMOGCM/BENCHMARK/GYRE_benchmark.sh

@@ -22 +22 @@
 #
 # Compiler among those in NEMOGCM/ARCH
-COMPILER=XC40_METO
+COMPILER=XC40_METO_perf_tools
 export BATCH_COMMAND_PAR="qsub"
 export BATCH_COMMAND_SEQ=$BATCH_COMMAND_PAR
@@ -28 +28 @@
 export MPIRUN_FLAG="yes"
 export USING_XIOS="yes"
+export PERF_REGIONS_HOME=/home/tigrah/perf_regions
+
+#Number of cores on a single node of HPC
+export CORES_PER_NODE=32
+
+# List of papi_counters to be used
+export LIST_COUNTERS=PAPI_L1_ICM
+
+
+# Make a link to perf_regions_fortran.f90 in MY_SRC directory
+# I think it should be possible to just include the .mod file but it's failing on XC40 at the moment
+ln -sf $PERF_REGIONS_HOME/src/perf_regions_fortran.F90 MY_SRC/perf_regions_fortran.F90
+
 #
 export DEL_KEYS="key_iomput"
@@ -58 +71 @@
 # control HPC behaviour for benchmarking
 #########################################
-module load perftools-lite
 module load cray-netcdf
 
@@ -77 +89 @@
 
 
+#Cleanup instrumentation from old run
+. ./perf_regions_instrumentation.py cleanup
+
+#Instrument OPA_SRC code before compilation
+. ./perf_regions_instrumentation.py
+
 # GYRE CONFIGURATION
 export TEST_NAME="BENCHMARK"
-export NUM_COUNTERS=2
-export LIST_COUNTERS=FP_COMP_OPS_EXE,PAPI_L3_TCM
-
 . ./param.cfg
 . ./all_functions.sh
 cd ${CONFIG_DIR}
-. ./makenemo -m ${CMP_NAM} -n GYRE_BENCHMARK -r GYRE -j 8 del_key key_mpp_mpi
-mkdir -p ${NEW_CONF}/${TEST_NAME}
+. ./makenemo -m ${CMP_NAM} -n GYRE_BENCHMARK -e /home/tigrah/dev_HPC_Gyre_benchmark_test/NEMOGCM/BENCHMARK/MY_SRC -r GYRE -j 8 del_key "key_mpp_mpi key_iomput"
+echo $PWD
+cd GYRE_BENCHMARK
+mkdir -p ${TEST_NAME}
 export EXE_DIR=${CONFIG_DIR}/${NEW_CONF}/${TEST_NAME}
-cp -rL ${CONFIG_DIR}/${NEW_CONF}/EXP00/* ${EXE_DIR}/.
-cp -r ${SETTE_DIR}/iodef_sette.xml ${EXE_DIR}/iodef.xml
 JOB_FILE=${EXE_DIR}/run_job.sh
+proc=1
+cd $EXE_DIR
+  cp -rL ${CONFIG_DIR}/${NEW_CONF}/EXP00/* ${EXE_DIR}/.
+  cp -r ${SETTE_DIR}/iodef_sette.xml ${EXE_DIR}/iodef.xml
+  cp -r ${SETTE_DIR}/perf_region_list.txt ${EXE_DIR}/perf_region_list.txt
+
 NPROC=1
 cd ${EXE_DIR}  

branches/2016/dev_HPC_Gyre_benchmark_test/NEMOGCM/BENCHMARK/prepare_job.sh

@@ -251 +251 @@
              -e"s:MPI_FLAG:${MPI_FLAG}:" \
              -e"s:DEF_NEMO_VALIDATION:${NEMO_VALIDATION_DIR}:" -e"s:DEF_NEW_CONF:${NEW_CONF}:" \
-             -e"s:DEF_CMP_NAM:${CMP_NAM}:" -e"s:DEF_TEST_NAME:${TEST_NAME}:" > run_sette_test.job
+             -e"s:DEF_CMP_NAM:${CMP_NAM}:" -e"s:DEF_TEST_NAME:${TEST_NAME}:" \
+             -e"s:DEF_LD_LIB:${PERF_REGIONS_HOME}/build/:" -e"s:DEF_COUNTERS:${LIST_COUNTERS}:" \
+             -e"s:DEF_CORES_PER_NODE:$CORES_PER_NODE:" > run_sette_test.job
 
         case ${COMPILER} in