From 60f3e06033cbd18283e531018703eb741e434d0b Mon Sep 17 00:00:00 2001 From: Evgeny Date: Tue, 29 Jan 2019 13:15:26 -0600 Subject: [PATCH 1/2] roctracer-proto pkg-config fix to includedir [ROCm/clr commit: 2159e655d50705ccdc65d6239e6c92e9fe5f1adf] --- projects/clr/hipamd/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/clr/hipamd/CMakeLists.txt b/projects/clr/hipamd/CMakeLists.txt index 3db80f9e7e..b2b67fbc0e 100644 --- a/projects/clr/hipamd/CMakeLists.txt +++ b/projects/clr/hipamd/CMakeLists.txt @@ -158,7 +158,7 @@ if(USE_PROF_API EQUAL 1) find_package(PkgConfig) pkg_check_modules(ROCTRACERPROTO QUIET roctracer-proto) if(ROCTRACERPROTO_FOUND EQUAL 1) - pkg_get_variable(PROF_API_HEADER_PATH roctracer-proto prefix) + pkg_get_variable(PROF_API_HEADER_PATH roctracer-proto includedir) else() set(PROF_API_HEADER_PATH /opt/rocm/roctracer/include/ext) endif() From ff6fc42ebd03f39e9661092c2b33d2d76853770e Mon Sep 17 00:00:00 2001 From: Evgeny Date: Tue, 29 Jan 2019 23:14:57 -0600 Subject: [PATCH 2/2] return false if PROF_API is disabled [ROCm/clr commit: a32c3c73848c01993e47995fcfd82883fe89ac8f] --- projects/clr/hipamd/include/hip/hcc_detail/hip_prof_api.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/clr/hipamd/include/hip/hcc_detail/hip_prof_api.h b/projects/clr/hipamd/include/hip/hcc_detail/hip_prof_api.h index dd3c3efec9..eb3112bdb4 100644 --- a/projects/clr/hipamd/include/hip/hcc_detail/hip_prof_api.h +++ b/projects/clr/hipamd/include/hip/hcc_detail/hip_prof_api.h @@ -195,8 +195,8 @@ class api_callbacks_table_t { public: typedef void* act_t; typedef void* fun_t; - bool set_activity(uint32_t id, act_t fun, void* arg) { return true; } - bool set_callback(uint32_t id, fun_t fun, void* arg) { return true; } + bool set_activity(uint32_t id, act_t fun, void* arg) { return false; } + bool set_callback(uint32_t id, fun_t fun, void* arg) { return false; } }; #endif