Skip to content

Extend parameterized test in test_sycl_queue_interface #497

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
diptorupd merged 2 commits into from
Jun 24, 2021
Merged

Extend parameterized test in test_sycl_queue_interface #497

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
c648464
Extend parameterized test in test_sycl_queue_interface
oleksandr-pavlyk Jun 23, 2021
2f38551
Use Memcpy, memadvise in tests
oleksandr-pavlyk Jun 23, 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
37 changes: 27 additions & 10 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 @@ -41,20 +41,30 @@ namespace
{
DEFINE_SIMPLE_CONVERSION_FUNCTIONS(queue, DPCTLSyclQueueRef);

void error_handler_fn(int /*err*/)
{
return;
}

struct TestDPCTLQueueMemberFunctions
: public ::testing::TestWithParam<const char *>
: public ::testing::TestWithParam<
std::tuple<const char *, DPCTLQueuePropertyType, bool>>
{
protected:
DPCTLSyclQueueRef QRef = nullptr;

TestDPCTLQueueMemberFunctions()
{
auto DS = DPCTLFilterSelector_Create(GetParam());
auto param_tuple = GetParam();
auto DS = DPCTLFilterSelector_Create(std::get<0>(param_tuple));
DPCTLSyclDeviceRef DRef = nullptr;
if (DS) {
EXPECT_NO_FATAL_FAILURE(DRef = DPCTLDevice_CreateFromSelector(DS));
EXPECT_NO_FATAL_FAILURE(QRef = DPCTLQueue_CreateForDevice(
DRef, nullptr, DPCTL_DEFAULT_PROPERTY));
EXPECT_NO_FATAL_FAILURE(
QRef = DPCTLQueue_CreateForDevice(
DRef,
(std::get<2>(param_tuple)) ? &error_handler_fn : nullptr,
std::get<1>(param_tuple)));
}
DPCTLDevice_Delete(DRef);
DPCTLDeviceSelector_Delete(DS);
Expand All @@ -63,8 +73,9 @@ struct TestDPCTLQueueMemberFunctions
void SetUp()
{
if (!QRef) {
auto param_tuple = GetParam();
auto message = "Skipping as no device of type " +
std::string(GetParam()) + ".";
std::string(std::get<0>(param_tuple)) + ".";
GTEST_SKIP_(message.c_str());
}
}
Expand Down Expand Up @@ -284,8 +295,14 @@ TEST_P(TestDPCTLQueueMemberFunctions, CheckGetDevice)
EXPECT_NO_FATAL_FAILURE(DPCTLDevice_Delete(D));
}

INSTANTIATE_TEST_SUITE_P(DPCTLQueueMemberFuncTests,
TestDPCTLQueueMemberFunctions,
::testing::Values("opencl:gpu:0",
"opencl:cpu:0",
"level_zero:gpu:0"));
INSTANTIATE_TEST_SUITE_P(
DPCTLQueueMemberFuncTests,
TestDPCTLQueueMemberFunctions,
::testing::Combine(
::testing::Values("opencl:gpu", "opencl:cpu", "level_zero:gpu"),
::testing::Values(DPCTL_DEFAULT_PROPERTY,
DPCTL_ENABLE_PROFILING,
DPCTL_IN_ORDER,
static_cast<DPCTLQueuePropertyType>(
DPCTL_ENABLE_PROFILING | DPCTL_IN_ORDER)),
::testing::Bool()));
9 changes: 9 additions & 0 deletions dpctl-capi/tests/test_sycl_usm_interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,15 @@ void common_test_body(size_t nbytes,
EXPECT_TRUE(DPCTLDevice_AreEq(Dev, QueueDev));

EXPECT_NO_FATAL_FAILURE(DPCTLQueue_Prefetch(Q, Ptr, nbytes));
EXPECT_NO_FATAL_FAILURE(DPCTLQueue_MemAdvise(Q, Ptr, nbytes, 0));

try {
unsigned short *host_ptr = new unsigned short[nbytes];
EXPECT_NO_FATAL_FAILURE(DPCTLQueue_Memcpy(Q, host_ptr, Ptr, nbytes));
delete[] host_ptr;
} catch (std::bad_alloc const &ba) {
// pass
}

DPCTLDevice_Delete(QueueDev);
DPCTLDevice_Delete(Dev);
Expand Down