diff --git a/sycl/include/CL/sycl/usm/usm_allocator.hpp b/sycl/include/CL/sycl/usm/usm_allocator.hpp index 2967f1fe0195d..1ee4d6ae44e66 100644 --- a/sycl/include/CL/sycl/usm/usm_allocator.hpp +++ b/sycl/include/CL/sycl/usm/usm_allocator.hpp @@ -87,8 +87,7 @@ class usm_allocator { usm::alloc AllocT = AllocKind, typename std::enable_if::type = 0> void destroy(pointer Ptr) { - throw feature_not_supported( - "Device pointers do not support destroy on host", PI_INVALID_OPERATION); + // This method must be a NOP for device pointers. } /// Note:: AllocKind == alloc::device is not allowed. diff --git a/sycl/test/usm/allocator_vector.cpp b/sycl/test/usm/allocator_vector.cpp index 2a87695c2f2ff..2f1b8c3ff3eef 100644 --- a/sycl/test/usm/allocator_vector.cpp +++ b/sycl/test/usm/allocator_vector.cpp @@ -30,35 +30,101 @@ int main() { auto dev = q.get_device(); auto ctxt = q.get_context(); - if (!dev.get_info()) - return 0; + if (dev.get_info()) { + usm_allocator alloc(ctxt, dev); - usm_allocator alloc(ctxt, dev); + std::vector vec(alloc); + vec.resize(N); - std::vector vec(alloc); - vec.resize(N); + for (int i = 0; i < N; i++) { + vec[i] = i; + } - for (int i = 0; i < N; i++) { - vec[i] = i; + int *res = &vec[0]; + int *vals = &vec[0]; + + auto e1 = q.submit([=](handler &h) { + h.single_task([=]() { + for (int i = 1; i < N; i++) { + res[0] += vals[i]; + } + }); + }); + + e1.wait(); + + int answer = (N * (N - 1)) / 2; + + if (vec[0] != answer) + return -1; + } + + if (dev.get_info()) { + usm_allocator alloc(ctxt, dev); + + std::vector vec(alloc); + vec.resize(N); + + for (int i = 0; i < N; i++) { + vec[i] = i; + } + + int *res = &vec[0]; + int *vals = &vec[0]; + + auto e1 = q.submit([=](handler &h) { + h.single_task([=]() { + for (int i = 1; i < N; i++) { + res[0] += vals[i]; + } + }); + }); + + e1.wait(); + + int answer = (N * (N - 1)) / 2; + + if (vec[0] != answer) + return -1; } - int *res = &vec[0]; - int *vals = &vec[0]; + if (dev.get_info()) { + usm_allocator alloc(ctxt, dev); - auto e1 = q.submit([=](handler &cgh) { - cgh.single_task([=]() { - for (int i = 1; i < N; i++) { - res[0] += vals[i]; - } + std::vector vec(alloc); + vec.resize(N); + + int *res = &vec[0]; + int *vals = &vec[0]; + + auto e0 = q.submit([=](handler &h) { + h.single_task([=]() { + res[0] = 0; + for (int i = 0; i < N; i++) { + vals[i] = i; + } + }); }); - }); - e1.wait(); + auto e1 = q.submit([=](handler &h) { + h.depends_on(e0); + h.single_task([=]() { + for (int i = 1; i < N; i++) { + res[0] += vals[i]; + } + }); + }); - int answer = (N * (N - 1)) / 2; + e1.wait(); - if (vec[0] != answer) - return -1; + int answer = (N * (N - 1)) / 2; + int result; + q.memcpy(&result, res, sizeof(int)); + q.wait(); + + if (result != answer) + return -1; + } return 0; }