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

File Reorganization with backward compatibility

Browse Source 
Package files installed in /opt/rocm
Wrapper header files and library soft links installed in/opt/rocm/rocprofiler
Test tools library and binaries renamed
Internal binaries installed in /opt/rocm/libexec/rocprofiler
run.sh updated with file reorg changes

Change-Id: I927d1a0dcd814764ebf0f473d0a64883906d5457


[ROCm/rocprofiler commit: 015697db74]
This commit is contained in:
Ranjith Ramakrishnan
2022-02-26 16:31:35 -08:00
parent 7284cbb59b
commit fcc553ec4d
7 changed files with 186 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/rocprofiler/test/CMakeLists.txt
+2 -2
View File
@@ -23,7 +23,7 @@
cmake_minimum_required ( VERSION 2.8.12 )
set ( CMAKE_VERBOSE_MAKEFILE TRUE CACHE BOOL "Verbose Output" FORCE )
set ( EXE_NAME "ctrl" )
set ( EXE_NAME "rocprof-ctrl" )
if ( NOT DEFINED TEST_DIR )
set ( TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR} )
@@ -105,7 +105,7 @@ execute_process ( COMMAND sh -xc "cp ${TEST_DIR}/tool/*.xml ${PROJECT_BINARY_DIR
execute_process ( COMMAND sh -xc "mkdir -p ${PROJECT_BINARY_DIR}/RESULTS" )
## Build test library
set ( TEST_LIB "tool" )
set ( TEST_LIB "rocprof-tool" )
set ( TEST_LIB_SRC ${TEST_DIR}/tool/tool.cpp ${UTIL_SRC} )
add_library ( ${TEST_LIB} SHARED ${TEST_LIB_SRC} )
target_include_directories ( ${TEST_LIB} PRIVATE ${TEST_DIR} ${ROOT_DIR} )
projects/rocprofiler/test/run.sh
+10 -10
View File
@@ -57,7 +57,7 @@ eval_test() {
}
# paths to ROC profiler and oher libraries
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD:$PWD/../../lib:/opt/rocm/lib
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD:$PWD/../../lib:/opt/rocm/lib:/opt/rocm/lib/rocprofiler
# enable tools load failure reporting
export HSA_TOOLS_REPORT_LOAD_FAILURE=1
@@ -101,18 +101,18 @@ export ROCP_KITER=20
export ROCP_DITER=20
export ROCP_AGENTS=1
export ROCP_THRS=3
eval_test "Intercepting usage model test" ./test/ctrl
eval_test "Intercepting usage model test" ./test/rocprof-ctrl
## Libtool test
# tool library loaded by ROC profiler
export ROCP_TOOL_LIB=libtool.so
export ROCP_TOOL_LIB=librocprof-tool.so
# ROC profiler kernels timing
export ROCP_TIMESTAMP_ON=1
# output directory for the tool library, for metrics results file 'results.txt'
export ROCP_OUTPUT_DIR=./RESULTS
if [ ! -e $ROCP_TOOL_LIB ] ; then
export ROCP_TOOL_LIB=test/libtool.so
export ROCP_TOOL_LIB=test/librocprof-tool.so
fi
export ROCP_KITER=20
@@ -120,14 +120,14 @@ export ROCP_DITER=20
export ROCP_AGENTS=1
export ROCP_THRS=1
export ROCP_INPUT=pmc_input.xml
eval_test "'rocprof' libtool PMC test" ./test/ctrl
eval_test "'rocprof' rocprof-tool PMC test" ./test/rocprof-ctrl
export ROCP_KITER=20
export ROCP_DITER=20
export ROCP_AGENTS=1
export ROCP_THRS=10
export ROCP_INPUT=pmc_input.xml
eval_test "'rocprof' libtool PMC n-thread test" ./test/ctrl
eval_test "'rocprof' rocprof-tool PMC n-thread test" ./test/rocprof-ctrl
export ROCP_OPT_MODE=1
export ROCP_KITER=20
@@ -135,7 +135,7 @@ export ROCP_DITER=20
export ROCP_AGENTS=1
export ROCP_THRS=10
export ROCP_INPUT=pmc_input.xml
eval_test "'rocprof' libtool PMC n-thread opt test" ./test/ctrl
eval_test "'rocprof' rocprof-tool PMC n-thread opt test" ./test/rocprof-ctrl
unset ROCP_OPT_MODE
export ROCP_KITER=20
@@ -143,14 +143,14 @@ export ROCP_DITER=20
export ROCP_AGENTS=1
export ROCP_THRS=1
export ROCP_INPUT=pmc_input1.xml
eval_test "'rocprof' libtool PMC test1" ./test/ctrl
eval_test "'rocprof' rocprof-tool PMC test1" ./test/rocprof-ctrl
export ROCP_KITER=20
export ROCP_DITER=20
export ROCP_AGENTS=1
export ROCP_THRS=10
export ROCP_INPUT=pmc_input1.xml
eval_test "'rocprof' libtool PMC n-thread test1" ./test/ctrl
eval_test "'rocprof' rocprof-tool PMC n-thread test1" ./test/rocprof-ctrl
unset ROCP_MCOPY_TRACKING
# enable HSA intercepting
@@ -158,7 +158,7 @@ export ROCP_HSA_INTERC=1
export ROCP_KITER=10
export ROCP_DITER=10
eval_test "libtool test, counter sets" ./test/ctrl
eval_test "rocprof-tool test, counter sets" ./test/rocprof-ctrl
## OpenCL test
#eval_test "libtool test, OpenCL sample" ./test/ocl/SimpleConvolution