Merge pull request #870 from eshcherb/roctracer-hip-frontend-190116

fixing HSA_INIT_API cid args

[ROCm/clr commit: c67082ebc2]

projects/clr/hipamd/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

projects/clr/hipamd/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<const char*>(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<const char*>(symbolName));