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

[SDK] Update HIP support for ROCm 7.0 (#413)

Browse Source 
* Update HIP VERSION to 7.0.0, HIP_RUNTIME_API_TABLE_STEP_VERSION to 13

* Changed rocprofiler_config_interfaces.cmake to check version after finding package

* Update cmake/rocprofiler_config_interfaces.cmake

---------

Co-authored-by: Madsen, Jonathan <Jonathan.Madsen@amd.com>

[ROCm/rocprofiler-sdk commit: b90ef494dd]
This commit is contained in:
Trowbridge, Ian
2025-05-27 13:14:08 -05:00
committed by GitHub
parent 3f47d1fffa
commit 6efbc492f1
6 changed files with 176 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/abi.cpp
+31
View File
@@ -550,6 +550,27 @@ ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipGraphBatchMemOpNodeSetParams_fn, 466
ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipGraphExecBatchMemOpNodeSetParams_fn, 467)
#endif
#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 9
ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipEventRecordWithFlags_fn, 468)
#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)
#endif
#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 11
ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipLaunchKernelExC_fn, 474)
ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipDrvLaunchKernelEx_fn, 475)
#endif
#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 12
ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipMemGetHandleForAddressRange_fn, 476)
#endif
#if HIP_RUNTIME_API_TABLE_STEP_VERSION == 0
ROCP_SDK_ENFORCE_ABI_VERSIONING(::HipDispatchTable, 442)
#elif HIP_RUNTIME_API_TABLE_STEP_VERSION == 1
@@ -568,6 +589,16 @@ ROCP_SDK_ENFORCE_ABI_VERSIONING(::HipDispatchTable, 463)
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)
#elif HIP_RUNTIME_API_TABLE_STEP_VERSION == 10
ROCP_SDK_ENFORCE_ABI_VERSIONING(::HipDispatchTable, 474)
#elif HIP_RUNTIME_API_TABLE_STEP_VERSION == 11
ROCP_SDK_ENFORCE_ABI_VERSIONING(::HipDispatchTable, 476)
#elif HIP_RUNTIME_API_TABLE_STEP_VERSION == 12
ROCP_SDK_ENFORCE_ABI_VERSIONING(::HipDispatchTable, 477)
#elif HIP_RUNTIME_API_TABLE_STEP_VERSION == 13
ROCP_SDK_ENFORCE_ABI_VERSIONING(::HipDispatchTable, 477)
#else
INTERNAL_CI_ROCP_SDK_ENFORCE_ABI_VERSIONING(::HipDispatchTable, 0)
#endif
projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/details/format.hpp
+30
View File
@@ -398,6 +398,36 @@ struct formatter<hipStreamBatchMemOpType> : rocprofiler::hip::details::base_form
}
};
#endif
#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 11
ROCP_SDK_HIP_FORMATTER(
hipLaunchConfig_st,
"{}gridDim={}, blockDim={}, dynamicSmemBytes={}, stream={}, attrs={}, numAttrs={}",
'{',
v.gridDim,
v.blockDim,
v.dynamicSmemBytes,
static_cast<void*>(v.stream),
static_cast<void*>(v.attrs),
v.numAttrs,
'}')
ROCP_SDK_HIP_FORMATTER(HIP_LAUNCH_CONFIG_st,
"{}gridDimX={}, gridDimY={}, gridDimZ={}, blockDimX={}, blockDimY={}, "
"blockDimZ={}, sharedMemBytes={}, hStream={}, attrs={}, numAttrs={}",
'{',
v.gridDimX,
v.gridDimY,
v.gridDimZ,
v.blockDimX,
v.blockDimY,
v.blockDimZ,
v.sharedMemBytes,
static_cast<void*>(v.hStream),
static_cast<void*>(v.attrs),
v.numAttrs,
'}')
#endif
} // namespace fmt
#undef ROCP_SDK_HIP_FORMATTER
projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/hip.def.cpp
+21
View File
@@ -576,6 +576,27 @@ 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_hipGraphBatchMemOpNodeSetParams, hipGraphBatchMemOpNodeSetParams, hipGraphBatchMemOpNodeSetParams_fn, hNode, nodeParams);
HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipGraphExecBatchMemOpNodeSetParams, hipGraphExecBatchMemOpNodeSetParams, hipGraphExecBatchMemOpNodeSetParams_fn, hGraphExec, hNode, nodeParams);
#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);
HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipLinkCreate, hipLinkCreate, hipLinkCreate_fn, numOptions, options, optionValues, stateOut);
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 >= 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);
#endif
#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 12
HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipMemGetHandleForAddressRange, hipMemGetHandleForAddressRange, hipMemGetHandleForAddressRange_fn, handle, dptr, size, handleType, flags);
#endif
// clang-format on
#else