Skip to content

Commit dd329d6

Browse files
[SYCL][NFC] Align graph builder functions with the LLVM coding style (#1127)
Change function names to camelCase. Signed-off-by: Sergey Semenov <[email protected]>
1 parent f7f4699 commit dd329d6

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

sycl/include/CL/sycl/detail/scheduler/scheduler.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,11 @@ class Scheduler {
155155
void removeRecordForMemObj(SYCLMemObjI *MemObject);
156156

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

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

165165
std::vector<SYCLMemObjI *> MMemObjs;

sycl/source/detail/scheduler/graph_builder.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Scheduler::GraphBuilder::getOrInsertMemObjRecord(const QueueImplPtr &Queue,
130130
}
131131

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

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

154-
void Scheduler::GraphBuilder::AddNodeToLeaves(MemObjRecord *Record,
154+
void Scheduler::GraphBuilder::addNodeToLeaves(MemObjRecord *Record,
155155
Command *Cmd,
156156
access::mode AccessMode) {
157157
CircularBuffer<Command *> &Leaves{AccessMode == access::mode::read
@@ -191,8 +191,8 @@ UpdateHostRequirementCommand *Scheduler::GraphBuilder::insertUpdateHostReqCmd(
191191
UpdateCommand->addDep(DepDesc{Dep, StoredReq, AllocaCmd});
192192
Dep->addUser(UpdateCommand);
193193
}
194-
UpdateLeaves(Deps, Record, Req->MAccessMode);
195-
AddNodeToLeaves(Record, UpdateCommand, Req->MAccessMode);
194+
updateLeaves(Deps, Record, Req->MAccessMode);
195+
addNodeToLeaves(Record, UpdateCommand, Req->MAccessMode);
196196
return UpdateCommand;
197197
}
198198

@@ -292,8 +292,8 @@ Command *Scheduler::GraphBuilder::insertMemoryMove(MemObjRecord *Record,
292292
NewCmd->addDep(DepDesc{Dep, NewCmd->getRequirement(), AllocaCmdDst});
293293
Dep->addUser(NewCmd);
294294
}
295-
UpdateLeaves(Deps, Record, access::mode::read_write);
296-
AddNodeToLeaves(Record, NewCmd, access::mode::read_write);
295+
updateLeaves(Deps, Record, access::mode::read_write);
296+
addNodeToLeaves(Record, NewCmd, access::mode::read_write);
297297
Record->MCurContext = Queue->getContextImplPtr();
298298
return NewCmd;
299299
}
@@ -330,8 +330,8 @@ Command *Scheduler::GraphBuilder::addCopyBack(Requirement *Req) {
330330
Dep->addUser(MemCpyCmd);
331331
}
332332

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

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

373373
Req->MBlockedCmd = EmptyCmd;
374374

@@ -504,7 +504,7 @@ AllocaCommandBase *Scheduler::GraphBuilder::getOrCreateAllocaForReq(
504504
auto *ParentAlloca =
505505
getOrCreateAllocaForReq(Record, &ParentRequirement, Queue);
506506
AllocaCmd = new AllocaSubBufCommand(Queue, *Req, ParentAlloca);
507-
UpdateLeaves(findDepsForReq(Record, Req, Queue->getContextImplPtr()),
507+
updateLeaves(findDepsForReq(Record, Req, Queue->getContextImplPtr()),
508508
Record, access::mode::read_write);
509509
} else {
510510

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

631631
// Register all the events as dependencies

sycl/test/scheduler/FinishedCmdCleanup.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ int main() {
6060

6161
FakeCommand LeafB{detail::getSyclObjImpl(Queue), FakeReqB};
6262
addEdge(&LeafB, &AllocaB, &AllocaB);
63-
TS.AddNodeToLeaves(RecC, &LeafB);
63+
TS.addNodeToLeaves(RecC, &LeafB);
6464

6565
FakeCommand LeafA{detail::getSyclObjImpl(Queue), FakeReqA};
6666
addEdge(&LeafA, InnerC, &AllocaA);
67-
TS.AddNodeToLeaves(RecC, &LeafA);
67+
TS.addNodeToLeaves(RecC, &LeafA);
6868

6969
FakeCommand *InnerB = new FakeCommandWithCallback(
7070
detail::getSyclObjImpl(Queue), FakeReqB, Callback);

sycl/test/scheduler/LeafLimit.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ int main() {
4343
}
4444
// Add edges as leaves and exceed the leaf limit
4545
for (auto LeafPtr : LeavesToAdd) {
46-
TS.AddNodeToLeaves(Rec, LeafPtr);
46+
TS.addNodeToLeaves(Rec, LeafPtr);
4747
}
4848
// Check that the oldest leaf has been removed from the leaf list
4949
// and added as a dependency of the newest one instead

sycl/test/scheduler/SchedulerTestUtils.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ class TestScheduler : public cl::sycl::detail::Scheduler {
5555
MGraphBuilder.cleanupCommandsForRecord(Rec);
5656
}
5757

58-
void AddNodeToLeaves(
58+
void addNodeToLeaves(
5959
cl::sycl::detail::MemObjRecord *Rec, cl::sycl::detail::Command *Cmd,
6060
cl::sycl::access::mode Mode = cl::sycl::access::mode::read_write) {
61-
return MGraphBuilder.AddNodeToLeaves(Rec, Cmd, Mode);
61+
return MGraphBuilder.addNodeToLeaves(Rec, Cmd, Mode);
6262
}
6363
};
6464

0 commit comments

Comments
 (0)