Skip to content

Commit c138003

Browse files
authored
[SYCL][NFC] Remove unnecessary enable_if (#7879)
1 parent 34cf20a commit c138003

File tree

2 files changed

+13
-20
lines changed

2 files changed

+13
-20
lines changed

sycl/source/detail/scheduler/graph_builder.cpp

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -538,8 +538,8 @@ Scheduler::GraphBuilder::addHostAccessor(Requirement *Req,
538538

539539
// Need empty command to be blocked until host accessor is destructed
540540
EmptyCommand *EmptyCmd =
541-
addEmptyCmd<Requirement>(UpdateHostAccCmd, {Req}, HostQueue,
542-
Command::BlockReason::HostAccessor, ToEnqueue);
541+
addEmptyCmd(UpdateHostAccCmd, {Req}, HostQueue,
542+
Command::BlockReason::HostAccessor, ToEnqueue);
543543

544544
Req->MBlockedCmd = EmptyCmd;
545545

@@ -851,15 +851,10 @@ void Scheduler::GraphBuilder::markModifiedIfWrite(MemObjRecord *Record,
851851
}
852852
}
853853

854-
template <typename T>
855-
typename detail::enable_if_t<
856-
std::is_same<typename std::remove_cv_t<T>, Requirement>::value,
857-
EmptyCommand *>
858-
Scheduler::GraphBuilder::addEmptyCmd(Command *Cmd, const std::vector<T *> &Reqs,
859-
const QueueImplPtr &Queue,
860-
Command::BlockReason Reason,
861-
std::vector<Command *> &ToEnqueue,
862-
const bool AddDepsToLeaves) {
854+
EmptyCommand *Scheduler::GraphBuilder::addEmptyCmd(
855+
Command *Cmd, const std::vector<Requirement *> &Reqs,
856+
const QueueImplPtr &Queue, Command::BlockReason Reason,
857+
std::vector<Command *> &ToEnqueue, const bool AddDepsToLeaves) {
863858
EmptyCommand *EmptyCmd =
864859
new EmptyCommand(Scheduler::getInstance().getDefaultHostQueue());
865860

@@ -870,7 +865,7 @@ Scheduler::GraphBuilder::addEmptyCmd(Command *Cmd, const std::vector<T *> &Reqs,
870865
EmptyCmd->MEnqueueStatus = EnqueueResultT::SyclEnqueueBlocked;
871866
EmptyCmd->MBlockReason = Reason;
872867

873-
for (T *Req : Reqs) {
868+
for (Requirement *Req : Reqs) {
874869
MemObjRecord *Record = getOrInsertMemObjRecord(Queue, Req, ToEnqueue);
875870
AllocaCommandBase *AllocaCmd =
876871
getOrCreateAllocaForReq(Record, Req, Queue, ToEnqueue);

sycl/source/detail/scheduler/scheduler.hpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -653,14 +653,12 @@ class Scheduler {
653653
const Requirement *Req,
654654
const ContextImplPtr &Context);
655655

656-
template <typename T>
657-
typename detail::enable_if_t<
658-
std::is_same<typename std::remove_cv_t<T>, Requirement>::value,
659-
EmptyCommand *>
660-
addEmptyCmd(Command *Cmd, const std::vector<T *> &Req,
661-
const QueueImplPtr &Queue, Command::BlockReason Reason,
662-
std::vector<Command *> &ToEnqueue,
663-
const bool AddDepsToLeaves = true);
656+
EmptyCommand *addEmptyCmd(Command *Cmd,
657+
const std::vector<Requirement *> &Req,
658+
const QueueImplPtr &Queue,
659+
Command::BlockReason Reason,
660+
std::vector<Command *> &ToEnqueue,
661+
const bool AddDepsToLeaves = true);
664662

665663
void createGraphForCommand(Command *NewCmd, CG &CG, bool isInteropTask,
666664
std::vector<Requirement *> &Reqs,

0 commit comments

Comments
 (0)