From 9b4c12a357433105cf74dce696d12b7128038be2 Mon Sep 17 00:00:00 2001 From: RahulC <168588218+rahulc-gh@users.noreply.github.com> Date: Wed, 3 Sep 2025 21:52:43 -0700 Subject: [PATCH] =?UTF-8?q?Revert=20"[rocprofiler-sdk][SDK]=20Update=20to?= =?UTF-8?q?=20address=20new=20API=20changes=20for=20HIP=20ROCm=E2=80=A6"?= =?UTF-8?q?=20(#850)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5ac738150ad53792736f2be958865a9c2979008e. --- .../rocprofiler-sdk/cxx/enum_string.hpp | 24 +-- .../include/rocprofiler-sdk/hip/api_args.h | 138 ------------ .../rocprofiler-sdk/hip/runtime_api_id.h | 21 -- .../source/lib/rocprofiler-sdk/hip/abi.cpp | 24 --- .../rocprofiler-sdk/hip/details/format.hpp | 196 ------------------ .../lib/rocprofiler-sdk/hip/hip.def.cpp | 22 -- 6 files changed, 1 insertion(+), 424 deletions(-) diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/cxx/enum_string.hpp b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/cxx/enum_string.hpp index 424b237e47..edc98375f3 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/cxx/enum_string.hpp +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/cxx/enum_string.hpp @@ -953,27 +953,7 @@ ROCPROFILER_ENUM_LABEL(ROCPROFILER_HIP_RUNTIME_API_ID_hipDrvLaunchKernelEx) #if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 12 ROCPROFILER_ENUM_LABEL(ROCPROFILER_HIP_RUNTIME_API_ID_hipMemGetHandleForAddressRange) #endif -#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 14 -ROCPROFILER_ENUM_LABEL(ROCPROFILER_HIP_RUNTIME_API_ID_hipModuleGetFunctionCount) -ROCPROFILER_ENUM_LABEL(ROCPROFILER_HIP_RUNTIME_API_ID_hipMemsetD2D8) -ROCPROFILER_ENUM_LABEL(ROCPROFILER_HIP_RUNTIME_API_ID_hipMemsetD2D8Async) -ROCPROFILER_ENUM_LABEL(ROCPROFILER_HIP_RUNTIME_API_ID_hipMemsetD2D16) -ROCPROFILER_ENUM_LABEL(ROCPROFILER_HIP_RUNTIME_API_ID_hipMemsetD2D16Async) -ROCPROFILER_ENUM_LABEL(ROCPROFILER_HIP_RUNTIME_API_ID_hipMemsetD2D32) -ROCPROFILER_ENUM_LABEL(ROCPROFILER_HIP_RUNTIME_API_ID_hipMemsetD2D32Async) -ROCPROFILER_ENUM_LABEL(ROCPROFILER_HIP_RUNTIME_API_ID_hipStreamGetAttribute) -ROCPROFILER_ENUM_LABEL(ROCPROFILER_HIP_RUNTIME_API_ID_hipStreamSetAttribute) -ROCPROFILER_ENUM_LABEL(ROCPROFILER_HIP_RUNTIME_API_ID_hipModuleLoadFatBinary) -ROCPROFILER_ENUM_LABEL(ROCPROFILER_HIP_RUNTIME_API_ID_hipMemcpyBatchAsync) -ROCPROFILER_ENUM_LABEL(ROCPROFILER_HIP_RUNTIME_API_ID_hipMemcpy3DBatchAsync) -ROCPROFILER_ENUM_LABEL(ROCPROFILER_HIP_RUNTIME_API_ID_hipMemcpy3DPeer) -ROCPROFILER_ENUM_LABEL(ROCPROFILER_HIP_RUNTIME_API_ID_hipMemcpy3DPeerAsync) -ROCPROFILER_ENUM_LABEL(ROCPROFILER_HIP_RUNTIME_API_ID_hipGetDriverEntryPoint) -ROCPROFILER_ENUM_LABEL(ROCPROFILER_HIP_RUNTIME_API_ID_hipGetDriverEntryPoint_spt) -ROCPROFILER_ENUM_LABEL(ROCPROFILER_HIP_RUNTIME_API_ID_hipMemPrefetchAsync_v2) -ROCPROFILER_ENUM_LABEL(ROCPROFILER_HIP_RUNTIME_API_ID_hipMemAdvise_v2) -ROCPROFILER_ENUM_LABEL(ROCPROFILER_HIP_RUNTIME_API_ID_hipStreamGetId) -#endif + #if HIP_RUNTIME_API_TABLE_STEP_VERSION == 0 static_assert(ROCPROFILER_HIP_RUNTIME_API_ID_LAST == 442); #elif HIP_RUNTIME_API_TABLE_STEP_VERSION == 1 @@ -1002,8 +982,6 @@ static_assert(ROCPROFILER_HIP_RUNTIME_API_ID_LAST == 476); static_assert(ROCPROFILER_HIP_RUNTIME_API_ID_LAST == 477); #elif HIP_RUNTIME_API_TABLE_STEP_VERSION == 13 static_assert(ROCPROFILER_HIP_RUNTIME_API_ID_LAST == 477); -#elif HIP_RUNTIME_API_TABLE_STEP_VERSION == 14 -static_assert(ROCPROFILER_HIP_RUNTIME_API_ID_LAST == 496); #else # if !defined(ROCPROFILER_UNSAFE_NO_VERSION_CHECK) && \ (defined(ROCPROFILER_CI) && ROCPROFILER_CI > 0) diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hip/api_args.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hip/api_args.h index cfcd3218ca..f036d90109 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hip/api_args.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hip/api_args.h @@ -3147,144 +3147,6 @@ typedef union rocprofiler_hip_api_args_t unsigned long long flags; } hipMemGetHandleForAddressRange; #endif -#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 14 - struct - { - unsigned int* count; - hipModule_t mod; - } hipModuleGetFunctionCount; - struct - { - hipDeviceptr_t dst; - size_t dstPitch; - unsigned char value; - size_t width; - size_t height; - } hipMemsetD2D8; - struct - { - hipDeviceptr_t dst; - size_t dstPitch; - unsigned char value; - size_t width; - size_t height; - hipStream_t stream; - } hipMemsetD2D8Async; - struct - { - hipDeviceptr_t dst; - size_t dstPitch; - unsigned short value; - size_t width; - size_t height; - } hipMemsetD2D16; - struct - { - hipDeviceptr_t dst; - size_t dstPitch; - unsigned short value; - size_t width; - size_t height; - hipStream_t stream; - } hipMemsetD2D16Async; - struct - { - hipDeviceptr_t dst; - size_t dstPitch; - unsigned int value; - size_t width; - size_t height; - } hipMemsetD2D32; - struct - { - hipDeviceptr_t dst; - size_t dstPitch; - unsigned int value; - size_t width; - size_t height; - hipStream_t stream; - } hipMemsetD2D32Async; - struct - { - hipStream_t stream; - hipLaunchAttributeID attr; - const hipLaunchAttributeValue* value_out; - } hipStreamGetAttribute; - struct - { - hipStream_t stream; - hipLaunchAttributeID attr; - const hipLaunchAttributeValue* value; - } hipStreamSetAttribute; - struct - { - hipModule_t* module; - const void* fatbin; - } hipModuleLoadFatBinary; - struct - { - void** dsts; - void** srcs; - size_t* sizes; - size_t count; - hipMemcpyAttributes* attrs; - size_t* attrsIdxs; - size_t numAttrs; - size_t* failIdx; - hipStream_t stream; - } hipMemcpyBatchAsync; - struct - { - size_t numOps; - hipMemcpy3DBatchOp* opList; - size_t* failIdx; - unsigned long long flags; - hipStream_t stream; - } hipMemcpy3DBatchAsync; - struct - { - hipMemcpy3DPeerParms* p; - } hipMemcpy3DPeer; - struct - { - hipMemcpy3DPeerParms* p; - hipStream_t stream; - } hipMemcpy3DPeerAsync; - struct - { - const char* symbol; - void** funcPtr; - unsigned long long flags; - hipDriverEntryPointQueryResult* driverStatus; - } hipGetDriverEntryPoint; - struct - { - const char* symbol; - void** funcPtr; - unsigned long long flags; - hipDriverEntryPointQueryResult* driverStatus; - } hipGetDriverEntryPoint_spt; - struct - { - const void* dev_ptr; - size_t count; - hipMemLocation location; - unsigned int flags; - hipStream_t stream; - } hipMemPrefetchAsync_v2; - struct - { - const void* dev_ptr; - size_t count; - hipMemoryAdvise advice; - hipMemLocation location; - } hipMemAdvise_v2; - struct - { - hipStream_t stream; - unsigned long long* streamId; - } hipStreamGetId; -#endif } rocprofiler_hip_api_args_t; ROCPROFILER_EXTERN_C_FINI diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hip/runtime_api_id.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hip/runtime_api_id.h index 1bccfa1f2c..0b78889d14 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hip/runtime_api_id.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hip/runtime_api_id.h @@ -530,27 +530,6 @@ typedef enum rocprofiler_hip_runtime_api_id_t // NOLINT(performance-enum-size) #endif #if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 12 ROCPROFILER_HIP_RUNTIME_API_ID_hipMemGetHandleForAddressRange, -#endif -#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 14 - ROCPROFILER_HIP_RUNTIME_API_ID_hipModuleGetFunctionCount, - ROCPROFILER_HIP_RUNTIME_API_ID_hipMemsetD2D8, - ROCPROFILER_HIP_RUNTIME_API_ID_hipMemsetD2D8Async, - ROCPROFILER_HIP_RUNTIME_API_ID_hipMemsetD2D16, - ROCPROFILER_HIP_RUNTIME_API_ID_hipMemsetD2D16Async, - ROCPROFILER_HIP_RUNTIME_API_ID_hipMemsetD2D32, - ROCPROFILER_HIP_RUNTIME_API_ID_hipMemsetD2D32Async, - ROCPROFILER_HIP_RUNTIME_API_ID_hipStreamGetAttribute, - ROCPROFILER_HIP_RUNTIME_API_ID_hipStreamSetAttribute, - ROCPROFILER_HIP_RUNTIME_API_ID_hipModuleLoadFatBinary, - ROCPROFILER_HIP_RUNTIME_API_ID_hipMemcpyBatchAsync, - ROCPROFILER_HIP_RUNTIME_API_ID_hipMemcpy3DBatchAsync, - ROCPROFILER_HIP_RUNTIME_API_ID_hipMemcpy3DPeer, - ROCPROFILER_HIP_RUNTIME_API_ID_hipMemcpy3DPeerAsync, - ROCPROFILER_HIP_RUNTIME_API_ID_hipGetDriverEntryPoint, - ROCPROFILER_HIP_RUNTIME_API_ID_hipGetDriverEntryPoint_spt, - ROCPROFILER_HIP_RUNTIME_API_ID_hipMemPrefetchAsync_v2, - ROCPROFILER_HIP_RUNTIME_API_ID_hipMemAdvise_v2, - ROCPROFILER_HIP_RUNTIME_API_ID_hipStreamGetId, #endif ROCPROFILER_HIP_RUNTIME_API_ID_LAST, } rocprofiler_hip_runtime_api_id_t; diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/abi.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/abi.cpp index ea8b5dae96..5269f98a46 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/abi.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/abi.cpp @@ -571,28 +571,6 @@ ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipDrvLaunchKernelEx_fn, 475) ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipMemGetHandleForAddressRange_fn, 476) #endif -#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 14 -ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipModuleGetFunctionCount_fn, 477); -ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipMemsetD2D8_fn, 478); -ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipMemsetD2D8Async_fn, 479); -ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipMemsetD2D16_fn, 480); -ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipMemsetD2D16Async_fn, 481); -ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipMemsetD2D32_fn, 482); -ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipMemsetD2D32Async_fn, 483); -ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipStreamGetAttribute_fn, 484); -ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipStreamSetAttribute_fn, 485); -ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipModuleLoadFatBinary_fn, 486); -ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipMemcpyBatchAsync_fn, 487); -ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipMemcpy3DBatchAsync_fn, 488); -ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipMemcpy3DPeer_fn, 489); -ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipMemcpy3DPeerAsync_fn, 490); -ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipGetDriverEntryPoint_fn, 491); -ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipGetDriverEntryPoint_spt_fn, 492); -ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipMemPrefetchAsync_v2_fn, 493); -ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipMemAdvise_v2_fn, 494); -ROCP_SDK_ENFORCE_ABI(::HipDispatchTable, hipStreamGetId_fn, 495); -#endif - #if HIP_RUNTIME_API_TABLE_STEP_VERSION == 0 ROCP_SDK_ENFORCE_ABI_VERSIONING(::HipDispatchTable, 442) #elif HIP_RUNTIME_API_TABLE_STEP_VERSION == 1 @@ -621,8 +599,6 @@ ROCP_SDK_ENFORCE_ABI_VERSIONING(::HipDispatchTable, 476) ROCP_SDK_ENFORCE_ABI_VERSIONING(::HipDispatchTable, 477) #elif HIP_RUNTIME_API_TABLE_STEP_VERSION == 13 ROCP_SDK_ENFORCE_ABI_VERSIONING(::HipDispatchTable, 477) -#elif HIP_RUNTIME_API_TABLE_STEP_VERSION == 14 -ROCP_SDK_ENFORCE_ABI_VERSIONING(::HipDispatchTable, 496) #else INTERNAL_CI_ROCP_SDK_ENFORCE_ABI_VERSIONING(::HipDispatchTable, 0) #endif diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/details/format.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/details/format.hpp index 1bc485cd69..beef1ac6e9 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/details/format.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/details/format.hpp @@ -279,11 +279,6 @@ struct formatter : rocprofiler::hip::details::base_formatter { ROCP_SDK_HIP_FORMAT_CASE_STMT(hipMemLocationType, Invalid); ROCP_SDK_HIP_FORMAT_CASE_STMT(hipMemLocationType, Device); -#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 14 - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipMemLocationType, Host); - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipMemLocationType, HostNuma); - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipMemLocationType, HostNumaCurrent); -#endif ROCP_SDK_HIP_FORMAT_DFLT_CASE(hipMemLocationType); } return fmt::format_to(ctx.out(), "Unknown"); @@ -433,197 +428,6 @@ ROCP_SDK_HIP_FORMATTER(HIP_LAUNCH_CONFIG_st, v.numAttrs, '}') #endif - -#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 14 -template <> -struct formatter : rocprofiler::hip::details::base_formatter -{ - template - auto format(const hipMemcpy3DOperand& v, Ctx& ctx) const - { - switch(v.type) - { - case hipMemcpyOperandTypePointer: - return fmt::format_to( - ctx.out(), - "{{type=Pointer, ptr={}, rowLength={}, layerHeight={}, locHint={}}}", - static_cast(v.op.ptr.ptr), - v.op.ptr.rowLength, - v.op.ptr.layerHeight, - v.op.ptr.locHint); - - case hipMemcpyOperandTypeArray: - return fmt::format_to(ctx.out(), - "{{type=Array, array={}, offset={}}}", - static_cast(v.op.array.array), - v.op.array.offset); - - default: - return fmt::format_to(ctx.out(), "{{type=UNKNOWN({})}}", static_cast(v.type)); - } - } -}; -ROCP_SDK_HIP_FORMATTER(hipAccessPolicyWindow, - "{{base_ptr={}, hitProp={}, hitRatio={}, missProp={}, num_bytes={}}}", - static_cast(v.base_ptr), - v.hitProp, - v.hitRatio, - v.missProp, - v.num_bytes) -template <> -struct formatter : rocprofiler::hip::details::base_formatter -{ - template - auto format(hipSynchronizationPolicy v, Ctx& ctx) const - { - switch(v) - { - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipSyncPolicy, Auto); - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipSyncPolicy, Spin); - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipSyncPolicy, Yield); - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipSyncPolicy, BlockingSync); - ROCP_SDK_HIP_FORMAT_DFLT_CASE(hipSyncPolicy); - } - return fmt::format_to(ctx.out(), "Unknown"); - } -}; -ROCP_SDK_HIP_FORMATTER(hipLaunchMemSyncDomainMap, "{{default={}, remote={}}}", v.default_, v.remote) -template <> -struct formatter : rocprofiler::hip::details::base_formatter -{ - template - auto format(hipLaunchMemSyncDomain v, Ctx& ctx) const - { - switch(v) - { - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipLaunchMemSyncDomain, Default); - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipLaunchMemSyncDomain, Remote); - ROCP_SDK_HIP_FORMAT_DFLT_CASE(hipLaunchMemSyncDomain); - } - return fmt::format_to(ctx.out(), "Unknown"); - } -}; -template <> -struct formatter : rocprofiler::hip::details::base_formatter -{ - template - auto format(hipMemcpySrcAccessOrder v, Ctx& ctx) const - { - switch(v) - { - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipMemcpySrcAccessOrder, Invalid); - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipMemcpySrcAccessOrder, Stream); - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipMemcpySrcAccessOrder, DuringApiCall); - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipMemcpySrcAccessOrder, Any); - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipMemcpySrcAccessOrder, Max); - ROCP_SDK_HIP_FORMAT_DFLT_CASE(hipMemcpySrcAccessOrder); - } - return fmt::format_to(ctx.out(), "Unknown"); - } -}; -template <> -struct formatter : rocprofiler::hip::details::base_formatter -{ - template - auto format(hipAccessProperty v, Ctx& ctx) const - { - switch(v) - { - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipAccessProperty, Normal); - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipAccessProperty, Streaming); - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipAccessProperty, Persisting); - ROCP_SDK_HIP_FORMAT_DFLT_CASE(hipAccessProperty); - } - return fmt::format_to(ctx.out(), "Unknown"); - } -}; -ROCP_SDK_HIP_FORMATTER(hipOffset3D, "{{x={}, y={}, z={}}}", v.x, v.y, v.z) -template <> -struct formatter : rocprofiler::hip::details::base_formatter -{ - template - auto format(hipLaunchAttributeID v, Ctx& ctx) const - { - switch(v) - { - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipLaunchAttribute, AccessPolicyWindow); - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipLaunchAttribute, Cooperative); - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipLaunchAttribute, SynchronizationPolicy); - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipLaunchAttribute, Priority); - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipLaunchAttribute, MemSyncDomainMap); - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipLaunchAttribute, MemSyncDomain); - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipLaunchAttribute, Max); - ROCP_SDK_HIP_FORMAT_DFLT_CASE(hipLaunchAttributeID); - } - return fmt::format_to(ctx.out(), "Unknown"); - } -}; -template <> -struct formatter : rocprofiler::hip::details::base_formatter -{ - template - auto format(hipLaunchAttributeValue v, Ctx& ctx) const - { - return fmt::format_to( - ctx.out(), - "{{accessPolicyWindow={}, cooperative={}, priority={}, syncPolicy={}, " - "memSyncDomainMap={}, memSyncDomain={}}}", - v.accessPolicyWindow, - v.cooperative, - v.priority, - v.syncPolicy, - v.memSyncDomainMap, - v.memSyncDomain); - } -}; -ROCP_SDK_HIP_FORMATTER(hipMemcpyAttributes, - "{}srcAccessOrder={}, srcLocHint={}, dstLocHint={}, flags={}{}", - '{', - v.srcAccessOrder, - v.srcLocHint, - v.dstLocHint, - v.flags, - '}') -ROCP_SDK_HIP_FORMATTER(hipMemcpy3DBatchOp, - "{}src={}, dst={}, extent={}, srcAccessOrder={}, flags={}{}", - '{', - v.src, - v.dst, - v.extent, - v.srcAccessOrder, - v.flags, - '}') -ROCP_SDK_HIP_FORMATTER(hipMemcpy3DPeerParms, - "{}srcArray={}, srcPos={}, srcPtr={}, srcDevice={}, dstArray={}, dstPos={}, " - "dstPtr={}, dstDevice={}, extent={}{}", - '{', - static_cast(v.srcArray), - v.srcPos, - v.srcPtr, - v.srcDevice, - static_cast(v.dstArray), - v.dstPos, - v.dstPtr, - v.dstDevice, - v.extent, - '}') -template <> -struct formatter : rocprofiler::hip::details::base_formatter -{ - template - auto format(hipDriverEntryPointQueryResult v, Ctx& ctx) const - { - switch(v) - { - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipDriverEntryPoint, Success); - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipDriverEntryPoint, SymbolNotFound); - ROCP_SDK_HIP_FORMAT_CASE_STMT(hipDriverEntryPoint, VersionNotSufficient); - ROCP_SDK_HIP_FORMAT_DFLT_CASE(hipDriverEntryPointQueryResult); - } - return fmt::format_to(ctx.out(), "Unknown"); - } -}; -#endif } // namespace fmt #undef ROCP_SDK_HIP_FORMATTER diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/hip.def.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/hip.def.cpp index dbf9ca05a1..e116a1eee1 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/hip.def.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/hip.def.cpp @@ -597,28 +597,6 @@ HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNT #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 - -#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 14 -HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipModuleGetFunctionCount, hipModuleGetFunctionCount, hipModuleGetFunctionCount_fn, count, mod); -HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipMemsetD2D8, hipMemsetD2D8, hipMemsetD2D8_fn, dst, dstPitch, value, width, height); -HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipMemsetD2D8Async, hipMemsetD2D8Async, hipMemsetD2D8Async_fn, dst, dstPitch, value, width, height, stream); -HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipMemsetD2D16, hipMemsetD2D16, hipMemsetD2D16_fn, dst, dstPitch, value, width, height); -HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipMemsetD2D16Async, hipMemsetD2D16Async, hipMemsetD2D16Async_fn, dst, dstPitch, value, width, height, stream); -HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipMemsetD2D32, hipMemsetD2D32, hipMemsetD2D32_fn, dst, dstPitch, value, width, height); -HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipMemsetD2D32Async, hipMemsetD2D32Async, hipMemsetD2D32Async_fn, dst, dstPitch, value, width, height, stream); -HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipStreamGetAttribute, hipStreamGetAttribute, hipStreamGetAttribute_fn, stream, attr, value_out); -HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipStreamSetAttribute, hipStreamSetAttribute, hipStreamSetAttribute_fn, stream, attr, value); -HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipModuleLoadFatBinary, hipModuleLoadFatBinary, hipModuleLoadFatBinary_fn, module, fatbin); -HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipMemcpyBatchAsync, hipMemcpyBatchAsync, hipMemcpyBatchAsync_fn, dsts, srcs, sizes, attrs, attrsIdxs, numAttrs, failIdx, stream); -HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipMemcpy3DBatchAsync, hipMemcpy3DBatchAsync, hipMemcpy3DBatchAsync_fn, numOps, opList, failIdx, flags, stream); -HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipMemcpy3DPeer, hipMemcpy3DPeer, hipMemcpy3DPeer_fn, p); -HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipMemcpy3DPeerAsync, hipMemcpy3DPeerAsync, hipMemcpy3DPeerAsync_fn, p, stream); -HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipGetDriverEntryPoint, hipGetDriverEntryPoint, hipGetDriverEntryPoint_fn, symbol, funcPtr, flags, driverStatus); -HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipGetDriverEntryPoint_spt, hipGetDriverEntryPoint_spt, hipGetDriverEntryPoint_spt_fn, symbol, funcPtr, flags, driverStatus); -HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipMemPrefetchAsync_v2, hipMemPrefetchAsync_v2, hipMemPrefetchAsync_v2_fn, dev_ptr, count, location, flags, stream); -HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipMemAdvise_v2, hipMemAdvise_v2, hipMemAdvise_v2_fn, dev_ptr, count, advice, location); -HIP_API_INFO_DEFINITION_V(ROCPROFILER_HIP_TABLE_ID_Runtime, ROCPROFILER_HIP_RUNTIME_API_ID_hipStreamGetId, hipStreamGetId, hipStreamGetId_fn, stream, streamId); -#endif // clang-format on #else