From 260d4536cc386b56c68e2b7bc974dc01ee53a964 Mon Sep 17 00:00:00 2001
From: Ammar ELWazir <Ammar.ELWazir@amd.com>
Date: Tue, 27 Jun 2023 11:19:08 +0000
Subject: [PATCH] Fixing Test Packages

Change-Id: I1c017732ce1dedfe8b74d680add101ca574d295c


[ROCm/rocprofiler commit: d8834eb37004765ec1331388d3435469b1bb5435]
---
 projects/rocprofiler/CMakeLists.txt              | 12 ++++++++++--
 projects/rocprofiler/build.sh                    | 16 ++++++++++------
 projects/rocprofiler/test/CMakeLists.txt         |  4 ++++
 .../featuretests/tracer/tracer_gtest.cpp         |  4 ++--
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/projects/rocprofiler/CMakeLists.txt b/projects/rocprofiler/CMakeLists.txt
index 50e3f1b63b..a0d0e7658a 100644
--- a/projects/rocprofiler/CMakeLists.txt
+++ b/projects/rocprofiler/CMakeLists.txt
@@ -370,6 +370,8 @@ if(${LIBRARY_TYPE} STREQUAL SHARED)
   set(CPACK_DEBIAN_PLUGINS_PACKAGE_DEPENDS
       "${PROJECT_NAME}, hsa-rocr-dev, rocm-core")
 
+  set ( CPACK_DEBIAN_CHANGELOG_FILE "${CMAKE_CURRENT_SOURCE_DIR}/CHANGELOG.md" )
+
   # RPM package specific variables
   if(DEFINED ENV{CPACK_RPM_PACKAGE_RELEASE})
     set(CPACK_RPM_PACKAGE_RELEASE $ENV{CPACK_RPM_PACKAGE_RELEASE})
@@ -417,12 +419,18 @@ if(${LIBRARY_TYPE} STREQUAL SHARED)
   message("CPACK_RPM_PACKAGE_RELEASE: ${CPACK_RPM_PACKAGE_RELEASE}")
 
   #Disable build id for rocprofiler as its creating transaction error
