Skip to content

[UR][CTS] Replace urEnqueueEventsWait with dummy event in waitlist tests #21671

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

Open
kswiecicki wants to merge 2 commits into
base: sycl
Choose a base branch
from
Open

[UR][CTS] Replace urEnqueueEventsWait with dummy event in waitlist tests #21671

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
1a2eae4
[UR][CTS] Replace urEnqueueEventsWait with dummy event in waitlist tests
kswiecicki Apr 1, 2026
b0f0eca
Re-enable the enqueue mem buffer read tests
kswiecicki Apr 1, 2026
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
6 changes: 2 additions & 4 deletions unified-runtime/test/conformance/enqueue/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@ add_conformance_kernels_test(enqueue
urEnqueueMemBufferCopy.cpp
urEnqueueMemBufferFill.cpp
urEnqueueMemBufferMap.cpp
# Enqueue memory buffer read tests ran simultenously lead to timeouts.
# Tracker: https://jira.devtools.intel.com/browse/URT-1026
# urEnqueueMemBufferRead.cpp
# urEnqueueMemBufferReadRect.cpp
urEnqueueMemBufferRead.cpp
urEnqueueMemBufferReadRect.cpp
urEnqueueMemBufferWrite.cpp
urEnqueueMemBufferWriteRect.cpp
urEnqueueMemImageCopy.cpp
Expand Down
10 changes: 5 additions & 5 deletions unified-runtime/test/conformance/enqueue/urEnqueueEventsWait.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

#include <uur/fixtures.h>
#include <uur/known_failure.h>
#include <uur/raii.h>

struct urEnqueueEventsWaitTest : uur::urMultiQueueTest {
void SetUp() override {
Expand Down Expand Up @@ -108,15 +109,14 @@ TEST_P(urEnqueueEventsWaitTest, InvalidNullPtrEventWaitList) {
ASSERT_EQ_RESULT(urEnqueueEventsWait(queue1, 1, nullptr, nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ur_event_handle_t validEvent;
ASSERT_SUCCESS(urEnqueueEventsWait(queue1, 0, nullptr, &validEvent));
uur::raii::Event eventDummy = nullptr;
ASSERT_SUCCESS(
urEventCreateWithNativeHandle(0, context, nullptr, eventDummy.ptr()));

ASSERT_EQ_RESULT(urEnqueueEventsWait(queue1, 0, &validEvent, nullptr),
ASSERT_EQ_RESULT(urEnqueueEventsWait(queue1, 0, eventDummy.ptr(), nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ur_event_handle_t inv_evt = nullptr;
ASSERT_EQ_RESULT(urEnqueueEventsWait(queue1, 1, &inv_evt, nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ASSERT_SUCCESS(urEventRelease(validEvent));
}
10 changes: 5 additions & 5 deletions unified-runtime/test/conformance/enqueue/urEnqueueEventsWaitWithBarrier.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
#include <uur/fixtures.h>
#include <uur/known_failure.h>
#include <uur/raii.h>

enum class BarrierType {
Normal,
Expand Down Expand Up @@ -150,17 +151,16 @@ TEST_P(urEnqueueEventsWaitWithBarrierTest, InvalidNullPtrEventWaitList) {
ASSERT_EQ_RESULT(EnqueueBarrier(queue1, 1, nullptr, nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ur_event_handle_t validEvent;
ASSERT_SUCCESS(urEnqueueEventsWait(queue1, 0, nullptr, &validEvent));
uur::raii::Event eventDummy = nullptr;
ASSERT_SUCCESS(
urEventCreateWithNativeHandle(0, context, nullptr, eventDummy.ptr()));
Comment on lines +154 to +156
Copy link
Copy Markdown
Contributor

@pbalcer pbalcer Apr 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't equivalent to urEnqueueEventsWait. It will not wait for the preceding operations on the queue.


ASSERT_EQ_RESULT(EnqueueBarrier(queue1, 0, &validEvent, nullptr),
ASSERT_EQ_RESULT(EnqueueBarrier(queue1, 0, eventDummy.ptr(), nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ur_event_handle_t inv_evt = nullptr;
ASSERT_EQ_RESULT(EnqueueBarrier(queue1, 1, &inv_evt, nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ASSERT_SUCCESS(urEventRelease(validEvent));
}

TEST_P(urEnqueueEventsWaitWithBarrierOrderingTest,
Expand Down
9 changes: 5 additions & 4 deletions unified-runtime/test/conformance/enqueue/urEnqueueKernelLaunchWithArgsExp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <memory>
#include <uur/fixtures.h>
#include <uur/known_failure.h>
#include <uur/raii.h>

struct urEnqueueKernelLaunchNoArgs3DTest : uur::urKernelExecutionTest {
void SetUp() override {
Expand Down Expand Up @@ -187,13 +188,14 @@ TEST_P(urEnqueueKernelLaunchTest, InvalidNullPtrEventWaitList) {
nullptr, nullptr, 1, nullptr, nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ur_event_handle_t validEvent;
ASSERT_SUCCESS(urEnqueueEventsWait(queue, 0, nullptr, &validEvent));
uur::raii::Event eventDummy = nullptr;
ASSERT_SUCCESS(
urEventCreateWithNativeHandle(0, context, nullptr, eventDummy.ptr()));

ASSERT_EQ_RESULT(urEnqueueKernelLaunchWithArgsExp(
queue, kernel, n_dimensions, &global_offset,
&global_size, nullptr, 0, nullptr, nullptr, 0,
&validEvent, nullptr),
eventDummy.ptr(), nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ur_event_handle_t inv_evt = nullptr;
Expand All @@ -202,7 +204,6 @@ TEST_P(urEnqueueKernelLaunchTest, InvalidNullPtrEventWaitList) {
&global_offset, &global_size, nullptr, 0,
nullptr, nullptr, 1, &inv_evt, nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);
ASSERT_SUCCESS(urEventRelease(validEvent));
}

TEST_P(urEnqueueKernelLaunchTest, InvalidWorkDimension) {
Expand Down
10 changes: 5 additions & 5 deletions unified-runtime/test/conformance/enqueue/urEnqueueMemBufferCopy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "uur/utils.h"
#include <uur/fixtures.h>
#include <uur/known_failure.h>
#include <uur/raii.h>

struct urEnqueueMemBufferCopyTestWithParam
: uur::urMultiQueueTypeTestWithParam<size_t> {
Expand Down Expand Up @@ -82,19 +83,18 @@ TEST_P(urEnqueueMemBufferCopyTestWithParam, InvalidNullPtrEventWaitList) {
size, 1, nullptr, nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ur_event_handle_t validEvent;
ASSERT_SUCCESS(urEnqueueEventsWait(queue, 0, nullptr, &validEvent));
uur::raii::Event eventDummy = nullptr;
ASSERT_SUCCESS(
urEventCreateWithNativeHandle(0, context, nullptr, eventDummy.ptr()));

ASSERT_EQ_RESULT(urEnqueueMemBufferCopy(queue, src_buffer, dst_buffer, 0, 0,
size, 0, &validEvent, nullptr),
size, 0, eventDummy.ptr(), nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ur_event_handle_t inv_evt = nullptr;
ASSERT_EQ_RESULT(urEnqueueMemBufferCopy(queue, src_buffer, dst_buffer, 0, 0,
size, 1, &inv_evt, nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ASSERT_SUCCESS(urEventRelease(validEvent));
}

TEST_P(urEnqueueMemBufferCopyTestWithParam, InvalidSize) {
Expand Down
18 changes: 9 additions & 9 deletions unified-runtime/test/conformance/enqueue/urEnqueueMemBufferCopyRect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "uur/fixtures.h"
#include "uur/known_failure.h"
#include <numeric>
#include <uur/raii.h>

static std::vector<uur::test_parameters_t> generateParameterizations() {
std::vector<uur::test_parameters_t> parameterizations;
Expand Down Expand Up @@ -214,23 +215,22 @@ TEST_P(urEnqueueMemBufferCopyRectTest, InvalidNullPtrEventWaitList) {
src_region, size, size, size, size, 1, nullptr, nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ur_event_handle_t validEvent;
ASSERT_SUCCESS(urEnqueueEventsWait(queue, 0, nullptr, &validEvent));
uur::raii::Event eventDummy = nullptr;
ASSERT_SUCCESS(
urEventCreateWithNativeHandle(0, context, nullptr, eventDummy.ptr()));

ASSERT_EQ_RESULT(urEnqueueMemBufferCopyRect(queue, src_buffer, dst_buffer,
src_origin, dst_origin,
src_region, size, size, size,
size, 0, &validEvent, nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);
ASSERT_EQ_RESULT(
urEnqueueMemBufferCopyRect(queue, src_buffer, dst_buffer, src_origin,
dst_origin, src_region, size, size, size, size,
0, eventDummy.ptr(), nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ur_event_handle_t inv_evt = nullptr;
ASSERT_EQ_RESULT(urEnqueueMemBufferCopyRect(queue, src_buffer, dst_buffer,
src_origin, dst_origin,
src_region, size, size, size,
size, 1, &inv_evt, nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ASSERT_SUCCESS(urEventRelease(validEvent));
}
TEST_P(urEnqueueMemBufferCopyRectTest, InvalidSize) {
UUR_KNOWN_FAILURE_ON(uur::NativeCPU{});
Expand Down
10 changes: 5 additions & 5 deletions unified-runtime/test/conformance/enqueue/urEnqueueMemBufferFill.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
#include "helpers.h"
#include <uur/fixtures.h>
#include <uur/raii.h>

struct testParametersFill {
size_t size;
Expand Down Expand Up @@ -184,21 +185,20 @@ TEST_P(urEnqueueMemBufferFillNegativeTest, InvalidNullPtrEventWaitList) {
nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ur_event_handle_t validEvent;
ASSERT_SUCCESS(urEnqueueEventsWait(queue, 0, nullptr, &validEvent));
uur::raii::Event eventDummy = nullptr;
ASSERT_SUCCESS(
urEventCreateWithNativeHandle(0, context, nullptr, eventDummy.ptr()));

ASSERT_EQ_RESULT(urEnqueueMemBufferFill(queue, buffer, &pattern,
sizeof(uint32_t), 0, size, 0,
&validEvent, nullptr),
eventDummy.ptr(), nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ur_event_handle_t inv_evt = nullptr;
ASSERT_EQ_RESULT(urEnqueueMemBufferFill(queue, buffer, &pattern,
sizeof(uint32_t), 0, size, 1,
&inv_evt, nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ASSERT_SUCCESS(urEventRelease(validEvent));
}

TEST_P(urEnqueueMemBufferFillNegativeTest, InvalidSize) {
Expand Down
10 changes: 5 additions & 5 deletions unified-runtime/test/conformance/enqueue/urEnqueueMemBufferMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "helpers.h"
#include <uur/fixtures.h>
#include <uur/known_failure.h>
#include <uur/raii.h>

using urEnqueueMemBufferMapTestWithParam =
uur::urMemBufferQueueTestWithParam<uur::mem_buffer_test_parameters_t>;
Expand Down Expand Up @@ -280,12 +281,13 @@ TEST_P(urEnqueueMemBufferMapTestWithParam, InvalidNullPtrEventWaitList) {
0, size, 1, nullptr, nullptr, &map),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ur_event_handle_t validEvent;
ASSERT_SUCCESS(urEnqueueEventsWait(queue, 0, nullptr, &validEvent));
uur::raii::Event eventDummy = nullptr;
ASSERT_SUCCESS(
urEventCreateWithNativeHandle(0, context, nullptr, eventDummy.ptr()));

ASSERT_EQ_RESULT(urEnqueueMemBufferMap(queue, buffer, true,
UR_MAP_FLAG_READ | UR_MAP_FLAG_WRITE,
0, size, 0, &validEvent, nullptr,
0, size, 0, eventDummy.ptr(), nullptr,
&map),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

Expand All @@ -294,8 +296,6 @@ TEST_P(urEnqueueMemBufferMapTestWithParam, InvalidNullPtrEventWaitList) {
UR_MAP_FLAG_READ | UR_MAP_FLAG_WRITE,
0, size, 1, &inv_evt, nullptr, &map),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ASSERT_SUCCESS(urEventRelease(validEvent));
}

TEST_P(urEnqueueMemBufferMapTestWithParam, InvalidSize) {
Expand Down
10 changes: 5 additions & 5 deletions unified-runtime/test/conformance/enqueue/urEnqueueMemBufferRead.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "helpers.h"
#include <uur/fixtures.h>
#include <uur/known_failure.h>
#include <uur/raii.h>

using urEnqueueMemBufferReadTestWithParam =
uur::urMemBufferQueueTestWithParam<uur::mem_buffer_test_parameters_t>;
Expand Down Expand Up @@ -50,20 +51,19 @@ TEST_P(urEnqueueMemBufferReadTestWithParam, InvalidNullPtrEventWaitList) {
output.data(), 1, nullptr, nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ur_event_handle_t validEvent;
ASSERT_SUCCESS(urEnqueueEventsWait(queue, 0, nullptr, &validEvent));
uur::raii::Event eventDummy = nullptr;
ASSERT_SUCCESS(
urEventCreateWithNativeHandle(0, context, nullptr, eventDummy.ptr()));

ASSERT_EQ_RESULT(urEnqueueMemBufferRead(queue, buffer, true, 0, size,
output.data(), 0, &validEvent,
output.data(), 0, eventDummy.ptr(),
nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ur_event_handle_t inv_evt = nullptr;
ASSERT_EQ_RESULT(urEnqueueMemBufferRead(queue, buffer, true, 0, size,
output.data(), 1, &inv_evt, nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ASSERT_SUCCESS(urEventRelease(validEvent));
}

TEST_P(urEnqueueMemBufferReadTestWithParam, InvalidSize) {
Expand Down
11 changes: 6 additions & 5 deletions unified-runtime/test/conformance/enqueue/urEnqueueMemBufferReadRect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "uur/fixtures.h"
#include <numeric>
#include <uur/known_failure.h>
#include <uur/raii.h>

// Choose parameters so that we get good coverage and catch some edge cases.
static std::vector<uur::test_parameters_t> generateParameterizations() {
Expand Down Expand Up @@ -175,13 +176,15 @@ TEST_P(urEnqueueMemBufferReadRectTest, InvalidNullPtrEventWaitList) {
host_slice_pitch, dst.data(), 1, nullptr, nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ur_event_handle_t validEvent;
ASSERT_SUCCESS(urEnqueueEventsWait(queue, 0, nullptr, &validEvent));
uur::raii::Event eventDummy = nullptr;
ASSERT_SUCCESS(
urEventCreateWithNativeHandle(0, context, nullptr, eventDummy.ptr()));

ASSERT_EQ_RESULT(urEnqueueMemBufferReadRect(
queue, buffer, true, buffer_offset, host_offset, region,
buffer_row_pitch, buffer_slice_pitch, host_row_pitch,
host_slice_pitch, dst.data(), 0, &validEvent, nullptr),
host_slice_pitch, dst.data(), 0, eventDummy.ptr(),
nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ur_event_handle_t invalidEvent = nullptr;
Expand All @@ -190,8 +193,6 @@ TEST_P(urEnqueueMemBufferReadRectTest, InvalidNullPtrEventWaitList) {
buffer_row_pitch, buffer_slice_pitch, host_row_pitch,
host_slice_pitch, dst.data(), 1, &invalidEvent, nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ASSERT_SUCCESS(urEventRelease(validEvent));
}

TEST_P(urEnqueueMemBufferReadRectTest, InvalidSize) {
Expand Down
10 changes: 5 additions & 5 deletions unified-runtime/test/conformance/enqueue/urEnqueueMemBufferWrite.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "helpers.h"
#include <uur/fixtures.h>
#include <uur/known_failure.h>
#include <uur/raii.h>

using urEnqueueMemBufferWriteTestWithParam =
uur::urMemBufferQueueTestWithParam<uur::mem_buffer_test_parameters_t>;
Expand Down Expand Up @@ -62,20 +63,19 @@ TEST_P(urEnqueueMemBufferWriteTestWithParam, InvalidNullPtrEventWaitList) {
input.data(), 1, nullptr, nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ur_event_handle_t validEvent;
ASSERT_SUCCESS(urEnqueueEventsWait(queue, 0, nullptr, &validEvent));
uur::raii::Event eventDummy = nullptr;
ASSERT_SUCCESS(
urEventCreateWithNativeHandle(0, context, nullptr, eventDummy.ptr()));

ASSERT_EQ_RESULT(urEnqueueMemBufferWrite(queue, buffer, true, 0, size,
input.data(), 0, &validEvent,
input.data(), 0, eventDummy.ptr(),
nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ur_event_handle_t inv_evt = nullptr;
ASSERT_EQ_RESULT(urEnqueueMemBufferWrite(queue, buffer, true, 0, size,
input.data(), 1, &inv_evt, nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ASSERT_SUCCESS(urEventRelease(validEvent));
}

TEST_P(urEnqueueMemBufferWriteTestWithParam, InvalidSize) {
Expand Down
10 changes: 5 additions & 5 deletions unified-runtime/test/conformance/enqueue/urEnqueueMemBufferWriteRect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "uur/fixtures.h"
#include <numeric>
#include <uur/known_failure.h>
#include <uur/raii.h>

static std::vector<uur::test_parameters_t> generateParameterizations() {
std::vector<uur::test_parameters_t> parameterizations;
Expand Down Expand Up @@ -178,13 +179,14 @@ TEST_P(urEnqueueMemBufferWriteRectTest, InvalidNullPtrEventWaitList) {
size, size, size, size, src.data(), 1, nullptr, nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ur_event_handle_t validEvent;
ASSERT_SUCCESS(urEnqueueEventsWait(queue, 0, nullptr, &validEvent));
uur::raii::Event eventDummy = nullptr;
ASSERT_SUCCESS(
urEventCreateWithNativeHandle(0, context, nullptr, eventDummy.ptr()));

ASSERT_EQ_RESULT(
urEnqueueMemBufferWriteRect(queue, buffer, true, buffer_offset,
host_offset, region, size, size, size, size,
src.data(), 0, &validEvent, nullptr),
src.data(), 0, eventDummy.ptr(), nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ur_event_handle_t inv_evt = nullptr;
Expand All @@ -193,8 +195,6 @@ TEST_P(urEnqueueMemBufferWriteRectTest, InvalidNullPtrEventWaitList) {
host_offset, region, size, size, size, size,
src.data(), 1, &inv_evt, nullptr),
UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST);

ASSERT_SUCCESS(urEventRelease(validEvent));
}

TEST_P(urEnqueueMemBufferWriteRectTest, InvalidSize) {
Expand Down
Loading
Loading