Skip to content

[SYCL][NFC] Align graph builder functions with the LLVM coding style #1127

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.

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
merged 1 commit into from
Feb 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions sycl/include/CL/sycl/detail/scheduler/scheduler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,11 @@ class Scheduler {
void removeRecordForMemObj(SYCLMemObjI *MemObject);

// Add new command to leaves if needed.
void AddNodeToLeaves(MemObjRecord *Record, Command *Cmd,
void addNodeToLeaves(MemObjRecord *Record, Command *Cmd,
access::mode AccessMode);

// Removes commands from leaves.
void UpdateLeaves(const std::set<Command *> &Cmds, MemObjRecord *Record,
void updateLeaves(const std::set<Command *> &Cmds, MemObjRecord *Record,
access::mode AccessMode);

std::vector<SYCLMemObjI *> MMemObjs;
Expand Down
26 changes: 13 additions & 13 deletions sycl/source/detail/scheduler/graph_builder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ Scheduler::GraphBuilder::getOrInsertMemObjRecord(const QueueImplPtr &Queue,
}

// Helper function which removes all values in Cmds from Leaves
void Scheduler::GraphBuilder::UpdateLeaves(const std::set<Command *> &Cmds,
void Scheduler::GraphBuilder::updateLeaves(const std::set<Command *> &Cmds,
MemObjRecord *Record,
access::mode AccessMode) {

Expand All @@ -151,7 +151,7 @@ void Scheduler::GraphBuilder::UpdateLeaves(const std::set<Command *> &Cmds,
}
}

void Scheduler::GraphBuilder::AddNodeToLeaves(MemObjRecord *Record,
void Scheduler::GraphBuilder::addNodeToLeaves(MemObjRecord *Record,
Command *Cmd,
access::mode AccessMode) {
CircularBuffer<Command *> &Leaves{AccessMode == access::mode::read
Expand Down Expand Up @@ -191,8 +191,8 @@ UpdateHostRequirementCommand *Scheduler::GraphBuilder::insertUpdateHostReqCmd(
UpdateCommand->addDep(DepDesc{Dep, StoredReq, AllocaCmd});
Dep->addUser(UpdateCommand);
}
UpdateLeaves(Deps, Record, Req->MAccessMode);
AddNodeToLeaves(Record, UpdateCommand, Req->MAccessMode);
updateLeaves(Deps, Record, Req->MAccessMode);
addNodeToLeaves(Record, UpdateCommand, Req->MAccessMode);
return UpdateCommand;
}

Expand Down Expand Up @@ -292,8 +292,8 @@ Command *Scheduler::GraphBuilder::insertMemoryMove(MemObjRecord *Record,
NewCmd->addDep(DepDesc{Dep, NewCmd->getRequirement(), AllocaCmdDst});
Dep->addUser(NewCmd);
}
UpdateLeaves(Deps, Record, access::mode::read_write);
AddNodeToLeaves(Record, NewCmd, access::mode::read_write);
updateLeaves(Deps, Record, access::mode::read_write);
addNodeToLeaves(Record, NewCmd, access::mode::read_write);
Record->MCurContext = Queue->getContextImplPtr();
return NewCmd;
}
Expand Down Expand Up @@ -330,8 +330,8 @@ Command *Scheduler::GraphBuilder::addCopyBack(Requirement *Req) {
Dep->addUser(MemCpyCmd);
}

UpdateLeaves(Deps, Record, Req->MAccessMode);
AddNodeToLeaves(Record, MemCpyCmd, Req->MAccessMode);
updateLeaves(Deps, Record, Req->MAccessMode);
addNodeToLeaves(Record, MemCpyCmd, Req->MAccessMode);
if (MPrintOptionsArray[AfterAddCopyBack])
printGraphAsDot("after_addCopyBack");
return MemCpyCmd;
Expand Down Expand Up @@ -367,8 +367,8 @@ Command *Scheduler::GraphBuilder::addHostAccessor(Requirement *Req) {
EmptyCmd->MCanEnqueue = false;
EmptyCmd->MBlockReason = "A Buffer is locked by the host accessor";

UpdateLeaves({UpdateHostAccCmd}, Record, Req->MAccessMode);
AddNodeToLeaves(Record, EmptyCmd, Req->MAccessMode);
updateLeaves({UpdateHostAccCmd}, Record, Req->MAccessMode);
addNodeToLeaves(Record, EmptyCmd, Req->MAccessMode);

Req->MBlockedCmd = EmptyCmd;

Expand Down Expand Up @@ -504,7 +504,7 @@ AllocaCommandBase *Scheduler::GraphBuilder::getOrCreateAllocaForReq(
auto *ParentAlloca =
getOrCreateAllocaForReq(Record, &ParentRequirement, Queue);
AllocaCmd = new AllocaSubBufCommand(Queue, *Req, ParentAlloca);
UpdateLeaves(findDepsForReq(Record, Req, Queue->getContextImplPtr()),
updateLeaves(findDepsForReq(Record, Req, Queue->getContextImplPtr()),
Record, access::mode::read_write);
} else {

Expand Down Expand Up @@ -624,8 +624,8 @@ Scheduler::GraphBuilder::addCG(std::unique_ptr<detail::CG> CommandGroup,
Dep.MDepCommand->addUser(NewCmd.get());
const Requirement *Req = Dep.MDepRequirement;
MemObjRecord *Record = getMemObjRecord(Req->MSYCLMemObj);
UpdateLeaves({Dep.MDepCommand}, Record, Req->MAccessMode);
AddNodeToLeaves(Record, NewCmd.get(), Req->MAccessMode);
updateLeaves({Dep.MDepCommand}, Record, Req->MAccessMode);
addNodeToLeaves(Record, NewCmd.get(), Req->MAccessMode);
}

// Register all the events as dependencies
Expand Down
4 changes: 2 additions & 2 deletions sycl/test/scheduler/FinishedCmdCleanup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ int main() {

FakeCommand LeafB{detail::getSyclObjImpl(Queue), FakeReqB};
addEdge(&LeafB, &AllocaB, &AllocaB);
TS.AddNodeToLeaves(RecC, &LeafB);
TS.addNodeToLeaves(RecC, &LeafB);

FakeCommand LeafA{detail::getSyclObjImpl(Queue), FakeReqA};
addEdge(&LeafA, InnerC, &AllocaA);
TS.AddNodeToLeaves(RecC, &LeafA);
TS.addNodeToLeaves(RecC, &LeafA);

FakeCommand *InnerB = new FakeCommandWithCallback(
detail::getSyclObjImpl(Queue), FakeReqB, Callback);
Expand Down
2 changes: 1 addition & 1 deletion sycl/test/scheduler/LeafLimit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ int main() {
}
// Add edges as leaves and exceed the leaf limit
for (auto LeafPtr : LeavesToAdd) {
TS.AddNodeToLeaves(Rec, LeafPtr);
TS.addNodeToLeaves(Rec, LeafPtr);
}
// Check that the oldest leaf has been removed from the leaf list
// and added as a dependency of the newest one instead
Expand Down
4 changes: 2 additions & 2 deletions sycl/test/scheduler/SchedulerTestUtils.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ class TestScheduler : public cl::sycl::detail::Scheduler {
MGraphBuilder.cleanupCommandsForRecord(Rec);
}

void AddNodeToLeaves(
void addNodeToLeaves(
cl::sycl::detail::MemObjRecord *Rec, cl::sycl::detail::Command *Cmd,
cl::sycl::access::mode Mode = cl::sycl::access::mode::read_write) {
return MGraphBuilder.AddNodeToLeaves(Rec, Cmd, Mode);
return MGraphBuilder.addNodeToLeaves(Rec, Cmd, Mode);
}
};

Expand Down