From 719e2a42c870eb2c99f1f8d6ffa98e3e7c8dc2f0 Mon Sep 17 00:00:00 2001 From: rkebichi <54912798+rkebichi@users.noreply.github.com> Date: Tue, 12 Nov 2019 17:14:23 -0500 Subject: [PATCH 1/8] Update CMakeLists.txt --- CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e90a4f7924..06d88d8d76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,9 +110,7 @@ install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/inc/roctracer_roctx.h DESTINATION in install ( FILES ${PROJECT_BINARY_DIR}/so-roctx-link DESTINATION ../lib RENAME ${ROCTX_LIBRARY}.so ) ## KFD wrapper -if ( DEFINED KFD_WRAPPER ) - install ( TARGETS "kfdwrapper64" LIBRARY DESTINATION lib ) -endif () +install ( TARGETS "kfdwrapper64" LIBRARY DESTINATION lib ) ## Packaging directives set ( CPACK_GENERATOR "DEB" "RPM" "TGZ" ) From ad5080dabc662c01fdcfd1b9734385dc64506e9c Mon Sep 17 00:00:00 2001 From: rkebichi <54912798+rkebichi@users.noreply.github.com> Date: Tue, 12 Nov 2019 17:23:41 -0500 Subject: [PATCH 2/8] Update env.cmake --- cmake_modules/env.cmake | 6 ------ 1 file changed, 6 deletions(-) diff --git a/cmake_modules/env.cmake b/cmake_modules/env.cmake index 9ad3fbf23b..da09ad4f5c 100644 --- a/cmake_modules/env.cmake +++ b/cmake_modules/env.cmake @@ -50,11 +50,6 @@ else() set ( HIP_VDI 0 ) endif() -## Enable KFD wrapper -if ( DEFINED KFD_WRAPPER ) - add_definitions ( -DKFD_WRAPPER=${KFD_WRAPPER} ) -endif() - ## Enable HIP/HCC local build if ( DEFINED LOCAL_BUILD ) add_definitions ( -DLOCAL_BUILD=${LOCAL_BUILD} ) @@ -136,6 +131,5 @@ message ( "-------------HCC-Inc: ${HCC_INC_DIR}" ) message ( "-------------HIP-Inc: ${HIP_INC_DIR}" ) message ( "-------------KFD-Inc: ${HSA_KMT_INC_PATH}" ) message ( "-------------HIP-VDI: ${HIP_VDI}" ) -message ( "---------KFD_WRAPPER: ${KFD_WRAPPER}" ) message ( "-----CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}" ) message ( "---CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}" ) From e177ff2c1ff7a7678a701dbf1d3a07159d7eff1d Mon Sep 17 00:00:00 2001 From: rkebichi <54912798+rkebichi@users.noreply.github.com> Date: Tue, 12 Nov 2019 17:24:57 -0500 Subject: [PATCH 3/8] Update CMakeLists.txt --- src/CMakeLists.txt | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 44b9fd81a3..7a65896baa 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,17 +17,15 @@ target_link_libraries( ${TARGET_LIB} PRIVATE ${HSA_RUNTIME_LIB} c stdc++ ) execute_process ( COMMAND sh -xc "${ROOT_DIR}/script/hsaap.py ${ROOT_DIR} ${HSA_RUNTIME_INC_PATH}" ) # Generating KFD/Thunk tracing primitives -if ( DEFINED KFD_WRAPPER ) - set ( KFD_LIB "kfdwrapper64" ) - set ( KFD_LIB_SRC - ${LIB_DIR}/kfd/kfd_wrapper.cpp - ) - execute_process ( COMMAND sh -xc "${ROOT_DIR}/script/gen_ostream_ops.py -in ${HSA_KMT_INC_PATH}/hsakmttypes.h -out ${ROOT_DIR}/inc/kfd_ostream_ops.h" ) - add_library ( ${KFD_LIB} SHARED ${KFD_LIB_SRC} ) - target_include_directories ( ${KFD_LIB} PRIVATE ${LIB_DIR} ${ROOT_DIR} ${ROOT_DIR}/inc ${HSA_RUNTIME_INC_PATH} ${HSA_RUNTIME_HSA_INC_PATH} ${HSA_KMT_INC_PATH} ) - target_link_libraries( ${KFD_LIB} PRIVATE c stdc++ ) - execute_process ( COMMAND sh -xc "${ROOT_DIR}/script/kfdap.py ${ROOT_DIR} ${HSA_KMT_INC_PATH}" ) -endif() +set ( KFD_LIB "kfdwrapper64" ) +set ( KFD_LIB_SRC + ${LIB_DIR}/kfd/kfd_wrapper.cpp +) +execute_process ( COMMAND sh -xc "${ROOT_DIR}/script/gen_ostream_ops.py -in ${HSA_KMT_INC_PATH}/hsakmttypes.h -out ${ROOT_DIR}/inc/kfd_ostream_ops.h" ) +add_library ( ${KFD_LIB} SHARED ${KFD_LIB_SRC} ) +target_include_directories ( ${KFD_LIB} PRIVATE ${LIB_DIR} ${ROOT_DIR} ${ROOT_DIR}/inc ${HSA_RUNTIME_INC_PATH} ${HSA_RUNTIME_HSA_INC_PATH} ${HSA_KMT_INC_PATH} ) +target_link_libraries( ${KFD_LIB} PRIVATE c stdc++ ) +execute_process ( COMMAND sh -xc "${ROOT_DIR}/script/kfdap.py ${ROOT_DIR} ${HSA_KMT_INC_PATH}" ) set ( ROCTX_LIB "roctx64" ) set ( ROCTX_LIB_SRC From e57a2125d79a055853efe0781157e578cb8f4ba0 Mon Sep 17 00:00:00 2001 From: rkebichi <54912798+rkebichi@users.noreply.github.com> Date: Tue, 12 Nov 2019 17:26:52 -0500 Subject: [PATCH 4/8] Update roctracer.cpp --- src/core/roctracer.cpp | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/core/roctracer.cpp b/src/core/roctracer.cpp index 1ae25fb885..50feac1bce 100644 --- a/src/core/roctracer.cpp +++ b/src/core/roctracer.cpp @@ -27,9 +27,7 @@ THE SOFTWARE. #include "inc/roctracer_roctx.h" #define PROF_API_IMPL 1 #include "inc/roctracer_hsa.h" -#ifdef KFD_WRAPPER #include "inc/roctracer_kfd.h" -#endif #include #include @@ -567,12 +565,10 @@ PUBLIC_API const char* roctracer_op_string( return roctracer::HipLoader::Instance().ApiName(op); break; } -#if KFD_WRAPPER case ACTIVITY_DOMAIN_KFD_API: { return roctracer::kfd_support::GetApiName(op); break; } -#endif default: EXC_RAISING(ROCTRACER_STATUS_BAD_DOMAIN, "invalid domain ID(" << domain << ")"); } @@ -593,13 +589,11 @@ PUBLIC_API roctracer_status_t roctracer_op_code( if (kind != NULL) *kind = 0; break; } -#ifdef KFD_WRAPPER case ACTIVITY_DOMAIN_KFD_API: { *op = roctracer::kfd_support::GetApiCode(str); if (kind != NULL) *kind = 0; break; } -#endif default: EXC_RAISING(ROCTRACER_STATUS_BAD_DOMAIN, "limited domain ID(" << domain << ")"); } @@ -612,9 +606,7 @@ static inline uint32_t get_op_num(const uint32_t& domain) { case ACTIVITY_DOMAIN_HSA_API: return HSA_API_ID_NUMBER; case ACTIVITY_DOMAIN_HCC_OPS: return HIP_OP_ID_NUMBER; case ACTIVITY_DOMAIN_HIP_API: return HIP_API_ID_NUMBER; -#ifdef KFD_WRAPPER case ACTIVITY_DOMAIN_KFD_API: return KFD_API_ID_NUMBER; -#endif case ACTIVITY_DOMAIN_EXT_API: return 0; case ACTIVITY_DOMAIN_ROCTX: return ROCTX_API_ID_NUMBER; default: @@ -631,13 +623,11 @@ static roctracer_status_t roctracer_enable_callback_fun( void* user_data) { switch (domain) { -#ifdef KFD_WRAPPER case ACTIVITY_DOMAIN_KFD_API: { const bool succ = roctracer::KfdLoader::Instance().RegisterApiCallback(op, (void*)callback, user_data); if (succ == false) EXC_RAISING(ROCTRACER_STATUS_ERROR, "KFD RegisterApiCallback error"); break; } -#endif case ACTIVITY_DOMAIN_HSA_OPS: break; case ACTIVITY_DOMAIN_HSA_API: { roctracer::hsa_support::cb_table.set(op, callback, user_data); @@ -712,13 +702,11 @@ static roctracer_status_t roctracer_disable_callback_fun( uint32_t op) { switch (domain) { -#ifdef KFD_WRAPPER case ACTIVITY_DOMAIN_KFD_API: { const bool succ = roctracer::KfdLoader::Instance().RemoveApiCallback(op); if (succ == false) EXC_RAISING(ROCTRACER_STATUS_ERROR, "KFD RemoveApiCallback error"); break; } -#endif case ACTIVITY_DOMAIN_HSA_OPS: break; case ACTIVITY_DOMAIN_HSA_API: break; case ACTIVITY_DOMAIN_HCC_OPS: break; @@ -1046,12 +1034,10 @@ PUBLIC_API roctracer_status_t roctracer_set_properties( break; } -#ifdef KFD_WRAPPER case ACTIVITY_DOMAIN_KFD_API: { roctracer::kfd_support::intercept_KFDApiTable(); break; } -#endif case ACTIVITY_DOMAIN_HSA_API: { // HSA API properties HsaApiTable* table = reinterpret_cast(properties); From f0b49ac122924f6327583f761276f0d9cf2513cd Mon Sep 17 00:00:00 2001 From: rkebichi <54912798+rkebichi@users.noreply.github.com> Date: Tue, 12 Nov 2019 17:27:33 -0500 Subject: [PATCH 5/8] Update CMakeLists.txt --- test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 8f04bce451..3be85fc399 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -33,7 +33,7 @@ set ( RUN_SCRIPT "${TEST_DIR}/run.sh" ) add_custom_target( mytest COMMAND make -C "${TEST_DIR}/MatrixTranspose" COMMAND sh -xc "cp ${TEST_DIR}/MatrixTranspose/MatrixTranspose ${PROJECT_BINARY_DIR}/test" - COMMAND HIP_VDI=${HIP_VDI} KFD_WRAPPER=${KFD_WRAPPER} make -C "${TEST_DIR}/MatrixTranspose_test" + COMMAND HIP_VDI=${HIP_VDI} make -C "${TEST_DIR}/MatrixTranspose_test" COMMAND sh -xc "cp ${TEST_DIR}/MatrixTranspose_test/MatrixTranspose ${PROJECT_BINARY_DIR}/test/MatrixTranspose_test" ) From 475b3619d556845fe482858eada3c885550ed447 Mon Sep 17 00:00:00 2001 From: rkebichi <54912798+rkebichi@users.noreply.github.com> Date: Tue, 12 Nov 2019 17:28:30 -0500 Subject: [PATCH 6/8] Update MatrixTranspose.cpp --- test/MatrixTranspose_test/MatrixTranspose.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/MatrixTranspose_test/MatrixTranspose.cpp b/test/MatrixTranspose_test/MatrixTranspose.cpp index 34007cf20f..f8391d784c 100644 --- a/test/MatrixTranspose_test/MatrixTranspose.cpp +++ b/test/MatrixTranspose_test/MatrixTranspose.cpp @@ -32,9 +32,7 @@ THE SOFTWARE. #include // kfd header file -#ifdef KFD_WRAPPER #include -#endif #ifndef ITERATIONS # define ITERATIONS 101 @@ -208,7 +206,6 @@ void api_callback( fprintf(stdout, "ROCTX: \"%s\"\n", data->args.message); return; } -#ifdef KFD_WRAPPER if (domain == ACTIVITY_DOMAIN_KFD_API) { const kfd_api_data_t* data = reinterpret_cast(callback_data); fprintf(stdout, "KFD: <%s id(%u)\tcorrelation_id(%lu) %s> \n", @@ -218,7 +215,6 @@ void api_callback( (data->phase == ACTIVITY_API_PHASE_ENTER) ? "on-enter" : "on-exit"); return; } -#endif const hip_api_data_t* data = reinterpret_cast(callback_data); fprintf(stdout, "<%s id(%u)\tcorrelation_id(%lu) %s> ", roctracer_op_string(ACTIVITY_DOMAIN_HIP_API, cid, 0), From 3aa084a248707900a1fba611d14fbc4b7dcf9e15 Mon Sep 17 00:00:00 2001 From: rkebichi <54912798+rkebichi@users.noreply.github.com> Date: Tue, 12 Nov 2019 17:29:43 -0500 Subject: [PATCH 7/8] Update tracer_tool.cpp --- test/tool/tracer_tool.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/test/tool/tracer_tool.cpp b/test/tool/tracer_tool.cpp index 71da132baa..e7cab52fa2 100644 --- a/test/tool/tracer_tool.cpp +++ b/test/tool/tracer_tool.cpp @@ -37,9 +37,7 @@ THE SOFTWARE. #include #include #include -#ifdef KFD_WRAPPER #include -#endif #include #include #include @@ -437,7 +435,6 @@ void hcc_activity_callback(const char* begin, const char* end, void* arg) { // KFD API tracing // KFD API callback function -#ifdef KFD_WRAPPER void kfd_api_callback( uint32_t domain, uint32_t cid, @@ -455,7 +452,6 @@ void kfd_api_callback( fprintf(kfd_api_file_handle, "%s\n", os.str().c_str()); } } -#endif /////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -738,7 +734,6 @@ extern "C" PUBLIC_API bool OnLoad(HsaApiTable* table, uint64_t runtime_version, err = pthread_create(&thread, &attr, control_thr_fun, NULL); } -#ifdef KFD_WRAPPER // Enable KFD API callbacks/activity if (trace_kfd) { kfd_api_file_handle = open_output_file(output_prefix, "kfd_api_trace.txt"); @@ -759,7 +754,6 @@ extern "C" PUBLIC_API bool OnLoad(HsaApiTable* table, uint64_t runtime_version, } printf(")\n"); } -#endif if (onload_debug) { printf("TOOL OnLoad end\n"); fflush(stdout); } return roctracer_load(table, runtime_version, failed_tool_count, failed_tool_names); From 19ad236bcf51025295080798a19f4b287bec7eb8 Mon Sep 17 00:00:00 2001 From: Rachida Kebichi Date: Tue, 12 Nov 2019 18:06:34 -0500 Subject: [PATCH 8/8] change permission to x --- script/gen_ostream_ops.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 script/gen_ostream_ops.py diff --git a/script/gen_ostream_ops.py b/script/gen_ostream_ops.py old mode 100644 new mode 100755