SWDEV-274821 SPM initialization fix

Change-Id: I5e27928a60083eff328bab3e79937ce11bce11bd

bin/rpl_run.sh

@@ -75,6 +75,8 @@ export ROCP_METRICS=$PKG_DIR/lib/metrics.xml
 export AQLPROFILE_READ_API=0
 # ROC Profiler package path
 export ROCP_PACKAGE_DIR=$PKG_DIR
+# enabled SPM KFD mode
+export ROCP_SPM_KFD_MODE=1
 
 # error handling
 fatal() {
@@ -184,7 +186,6 @@ usage() {
   echo "  --flush-rate <rate> - to enable trace flush rate (time period)"
   echo "    Supported time formats: <number(m|s|ms|us)>"
   echo "  --parallel-kernels - to enable cnocurrent kernels"
-  echo "  --spm-mode <on|off> - to enable collecting time-based sampling of HW counter data [off]"
   echo ""
   echo "Configuration file:"
   echo "  You can set your parameters defaults preferences in the configuration file 'rpl_rc.xml'. The search path sequence: .:${HOME}:<package path>"
@@ -445,10 +446,6 @@ while [ 1 ] ; do
     ARG_VAL=0
     export ROCP_K_CONCURRENT=1
     export AQLPROFILE_READ_API=1
-  elif [ "$1" = "--spm-mode" ] ; then
-    if [ "$2" = "on" ] ; then
-      export ROCP_SPM_KFD_MODE=1
-    fi
   elif [ "$1" = "--verbose" ] ; then
     ARG_VAL=0
     export ROCP_VERBOSE_MODE=1

bin/txt2xml.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 
 ################################################################################
 # Copyright (c) 2018 Advanced Micro Devices, Inc. All rights reserved.
@@ -64,7 +64,7 @@ parse() {
         gpu_index=$line
       fi
     else
-      found=$(echo $feature | sed -n "/^\(pmc\|sqtt\|hsa\)$/ p")
+      found=$(echo $feature | sed -n "/^\(pmc\|sqtt\|hip\|hsa\|kfd\)$/ p")
       if [ -n "$found" ] ; then
         output=$outdir/input${index}.xml
         header="# $timestamp '$output' generated with '$0 $*'"
@@ -85,9 +85,21 @@ EOF
 EOF
         fi
 
+        if [ "$feature" == "hip" ] ; then
+          cat >> $output <<EOF
+<trace name="HIP"><parameters api="$line"></parameters></trace>
+EOF
+        fi
+
         if [ "$feature" == "hsa" ] ; then
           cat >> $output <<EOF
 <trace name="HSA"><parameters api="$line"></parameters></trace>
+EOF
+        fi
+
+        if [ "$feature" == "kfd" ] ; then
+          cat >> $output <<EOF
+<trace name="KFD"><parameters api="$line"></parameters></trace>
 EOF
         fi
       fi