Skip to content

Commit 3b5c77b

Browse files
committed
[UR][CTS] Skip command-buffer OpenCL CTS tests
buffer read/write CTS tests aren't supported for the OpenCL adapter, because there is a gap in cl_khr_command_buffer that blocks implementing the required UR entry-points KhronosGroup/OpenCL-Docs#1281 is the cl_khr_command_buffer issue progressing this.
1 parent 8b445d6 commit 3b5c77b

File tree

6 files changed

+26
-1
lines changed

6 files changed

+26
-1
lines changed

unified-runtime/test/conformance/exp_command_buffer/copy.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@ UUR_DEVICE_TEST_SUITE_WITH_PARAM(
116116
printMemcpyTestString<urCommandBufferMemcpyCommandsTest>);
117117

118118
TEST_P(urCommandBufferMemcpyCommandsTest, Buffer) {
119+
// Buffer read & write not supported on OpenCL
120+
// See https://github.com/KhronosGroup/OpenCL-Docs/issues/1281
121+
UUR_KNOWN_FAILURE_ON(uur::OpenCL{});
122+
119123
std::vector<uint8_t> input(size);
120124
std::iota(input.begin(), input.end(), 1);
121125

unified-runtime/test/conformance/exp_command_buffer/enqueue.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,11 @@ TEST_P(urEnqueueCommandBufferExpTest, SerializeInOrOutOfOrderQueue) {
194194
// Tests releasing command-buffer while it is still executing relying
195195
// on synchronization during urCommandBufferReleaseExp call.
196196
TEST_P(urEnqueueCommandBufferExpTest, EnqueueAndRelease) {
197+
// OpenCL implementations not behaving correctly until OpenCL-CTS PR
198+
// https://github.com/KhronosGroup/OpenCL-CTS/pull/2414 is merged
199+
// enforcing the behavior
200+
UUR_KNOWN_FAILURE_ON(uur::OpenCL{});
201+
197202
ASSERT_SUCCESS(urEnqueueCommandBufferExp(
198203
in_or_out_of_order_queue, cmd_buf_handle, 0, nullptr, nullptr));
199204

unified-runtime/test/conformance/exp_command_buffer/read.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ struct testParametersRead {
1515
struct urCommandBufferReadCommandsTest
1616
: uur::command_buffer::urCommandBufferExpTestWithParam<testParametersRead> {
1717
void SetUp() override {
18+
// Buffer read not supported on OpenCL
19+
// see https://github.com/KhronosGroup/OpenCL-Docs/issues/1281
20+
UUR_KNOWN_FAILURE_ON(uur::OpenCL{});
21+
1822
UUR_RETURN_ON_FATAL_FAILURE(
1923
uur::command_buffer::urCommandBufferExpTestWithParam<
2024
testParametersRead>::SetUp());

unified-runtime/test/conformance/exp_command_buffer/rect_read.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ struct urCommandBufferAppendMemBufferReadRectTestWithParam
7575
: public uur::command_buffer::urCommandBufferExpTestWithParam<
7676
uur::test_parameters_t> {
7777
void SetUp() override {
78+
// Buffer read not supported on OpenCL
79+
// see https://github.com/KhronosGroup/OpenCL-Docs/issues/1281
80+
UUR_KNOWN_FAILURE_ON(uur::OpenCL{});
81+
7882
UUR_RETURN_ON_FATAL_FAILURE(
7983
uur::command_buffer::urCommandBufferExpTestWithParam<
8084
uur::test_parameters_t>::SetUp());

unified-runtime/test/conformance/exp_command_buffer/rect_write.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ struct urCommandBufferAppendMemBufferWriteRectTestWithParam
7575
uur::test_parameters_t> {
7676

7777
void SetUp() override {
78+
// Buffer write not supported on OpenCL
79+
// see https://github.com/KhronosGroup/OpenCL-Docs/issues/1281
80+
UUR_KNOWN_FAILURE_ON(uur::OpenCL{});
81+
7882
UUR_RETURN_ON_FATAL_FAILURE(
7983
uur::command_buffer::urCommandBufferExpTestWithParam<
8084
uur::test_parameters_t>::SetUp());
@@ -151,4 +155,4 @@ TEST_P(urCommandBufferAppendMemBufferWriteRectTestWithParam, Success) {
151155

152156
// Verify the results.
153157
EXPECT_EQ(expected, output);
154-
}
158+
}

unified-runtime/test/conformance/exp_command_buffer/write.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ struct urCommandBufferWriteCommandsTest
1616
: uur::command_buffer::urCommandBufferExpTestWithParam<
1717
testParametersWrite> {
1818
void SetUp() override {
19+
// Buffer write not supported on OpenCL
20+
// see https://github.com/KhronosGroup/OpenCL-Docs/issues/1281
21+
UUR_KNOWN_FAILURE_ON(uur::OpenCL{});
22+
1923
UUR_RETURN_ON_FATAL_FAILURE(
2024
uur::command_buffer::urCommandBufferExpTestWithParam<
2125
testParametersWrite>::SetUp());

0 commit comments

Comments
 (0)