Skip to content

[SYCL] Fix test regressions caused by conflicting changes #4396

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
bader merged 2 commits into from
Aug 25, 2021
Merged

[SYCL] Fix test regressions caused by conflicting changes #4396

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00764d1
[SYCL] Fix test regressions caused by conflicting changes
Aug 24, 2021
9d48af3
Apply suggestions from code review
alexbatashev Aug 24, 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
9 changes: 9 additions & 0 deletions sycl/unittests/SYCL2020/GetNativeOpenCL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,13 @@ pi_result redefinedEventGetInfo(pi_event event, pi_event_info param_name,
return PI_SUCCESS;
}

static pi_result redefinedUSMEnqueueMemset(pi_queue, void *, pi_int32, size_t,
pi_uint32, const pi_event *,
pi_event *event) {
*event = reinterpret_cast<pi_event>(new int{});
return PI_SUCCESS;
}

TEST(GetNative, GetNativeHandle) {
platform Plt{default_selector()};
if (Plt.get_backend() != backend::opencl) {
Expand All @@ -83,6 +90,8 @@ TEST(GetNative, GetNativeHandle) {
Mock.redefine<detail::PiApiKind::piDeviceRetain>(redefinedDeviceRetain);
Mock.redefine<detail::PiApiKind::piProgramRetain>(redefinedProgramRetain);
Mock.redefine<detail::PiApiKind::piEventRetain>(redefinedEventRetain);
Mock.redefine<detail::PiApiKind::piextUSMEnqueueMemset>(
redefinedUSMEnqueueMemset);

default_selector Selector;
context Context(Plt);
Expand Down
6 changes: 5 additions & 1 deletion sycl/unittests/helpers/CommonRedefinitions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,17 @@ inline pi_result redefinedEventsWaitCommon(pi_uint32 num_events,
}

inline pi_result redefinedEventReleaseCommon(pi_event event) {
if (event != nullptr)
delete reinterpret_cast<int *>(event);
return PI_SUCCESS;
}

inline pi_result redefinedEnqueueKernelLaunchCommon(
pi_queue, pi_kernel, pi_uint32, const size_t *, const size_t *,
const size_t *, pi_uint32, const pi_event *, pi_event *) {
const size_t *, pi_uint32, const pi_event *, pi_event *event) {
*event = reinterpret_cast<pi_event>(new int{});
return PI_SUCCESS;
;
Comment thread
alexbatashev marked this conversation as resolved.
Outdated
}

inline pi_result redefinedKernelGetGroupInfoCommon(
Expand Down
1 change: 1 addition & 0 deletions sycl/unittests/scheduler/InOrderQueueHostTaskDeps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,5 +110,6 @@ TEST_F(SchedulerTest, InOrderQueueHostTaskDeps) {
})
.wait();

std::cout << GEventsWaitCounter << "\n";
Comment thread
alexbatashev marked this conversation as resolved.
Outdated
Comment thread
alexbatashev marked this conversation as resolved.
Outdated
EXPECT_TRUE(GEventsWaitCounter == 1);
}