Skip to content

[SYCL][CUDA] Cleanup of SYCL context on native unit tests #1824

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 2 commits into from
Jun 6, 2020
Merged

[SYCL][CUDA] Cleanup of SYCL context on native unit tests #1824

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bc1f4a
[SYCL][CUDA] Cleanup of SYCL context on native unit tests
Ruyk Jun 5, 2020
bfe7946
Fixed wrong usage of unique_ptr
Ruyk Jun 6, 2020
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
23 changes: 11 additions & 12 deletions sycl/unittests/pi/cuda/test_interop_get_native.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,15 @@ using namespace cl::sycl;
struct CudaInteropGetNativeTests : public ::testing::TestWithParam<platform> {

protected:
queue syclQueue_;
context syclContext_;
std::unique_ptr<queue> syclQueue_;
device syclDevice_;

void SetUp() override {
syclDevice_ = GetParam().get_devices()[0];
syclQueue_ = queue{syclDevice_};
syclContext_ = syclQueue_.get_context();
syclQueue_ = std::unique_ptr<queue>{new queue{syclDevice_}};
}

void TearDown() override {}
void TearDown() override { syclQueue_.reset(); }
};

TEST_P(CudaInteropGetNativeTests, getNativeDevice) {
Expand All @@ -41,31 +39,32 @@ TEST_P(CudaInteropGetNativeTests, getNativeDevice) {
}

TEST_P(CudaInteropGetNativeTests, getNativeContext) {
CUcontext cudaContext = get_native<backend::cuda>(syclContext_);
CUcontext cudaContext = get_native<backend::cuda>(syclQueue_->get_context());
ASSERT_NE(cudaContext, nullptr);
}

TEST_P(CudaInteropGetNativeTests, getNativeQueue) {
CUstream cudaStream = get_native<backend::cuda>(syclQueue_);
CUstream cudaStream = get_native<backend::cuda>(*syclQueue_);
ASSERT_NE(cudaStream, nullptr);

CUcontext streamContext = nullptr;
CUresult result = cuStreamGetCtx(cudaStream, &streamContext);
ASSERT_EQ(result, CUDA_SUCCESS);

CUcontext cudaContext = get_native<backend::cuda>(syclContext_);
CUcontext cudaContext = get_native<backend::cuda>(syclQueue_->get_context());
ASSERT_EQ(streamContext, cudaContext);
}

TEST_P(CudaInteropGetNativeTests, interopTaskGetMem) {
buffer<int, 1> syclBuffer(range<1>{1});
syclQueue_.submit([&](handler &cgh) {
syclQueue_->submit([&](handler &cgh) {
auto syclAccessor = syclBuffer.get_access<access::mode::read>(cgh);
cgh.interop_task([=](interop_handler ih) {
CUdeviceptr cudaPtr = ih.get_mem<backend::cuda>(syclAccessor);
CUdeviceptr cudaPtrBase;
size_t cudaPtrSize = 0;
CUcontext cudaContext = get_native<backend::cuda>(syclContext_);
CUcontext cudaContext =
get_native<backend::cuda>(syclQueue_->get_context());
ASSERT_EQ(CUDA_SUCCESS, cuCtxPushCurrent(cudaContext));
ASSERT_EQ(CUDA_SUCCESS,
cuMemGetAddressRange(&cudaPtrBase, &cudaPtrSize, cudaPtr));
Expand All @@ -76,8 +75,8 @@ TEST_P(CudaInteropGetNativeTests, interopTaskGetMem) {
}

TEST_P(CudaInteropGetNativeTests, interopTaskGetBufferMem) {
CUstream cudaStream = get_native<backend::cuda>(syclQueue_);
syclQueue_.submit([&](handler &cgh) {
CUstream cudaStream = get_native<backend::cuda>(*syclQueue_);
syclQueue_->submit([&](handler &cgh) {
cgh.interop_task([=](interop_handler ih) {
CUstream cudaInteropStream = ih.get_queue<backend::cuda>();
ASSERT_EQ(cudaInteropStream, cudaStream);
Expand Down