From 3fe6016957568bb94dc4acfa6ab86e3518c31401 Mon Sep 17 00:00:00 2001
From: Sriraksha Nagaraj <Sriraksha.Nagaraj@amd.com>
Date: Tue, 30 May 2023 08:26:15 -0500
Subject: [PATCH] SWDEV-356166: Adding fix to load rocminfo without it in the
 PATH variable

Change-Id: I3f36900b47b72fab44c561123cd7600161124430
---
 CMakeLists.txt | 10 +++++++++-
 bin/tblextr.py |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5a0a9d05f..bdb88c34c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -119,6 +119,14 @@ find_package(
 find_library(NUMA NAME numa REQUIRED)
 link_libraries(${NUMA})
 
+find_program(ROCMINFO_EXEC NAMES "rocminfo"
+PATHS ${ROCM_PATH}
+${CMAKE_INSTALL_PREFIX} "/usr/local" "/usr"
+PATH_SUFFIXES bin)
+set(ORIGINAL_SCRIPT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin/tblextr.py)
+set(OUTPUT_SCRIPT_PATH ${CMAKE_CURRENT_BINARY_DIR}/bin/tblextr.py)
+configure_file(${ORIGINAL_SCRIPT_PATH} ${OUTPUT_SCRIPT_PATH} @ONLY)
+
 get_property(
   HSA_RUNTIME_INCLUDE_DIRECTORIES
   TARGET hsa-runtime64::hsa-runtime64
@@ -226,7 +234,7 @@ install(
   FILES ${CMAKE_CURRENT_SOURCE_DIR}/bin/txt2xml.sh
         ${CMAKE_CURRENT_SOURCE_DIR}/bin/merge_traces.sh
         ${CMAKE_CURRENT_SOURCE_DIR}/bin/txt2params.py
-        ${CMAKE_CURRENT_SOURCE_DIR}/bin/tblextr.py
+        ${CMAKE_CURRENT_BINARY_DIR}/bin/tblextr.py
         ${CMAKE_CURRENT_SOURCE_DIR}/bin/dform.py
         ${CMAKE_CURRENT_SOURCE_DIR}/bin/mem_manager.py
         ${CMAKE_CURRENT_SOURCE_DIR}/bin/sqlitedb.py
diff --git a/bin/tblextr.py b/bin/tblextr.py
index d8c7d55a8d..a8ad16d7ed 100755
--- a/bin/tblextr.py
+++ b/bin/tblextr.py
@@ -833,7 +833,7 @@ else:
   copy_statfile = re.sub(r'\.stats\.csv$', r'.copy_stats.csv', statfile)
   memcopy_info_file = re.sub(r'\.stats\.csv$', r'.memcopy_info.csv', statfile)
   sysinfo_file = re.sub(r'\.stats\.csv$', r'.sysinfo.txt', statfile)
-  metadata_gen(sysinfo_file, 'rocminfo')
+  metadata_gen(sysinfo_file, "@ROCMINFO_EXEC@")
 
   with open(dbfile, mode='w') as fd: fd.truncate()
   db = SQLiteDB(dbfile)