Skip to content

Addressed concern regarding #494 #535

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
oleksandr-pavlyk merged 1 commit into from
Aug 19, 2021
Merged

Addressed concern regarding #494 #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions dpctl-capi/include/dpctl_sycl_enum_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ typedef enum
{
// clang-format off
DPCTL_DEFAULT_PROPERTY = 0,
DPCTL_ENABLE_PROFILING = 1 << 1,
DPCTL_IN_ORDER = 1 << 2
DPCTL_ENABLE_PROFILING = 1 << 0,
DPCTL_IN_ORDER = 1 << 1
// clang-format on
} DPCTLQueuePropertyType;

Expand Down
16 changes: 13 additions & 3 deletions dpctl-capi/source/dpctl_sycl_queue_interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,11 @@ bool set_kernel_arg(handler &cgh,
std::unique_ptr<property_list> create_property_list(int properties)
{
std::unique_ptr<property_list> propList;
if (properties & DPCTL_ENABLE_PROFILING) {
if (properties & DPCTL_IN_ORDER) {
int _prop = properties;
if (_prop & DPCTL_ENABLE_PROFILING) {
_prop = _prop ^ DPCTL_ENABLE_PROFILING;
if (_prop & DPCTL_IN_ORDER) {
_prop = _prop ^ DPCTL_IN_ORDER;
propList = std::make_unique<property_list>(
sycl::property::queue::enable_profiling(),
sycl::property::queue::in_order());
Expand All @@ -130,11 +133,18 @@ std::unique_ptr<property_list> create_property_list(int properties)
sycl::property::queue::enable_profiling());
}
}
else if (properties & DPCTL_IN_ORDER) {
else if (_prop & DPCTL_IN_ORDER) {
_prop = _prop ^ DPCTL_IN_ORDER;
propList =
std::make_unique<property_list>(sycl::property::queue::in_order());
}

if (_prop) {
// todo: log error
std::cerr << "Invalid queue property argument (" << std::hex
<< properties << "), interpreted as (" << (properties ^ _prop)
<< ")" << '\n';
}
return propList;
}

Expand Down
35 changes: 35 additions & 0 deletions dpctl-capi/tests/test_sycl_queue_interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,41 @@ TEST(TestDPCTLSyclQueueInterface, CheckHasEnableProfilingInvalid)
EXPECT_FALSE(ioq);
}

TEST(TestDPCTLSyclQueueInterface, CheckPropertyHandling)
{
DPCTLSyclQueueRef QRef = nullptr;
DPCTLSyclDeviceSelectorRef DSRef = nullptr;
DPCTLSyclDeviceRef DRef = nullptr;

EXPECT_NO_FATAL_FAILURE(DSRef = DPCTLDefaultSelector_Create());
EXPECT_NO_FATAL_FAILURE(DRef = DPCTLDevice_CreateFromSelector(DSRef));

::testing::internal::CaptureStderr();
EXPECT_NO_FATAL_FAILURE(QRef = DPCTLQueue_CreateForDevice(
DRef, nullptr, DPCTL_DEFAULT_PROPERTY));
std::string capt1 = ::testing::internal::GetCapturedStderr();
ASSERT_TRUE(capt1.empty());
ASSERT_FALSE(DPCTLQueue_IsInOrder(QRef));
ASSERT_FALSE(DPCTLQueue_HasEnableProfiling(QRef));
EXPECT_NO_FATAL_FAILURE(DPCTLQueue_Delete(QRef));

QRef = nullptr;
::testing::internal::CaptureStderr();
int invalid_prop = -1;
EXPECT_NO_FATAL_FAILURE(
QRef = DPCTLQueue_CreateForDevice(DRef, nullptr, invalid_prop));
std::string capt2 = ::testing::internal::GetCapturedStderr();
ASSERT_TRUE(!capt2.empty());
ASSERT_TRUE(DPCTLQueue_IsInOrder(QRef) ==
bool((invalid_prop & DPCTL_IN_ORDER)));
ASSERT_TRUE(DPCTLQueue_HasEnableProfiling(QRef) ==
bool((invalid_prop & DPCTL_ENABLE_PROFILING)));
EXPECT_NO_FATAL_FAILURE(DPCTLQueue_Delete(QRef));

EXPECT_NO_FATAL_FAILURE(DPCTLDevice_Delete(DRef));
EXPECT_NO_FATAL_FAILURE(DPCTLDeviceSelector_Delete(DSRef));
}

TEST_P(TestDPCTLQueueMemberFunctions, CheckGetBackend)
{
auto q = unwrap(QRef);
Expand Down