SWDEV-431667: Fixing counter listing

Change-Id: Ibcb80edcdc4e61f3d57911598ee7950f09b2e85e

bin/rpl_run.sh

@@ -57,6 +57,33 @@ GEN_STATS=0
 # Quoting profiled cmd line
 CMD_QTS=1
 
+export PATH=.:$PATH
+
+# enable error logging
+export HSA_TOOLS_REPORT_LOAD_FAILURE=1
+export HSA_VEN_AMD_AQLPROFILE_LOG=1
+export ROCPROFILER_LOG=1
+unset ROCPROFILER_SESS
+
+# Profiler environment
+# Loading of profiler library by HSA runtime
+MY_HSA_TOOLS_LIB="$RPL_PATH/librocprofiler64.so.1"
+# Loading of the test tool by ROC Profiler
+export ROCP_TOOL_LIB=$TLIB_PATH/librocprof-tool.so
+# ROC Profiler metrics definition
+export ROCP_METRICS=$TLIB_PATH/metrics.xml
+
+# Enabling HSA dispatches intercepting by ROC PRofiler
+export ROCP_HSA_INTERCEPT=1
+# Disabling internal ROC Profiler proxy queue (simple version supported for testing purposes)
+unset ROCP_PROXY_QUEUE
+# Disable AQL-profile read API
+export AQLPROFILE_READ_API=0
+# ROC Profiler package path
+export ROCP_PACKAGE_DIR=$ROOT_DIR
+# enabled SPM KFD mode
+export ROCP_SPM_KFD_MODE=1
+
 # error handling
 fatal() {
   echo "$0: Error: $1"
@@ -355,6 +382,22 @@ convert_time_val() {
   fi
 }
 
+unset_v1_envs() {
+  # enable error logging
+ unset HSA_TOOLS_REPORT_LOAD_FAILURE
+ unset HSA_VEN_AMD_AQLPROFILE_LOG
+ unset ROCPROFILER_LOG
+ unset ROCPROFILER_SESS
+ unset MY_HSA_TOOLS_LIB
+ unset ROCP_TOOL_LIB
+ unset ROCP_METRICS
+ unset ROCP_HSA_INTERCEPT
+ unset ROCP_PROXY_QUEUE
+ unset AQLPROFILE_READ_API
+ unset ROCP_PACKAGE_DIR
+ unset ROCP_SPM_KFD_MODE
+}
+
 ################################################################################################
 # main
 echo "RPL: on '$time_stamp' from '$ROOT_DIR' in '$RUN_DIR'"
@@ -377,6 +420,8 @@ while [ 1 ] ; do
     if [ $2 = 1 ] ; then
       :
     elif [ $2 = 2 ] ; then
+      # unset all v1 variables
+      unset_v1_envs
       eval $BIN_DIR/rocprofv2 $ROCPROF_ARGS
       exit 0
     else
@@ -520,33 +565,6 @@ while [ 1 ] ; do
   if [ "$ARG_VAL" = 1 ] ; then shift; fi
 done
 
-export PATH=.:$PATH
-
-# enable error logging
-export HSA_TOOLS_REPORT_LOAD_FAILURE=1
-export HSA_VEN_AMD_AQLPROFILE_LOG=1
-export ROCPROFILER_LOG=1
-unset ROCPROFILER_SESS
-
-# Profiler environment
-# Loading of profiler library by HSA runtime
-MY_HSA_TOOLS_LIB="$RPL_PATH/librocprofiler64.so.1"
-# Loading of the test tool by ROC Profiler
-export ROCP_TOOL_LIB=$TLIB_PATH/librocprof-tool.so
-# Enabling HSA dispatches intercepting by ROC PRofiler
-export ROCP_HSA_INTERCEPT=1
-# Disabling internal ROC Profiler proxy queue (simple version supported for testing purposes)
-unset ROCP_PROXY_QUEUE
-# ROC Profiler metrics definition
-export ROCP_METRICS=$TLIB_PATH/metrics.xml
-# Disable AQL-profile read API
-export AQLPROFILE_READ_API=0
-# ROC Profiler package path
-export ROCP_PACKAGE_DIR=$ROOT_DIR
-# enabled SPM KFD mode
-export ROCP_SPM_KFD_MODE=1
-
-
 ARG_CK=`echo $ARG_IN | sed "s/^-.*$/-/"`
 if [ "$ARG_CK" = "-" ] ; then
   fatal "Wrong option '$ARG_IN'"