AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding RUNPATH to find libhsakmt.so for Centos and SLES

Browse Source 
- This new path is required when libhsaruntime.so is referred
from the top level ROCm lib directory.
- Once ROCm stack lib/lib64 structure is flatten, RUNPATH in all
the libraries needs to be updated.

Change-Id: I369131ce93e14958ec57a54701671f2bfd8d522a
Signed-off-by: Pruthvi Madugundu <pruthvi.madugundu@amd.com>
This commit is contained in:
Pruthvi Madugundu
2020-02-14 11:31:09 -08:00
committed by Pruthvi Madugundu
parent 3e9aca0f34
commit e931fd424b
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/hsa-ext-image/CMakeLists.txt
+2 -2
View File
@@ -73,7 +73,7 @@ get_filename_component( OPEN_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/.." ABSOLUT
set( OPEN_SOURCE_DIR ${OPEN_SOURCE_DIR} CACHE PATH "Open source root dir" FORCE )
## Set RUNPATH - ../../lib covers use of the legacy symlink in /hsa/lib/
set(CMAKE_INSTALL_RPATH "$ORIGIN;$ORIGIN/../../lib;$ORIGIN/../../lib64")
set(CMAKE_INSTALL_RPATH "$ORIGIN;$ORIGIN/../../lib;$ORIGIN/../../lib64;$ORIGIN/../lib64")
## ------------------------- Linux Compiler and Linker options -------------------------
set ( CMAKE_CXX_FLAGS "-std=c++11 " )
@@ -117,7 +117,7 @@ set ( IMAGE_SRCS ${EXT_SOURCE_DIR}/image/addrlib/src/addrinterface.cpp
${EXT_SOURCE_DIR}/image/addrlib/src/core/addrlib1.cpp
${EXT_SOURCE_DIR}/image/addrlib/src/core/addrlib2.cpp
${EXT_SOURCE_DIR}/image/addrlib/src/core/addrobject.cpp
${EXT_SOURCE_DIR}/image/addrlib/src/core/coord.cpp
${EXT_SOURCE_DIR}/image/addrlib/src/core/coord.cpp
${EXT_SOURCE_DIR}/image/addrlib/src/gfx10/gfx10addrlib.cpp
${EXT_SOURCE_DIR}/image/addrlib/src/gfx9/gfx9addrlib.cpp
${EXT_SOURCE_DIR}/image/addrlib/src/r800/ciaddrlib.cpp
runtime/hsa-runtime-tools/CMakeLists.txt
+3 -3
View File
@@ -72,7 +72,7 @@ get_filename_component( OPEN_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/.." ABSOLUT
set( OPEN_SOURCE_DIR ${OPEN_SOURCE_DIR} CACHE PATH "Open source root dir" FORCE )
## Set RUNPATH - ../../lib covers use of the legacy symlink in /hsa/lib/
set(CMAKE_INSTALL_RPATH "$ORIGIN;$ORIGIN/../../lib;$ORIGIN/../../lib64")
set(CMAKE_INSTALL_RPATH "$ORIGIN;$ORIGIN/../../lib;$ORIGIN/../../lib64;$ORIGIN/../lib64")
## ------------------------- Linux Compiler and Linker options -------------------------
set ( CMAKE_CXX_FLAGS "-std=c++11 ")
@@ -146,7 +146,7 @@ set ( INTERCEPT_SRC ${TOOLS_SOURCE_DIR}/intercept/amd_sw_aql_command_processor
${TOOLS_SOURCE_DIR}/intercept/aql_proxy_queue.cpp
${TOOLS_SOURCE_DIR}/intercept/profiler.cpp )
set ( PROFILER_SRC ${TOOLS_SOURCE_DIR}/profiler/gpu_countergroup.cpp
set ( PROFILER_SRC ${TOOLS_SOURCE_DIR}/profiler/gpu_countergroup.cpp
${TOOLS_SOURCE_DIR}/profiler/gpu_counter.cpp
${TOOLS_SOURCE_DIR}/profiler/var_data.cpp
${TOOLS_SOURCE_DIR}/profiler/info_set.cpp
@@ -159,7 +159,7 @@ set ( PROFILER_SRC ${TOOLS_SOURCE_DIR}/profiler/gpu_countergroup.cpp
${TOOLS_SOURCE_DIR}/profiler/ai_pmu.cpp
${TOOLS_SOURCE_DIR}/profiler/hsa_ext_profiler.cpp )
set ( THREAD_TRACE_SRC ${TOOLS_SOURCE_DIR}/threadtrace/thread_trace.cpp
set ( THREAD_TRACE_SRC ${TOOLS_SOURCE_DIR}/threadtrace/thread_trace.cpp
${TOOLS_SOURCE_DIR}/threadtrace/gfx9_factory.cpp
${TOOLS_SOURCE_DIR}/threadtrace/gfx9_thread_trace.cpp
${TOOLS_SOURCE_DIR}/threadtrace/pre_gfx9_factory.cpp
runtime/hsa-runtime/CMakeLists.txt
+1 -1
View File
@@ -111,7 +111,7 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/libamdhsacode )
add_definitions ( -DROCR_BUILD_ID=${PACKAGE_VERSION_STRING} )
## Set RUNPATH - ../../lib covers use of the legacy symlink in /hsa/lib/
set(CMAKE_INSTALL_RPATH "$ORIGIN;$ORIGIN/../../lib;$ORIGIN/../../lib64")
set(CMAKE_INSTALL_RPATH "$ORIGIN;$ORIGIN/../../lib;$ORIGIN/../../lib64;$ORIGIN/../lib64")
## ------------------------- Linux Compiler and Linker options -------------------------
set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -fexceptions -fno-rtti -fvisibility=hidden -Wno-error=sign-compare -Wno-sign-compare -Wno-write-strings -Wno-conversion-null -fno-math-errno -fno-threadsafe-statics -fmerge-all-constants -fms-extensions -Wno-error=comment -Wno-comment -Wno-error=pointer-arith -Wno-pointer-arith -Wno-error=unused-variable -Wno-error=unused-function" )