From d17388cd6b3cb23a47aadd1cbb64f9830af07660 Mon Sep 17 00:00:00 2001 From: "Brzak, Branislav" Date: Mon, 26 May 2025 16:58:22 +0200 Subject: [PATCH] SWDEV-518962 - Match hipCtxGetApiVersion signature with Cuda (#327) [ROCm/clr commit: ee2d4a035851de31c0e2205033bb75e60fe1e0ab] --- .../clr/hipamd/include/hip/amd_detail/hip_api_trace.hpp | 2 +- projects/clr/hipamd/include/hip/amd_detail/hip_prof_str.h | 8 ++++---- projects/clr/hipamd/src/hip_api_trace.cpp | 2 +- projects/clr/hipamd/src/hip_context.cpp | 2 +- projects/clr/hipamd/src/hip_table_interface.cpp | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/clr/hipamd/include/hip/amd_detail/hip_api_trace.hpp b/projects/clr/hipamd/include/hip/amd_detail/hip_api_trace.hpp index 2c4e835ee3..6fc4e0ae9f 100644 --- a/projects/clr/hipamd/include/hip/amd_detail/hip_api_trace.hpp +++ b/projects/clr/hipamd/include/hip/amd_detail/hip_api_trace.hpp @@ -127,7 +127,7 @@ typedef hipError_t (*t_hipCtxCreate)(hipCtx_t* ctx, unsigned int flags, hipDevic typedef hipError_t (*t_hipCtxDestroy)(hipCtx_t ctx); typedef hipError_t (*t_hipCtxDisablePeerAccess)(hipCtx_t peerCtx); typedef hipError_t (*t_hipCtxEnablePeerAccess)(hipCtx_t peerCtx, unsigned int flags); -typedef hipError_t (*t_hipCtxGetApiVersion)(hipCtx_t ctx, int* apiVersion); +typedef hipError_t (*t_hipCtxGetApiVersion)(hipCtx_t ctx, unsigned int* apiVersion); typedef hipError_t (*t_hipCtxGetCacheConfig)(hipFuncCache_t* cacheConfig); typedef hipError_t (*t_hipCtxGetCurrent)(hipCtx_t* ctx); typedef hipError_t (*t_hipCtxGetDevice)(hipDevice_t* device); diff --git a/projects/clr/hipamd/include/hip/amd_detail/hip_prof_str.h b/projects/clr/hipamd/include/hip/amd_detail/hip_prof_str.h index 9431cc4963..d6c374a4c8 100644 --- a/projects/clr/hipamd/include/hip/amd_detail/hip_prof_str.h +++ b/projects/clr/hipamd/include/hip/amd_detail/hip_prof_str.h @@ -1400,8 +1400,8 @@ typedef struct hip_api_data_s { } hipCtxEnablePeerAccess; struct { hipCtx_t ctx; - int* apiVersion; - int apiVersion__val; + unsigned int* apiVersion; + unsigned int apiVersion__val; } hipCtxGetApiVersion; struct { hipFuncCache_t* cacheConfig; @@ -3843,10 +3843,10 @@ typedef struct hip_api_data_s { cb_data.args.hipCtxEnablePeerAccess.peerCtx = (hipCtx_t)peerCtx; \ cb_data.args.hipCtxEnablePeerAccess.flags = (unsigned int)flags; \ }; -// hipCtxGetApiVersion[('hipCtx_t', 'ctx'), ('int*', 'apiVersion')] +// hipCtxGetApiVersion[('hipCtx_t', 'ctx'), ('unsigned int*', 'apiVersion')] #define INIT_hipCtxGetApiVersion_CB_ARGS_DATA(cb_data) { \ cb_data.args.hipCtxGetApiVersion.ctx = (hipCtx_t)ctx; \ - cb_data.args.hipCtxGetApiVersion.apiVersion = (int*)apiVersion; \ + cb_data.args.hipCtxGetApiVersion.apiVersion = (unsigned int*)apiVersion; \ }; // hipCtxGetCacheConfig[('hipFuncCache_t*', 'cacheConfig')] #define INIT_hipCtxGetCacheConfig_CB_ARGS_DATA(cb_data) { \ diff --git a/projects/clr/hipamd/src/hip_api_trace.cpp b/projects/clr/hipamd/src/hip_api_trace.cpp index 1a6720e1ca..4b98e4d9c1 100644 --- a/projects/clr/hipamd/src/hip_api_trace.cpp +++ b/projects/clr/hipamd/src/hip_api_trace.cpp @@ -88,7 +88,7 @@ hipError_t hipCtxCreate(hipCtx_t* ctx, unsigned int flags, hipDevice_t device); hipError_t hipCtxDestroy(hipCtx_t ctx); hipError_t hipCtxDisablePeerAccess(hipCtx_t peerCtx); hipError_t hipCtxEnablePeerAccess(hipCtx_t peerCtx, unsigned int flags); -hipError_t hipCtxGetApiVersion(hipCtx_t ctx, int* apiVersion); +hipError_t hipCtxGetApiVersion(hipCtx_t ctx, unsigned int* apiVersion); hipError_t hipCtxGetCacheConfig(hipFuncCache_t* cacheConfig); hipError_t hipCtxGetCurrent(hipCtx_t* ctx); hipError_t hipCtxGetDevice(hipDevice_t* device); diff --git a/projects/clr/hipamd/src/hip_context.cpp b/projects/clr/hipamd/src/hip_context.cpp index f9cd781639..8a927ffbb1 100644 --- a/projects/clr/hipamd/src/hip_context.cpp +++ b/projects/clr/hipamd/src/hip_context.cpp @@ -317,7 +317,7 @@ hipError_t hipCtxGetDevice(hipDevice_t* device) { HIP_RETURN(hipErrorInvalidContext); } -hipError_t hipCtxGetApiVersion(hipCtx_t ctx, int* apiVersion) { +hipError_t hipCtxGetApiVersion(hipCtx_t ctx, unsigned int* apiVersion) { HIP_INIT_API(hipCtxGetApiVersion, apiVersion); HIP_RETURN(hipErrorNotSupported); } diff --git a/projects/clr/hipamd/src/hip_table_interface.cpp b/projects/clr/hipamd/src/hip_table_interface.cpp index 830e17f741..f5b4cc10e8 100644 --- a/projects/clr/hipamd/src/hip_table_interface.cpp +++ b/projects/clr/hipamd/src/hip_table_interface.cpp @@ -144,7 +144,7 @@ hipError_t hipCtxDisablePeerAccess(hipCtx_t peerCtx) { hipError_t hipCtxEnablePeerAccess(hipCtx_t peerCtx, unsigned int flags) { return hip::GetHipDispatchTable()->hipCtxEnablePeerAccess_fn(peerCtx, flags); } -hipError_t hipCtxGetApiVersion(hipCtx_t ctx, int* apiVersion) { +hipError_t hipCtxGetApiVersion(hipCtx_t ctx, unsigned int* apiVersion) { return hip::GetHipDispatchTable()->hipCtxGetApiVersion_fn(ctx, apiVersion); } hipError_t hipCtxGetCacheConfig(hipFuncCache_t* cacheConfig) {