Skip to content

Commit 2f56926

Browse files
[SYCL] Fix unused variable warnings (#12523)
Fixes warnings introduced in #11758
1 parent 9a7e091 commit 2f56926

File tree

3 files changed

+11
-18
lines changed

3 files changed

+11
-18
lines changed

sycl/source/detail/queue_impl.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -321,10 +321,9 @@ areEventsSafeForSchedulerBypass(const std::vector<sycl::event> &DepEvents,
321321
return SyclEventImplPtr->getHandleRef() != nullptr;
322322
};
323323

324-
return std::all_of(DepEvents.begin(), DepEvents.end(),
325-
[&Context, &CheckEvent](const sycl::event &Event) {
326-
return CheckEvent(Event);
327-
});
324+
return std::all_of(
325+
DepEvents.begin(), DepEvents.end(),
326+
[&CheckEvent](const sycl::event &Event) { return CheckEvent(Event); });
328327
}
329328

330329
template <typename HandlerFuncT>

sycl/source/detail/queue_impl.hpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -744,8 +744,7 @@ class queue_impl {
744744

745745
// template is needed for proper unit testing
746746
template <typename HandlerType = handler>
747-
void finalizeHandler(HandlerType &Handler, const CG::CGTYPE &Type,
748-
event &EventRet) {
747+
void finalizeHandler(HandlerType &Handler, event &EventRet) {
749748
if (MIsInorder) {
750749
// Accessing and changing of an event isn't atomic operation.
751750
// Hence, here is the lock for thread-safety.
@@ -831,11 +830,11 @@ class queue_impl {
831830
!(Handler.MKernel && Handler.MKernel->isInterop()) &&
832831
ProgramManager::getInstance().kernelUsesAssert(Handler.MKernelName);
833832

834-
finalizeHandler(Handler, Type, Event);
833+
finalizeHandler(Handler, Event);
835834

836835
(*PostProcess)(IsKernel, KernelUsesAssert, Event);
837836
} else
838-
finalizeHandler(Handler, Type, Event);
837+
finalizeHandler(Handler, Event);
839838

840839
addEvent(Event);
841840
return Event;

sycl/unittests/scheduler/InOrderQueueSyncCheck.cpp

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,35 +72,30 @@ TEST_F(SchedulerTest, InOrderQueueSyncCheck) {
7272
{
7373
LimitedHandlerSimulation MockCGH;
7474
EXPECT_CALL(MockCGH, depends_on).Times(0);
75-
Queue->finalizeHandler<LimitedHandlerSimulation>(
76-
MockCGH, detail::CG::CGTYPE::CodeplayHostTask, Event);
75+
Queue->finalizeHandler<LimitedHandlerSimulation>(MockCGH, Event);
7776
}
7877
// host task
7978
{
8079
LimitedHandlerSimulation MockCGH;
8180
EXPECT_CALL(MockCGH, depends_on).Times(1);
82-
Queue->finalizeHandler<LimitedHandlerSimulation>(
83-
MockCGH, detail::CG::CGTYPE::CodeplayHostTask, Event);
81+
Queue->finalizeHandler<LimitedHandlerSimulation>(MockCGH, Event);
8482
}
8583
// kernel task
8684
{
8785
LimitedHandlerSimulation MockCGH;
8886
EXPECT_CALL(MockCGH, depends_on).Times(1);
89-
Queue->finalizeHandler<LimitedHandlerSimulation>(
90-
MockCGH, detail::CG::CGTYPE::Kernel, Event);
87+
Queue->finalizeHandler<LimitedHandlerSimulation>(MockCGH, Event);
9188
}
9289
// kernel task
9390
{
9491
LimitedHandlerSimulation MockCGH;
9592
EXPECT_CALL(MockCGH, depends_on).Times(1);
96-
Queue->finalizeHandler<LimitedHandlerSimulation>(
97-
MockCGH, detail::CG::CGTYPE::Kernel, Event);
93+
Queue->finalizeHandler<LimitedHandlerSimulation>(MockCGH, Event);
9894
}
9995
// host task
10096
{
10197
LimitedHandlerSimulation MockCGH;
10298
EXPECT_CALL(MockCGH, depends_on).Times(1);
103-
Queue->finalizeHandler<LimitedHandlerSimulation>(
104-
MockCGH, detail::CG::CGTYPE::CodeplayHostTask, Event);
99+
Queue->finalizeHandler<LimitedHandlerSimulation>(MockCGH, Event);
105100
}
106101
}

0 commit comments

Comments
 (0)