From 00df7f2db87d60ba098458fc39ff419a1653e09e Mon Sep 17 00:00:00 2001
From: Evgeny <evgeny.shcherbakov@amd.com>
Date: Tue, 29 Jan 2019 15:26:05 -0600
Subject: [PATCH] scripts fix and install in specific location

Change-Id: I4aa8b0c46efa2b8eec26b5b6225ba2a155d17da5
---
 CMakeLists.txt | 17 ++++++++++++-----
 bin/rpl_run.sh | 13 +++++++------
 bin/tblextr.py | 27 +++++++++++++--------------
 3 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d46cf67c3c..8205a8437e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,9 +74,13 @@ endif ()
 add_subdirectory ( ${TEST_DIR} ${PROJECT_BINARY_DIR}/test )
 
 ## Create symlinks for packaging and install
-add_custom_target ( rocprof-link ALL
-                    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-                    COMMAND ${CMAKE_COMMAND} -E create_symlink rpl_run.sh rocprof-link )
+add_custom_target ( rocprof-link ALL WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+                    COMMAND ${CMAKE_COMMAND} -E create_symlink ../${ROCPROFILER_NAME}/bin/rpl_run.sh rocprof-link )
+add_custom_target ( inc-link ALL WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+                    COMMAND ${CMAKE_COMMAND} -E create_symlink ../${ROCPROFILER_NAME}/include inc-link )
+add_custom_target ( so-link ALL WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+                    COMMAND ${CMAKE_COMMAND} -E create_symlink ../${ROCPROFILER_NAME}/lib/${ROCPROFILER_LIBRARY}.so so-link )
+
 set ( CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/${ROCPROFILER_NAME}" )
 message ( "---------Install-Dir: ${CMAKE_INSTALL_PREFIX}" )
 install ( TARGETS ${ROCPROFILER_TARGET} LIBRARY DESTINATION lib )
@@ -86,10 +90,13 @@ install ( FILES
           ${CMAKE_CURRENT_SOURCE_DIR}/bin/rpl_run.sh
           ${CMAKE_CURRENT_SOURCE_DIR}/bin/txt2xml.sh
           ${CMAKE_CURRENT_SOURCE_DIR}/bin/tblextr.py
+          ${CMAKE_CURRENT_SOURCE_DIR}/bin/dform.py
+          ${CMAKE_CURRENT_SOURCE_DIR}/bin/sqlitedb.py
           DESTINATION bin
           PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
-install ( FILES ${PROJECT_BINARY_DIR}/rocprof-link
-          DESTINATION bin
+install ( FILES ${PROJECT_BINARY_DIR}/inc-link DESTINATION ../include RENAME ${ROCPROFILER_NAME} )
+install ( FILES ${PROJECT_BINARY_DIR}/so-link DESTINATION ../lib RENAME ${ROCPROFILER_NAME}.so )
+install ( FILES ${PROJECT_BINARY_DIR}/rocprof-link DESTINATION ../bin
           PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
           RENAME rocprof )
 # gfx_metrics.xml metrics.xml
diff --git a/bin/rpl_run.sh b/bin/rpl_run.sh
index ef26472ed6..7d3dffac7d 100755
--- a/bin/rpl_run.sh
+++ b/bin/rpl_run.sh
@@ -23,18 +23,19 @@
 ################################################################################
 
 time_stamp=`date +%y%m%d_%H%M%S`
-BIN_DIR=`dirname $0`
-BIN_DIR=`cd $BIN_DIR; pwd`
+BIN_DIR=$(dirname $(realpath $0))
+PKG_DIR=$(dirname $BIN_DIR)
+ROOT_DIR=$(dirname $PKG_DIR)
 RUN_DIR=`pwd`
 TMP_DIR="/tmp"
 DATA_DIR="rpl_data_${time_stamp}_$$"
 
-PKG_DIR=`echo $BIN_DIR | sed "s/\/bin\/*//"`
-BIN_DIR=$PKG_DIR/bin
-
 # PATH to custom HSA and OpenCl runtimes
 HSA_PATH=$PKG_DIR/lib/hsa
 
+# roctracer path
+if [ -z "$ROCTRACER_PATH" ] ; then ROCTRACER_PATH=$ROOT_DIR/roctracer; fi
+
 # runtime API trace
 HSA_TRACE=0
 HIP_TRACE=0
@@ -42,7 +43,7 @@ HIP_TRACE=0
 # Generate stats
 GEN_STATS=0
 
-export LD_LIBRARY_PATH=$PKG_DIR/lib:$PKG_DIR/tool:$PKG_DIR/roctracer/lib:$PKG_DIR/roctracer/tool:$HSA_PATH
+export LD_LIBRARY_PATH=$PKG_DIR/lib:$PKG_DIR/tool:$ROCTRACER_PATH/lib:$ROCTRACER_PATH/tool:$HSA_PATH
 export PATH=.:$PATH
 
 # enable error logging
diff --git a/bin/tblextr.py b/bin/tblextr.py
index 5eb600cc8e..c732283f29 100755
--- a/bin/tblextr.py
+++ b/bin/tblextr.py
@@ -110,21 +110,20 @@ def parse_res(infile):
           var_table[dispatch_number]['BeginNs'] = m.group(2)
           var_table[dispatch_number]['EndNs'] = m.group(3)
           var_table[dispatch_number]['CompleteNs'] = m.group(4)
-        else: fatal('bad kernel record "' + record + '"')
 
-        gpu_pid = GPU_BASE_PID + int(gpu_id)
-        if not gpu_pid in dep_dict: dep_dict[gpu_pid] = {}
-        dep_str = dep_dict[gpu_pid]
-        if not 'tid' in dep_str: dep_str['tid'] = []
-        if not 'from' in dep_str: dep_str['from'] = []
-        if not 'to' in dep_str: dep_str['to'] = {}
-        to_id = len(dep_str['tid'])
-        from_us = int(m.group(1)) / 1000
-        to_us = int(m.group(2)) / 1000
-        dep_str['to'][to_id] = to_us
-        dep_str['from'].append(from_us)
-        dep_str['tid'].append(disp_tid)
-        kern_dep_list.append((disp_tid, m.group(1)))
+          gpu_pid = GPU_BASE_PID + int(gpu_id)
+          if not gpu_pid in dep_dict: dep_dict[gpu_pid] = {}
+          dep_str = dep_dict[gpu_pid]
+          if not 'tid' in dep_str: dep_str['tid'] = []
+          if not 'from' in dep_str: dep_str['from'] = []
+          if not 'to' in dep_str: dep_str['to'] = {}
+          to_id = len(dep_str['tid'])
+          from_us = int(m.group(1)) / 1000
+          to_us = int(m.group(2)) / 1000
+          dep_str['to'][to_id] = to_us
+          dep_str['from'].append(from_us)
+          dep_str['tid'].append(disp_tid)
+          kern_dep_list.append((disp_tid, m.group(1)))
 
   inp.close()
 #############################################################