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

SWDEV-499927 - Fix hipMemAllocationProp

Browse Source 
- The member of the hipMemAllocationProp struct is named requestedHandleTypes. However, in HIP, it is named requestedHandleType. I have decided not to follow CUDA's naming convention, as it would require a lot of changes across HIP repositories (clr, hip, hip-tests).
 - Fix hipMemGetAllocationPropertiesFromHandle to update out parameter properly.

Change-Id: I8417a2e73b0ee9fa5ca0d36546e75cfce82cbf3e
This commit is contained in:
Marko Arandjelovic
2024-11-21 18:50:58 +02:00
committed by Marko Arandjelovic
parent 66367f3ec6
commit f65d41442f
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hipnv/include/hip/nvidia_detail/nvidia_hip_runtime_api.h
+22 -4
View File
@@ -1729,7 +1729,7 @@ typedef struct hipMemAllocationProp {
/** Memory allocation type */
hipMemAllocationType type;
/** Requested handle type */
hipMemAllocationHandleType requestedHandleTypes;
hipMemAllocationHandleType requestedHandleType;
/** Location of allocation */
hipMemLocation location;
/**
@@ -2690,7 +2690,7 @@ inline static hipError_t hipDeviceGetAttribute(int* pi, hipDeviceAttribute_t att
inline static CUmemAllocationProp hipMemAllocationPropToCUmemAllocationProp(const hipMemAllocationProp* prop) {
CUmemAllocationProp cuProp;
cuProp.type = (CUmemAllocationType)prop->type;
cuProp.requestedHandleTypes = (CUmemAllocationHandleType)prop->requestedHandleTypes;
cuProp.requestedHandleTypes = (CUmemAllocationHandleType)prop->requestedHandleType;
cuProp.location.type = (CUmemLocationType)prop->location.type;
cuProp.location.id = prop->location.id;
cuProp.win32HandleMetaData = prop->win32HandleMetaData;
@@ -2703,6 +2703,22 @@ inline static CUmemAllocationProp hipMemAllocationPropToCUmemAllocationProp(cons
cuProp.allocFlags.reserved[3] = prop->allocFlags.reserved[3];
return cuProp;
}
inline static hipMemAllocationProp CUmemAllocationPropToHipMemAllocationProp(const CUmemAllocationProp* prop) {
hipMemAllocationProp hipProp;
hipProp.type = (hipMemAllocationType)prop->type;
hipProp.requestedHandleType = (hipMemAllocationHandleType)prop->requestedHandleTypes;
hipProp.location.type = (hipMemLocationType)prop->location.type;
hipProp.location.id = prop->location.id;
hipProp.win32HandleMetaData = prop->win32HandleMetaData;
hipProp.allocFlags.compressionType = prop->allocFlags.compressionType;
hipProp.allocFlags.gpuDirectRDMACapable = prop->allocFlags.gpuDirectRDMACapable;
hipProp.allocFlags.usage = prop->allocFlags.usage;
hipProp.allocFlags.reserved[0] = prop->allocFlags.reserved[0];
hipProp.allocFlags.reserved[1] = prop->allocFlags.reserved[1];
hipProp.allocFlags.reserved[2] = prop->allocFlags.reserved[2];
hipProp.allocFlags.reserved[3] = prop->allocFlags.reserved[3];
return hipProp;
}
inline static CUmemLocation hipMemLocationToCUmemLocation(const hipMemLocation* loc) {
CUmemLocation cuLoc;
cuLoc.id = loc->id;
@@ -2756,8 +2772,10 @@ inline static hipError_t hipMemGetAccess(unsigned long long* flags,
}
inline static hipError_t hipMemGetAllocationPropertiesFromHandle(hipMemAllocationProp* prop,
hipMemGenericAllocationHandle_t handle) {
CUmemAllocationProp cuProp = hipMemAllocationPropToCUmemAllocationProp(prop);
return hipCUResultTohipError(cuMemGetAllocationPropertiesFromHandle(&cuProp, handle));
CUmemAllocationProp cuProp;
auto err = cuMemGetAllocationPropertiesFromHandle(&cuProp, handle);
*prop = CUmemAllocationPropToHipMemAllocationProp(&cuProp);
return hipCUResultTohipError(err);
}
inline static hipError_t hipMemImportFromShareableHandle(hipMemGenericAllocationHandle_t* handle,
void* osHandle,