From 3f7ff3450e3cfdbb48d5905c63aeecfefaa891f8 Mon Sep 17 00:00:00 2001 From: Evgeny Date: Wed, 16 Jan 2019 23:45:44 -0600 Subject: [PATCH] fixing HSA_INIT_API cid args [ROCm/hip commit: 0164464bccc5a9dc1b65264d0611dd52da81ed94] --- projects/hip/include/hip/hcc_detail/hip_prof_str.h | 4 ++++ projects/hip/src/hip_memory.cpp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/projects/hip/include/hip/hcc_detail/hip_prof_str.h b/projects/hip/include/hip/hcc_detail/hip_prof_str.h index 9fe681c18d..3a0d3e08ec 100644 --- a/projects/hip/include/hip/hcc_detail/hip_prof_str.h +++ b/projects/hip/include/hip/hcc_detail/hip_prof_str.h @@ -39,6 +39,8 @@ #define INIT_hipStreamCreateWithPriority_CB_ARGS_DATA(cb_data) {}; #define INIT_hipDeviceGetStreamPriorityRange_CB_ARGS_DATA(cb_data) {}; #define INIT_hipStreamGetPriority_CB_ARGS_DATA(cb_data) {}; +#define INIT_hipGetSymbolAddress_CB_ARGS_DATA(cb_data) {}; +#define INIT_hipGetSymbolSize_CB_ARGS_DATA(cb_data) {}; // HIP API callbacks ID enumaration enum hip_api_id_t { @@ -218,6 +220,8 @@ enum hip_api_id_t { HIP_API_ID_hipStreamCreateWithPriority = HIP_API_ID_NUMBER, HIP_API_ID_hipDeviceGetStreamPriorityRange = HIP_API_ID_NUMBER, HIP_API_ID_hipStreamGetPriority = HIP_API_ID_NUMBER, + HIP_API_ID_hipGetSymbolAddress = HIP_API_ID_NUMBER, + HIP_API_ID_hipGetSymbolSize = HIP_API_ID_NUMBER, }; // Return HIP API string diff --git a/projects/hip/src/hip_memory.cpp b/projects/hip/src/hip_memory.cpp index c50b50eda5..ef5f80aee4 100644 --- a/projects/hip/src/hip_memory.cpp +++ b/projects/hip/src/hip_memory.cpp @@ -1108,7 +1108,7 @@ hipError_t hipMemcpyFromSymbolAsync(void* dst, const void* symbolName, size_t co hipError_t hipGetSymbolAddress(void** devPtr, const void* symbolName) { - HIP_INIT_API(devPtr, symbolName); + HIP_INIT_API(hipGetSymbolAddress, devPtr, symbolName); size_t size = 0; return ihipModuleGetGlobal(devPtr, &size, 0, static_cast(symbolName)); @@ -1116,7 +1116,7 @@ hipError_t hipGetSymbolAddress(void** devPtr, const void* symbolName) { hipError_t hipGetSymbolSize(size_t* size, const void* symbolName) { - HIP_INIT_API(size, symbolName); + HIP_INIT_API(hipGetSymbolSize, size, symbolName); void* devPtr = nullptr; return ihipModuleGetGlobal(&devPtr, size, 0, static_cast(symbolName));