Skip to content

[SYCL] Add tests for atomic_memory_order/scope context queries. #8770

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 4 commits into from
Apr 6, 2023
Merged

[SYCL] Add tests for atomic_memory_order/scope context queries. #8770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ea098f
Adds atomic_memory_scope context query.
maarquitos14 Mar 24, 2023
2bd78b1
Address code review comments.
maarquitos14 Mar 27, 2023
6b6d667
Merge remote-tracking branch 'intel/origin/sycl' into maronas/context…
maarquitos14 Mar 29, 2023
8bf8bdf
Merge remote-tracking branch 'intel/origin/sycl' into maronas/context…
maarquitos14 Apr 6, 2023
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
52 changes: 47 additions & 5 deletions sycl/unittests/SYCL2020/AtomicMemoryOrderCapabilities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,26 @@ using namespace sycl;

namespace {

static constexpr size_t expectedCapabilityVecSize = 5;
static thread_local bool deviceGetInfoCalled = false;
thread_local bool deviceGetInfoCalled;

static bool has_capability(const std::vector<memory_order> &deviceCapabilities,
memory_order capabilityToFind) {
return std::find(deviceCapabilities.begin(), deviceCapabilities.end(),
capabilityToFind) != deviceCapabilities.end();
}

pi_result redefinedDevicesGet(pi_platform platform, pi_device_type device_type,
pi_uint32 num_entries, pi_device *devices,
pi_uint32 *num_devices) {
if (num_devices)
*num_devices = 2;
if (devices && num_entries > 0) {
devices[0] = reinterpret_cast<pi_device>(1);
devices[1] = reinterpret_cast<pi_device>(2);
}
return PI_SUCCESS;
}

pi_result redefinedDeviceGetInfo(pi_device device, pi_device_info param_name,
size_t param_value_size, void *param_value,
size_t *param_value_size_ret) {
Expand All @@ -32,9 +43,14 @@ pi_result redefinedDeviceGetInfo(pi_device device, pi_device_info param_name,
if (param_value) {
pi_memory_order_capabilities *Capabilities =
reinterpret_cast<pi_memory_order_capabilities *>(param_value);
*Capabilities = PI_MEMORY_ORDER_RELAXED | PI_MEMORY_ORDER_ACQUIRE |
PI_MEMORY_ORDER_RELEASE | PI_MEMORY_ORDER_ACQ_REL |
PI_MEMORY_ORDER_SEQ_CST;
if (device == reinterpret_cast<pi_device>(1)) {
*Capabilities = PI_MEMORY_ORDER_RELAXED | PI_MEMORY_ORDER_ACQUIRE |
PI_MEMORY_ORDER_RELEASE | PI_MEMORY_ORDER_ACQ_REL |
PI_MEMORY_ORDER_SEQ_CST;
}
if (device == reinterpret_cast<pi_device>(2)) {
*Capabilities = PI_MEMORY_ORDER_RELAXED | PI_MEMORY_ORDER_SEQ_CST;
}
}
}
return PI_SUCCESS;
Expand All @@ -50,9 +66,12 @@ TEST(AtomicMemoryOrderCapabilities, DeviceQueryReturnsCorrectCapabilities) {
const device Dev = Plt.get_devices()[0];
context Ctx{Dev};

deviceGetInfoCalled = false;

auto Capabilities =
Dev.get_info<info::device::atomic_memory_order_capabilities>();
EXPECT_TRUE(deviceGetInfoCalled);
constexpr size_t expectedCapabilityVecSize = 5;
EXPECT_EQ(Capabilities.size(), expectedCapabilityVecSize);

EXPECT_TRUE(has_capability(Capabilities, memory_order::relaxed));
Expand All @@ -62,4 +81,27 @@ TEST(AtomicMemoryOrderCapabilities, DeviceQueryReturnsCorrectCapabilities) {
EXPECT_TRUE(has_capability(Capabilities, memory_order::seq_cst));
}

TEST(AtomicMemoryOrderCapabilities, ContextQueryReturnsCorrectCapabilities) {
unittest::PiMock Mock;
platform Plt = Mock.getPlatform();

Mock.redefineAfter<detail::PiApiKind::piDeviceGetInfo>(
redefinedDeviceGetInfo);
Mock.redefineAfter<detail::PiApiKind::piDevicesGet>(redefinedDevicesGet);

auto devices = Plt.get_devices();
context Ctx{devices};

deviceGetInfoCalled = false;

auto Capabilities =
Ctx.get_info<info::context::atomic_memory_order_capabilities>();
EXPECT_TRUE(deviceGetInfoCalled);
constexpr size_t expectedCapabilityVecSize = 2;
EXPECT_EQ(Capabilities.size(), expectedCapabilityVecSize);

EXPECT_TRUE(has_capability(Capabilities, memory_order::relaxed));
EXPECT_TRUE(has_capability(Capabilities, memory_order::seq_cst));
}

} // namespace
54 changes: 50 additions & 4 deletions sycl/unittests/SYCL2020/AtomicMemoryScopeCapabilities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,18 @@ namespace {

thread_local bool deviceGetInfoCalled;

pi_result redefinedDevicesGet(pi_platform platform, pi_device_type device_type,
pi_uint32 num_entries, pi_device *devices,
pi_uint32 *num_devices) {
if (num_devices)
*num_devices = 2;
if (devices && num_entries > 0) {
devices[0] = reinterpret_cast<pi_device>(1);
devices[1] = reinterpret_cast<pi_device>(2);
}
return PI_SUCCESS;
}

pi_result redefinedDeviceGetInfoAfter(pi_device device,
pi_device_info param_name,
size_t param_value_size,
Expand All @@ -26,15 +38,21 @@ pi_result redefinedDeviceGetInfoAfter(pi_device device,
if (param_value) {
auto *Result =
reinterpret_cast<pi_memory_scope_capabilities *>(param_value);
*Result = PI_MEMORY_SCOPE_WORK_ITEM | PI_MEMORY_SCOPE_SUB_GROUP |
PI_MEMORY_SCOPE_WORK_GROUP | PI_MEMORY_SCOPE_DEVICE |
PI_MEMORY_SCOPE_SYSTEM;
if (device == reinterpret_cast<pi_device>(1)) {
*Result = PI_MEMORY_SCOPE_WORK_ITEM | PI_MEMORY_SCOPE_SUB_GROUP |
PI_MEMORY_SCOPE_WORK_GROUP | PI_MEMORY_SCOPE_DEVICE |
PI_MEMORY_SCOPE_SYSTEM;
}
if (device == reinterpret_cast<pi_device>(2)) {
*Result = PI_MEMORY_SCOPE_WORK_ITEM | PI_MEMORY_SCOPE_SYSTEM;
}
}
}
return PI_SUCCESS;
}

TEST(AtomicMemoryScopeCapabilitiesCheck, CheckAtomicMemoryScopeCapabilities) {
TEST(AtomicMemoryScopeCapabilitiesCheck,
CheckDeviceAtomicMemoryScopeCapabilities) {
sycl::unittest::PiMock Mock;
sycl::platform Plt = Mock.getPlatform();
device Dev = Plt.get_devices()[0];
Expand Down Expand Up @@ -65,4 +83,32 @@ TEST(AtomicMemoryScopeCapabilitiesCheck, CheckAtomicMemoryScopeCapabilities) {
sycl::memory_scope::system);
EXPECT_FALSE(res == scope_capabilities.end());
}

TEST(AtomicMemoryScopeCapabilitiesCheck,
CheckContextAtomicMemoryScopeCapabilities) {
sycl::unittest::PiMock Mock;
sycl::platform Plt = Mock.getPlatform();

Mock.redefineAfter<detail::PiApiKind::piDeviceGetInfo>(
redefinedDeviceGetInfoAfter);
Mock.redefineAfter<detail::PiApiKind::piDevicesGet>(redefinedDevicesGet);

auto devices = Plt.get_devices();
context Ctx{devices};

deviceGetInfoCalled = false;

auto scope_capabilities =
Ctx.get_info<sycl::info::context::atomic_memory_scope_capabilities>();
EXPECT_TRUE(deviceGetInfoCalled);
size_t expectedSize = 2;
EXPECT_EQ(scope_capabilities.size(), expectedSize);

auto res = std::find(scope_capabilities.begin(), scope_capabilities.end(),
sycl::memory_scope::work_item);
EXPECT_FALSE(res == scope_capabilities.end());
res = std::find(scope_capabilities.begin(), scope_capabilities.end(),
sycl::memory_scope::system);
EXPECT_FALSE(res == scope_capabilities.end());
}
} // anonymous namespace