From 63a26884aa1ea38869f1aba630bef5cc24c7aa3e Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 24 Oct 2019 14:40:22 -0400 Subject: [PATCH] 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 --- api/hip/hip_activity.cpp | 7 +++---- api/hip/hip_hcc.def.in | 6 +++--- api/hip/hip_hcc.map.in | 6 +++--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/api/hip/hip_activity.cpp b/api/hip/hip_activity.cpp index 00a208270a..045abc7380 100644 --- a/api/hip/hip_activity.cpp +++ b/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(id_callback), reinterpret_cast(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(op)); } diff --git a/api/hip/hip_hcc.def.in b/api/hip/hip_hcc.def.in index abe083ac23..a2eade8ae7 100644 --- a/api/hip/hip_hcc.def.in +++ b/api/hip/hip_hcc.def.in @@ -199,9 +199,9 @@ hipHccGetAccelerator hipHccGetAcceleratorView hipCreateSurfaceObject hipDestroySurfaceObject -InitActivityCallback -EnableActivityCallback -GetCmdName +hipInitActivityCallback +hipEnableActivityCallback +hipGetCmdName hiprtcAddNameExpression hiprtcCompileProgram hiprtcCreateProgram diff --git a/api/hip/hip_hcc.map.in b/api/hip/hip_hcc.map.in index 1dd522e4e2..378ec5bf80 100644 --- a/api/hip/hip_hcc.map.in +++ b/api/hip/hip_hcc.map.in @@ -212,9 +212,9 @@ global: hipDestroySurfaceObject*; hipHccModuleLaunchKernel*; hipExtModuleLaunchKernel*; - InitActivityCallback*; - EnableActivityCallback*; - GetCmdName*; + hipInitActivityCallback*; + hipEnableActivityCallback*; + hipGetCmdName*; hiprtcAddNameExpression*; hiprtcCompileProgram*; hiprtcCreateProgram*;