Skip to content

[HIP] Ifdef entry point introduced in HIP 5.6 #1088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 28, 2023
Merged

[HIP] Ifdef entry point introduced in HIP 5.6 #1088

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2652a77
Ifdef HIP 5.6 entry point
Nov 16, 2023
686b3d7
Change to HIP_VERSION macro
Nov 17, 2023
79457b2
Make unsupported top level return
Nov 27, 2023
1c85750
Make work for buffer case
Nov 27, 2023
f6c476d
Throw from std::visit
Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions source/adapters/hip/memory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,12 @@ UR_APIEXPORT ur_result_t UR_APICALL urMemGetInfo(ur_mem_handle_t hMemory,
UR_CHECK_ERROR(hipMemGetAddressRange(&BasePtr, &AllocSize, Mem.Ptr));
return AllocSize;
} else if constexpr (std::is_same_v<T, SurfaceMem>) {
#if HIP_VERSION < 50600000
throw UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
#else
HIP_ARRAY3D_DESCRIPTOR ArrayDescriptor;
UR_CHECK_ERROR(hipArray3DGetDescriptor(&ArrayDescriptor, Mem.Array));
UR_CHECK_ERROR(
hipArray3DGetDescriptor(&ArrayDescriptor, Mem.getArray()));
const auto PixelSizeBytes =
GetHipFormatPixelSize(ArrayDescriptor.Format) *
ArrayDescriptor.NumChannels;
Expand All @@ -284,6 +288,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urMemGetInfo(ur_mem_handle_t hMemory,
(ArrayDescriptor.Height ? ArrayDescriptor.Height : 1) *
(ArrayDescriptor.Depth ? ArrayDescriptor.Depth : 1);
return ImageSizeBytes;
#endif
} else {
static_assert(ur_always_false_t<T>, "Not exhaustive visitor!");
}
Expand Down Expand Up @@ -535,10 +540,13 @@ UR_APIEXPORT ur_result_t UR_APICALL urMemImageGetInfo(ur_mem_handle_t hMemory,
UrReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);

try {

HIP_ARRAY3D_DESCRIPTOR ArrayInfo;
#if HIP_VERSION >= 50600000
UR_CHECK_ERROR(hipArray3DGetDescriptor(
&ArrayInfo, std::get<SurfaceMem>(hMemory->Mem).Array));
&ArrayInfo, std::get<SurfaceMem>(hMemory->Mem).getArray()));
#else
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
#endif

const auto hip2urFormat =
[](hipArray_Format HipFormat) -> ur_image_channel_type_t {
Expand Down