-  set ( CPACK_RPM_SPEC_MORE_DEFINE "%define _build_id_links none" )
-
+  set ( CPACK_RPM_SPEC_MORE_DEFINE "%define _build_id_links none
+                                    %global __strip ${CPACK_STRIP_EXECUTABLE}
+                                    %global __objdump ${CPACK_OBJDUMP_EXECUTABLE}
+                                    %global __objcopy ${CPACK_OBJCOPY_EXECUTABLE}
+                                    %global __readelf ${CPACK_READELF_EXECUTABLE}")
+           
   # RPM package specific variable for ASAN
   set ( CPACK_RPM_ASAN_PACKAGE_NAME "${ROCPROFILER_NAME}-asan" )
   set ( CPACK_RPM_ASAN_PACKAGE_REQUIRES "hsa-rocr-asan, rocm-core-asan" )
 
+  #set ( CPACK_RPM_CHANGELOG_FILE "${CMAKE_CURRENT_SOURCE_DIR}/CHANGELOG.md" )
+
   # Remove dependency on rocm-core if -DROCM_DEP_ROCMCORE=ON not given to cmake
   if(NOT ROCM_DEP_ROCMCORE)
     string(REGEX REPLACE ",? ?rocm-core" "" CPACK_RPM_RUNTIME_PACKAGE_REQUIRES
diff --git a/projects/rocprofiler/build.sh b/projects/rocprofiler/build.sh
index c87638ed58..4b13f19fa8 100755
--- a/projects/rocprofiler/build.sh
+++ b/projects/rocprofiler/build.sh
@@ -25,7 +25,7 @@
 SRC_DIR=$(dirname "$0")
 COMPONENT="rocprofiler"
 ROCM_PATH="${ROCM_PATH:=/opt/rocm}"
-LD_RUNPATH_FLAG=" -Wl,--enable-new-dtags -Wl,--rpath,$ROCM_PATH/lib:$ROCM_PATH/lib64"
+LD_RUNPATH_FLAG=" -Wl,--enable-new-dtags -Wl,--rpath,$ROCM_PATH/lib"
 
 usage() {
   echo -e "ROCProfiler Build Script Usage:"
@@ -79,18 +79,22 @@ if [ "$TO_CLEAN" = "yes" ] ; then rm -rf $BUILD_DIR; fi
 mkdir -p $BUILD_DIR
 pushd $BUILD_DIR
 
-cmake \
+cmake  \
     -DCMAKE_EXPORT_COMPILE_COMMANDS=TRUE \
     -DCMAKE_BUILD_TYPE=${BUILD_TYPE:-'RelWithDebInfo'} \
-    -DCMAKE_MODULE_PATH=$ROCM_PATH/hip/cmake \
-    -DCMAKE_PREFIX_PATH="$PREFIX_PATH" \
+    -DCMAKE_MODULE_PATH="${ROCM_PATH}/hip/cmake;${ROCM_PATH}/lib/cmake" \
+    -DCMAKE_PREFIX_PATH="${ROCM_INSTALL_PATH}/llvm;$PREFIX_PATH" \
     -DCMAKE_INSTALL_PREFIX="$PACKAGE_ROOT" \
     -DCMAKE_SHARED_LINKER_FLAGS="$LD_RUNPATH_FLAG" \
-    -DCPACK_PACKAGING_INSTALL_PREFIX=$PACKAGE_ROOT \
-    -DCPACK_GENERATOR=${CPACKGEN:-'DEB;RPM'} \
     -DCMAKE_INSTALL_RPATH=${ROCM_RPATH} \
     -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE \
     -DGPU_TARGETS="$GPU_LIST" \
+    -DCPACK_PACKAGING_INSTALL_PREFIX=$PACKAGE_ROOT \
+    -DCPACK_GENERATOR=${CPACKGEN:-'DEB;RPM'} \
+    -DCPACK_OBJCOPY_EXECUTABLE="${PACKAGE_ROOT}/llvm/bin/llvm-objcopy" \
+    -DCPACK_READELF_EXECUTABLE="${PACKAGE_ROOT}/llvm/bin/llvm-readelf" \
+    -DCPACK_STRIP_EXECUTABLE="${PACKAGE_ROOT}/llvm/bin/llvm-strip" \
+    -DCPACK_OBJDUMP_EXECUTABLE="${PACKAGE_ROOT}/llvm/bin/llvm-objdump" \
     $ROCPROFILER_ROOT
 
 popd
diff --git a/projects/rocprofiler/test/CMakeLists.txt b/projects/rocprofiler/test/CMakeLists.txt
index d63a7f152a..e261e178cc 100644
--- a/projects/rocprofiler/test/CMakeLists.txt
+++ b/projects/rocprofiler/test/CMakeLists.txt
@@ -126,6 +126,10 @@ foreach(target_id ${GPU_LIST})
 endforeach(target_id)
 add_custom_target(test DEPENDS ${HSACO_TARGET_LIST})
 add_custom_target(mytest DEPENDS ${HSACO_TARGET_LIST})
+add_custom_command(TARGET mytest POST_BUILD
+  DEPENDS mytest
+  COMMAND $<$<CONFIG:release>:${CMAKE_STRIP}>
+  ARGS ${HSACO_TARGET_LIST})
 
 ## Building standalone test executable
 add_executable ( ${ST_EXE_NAME} ${ST_TST_SRC} ${UTIL_SRC} ${KERN_SRC} )
diff --git a/projects/rocprofiler/tests-v2/featuretests/tracer/tracer_gtest.cpp b/projects/rocprofiler/tests-v2/featuretests/tracer/tracer_gtest.cpp
index 3b4c64c21d..1327879735 100644
--- a/projects/rocprofiler/tests-v2/featuretests/tracer/tracer_gtest.cpp
+++ b/projects/rocprofiler/tests-v2/featuretests/tracer/tracer_gtest.cpp
@@ -262,7 +262,7 @@ class AsyncCopyTest : public Tracertest {
 
 // Test:1 Compares total num of kernel-names in golden output against current
 // tracer output
-TEST_F(AsyncCopyTest, WhenRunningTracerWithAppThenAsyncCopyOutputIsgenerated) {
+TEST_F(AsyncCopyTest, DISABLED_WhenRunningTracerWithAppThenAsyncCopyOutputIsgenerated) {
   // kernel info in current profler run
   std::vector<tracer_kernel_info_t> current_kernel_info;
 
@@ -271,7 +271,7 @@ TEST_F(AsyncCopyTest, WhenRunningTracerWithAppThenAsyncCopyOutputIsgenerated) {
 }
 
 // Test:2 Matches coelation Ids
-TEST_F(AsyncCopyTest, WhenRunningTracerWithAppThenAsyncCorelationCountIsCorrect) {
+TEST_F(AsyncCopyTest, DISABLED_WhenRunningTracerWithAppThenAsyncCorelationCountIsCorrect) {
   // kernel info in current profler run
   std::vector<tracer_kernel_info_t> current_kernel_info;