Skip to content

[SYCL][CUDA] Add the Use Default Stream property #4004

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 30, 2021
Merged

[SYCL][CUDA] Add the Use Default Stream property #4004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
275a0a0
[SYCL][CUDA] Add the Use Default Stream property
Ruyk Jun 27, 2021
9885231
Remove use_default_stream prop from the def file
Ruyk Jun 28, 2021
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
3 changes: 2 additions & 1 deletion sycl/include/CL/sycl/detail/property_helper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ enum DataLessPropKind {
BufferUsePinnedHostMemory = 5,
UsePrimaryContext = 6,
InitializeToIdentity = 7,
UseDefaultStream = 8,
// Indicates the last known dataless property.
LastKnownDataLessPropKind = 7,
LastKnownDataLessPropKind = 8,
// Exceeding 32 may cause ABI breaking change on some of OSes.
DataLessPropKindSize = 32
};
Expand Down
4 changes: 4 additions & 0 deletions sycl/include/CL/sycl/properties/queue_properties.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ namespace queue {
class in_order : public detail::DataLessProperty<detail::InOrder> {};
class enable_profiling
: public detail::DataLessProperty<detail::QueueEnableProfiling> {};
namespace cuda {
class use_default_stream
: public detail::DataLessProperty<detail::UseDefaultStream> {};
} // namespace cuda
} // namespace queue
} // namespace property
} // namespace sycl
Expand Down
4 changes: 4 additions & 0 deletions sycl/source/detail/queue_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#pragma once

#include <CL/sycl/context.hpp>
#include <CL/sycl/detail/cuda_definitions.hpp>
#include <CL/sycl/device.hpp>
#include <CL/sycl/event.hpp>
#include <CL/sycl/exception.hpp>
Expand Down Expand Up @@ -248,6 +249,9 @@ class queue_impl {
if (MPropList.has_property<property::queue::enable_profiling>()) {
CreationFlags |= PI_QUEUE_PROFILING_ENABLE;
}
if (MPropList.has_property<property::queue::cuda::use_default_stream>()) {
CreationFlags |= __SYCL_PI_CUDA_USE_DEFAULT_STREAM;
}
RT::PiQueue Queue{};
RT::PiContext Context = MContext->getHandleRef();
RT::PiDevice Device = MDevice->getHandleRef();
Expand Down
18 changes: 16 additions & 2 deletions sycl/unittests/pi/cuda/test_queue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,18 @@

#include <cuda.h>

#include "TestGetPlatforms.hpp"
#include "TestGetPlugin.hpp"
#include <CL/sycl.hpp>
#include <CL/sycl/backend/cuda.hpp>
#include <CL/sycl/detail/cuda_definitions.hpp>
#include <CL/sycl/detail/pi.hpp>
#include <detail/plugin.hpp>
#include <pi_cuda.hpp>

using namespace cl::sycl;
using namespace sycl;

struct CudaTestQueue : public ::testing::Test {
struct CudaTestQueue : public ::testing::TestWithParam<platform> {

protected:
detail::plugin plugin = pi::initializeAndGet(backend::cuda);
Expand Down Expand Up @@ -149,3 +151,15 @@ TEST_F(CudaTestQueue, PICreateQueueInterop) {
ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piQueueRelease>(queue)),
PI_SUCCESS);
}

TEST_P(CudaTestQueue, SYCLQueueDefaultStream) {
std::vector<device> CudaDevices = GetParam().get_devices();
auto deviceA_ = CudaDevices[0];
queue Queue(deviceA_, async_handler{},
{property::queue::cuda::use_default_stream{}});

CUstream CudaStream = get_native<backend::cuda>(Queue);
unsigned int flags;
cuStreamGetFlags(CudaStream, &flags);
ASSERT_EQ(flags, CU_STREAM_DEFAULT);
}