P4 to Git Change 2009236 by eshcherb@evgeny-hip on 2019/10/07 11:49:55

SWDEV-197287 - HIP tracing layer instrumentation

	hip_prof_str.h - generated header; as a next step a genrator will be integrated in HIP makefile (similar to HIP-HCC)
	prof_protocol.h - temporarily included in HIP sources. Provided by roctracer-proto package. HIP-HCC CMake has parameter to set a path to the header.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/build/Makefile.hip#23 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_context.cpp#23 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_device.cpp#24 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_device_runtime.cpp#19 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_error.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_event.cpp#17 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_intercept.cpp#1 add
... //depot/stg/opencl/drivers/opencl/api/hip/hip_internal.hpp#44 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_memory.cpp#74 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_module.cpp#43 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_peer.cpp#7 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_platform.cpp#44 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_prof_api.h#1 add
... //depot/stg/opencl/drivers/opencl/api/hip/hip_profile.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_stream.cpp#25 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_surface.cpp#5 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_texture.cpp#21 edit
... //depot/stg/opencl/drivers/opencl/api/hip/prof_protocol.h#1 add
... //depot/stg/opencl/drivers/opencl/hip_prof_gen.py#1 add
... //depot/stg/opencl/drivers/opencl/make/hip.git/include/hip/hcc_detail/hip_prof_str.h#2 delete

api/hip/hip_device.cpp

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #include "hip_internal.hpp"
 
 hipError_t hipDeviceGet(hipDevice_t *device, int deviceId) {
-  HIP_INIT_API(device, deviceId);
+  HIP_INIT_API(hipDeviceGet, device, deviceId);
 
   if (device != nullptr) {
     *device = deviceId;
@@ -38,7 +38,7 @@ hipError_t hipDeviceGet(hipDevice_t *device, int deviceId) {
 
 hipError_t hipFuncSetCacheConfig (const void* func, hipFuncCache_t cacheConfig) {
 
-  HIP_INIT_API(cacheConfig);
+  HIP_INIT_API(hipFuncSetCacheConfig, cacheConfig);
 
   // No way to set cache config yet.
 
@@ -47,7 +47,7 @@ hipError_t hipFuncSetCacheConfig (const void* func, hipFuncCache_t cacheConfig)
 
 hipError_t hipDeviceTotalMem (size_t *bytes, hipDevice_t device) {
 
-  HIP_INIT_API(bytes, device);
+  HIP_INIT_API(hipDeviceTotalMem, bytes, device);
 
   if (device < 0 || static_cast<size_t>(device) >= g_devices.size()) {
     HIP_RETURN(hipErrorInvalidDevice);
@@ -67,7 +67,7 @@ hipError_t hipDeviceTotalMem (size_t *bytes, hipDevice_t device) {
 
 hipError_t hipDeviceComputeCapability(int *major, int *minor, hipDevice_t device) {
 
-  HIP_INIT_API(major, minor, device);
+  HIP_INIT_API(hipDeviceComputeCapability, major, minor, device);
 
   if (device < 0 || static_cast<size_t>(device) >= g_devices.size()) {
     HIP_RETURN(hipErrorInvalidDevice);
@@ -86,7 +86,7 @@ hipError_t hipDeviceComputeCapability(int *major, int *minor, hipDevice_t device
 }
 
 hipError_t hipDeviceGetCount(int* count) {
-  HIP_INIT_API(count);
+  HIP_INIT_API(NONE, count);
 
   HIP_RETURN(ihipDeviceGetCount(count));
 }
@@ -108,7 +108,7 @@ hipError_t ihipDeviceGetCount(int* count) {
 
 hipError_t hipDeviceGetName(char *name, int len, hipDevice_t device) {
 
-  HIP_INIT_API((void*)name, len, device);
+  HIP_INIT_API(hipDeviceGetName, (void*)name, len, device);
 
   if (device < 0 || static_cast<size_t>(device) >= g_devices.size()) {
     HIP_RETURN(hipErrorInvalidDevice);
@@ -134,7 +134,7 @@ hipError_t hipDeviceGetName(char *name, int len, hipDevice_t device) {
 }
 
 hipError_t hipGetDeviceProperties ( hipDeviceProp_t* props, hipDevice_t device ) {
-  HIP_INIT_API(props, device);
+  HIP_INIT_API(hipGetDeviceProperties, props, device);
 
   if (props == nullptr) {
     HIP_RETURN(hipErrorInvalidValue);
@@ -218,7 +218,7 @@ hipError_t hipGetDeviceProperties ( hipDeviceProp_t* props, hipDevice_t device )
 }
 
 hipError_t hipHccGetAccelerator(int deviceId, hc::accelerator* acc) {
-  HIP_INIT_API(deviceId, acc);
+  HIP_INIT_API(NONE, deviceId, acc);
 
   assert(0 && "Unimplemented");
 
@@ -226,7 +226,7 @@ hipError_t hipHccGetAccelerator(int deviceId, hc::accelerator* acc) {
 }
 
 hipError_t hipHccGetAcceleratorView(hipStream_t stream, hc::accelerator_view** av) {
-  HIP_INIT_API(stream, av);
+  HIP_INIT_API(NONE, stream, av);
 
   assert(0 && "Unimplemented");