Skip to content

[SYCL][CUDA] Add mem_advise reset and managed mem check #5536

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 14 commits into from
Jul 29, 2022
Merged

[SYCL][CUDA] Add mem_advise reset and managed mem check #5536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
172708b
add mem_advise reset and managed mem check
Feb 10, 2022
8ed7a36
emit warning
May 9, 2022
d332e39
Merge branch 'sycl' of https://github.com/AidanBeltonS/llvm into cuda…
Jun 28, 2022
475b168
remove hint
Jun 28, 2022
958f197
Rename PI_MEM_ADVISE_RESET to PI_MEM_ADVICE_RESET
AidanBeltonS Jul 18, 2022
753ed95
Check for concurrent managed access with PI_MEM_ADVISE_RESET
Jul 18, 2022
2c1062b
Increment SYCL_DEV_ABI_VERSION
Jul 18, 2022
45655bc
Change PI_MEM_ADVICE_RESET value
Jul 18, 2022
dcb9eee
Merge branch 'cuda_memadvise' of https://github.com/AidanBeltonS/llvm…
Jul 18, 2022
3d40b56
Merge branch 'sycl' of https://github.com/AidanBeltonS/llvm into cuda…
Jul 18, 2022
d61e28c
Transfer changes to new pi.h directory
Jul 18, 2022
c9143c2
Fix typo
Jul 18, 2022
bfbfbb0
Incremement PI version
Jul 29, 2022
21cd50b
Increment PI major version and add comment
Jul 29, 2022
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
9 changes: 6 additions & 3 deletions sycl/include/sycl/detail/pi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,11 @@
// 8.10 Added new optional device argument to piextQueueCreateWithNativeHandle
// 9.11 Use values of OpenCL enums directly, rather than including `<CL/cl.h>`;
// NOTE that this results in a changed API for `piProgramGetBuildInfo`.
// 10.12 Change enum value PI_MEM_ADVICE_UNKNOWN from 0 to 999, and set enum
// PI_MEM_ADVISE_RESET to 0.

#define _PI_H_VERSION_MAJOR 9
#define _PI_H_VERSION_MINOR 11
#define _PI_H_VERSION_MAJOR 10
#define _PI_H_VERSION_MINOR 12

#define _PI_STRING_HELPER(a) #a
#define _PI_CONCAT(a, b) _PI_STRING_HELPER(a.b)
Expand Down Expand Up @@ -404,7 +406,7 @@ typedef enum {

typedef enum {
// Device-specific value opaque in PI API.
PI_MEM_ADVICE_UNKNOWN,
PI_MEM_ADVICE_RESET = 0,
PI_MEM_ADVICE_CUDA_SET_READ_MOSTLY = 101,
PI_MEM_ADVICE_CUDA_UNSET_READ_MOSTLY = 102,
PI_MEM_ADVICE_CUDA_SET_PREFERRED_LOCATION = 103,
Expand All @@ -415,6 +417,7 @@ typedef enum {
PI_MEM_ADVICE_CUDA_UNSET_PREFERRED_LOCATION_HOST = 108,
PI_MEM_ADVICE_CUDA_SET_ACCESSED_BY_HOST = 109,
PI_MEM_ADVICE_CUDA_UNSET_ACCESSED_BY_HOST = 110,
PI_MEM_ADVICE_UNKNOWN = 999,
} _pi_mem_advice;

typedef enum {
Expand Down
14 changes: 13 additions & 1 deletion sycl/plugins/cuda/pi_cuda.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5099,7 +5099,8 @@ pi_result cuda_piextUSMEnqueueMemAdvise(pi_queue queue, const void *ptr,
if (advice == PI_MEM_ADVICE_CUDA_SET_PREFERRED_LOCATION ||
advice == PI_MEM_ADVICE_CUDA_UNSET_PREFERRED_LOCATION ||
advice == PI_MEM_ADVICE_CUDA_SET_ACCESSED_BY ||
advice == PI_MEM_ADVICE_CUDA_UNSET_ACCESSED_BY) {
advice == PI_MEM_ADVICE_CUDA_UNSET_ACCESSED_BY ||
advice == PI_MEM_ADVICE_RESET) {
pi_device device = queue->get_context()->get_device();
if (!getAttribute(device, CU_DEVICE_ATTRIBUTE_CONCURRENT_MANAGED_ACCESS)) {
setErrorMessage("Mem advise ignored as device does not support "
Expand Down Expand Up @@ -5148,6 +5149,17 @@ pi_result cuda_piextUSMEnqueueMemAdvise(pi_queue queue, const void *ptr,
PI_MEM_ADVICE_CUDA_SET_PREFERRED_LOCATION)),
CU_DEVICE_CPU));
break;
case PI_MEM_ADVICE_RESET:
PI_CHECK_ERROR(cuMemAdvise((CUdeviceptr)ptr, length,
CU_MEM_ADVISE_UNSET_READ_MOSTLY,
queue->get_context()->get_device()->get()));
PI_CHECK_ERROR(cuMemAdvise((CUdeviceptr)ptr, length,
CU_MEM_ADVISE_UNSET_PREFERRED_LOCATION,
queue->get_context()->get_device()->get()));
PI_CHECK_ERROR(cuMemAdvise((CUdeviceptr)ptr, length,
CU_MEM_ADVISE_UNSET_ACCESSED_BY,
queue->get_context()->get_device()->get()));
break;
default:
cl::sycl::detail::pi::die("Unknown advice");
}
Expand Down