AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix to PR #413 HIP_RUNTIME_API_TABLE_STEP_VERSION 9 vs. 10 (#419)

Browse Source 
Fix HIP_RUNTIME_API_TABLE_STEP_VERSION 9 vs. 10

- in rocm-6.4.x, hipLinkAddData, hipLinkAddFile, hipLinkComplete, hipLinkCreate, hipLinkDestroy are HIP_RUNTIME_API_TABLE_STEP_VERSION == 9
- in amd-staging, hipEventRecordWithFlags is HIP_RUNTIME_API_TABLE_STEP_VERSION == 9
  - this should fixed in amd-staging such that HIP_RUNTIME_API_TABLE_STEP_VERSION == 10

Co-authored-by: Jonathan R. Madsen <jonathanrmadsen@gmail.com>
This commit is contained in:
Madsen, Jonathan
2025-05-27 17:40:21 -05:00
committed by GitHub
parent d910dded7d
commit fec74141b0
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/include/rocprofiler-sdk/hip/api_args.h
+8 -8
View File
@@ -3064,14 +3064,6 @@ typedef union rocprofiler_hip_api_args_t
} hipGraphExecBatchMemOpNodeSetParams;
#endif
#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 9
struct
{
hipEvent_t event;
hipStream_t stream;
unsigned int flags;
} hipEventRecordWithFlags;
#endif
#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 10
struct
{
hipLinkState_t state;
@@ -3110,6 +3102,14 @@ typedef union rocprofiler_hip_api_args_t
hipLinkState_t state;
} hipLinkDestroy;
#endif
#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 10
struct
{
hipEvent_t event;
hipStream_t stream;
unsigned int flags;
} hipEventRecordWithFlags;
#endif
#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 11
struct
{
source/include/rocprofiler-sdk/hip/runtime_api_id.h
+3 -3
View File
@@ -515,15 +515,15 @@ typedef enum rocprofiler_hip_runtime_api_id_t // NOLINT(performance-enum-size)
ROCPROFILER_HIP_RUNTIME_API_ID_hipGraphExecBatchMemOpNodeSetParams,
#endif
#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 9
ROCPROFILER_HIP_RUNTIME_API_ID_hipEventRecordWithFlags,
#endif
#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 10
ROCPROFILER_HIP_RUNTIME_API_ID_hipLinkAddData,
ROCPROFILER_HIP_RUNTIME_API_ID_hipLinkAddFile,
ROCPROFILER_HIP_RUNTIME_API_ID_hipLinkComplete,
ROCPROFILER_HIP_RUNTIME_API_ID_hipLinkCreate,
ROCPROFILER_HIP_RUNTIME_API_ID_hipLinkDestroy,
#endif
#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 10
ROCPROFILER_HIP_RUNTIME_API_ID_hipEventRecordWithFlags,
#endif
#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 11
ROCPROFILER_HIP_RUNTIME_API_ID_hipLaunchKernelExC,
ROCPROFILER_HIP_RUNTIME_API_ID_hipDrvLaunchKernelEx,
source/lib/rocprofiler-sdk/hip/abi.cpp
+7 -7
View File
@@ -551,15 +551,15 @@ ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipGraphExecBatchMemOpNodeSetParams_fn,
#endif
#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 9
ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipEventRecordWithFlags_fn, 468)
ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipLinkAddData_fn, 468)
ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipLinkAddFile_fn, 469)
ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipLinkComplete_fn, 470)
ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipLinkCreate_fn, 471)
ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipLinkDestroy_fn, 472)
#endif
#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 10
ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipLinkAddData_fn, 469)
ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipLinkAddFile_fn, 470)
ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipLinkComplete_fn, 471)
ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipLinkCreate_fn, 472)
ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipLinkDestroy_fn, 473)
ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipEventRecordWithFlags_fn, 473)
#endif
#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 11
@@ -590,7 +590,7 @@ ROCP_SDK_ENFORCE_ABI_VERSIONING(::HipDispatchTable, 464)
#elif HIP_RUNTIME_API_TABLE_STEP_VERSION == 8
ROCP_SDK_ENFORCE_ABI_VERSIONING(::HipDispatchTable, 468)
#elif HIP_RUNTIME_API_TABLE_STEP_VERSION == 9
ROCP_SDK_ENFORCE_ABI_VERSIONING(::HipDispatchTable, 469)
ROCP_SDK_ENFORCE_ABI_VERSIONING(::HipDispatchTable, 473)
#elif HIP_RUNTIME_API_TABLE_STEP_VERSION == 10
ROCP_SDK_ENFORCE_ABI_VERSIONING(::HipDispatchTable, 474)
#elif HIP_RUNTIME_API_TABLE_STEP_VERSION == 11
source/lib/rocprofiler-sdk/hip/hip.def.cpp
+4 -4
View File
@@ -578,10 +578,6 @@ HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNT
#endif
#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 9
HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipEventRecordWithFlags, hipEventRecordWithFlags, hipEventRecordWithFlags_fn, event, stream, flags);
#endif
#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 10
HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipLinkAddData, hipLinkAddData, hipLinkAddData_fn, state, type, data, size, name, numOptions, options, optionValues);
HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipLinkAddFile, hipLinkAddFile, hipLinkAddFile_fn, state, type, path, numOptions, options, optionValues);
HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipLinkComplete, hipLinkComplete, hipLinkComplete_fn, state, hipBinOut, sizeOut);
@@ -589,6 +585,10 @@ HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNT
HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipLinkDestroy, hipLinkDestroy, hipLinkDestroy_fn, state);
#endif
#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 10
HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipEventRecordWithFlags, hipEventRecordWithFlags, hipEventRecordWithFlags_fn, event, stream, flags);
#endif
#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 11
HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipLaunchKernelExC, hipLaunchKernelExC, hipLaunchKernelExC_fn, config, fPtr, args);
HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipDrvLaunchKernelEx, hipDrvLaunchKernelEx, hipDrvLaunchKernelEx_fn, config, f, params, extra);