P4 to Git Change 2018917 by gandryey@gera-win10 on 2019/10/24 14:33:36

SWDEV-197289 - VDI tracing API integration in rocTracer
	- Change the names of the functions according to the new interface

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_activity.cpp#2 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_hcc.def.in#34 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_hcc.map.in#32 edit


[ROCm/clr commit: 565ba944d0]

projects/clr/hipamd/api/hip/hip_activity.cpp

@@ -17,19 +17,18 @@ OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-
 #include "platform/activity.hpp"
 
-extern "C" void InitActivityCallback(void* id_callback, void* op_callback, void* arg) {
+extern "C" void hipInitActivityCallback(void* id_callback, void* op_callback, void* arg) {
   activity_prof::CallbacksTable::init(reinterpret_cast<activity_prof::id_callback_fun_t>(id_callback),
                                       reinterpret_cast<activity_prof::callback_fun_t>(op_callback),
                                       arg);
 }
 
-extern "C" bool EnableActivityCallback(unsigned op, bool enable) {
+extern "C" bool hipEnableActivityCallback(unsigned op, bool enable) {
   return activity_prof::CallbacksTable::SetEnabled(op, enable);
 }
 
-extern "C" const char* GetCmdName(unsigned op) {
+extern "C" const char* hipGetCmdName(unsigned op) {
   return getOclCommandKindString(static_cast<uint32_t>(op));
 }

projects/clr/hipamd/api/hip/hip_hcc.def.in

@@ -199,9 +199,9 @@ hipHccGetAccelerator
 hipHccGetAcceleratorView
 hipCreateSurfaceObject
 hipDestroySurfaceObject
-InitActivityCallback
-EnableActivityCallback
-GetCmdName
+hipInitActivityCallback
+hipEnableActivityCallback
+hipGetCmdName
 hiprtcAddNameExpression
 hiprtcCompileProgram
 hiprtcCreateProgram

projects/clr/hipamd/api/hip/hip_hcc.map.in

@@ -212,9 +212,9 @@ global:
     hipDestroySurfaceObject*;
     hipHccModuleLaunchKernel*;
     hipExtModuleLaunchKernel*;
-    InitActivityCallback*;
-    EnableActivityCallback*;
-    GetCmdName*;
+    hipInitActivityCallback*;
+    hipEnableActivityCallback*;
+    hipGetCmdName*;
     hiprtcAddNameExpression*;
     hiprtcCompileProgram*;
     hiprtcCreateProgram*;