Skip to content

[SYCL] Detach allocas from their dependencies regardless of linked alloca presence #4573

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
againull merged 3 commits into from
Sep 22, 2021
Merged

[SYCL] Detach allocas from their dependencies regardless of linked alloca presence #4573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dfcf273
[SYCL] Detach allocas from their dependencies regardless of linked al…
abuyukku Sep 14, 2021
096eb8b
Updated comment
abuyukku Sep 17, 2021
cdd6519
Add test
abuyukku Sep 22, 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
12 changes: 6 additions & 6 deletions sycl/source/detail/scheduler/graph_builder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,18 +1027,18 @@ void Scheduler::GraphBuilder::cleanupCommandsForRecord(
AllocaCmd->MUsers.clear();
}

// Linked alloca's share dependencies. Unchain from deps linked alloca's.
// Any cmd of the alloca - linked_alloca may be used later on.
// Make sure the Linked Allocas are marked visited by the previous walk.
// Remove allocation commands from the users of their dependencies.
for (AllocaCommandBase *AllocaCmd : AllocaCommands) {
AllocaCommandBase *LinkedCmd = AllocaCmd->MLinkedAllocaCmd;

if (LinkedCmd) {
assert(LinkedCmd->MMarks.MVisited);

for (DepDesc &Dep : AllocaCmd->MDeps)
if (Dep.MDepCommand)
Dep.MDepCommand->MUsers.erase(AllocaCmd);
}

for (DepDesc &Dep : AllocaCmd->MDeps)
if (Dep.MDepCommand)
Dep.MDepCommand->MUsers.erase(AllocaCmd);
}

// Traverse the graph using BFS
Expand Down
30 changes: 29 additions & 1 deletion sycl/unittests/scheduler/MemObjCommandCleanup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

using namespace cl::sycl;

TEST_F(SchedulerTest, MemObjCommandCleanup) {
TEST_F(SchedulerTest, MemObjCommandCleanupAllocaUsers) {
MockScheduler MS;
buffer<int, 1> BufA(range<1>(1));
buffer<int, 1> BufB(range<1>(1));
Expand Down Expand Up @@ -51,3 +51,31 @@ TEST_F(SchedulerTest, MemObjCommandCleanup) {
EXPECT_EQ(MockDirectUser->MDeps[0].MDepCommand, MockAllocaB.get());
EXPECT_TRUE(IndirectUserDeleted);
}

TEST_F(SchedulerTest, MemObjCommandCleanupAllocaDeps) {
MockScheduler MS;
buffer<int, 1> Buf(range<1>(1));
detail::Requirement MockReq = getMockRequirement(Buf);
std::vector<detail::Command *> AuxCmds;
detail::MemObjRecord *MemObjRec = MS.getOrInsertMemObjRecord(
detail::getSyclObjImpl(MQueue), &MockReq, AuxCmds);

// Create a fake alloca.
detail::AllocaCommand *MockAllocaCmd =
new detail::AllocaCommand(detail::getSyclObjImpl(MQueue), MockReq);
MemObjRec->MAllocaCommands.push_back(MockAllocaCmd);

// Add another mock command and add MockAllocaCmd as its user.
MockCommand DepCmd(detail::getSyclObjImpl(MQueue), MockReq);
addEdge(MockAllocaCmd, &DepCmd, nullptr);

// Check that DepCmd.MUsers size reflect the dependency properly.
ASSERT_EQ(DepCmd.MUsers.size(), 1U);
ASSERT_EQ(DepCmd.MUsers.count(MockAllocaCmd), 1U);

MS.cleanupCommandsForRecord(MemObjRec);
MS.removeRecordForMemObj(detail::getSyclObjImpl(Buf).get());

// Check that DepCmd has its MUsers field cleared.
ASSERT_EQ(DepCmd.MUsers.size(), 0U);
}