SWDEV-416735 Adding --merge-traces option to rocprof script

Change-Id: Ia6bc11c6265913d20ead85c50981893d147ff5eb

bin/merge_traces.sh

@@ -32,9 +32,12 @@ bin_name=`basename $0`
 usage() {
   echo "Script for aggregating results from multiple rocprofiler out directries."
   echo "Full path: $BIN_DIR/$bin_name"
-  echo "Usage:"
+  echo "Usage: if running independently"
   echo "  $bin_name -o <outputdir> [<inputdir>...]"
   echo ""
+  echo "Usage: if running with rocprof"
+  echo "  rocprof --merge-traces -o <outputdir> [<inputdir>...]"
+  echo ""
   echo "Options:"
   echo "  -o <outputdir> - output directory where the results will be aggregated."
   echo "  <inputdir>... - space separated list of rocprofiler directories. If not specified, CWD is used."

bin/rpl_run.sh

@@ -227,6 +227,10 @@ usage() {
   echo "      obj-tracking=off"
   echo "    ></defaults>"
   echo ""
+  echo "  --merge-traces - Script for aggregating results from multiple rocprofiler out directries."
+  echo "                   Usage: if running with rocprof"
+  echo "                   rocprof --merge-traces -o <outputdir> [<inputdir>...]"
+  echo ""
   exit 1
 }
 
@@ -529,6 +533,11 @@ while [ 1 ] ; do
     if [ "$2" = "off" ] ; then
       CMD_QTS=0
     fi
+  elif [ "$1" = "--merge-traces" ] ; then
+    shift
+    echo "merging traces with $PROF_BIN_DIR/merge_traces.sh"
+    $PROF_BIN_DIR/merge_traces.sh $@
+    exit 0
   else
     break
   fi