@@ -21,11 +21,14 @@ using namespace cl::sycl;
21
21
// overflowed.
22
22
TEST_F (SchedulerTest, LeafLimit) {
23
23
MockScheduler MS;
24
+ std::vector<std::unique_ptr<MockCommand>> LeavesToAdd;
25
+ std::unique_ptr<MockCommand> MockDepCmd;
24
26
25
27
buffer<int , 1 > Buf (range<1 >(1 ));
26
28
detail::Requirement MockReq = getMockRequirement (Buf);
27
- MockCommand *MockDepCmd =
28
- new MockCommand (detail::getSyclObjImpl (MQueue), MockReq);
29
+
30
+ MockDepCmd =
31
+ std::make_unique<MockCommand>(detail::getSyclObjImpl (MQueue), MockReq);
29
32
detail::MemObjRecord *Rec =
30
33
MS.getOrInsertMemObjRecord (detail::getSyclObjImpl (MQueue), &MockReq);
31
34
@@ -34,16 +37,17 @@ TEST_F(SchedulerTest, LeafLimit) {
34
37
for (std::size_t i = 0 ; i < Rec->MWriteLeaves .genericCommandsCapacity () + 1 ;
35
38
++i) {
36
39
LeavesToAdd.push_back (
37
- new MockCommand (detail::getSyclObjImpl (MQueue), MockReq));
40
+ std::make_unique< MockCommand> (detail::getSyclObjImpl (MQueue), MockReq));
38
41
}
39
42
// Create edges: all soon-to-be leaves are direct users of MockDep
40
- for (auto Leaf : LeavesToAdd) {
41
- MockDepCmd->addUser (Leaf);
42
- Leaf->addDep (detail::DepDesc{MockDepCmd, Leaf->getRequirement (), nullptr });
43
+ for (auto &Leaf : LeavesToAdd) {
44
+ MockDepCmd->addUser (Leaf.get ());
45
+ Leaf->addDep (
46
+ detail::DepDesc{MockDepCmd.get (), Leaf->getRequirement (), nullptr });
43
47
}
44
48
// Add edges as leaves and exceed the leaf limit
45
- for (auto LeafPtr : LeavesToAdd) {
46
- MS.addNodeToLeaves (Rec, LeafPtr);
49
+ for (auto & LeafPtr : LeavesToAdd) {
50
+ MS.addNodeToLeaves (Rec, LeafPtr. get () );
47
51
}
48
52
// Check that the oldest leaf has been removed from the leaf list
49
53
// and added as a dependency of the newest one instead
@@ -52,11 +56,11 @@ TEST_F(SchedulerTest, LeafLimit) {
52
56
ASSERT_TRUE (std::find (Leaves.begin (), Leaves.end (), LeavesToAdd.front ()) ==
53
57
Leaves.end ());
54
58
for (std::size_t i = 1 ; i < LeavesToAdd.size (); ++i) {
55
- assert (std::find (Leaves.begin (), Leaves.end (), LeavesToAdd[i]) !=
59
+ assert (std::find (Leaves.begin (), Leaves.end (), LeavesToAdd[i]. get () ) !=
56
60
Leaves.end ());
57
61
}
58
- MockCommand *OldestLeaf = LeavesToAdd.front ();
59
- MockCommand *NewestLeaf = LeavesToAdd.back ();
62
+ MockCommand *OldestLeaf = LeavesToAdd.front (). get () ;
63
+ MockCommand *NewestLeaf = LeavesToAdd.back (). get () ;
60
64
ASSERT_EQ (OldestLeaf->MUsers .size (), 1U );
61
65
EXPECT_GT (OldestLeaf->MUsers .count (NewestLeaf), 0U );
62
66
ASSERT_EQ (NewestLeaf->MDeps .size (), 2U );
0 commit comments