Skip to content
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.

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

[SYCL][UR] Combined CTS fixes for CL adapter. #11794

Merged

Conversation

aarongreig
Copy link
Contributor

Pulls in fixes from oneapi-src/unified-runtime#1044

@aarongreig aarongreig force-pushed the aaron/opencl-cts-fixes-combined branch from d098f70 to ab321fb Compare November 6, 2023 16:28
@aarongreig aarongreig force-pushed the aaron/opencl-cts-fixes-combined branch from ab321fb to 76a4777 Compare November 6, 2023 16:41
@aarongreig aarongreig force-pushed the aaron/opencl-cts-fixes-combined branch from 76a4777 to d9eefd5 Compare November 6, 2023 17:27
@aarongreig aarongreig force-pushed the aaron/opencl-cts-fixes-combined branch from 10bf762 to 7ddce35 Compare November 8, 2023 12:13
Copy link
Contributor

@kbenzie kbenzie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not that oneapi-src/unified-runtime#1044 has merged, please pull in the latest sycl branch changes and update the UNIFIED_RUNTIME_REPO/UNIFIED_RUNTIME_TAG values as suggested. Then make this PR ready to review.

sycl/plugins/unified_runtime/CMakeLists.txt Outdated Show resolved Hide resolved
Pulls in fixes from oneapi-src/unified-runtime#1044

New UR commit hash 192e9404392c38ac43d09116d6c97e153c66f46b

Also correct type in a couple of NUM_DEVICES PI queries, and  implement
a workaround in pi2ur for type mismatch between PI kernel num args query
and UR equivalent.
@aarongreig aarongreig force-pushed the aaron/opencl-cts-fixes-combined branch from 81ff919 to 4bfc140 Compare November 10, 2023 13:39
@aarongreig aarongreig marked this pull request as ready for review November 10, 2023 13:39
@aarongreig aarongreig requested review from a team as code owners November 10, 2023 13:39
Copy link
Contributor

@kbenzie kbenzie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UR LGTM

@kbenzie
Copy link
Contributor

kbenzie commented Nov 13, 2023

@intel/llvm-reviewers-runtime please review, it is intended for the next release.

@@ -2336,8 +2336,18 @@ inline pi_result piKernelGetInfo(pi_kernel Kernel, pi_kernel_info ParamName,
break;
}
case PI_KERNEL_INFO_NUM_ARGS: {
UrParamName = UR_KERNEL_INFO_NUM_ARGS;
break;
size_t NumArgs = 0;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do use use different types for different Num*?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It turned out this particular query has always been size_t in UR, one of the fixes we're pulling in causes that to be properly validated now so we need to do this bit of translation. We do plan to fix this for the next release cycle oneapi-src/unified-runtime#1038

@aelovikov-intel aelovikov-intel merged commit 4c0780e into intel:sycl Nov 14, 2023
11 checks passed
callumfare pushed a commit to kbenzie/llvm that referenced this pull request Dec 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants