rebase to master, tracer related changes

src/hip_clang.cpp

@@ -159,7 +159,7 @@ extern "C" void __hipRegisterFunction(
   dim3*        gridDim,
   int*         wSize)
 {
-  HIP_INIT_API(modules, hostFunction, deviceFunction, deviceName);
+  HIP_INIT_API(NONE, modules, hostFunction, deviceFunction, deviceName);
   std::vector<hipFunction_t> functions{g_deviceCnt};
 
   assert(modules && modules->size() >= g_deviceCnt);
@@ -214,7 +214,7 @@ hipError_t hipSetupArgument(
   size_t size,
   size_t offset)
 {
-  HIP_INIT_API(arg, size, offset);
+  HIP_INIT_API(hipSetupArgument, arg, size, offset);
   auto ctx = ihipGetTlsDefaultCtx();
   LockedAccessor_CtxCrit_t crit(ctx->criticalData());
   auto& arguments = crit->_execStack.top()._arguments;
@@ -229,7 +229,7 @@ hipError_t hipSetupArgument(
 
 hipError_t hipLaunchByPtr(const void *hostFunction)
 {
-  HIP_INIT_API(hostFunction);
+  HIP_INIT_API(hipLaunchByPtr, hostFunction);
   ihipExec_t exec;
   {
     auto ctx = ihipGetTlsDefaultCtx();

src/hip_stream.cpp

@@ -104,7 +104,7 @@ hipError_t hipStreamCreate(hipStream_t* stream) {
 
 //---
 hipError_t hipStreamCreateWithPriority(hipStream_t* stream, unsigned int flags, int priority) {
-    HIP_INIT_API(stream, flags, priority);
+    HIP_INIT_API(hipStreamCreateWithPriority, stream, flags, priority);
 
     // clamp priority to range [priority_high:priority_low]
     priority = (priority < priority_high ? priority_high : (priority > priority_low ? priority_low : priority));
@@ -113,7 +113,7 @@ hipError_t hipStreamCreateWithPriority(hipStream_t* stream, unsigned int flags,
 
 //---
 hipError_t hipDeviceGetStreamPriorityRange(int* leastPriority, int* greatestPriority) {
-    HIP_INIT_API(leastPriority, greatestPriority);
+    HIP_INIT_API(hipDeviceGetStreamPriorityRange, leastPriority, greatestPriority);
 
     if (leastPriority != NULL) *leastPriority = priority_low;
     if (greatestPriority != NULL) *greatestPriority = priority_high;
@@ -229,7 +229,7 @@ hipError_t hipStreamGetFlags(hipStream_t stream, unsigned int* flags) {
 
 //--
 hipError_t hipStreamGetPriority(hipStream_t stream, int* priority) {
-    HIP_INIT_API(stream, priority);
+    HIP_INIT_API(hipStreamGetPriority, stream, priority);
 
     if (priority == NULL) {
         return ihipLogStatus(hipErrorInvalidValue);