-
Notifications
You must be signed in to change notification settings - Fork 738
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SYCL][HIP][CUDA] Use new version of piMemGetNativeHandle and add test (
#12297) We want to change the signature of `piMemGetNativeHandle` for reasons explained here oneapi-src/unified-runtime#1199 Corresponding UR PR: oneapi-src/unified-runtime#1226 A previous PR added a new entry point #12199 but it was decided that it is better to modify the existing entry point
- Loading branch information
Showing
14 changed files
with
188 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| // FIXME: the rocm include path and link path are highly platform dependent, | ||
| // we should set this with some variable instead. | ||
| // RUN: %{build} -o %t.out -I/opt/rocm/include -L/opt/rocm/lib -lamdhip64 | ||
| // RUN: %{run} %t.out | ||
| // REQUIRES: hip | ||
|
|
||
| #include <iostream> | ||
| #include <sycl/sycl.hpp> | ||
|
|
||
| #define __HIP_PLATFORM_AMD__ | ||
|
|
||
| #include <hip/hip_runtime.h> | ||
|
|
||
| using namespace sycl; | ||
| using namespace sycl::access; | ||
|
|
||
| static constexpr size_t BUFFER_SIZE = 1024; | ||
|
|
||
| template <typename T> class Modifier; | ||
|
|
||
| template <typename T> class Init; | ||
|
|
||
| template <typename BufferT, typename ValueT> | ||
| void checkBufferValues(BufferT Buffer, ValueT Value) { | ||
| auto Acc = Buffer.get_host_access(); | ||
| for (size_t Idx = 0; Idx < Acc.get_count(); ++Idx) { | ||
| if (Acc[Idx] != Value) { | ||
| std::cerr << "buffer[" << Idx << "] = " << Acc[Idx] | ||
| << ", expected val = " << Value << '\n'; | ||
| exit(1); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| template <typename DataT> | ||
| void copy(buffer<DataT, 1> &Src, buffer<DataT, 1> &Dst, queue &Q) { | ||
| Q.submit([&](handler &CGH) { | ||
| auto SrcA = Src.template get_access<mode::read>(CGH); | ||
| auto DstA = Dst.template get_access<mode::write>(CGH); | ||
|
|
||
| auto Func = [=](interop_handle IH) { | ||
| auto HipStream = IH.get_native_queue<backend::ext_oneapi_hip>(); | ||
| auto SrcMem = IH.get_native_mem<backend::ext_oneapi_hip>(SrcA); | ||
| auto DstMem = IH.get_native_mem<backend::ext_oneapi_hip>(DstA); | ||
|
|
||
| if (hipMemcpyWithStream(DstMem, SrcMem, sizeof(DataT) * SrcA.get_count(), | ||
| hipMemcpyDefault, HipStream) != hipSuccess) { | ||
| throw; | ||
| } | ||
|
|
||
| if (hipStreamSynchronize(HipStream) != hipSuccess) { | ||
| throw; | ||
| } | ||
|
|
||
| if (Q.get_backend() != IH.get_backend()) | ||
| throw; | ||
| }; | ||
| CGH.host_task(Func); | ||
| }); | ||
| } | ||
|
|
||
| template <typename DataT> void modify(buffer<DataT, 1> &B, queue &Q) { | ||
| Q.submit([&](handler &CGH) { | ||
| auto Acc = B.template get_access<mode::read_write>(CGH); | ||
|
|
||
| auto Kernel = [=](item<1> Id) { Acc[Id] += 1; }; | ||
|
|
||
| CGH.parallel_for<Modifier<DataT>>(Acc.get_count(), Kernel); | ||
| }); | ||
| } | ||
|
|
||
| template <typename DataT, DataT B1Init, DataT B2Init> | ||
| void init(buffer<DataT, 1> &B1, buffer<DataT, 1> &B2, queue &Q) { | ||
| Q.submit([&](handler &CGH) { | ||
| auto Acc1 = B1.template get_access<mode::write>(CGH); | ||
| auto Acc2 = B2.template get_access<mode::write>(CGH); | ||
|
|
||
| CGH.parallel_for<Init<DataT>>(BUFFER_SIZE, [=](item<1> Id) { | ||
| Acc1[Id] = B1Init; | ||
| Acc2[Id] = B2Init; | ||
| }); | ||
| }); | ||
| } | ||
|
|
||
| // Check that a single host-interop-task with a buffer will work. | ||
| void test_ht_buffer(queue &Q) { | ||
| buffer<int, 1> Buffer{BUFFER_SIZE}; | ||
|
|
||
| Q.submit([&](handler &CGH) { | ||
| auto Acc = Buffer.get_access<mode::write>(CGH); | ||
| auto Func = [=](interop_handle IH) { /*A no-op */ }; | ||
| CGH.host_task(Func); | ||
| }); | ||
| } | ||
|
|
||
| // A test that uses HIP interop to copy data from buffer A to buffer B, by | ||
| // getting HIP ptrs and calling the hipMemcpyWithStream. Then run a SYCL | ||
| // kernel that modifies the data in place for B, e.g. increment one, then copy | ||
| // back to buffer A. Run it on a loop, to ensure the dependencies and the | ||
| // reference counting of the objects is not leaked. | ||
| void test_ht_kernel_dependencies(queue &Q) { | ||
| static constexpr int COUNT = 4; | ||
| buffer<int, 1> Buffer1{BUFFER_SIZE}; | ||
| buffer<int, 1> Buffer2{BUFFER_SIZE}; | ||
|
|
||
| // Init the buffer with a'priori invalid data. | ||
| init<int, -1, -2>(Buffer1, Buffer2, Q); | ||
|
|
||
| // Repeat a couple of times. | ||
| for (size_t Idx = 0; Idx < COUNT; ++Idx) { | ||
| copy(Buffer1, Buffer2, Q); | ||
| modify(Buffer2, Q); | ||
| copy(Buffer2, Buffer1, Q); | ||
| } | ||
|
|
||
| checkBufferValues(Buffer1, COUNT - 1); | ||
| checkBufferValues(Buffer2, COUNT - 1); | ||
| } | ||
|
|
||
| void tests(queue &Q) { | ||
| test_ht_buffer(Q); | ||
| test_ht_kernel_dependencies(Q); | ||
| } | ||
|
|
||
| int main() { | ||
| queue Q([](sycl::exception_list ExceptionList) { | ||
| if (ExceptionList.size() != 1) { | ||
| std::cerr << "Should be one exception in exception list" << std::endl; | ||
| std::abort(); | ||
| } | ||
| std::rethrow_exception(*ExceptionList.begin()); | ||
| }); | ||
| tests(Q); | ||
| std::cout << "Test PASSED" << std::endl; | ||
| return 0; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters