Skip to content

[OpenCL] Add OpenCL version check for independent forward progress query #1833

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 4 commits into from
Nov 1, 2024
Merged

[OpenCL] Add OpenCL version check for independent forward progress query #1833

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f51394
Add opencl version check
ayylol Jul 2, 2024
62ba9e9
Remove independent forward progress fall through
ayylol Jul 8, 2024
8680c25
Add clarification comment
ayylol Jul 8, 2024
1984ceb
clang format
ayylol Jul 9, 2024
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
24 changes: 22 additions & 2 deletions source/adapters/opencl/device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,8 +887,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
case UR_DEVICE_INFO_AVAILABLE:
case UR_DEVICE_INFO_COMPILER_AVAILABLE:
case UR_DEVICE_INFO_LINKER_AVAILABLE:
case UR_DEVICE_INFO_PREFERRED_INTEROP_USER_SYNC:
case UR_DEVICE_INFO_SUB_GROUP_INDEPENDENT_FORWARD_PROGRESS: {
case UR_DEVICE_INFO_PREFERRED_INTEROP_USER_SYNC: {
/* CL type: cl_bool
* UR type: ur_bool_t */

Expand All @@ -900,6 +899,27 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
/* cl_bool is uint32_t and ur_bool_t is bool */
return ReturnValue(static_cast<ur_bool_t>(CLValue));
}
case UR_DEVICE_INFO_SUB_GROUP_INDEPENDENT_FORWARD_PROGRESS: {
/* CL type: cl_bool
* UR type: ur_bool_t */

oclv::OpenCLVersion DevVer;
CL_RETURN_ON_FAILURE(cl_adapter::getDeviceVersion(
cl_adapter::cast<cl_device_id>(hDevice), DevVer));
/* Independent forward progress query is only supported as of OpenCL 2.1
* if version is older we return a default false. */
if (DevVer >= oclv::V2_1) {
cl_bool CLValue;
CL_RETURN_ON_FAILURE(
clGetDeviceInfo(cl_adapter::cast<cl_device_id>(hDevice), CLPropName,
sizeof(cl_bool), &CLValue, nullptr));

/* cl_bool is uint32_t and ur_bool_t is bool */
return ReturnValue(static_cast<ur_bool_t>(CLValue));
} else {
return ReturnValue(false);
}
}
case UR_DEVICE_INFO_VENDOR_ID:
case UR_DEVICE_INFO_MAX_COMPUTE_UNITS:
case UR_DEVICE_INFO_MAX_WORK_ITEM_DIMENSIONS:
Expand Down
Loading