Revert "[rocprofiler-sdk][SDK] Update to address new API changes for HIP ROCm…" (#850)
This reverts commit 5ac738150a.
Этот коммит содержится в:
RahulC
GitHub
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
Ссылка в новой задаче
Block a user