Skip to content

Commit b3cf214

Browse files
author
Ewan Crawford
committed
Use TestKernel helper in unittests
1 parent 824096f commit b3cf214

File tree

1 file changed

+24
-23
lines changed

1 file changed

+24
-23
lines changed

‎sycl/unittests/Extensions/CommandGraph.cpp‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <detail/config.hpp>
1515
#include <helpers/PiMock.hpp>
1616
#include <helpers/ScopedEnvVar.hpp>
17+
#include <helpers/TestKernel.hpp>
1718

1819
#include <gtest/gtest.h>
1920

@@ -57,7 +58,7 @@ TEST_F(CommandGraphTest, AddNode) {
5758
ASSERT_TRUE(GraphImpl->MRoots.empty());
5859

5960
auto Node1 = Graph.add(
60-
[&](sycl::handler &cgh) { cgh.single_task<class TestKernel>([]() {}); });
61+
[&](sycl::handler &cgh) { cgh.single_task<TestKernel<>>([]() {}); });
6162
ASSERT_NE(sycl::detail::getSyclObjImpl(Node1), nullptr);
6263
ASSERT_FALSE(sycl::detail::getSyclObjImpl(Node1)->isEmpty());
6364
ASSERT_EQ(GraphImpl->MRoots.size(), 1lu);
@@ -112,17 +113,17 @@ TEST_F(CommandGraphTest, Finalize) {
112113
sycl::buffer<int> Buf(1);
113114
auto Node1 = Graph.add([&](sycl::handler &cgh) {
114115
sycl::accessor A(Buf, cgh, sycl::write_only, sycl::no_init);
115-
cgh.single_task<class TestKernel1>([=]() { A[0] = 1; });
116+
cgh.single_task<TestKernel<>>([]() {});
116117
});
117118

118119
// Add independent node
119120
auto Node2 = Graph.add(
120-
[&](sycl::handler &cgh) { cgh.single_task<class TestKernel>([]() {}); });
121+
[&](sycl::handler &cgh) { cgh.single_task<TestKernel<>>([]() {}); });
121122

122123
// Add a node that depends on Node1 due to the accessor
123124
auto Node3 = Graph.add([&](sycl::handler &cgh) {
124125
sycl::accessor A(Buf, cgh, sycl::write_only, sycl::no_init);
125-
cgh.single_task<class TestKernel2>([=]() { A[0] = 3; });
126+
cgh.single_task<TestKernel<>>([]() {});
126127
});
127128

128129
// Guarantee order of independent nodes 1 and 2
@@ -148,7 +149,7 @@ TEST_F(CommandGraphTest, MakeEdge) {
148149

149150
// Add two independent nodes
150151
auto Node1 = Graph.add(
151-
[&](sycl::handler &cgh) { cgh.single_task<class TestKernel>([]() {}); });
152+
[&](sycl::handler &cgh) { cgh.single_task<TestKernel<>>([]() {}); });
152153
auto Node2 = Graph.add([&](sycl::handler &cgh) {});
153154
ASSERT_EQ(GraphImpl->MRoots.size(), 2ul);
154155
ASSERT_TRUE(sycl::detail::getSyclObjImpl(Node1)->MSuccessors.empty());
@@ -242,7 +243,7 @@ TEST_F(CommandGraphTest, BeginEndRecording) {
242243
TEST_F(CommandGraphTest, GetCGCopy) {
243244
auto Node1 = Graph.add([&](sycl::handler &cgh) {});
244245
auto Node2 = Graph.add(
245-
[&](sycl::handler &cgh) { cgh.single_task<class TestKernel>([]() {}); },
246+
[&](sycl::handler &cgh) { cgh.single_task<TestKernel<>>([]() {}); },
246247
{experimental::property::node::depends_on(Node1)});
247248

248249
// Get copy of CG of Node2 and check equality
@@ -264,21 +265,21 @@ TEST_F(CommandGraphTest, GetCGCopy) {
264265
TEST_F(CommandGraphTest, SubGraph) {
265266
// Add sub-graph with two nodes
266267
auto Node1Graph = Graph.add(
267-
[&](sycl::handler &cgh) { cgh.single_task<class TestKernel>([]() {}); });
268+
[&](sycl::handler &cgh) { cgh.single_task<TestKernel<>>([]() {}); });
268269
auto Node2Graph = Graph.add(
269-
[&](sycl::handler &cgh) { cgh.single_task<class TestKernel>([]() {}); },
270+
[&](sycl::handler &cgh) { cgh.single_task<TestKernel<>>([]() {}); },
270271
{experimental::property::node::depends_on(Node1Graph)});
271272
auto GraphExec = Graph.finalize();
272273

273274
// Add node to main graph followed by sub-graph and another node
274275
experimental::command_graph MainGraph(Queue.get_context(), Dev);
275276
auto Node1MainGraph = MainGraph.add(
276-
[&](sycl::handler &cgh) { cgh.single_task<class TestKernel>([]() {}); });
277+
[&](sycl::handler &cgh) { cgh.single_task<TestKernel<>>([]() {}); });
277278
auto Node2MainGraph =
278279
MainGraph.add([&](handler &CGH) { CGH.ext_oneapi_graph(GraphExec); },
279280
{experimental::property::node::depends_on(Node1MainGraph)});
280281
auto Node3MainGraph = MainGraph.add(
281-
[&](sycl::handler &cgh) { cgh.single_task<class TestKernel>([]() {}); },
282+
[&](sycl::handler &cgh) { cgh.single_task<TestKernel<>>([]() {}); },
282283
{experimental::property::node::depends_on(Node2MainGraph)});
283284

284285
// Assert order of the added sub-graph
@@ -466,10 +467,10 @@ TEST_F(CommandGraphTest, RecordSubGraph) {
466467
// Record sub-graph with two nodes
467468
Graph.begin_recording(Queue);
468469
auto Node1Graph = Queue.submit(
469-
[&](sycl::handler &cgh) { cgh.single_task<class TestKernel>([]() {}); });
470+
[&](sycl::handler &cgh) { cgh.single_task<TestKernel<>>([]() {}); });
470471
auto Node2Graph = Queue.submit([&](sycl::handler &cgh) {
471472
cgh.depends_on(Node1Graph);
472-
cgh.single_task<class TestKernel>([]() {});
473+
cgh.single_task<TestKernel<>>([]() {});
473474
});
474475
Graph.end_recording(Queue);
475476
auto GraphExec = Graph.finalize();
@@ -478,14 +479,14 @@ TEST_F(CommandGraphTest, RecordSubGraph) {
478479
experimental::command_graph MainGraph(Queue.get_context(), Dev);
479480
MainGraph.begin_recording(Queue);
480481
auto Node1MainGraph = Queue.submit(
481-
[&](sycl::handler &cgh) { cgh.single_task<class TestKernel>([]() {}); });
482+
[&](sycl::handler &cgh) { cgh.single_task<TestKernel<>>([]() {}); });
482483
auto Node2MainGraph = Queue.submit([&](handler &cgh) {
483484
cgh.depends_on(Node1MainGraph);
484485
cgh.ext_oneapi_graph(GraphExec);
485486
});
486487
auto Node3MainGraph = Queue.submit([&](sycl::handler &cgh) {
487488
cgh.depends_on(Node2MainGraph);
488-
cgh.single_task<class TestKernel>([]() {});
489+
cgh.single_task<TestKernel<>>([]() {});
489490
});
490491
MainGraph.end_recording(Queue);
491492

@@ -541,7 +542,7 @@ TEST_F(CommandGraphTest, InOrderQueue) {
541542
// Record in-order queue with three nodes
542543
InOrderGraph.begin_recording(InOrderQueue);
543544
auto Node1Graph = InOrderQueue.submit(
544-
[&](sycl::handler &cgh) { cgh.single_task<class TestKernel>([]() {}); });
545+
[&](sycl::handler &cgh) { cgh.single_task<TestKernel<>>([]() {}); });
545546

546547
auto PtrNode1 =
547548
sycl::detail::getSyclObjImpl(InOrderGraph)
@@ -550,7 +551,7 @@ TEST_F(CommandGraphTest, InOrderQueue) {
550551
ASSERT_TRUE(PtrNode1->MPredecessors.empty());
551552

552553
auto Node2Graph = InOrderQueue.submit(
553-
[&](sycl::handler &cgh) { cgh.single_task<class TestKernel>([]() {}); });
554+
[&](sycl::handler &cgh) { cgh.single_task<TestKernel<>>([]() {}); });
554555

555556
auto PtrNode2 =
556557
sycl::detail::getSyclObjImpl(InOrderGraph)
@@ -563,7 +564,7 @@ TEST_F(CommandGraphTest, InOrderQueue) {
563564
ASSERT_EQ(PtrNode2->MPredecessors.front().lock(), PtrNode1);
564565

565566
auto Node3Graph = InOrderQueue.submit(
566-
[&](sycl::handler &cgh) { cgh.single_task<class TestKernel>([]() {}); });
567+
[&](sycl::handler &cgh) { cgh.single_task<TestKernel<>>([]() {}); });
567568

568569
auto PtrNode3 =
569570
sycl::detail::getSyclObjImpl(InOrderGraph)
@@ -601,7 +602,7 @@ TEST_F(CommandGraphTest, InOrderQueueWithEmpty) {
601602
// node
602603
InOrderGraph.begin_recording(InOrderQueue);
603604
auto Node1Graph = InOrderQueue.submit(
604-
[&](sycl::handler &cgh) { cgh.single_task<class TestKernel>([]() {}); });
605+
[&](sycl::handler &cgh) { cgh.single_task<TestKernel<>>([]() {}); });
605606

606607
auto PtrNode1 =
607608
sycl::detail::getSyclObjImpl(InOrderGraph)
@@ -622,7 +623,7 @@ TEST_F(CommandGraphTest, InOrderQueueWithEmpty) {
622623
ASSERT_EQ(PtrNode2->MPredecessors.front().lock(), PtrNode1);
623624

624625
auto Node3Graph = InOrderQueue.submit(
625-
[&](sycl::handler &cgh) { cgh.single_task<class TestKernel>([]() {}); });
626+
[&](sycl::handler &cgh) { cgh.single_task<TestKernel<>>([]() {}); });
626627

627628
auto PtrNode3 =
628629
sycl::detail::getSyclObjImpl(InOrderGraph)
@@ -669,7 +670,7 @@ TEST_F(CommandGraphTest, InOrderQueueWithEmptyFirst) {
669670
ASSERT_TRUE(PtrNode1->MPredecessors.empty());
670671

671672
auto Node2Graph = InOrderQueue.submit(
672-
[&](sycl::handler &cgh) { cgh.single_task<class TestKernel>([]() {}); });
673+
[&](sycl::handler &cgh) { cgh.single_task<TestKernel<>>([]() {}); });
673674

674675
auto PtrNode2 =
675676
sycl::detail::getSyclObjImpl(InOrderGraph)
@@ -682,7 +683,7 @@ TEST_F(CommandGraphTest, InOrderQueueWithEmptyFirst) {
682683
ASSERT_EQ(PtrNode2->MPredecessors.front().lock(), PtrNode1);
683684

684685
auto Node3Graph = InOrderQueue.submit(
685-
[&](sycl::handler &cgh) { cgh.single_task<class TestKernel>([]() {}); });
686+
[&](sycl::handler &cgh) { cgh.single_task<TestKernel<>>([]() {}); });
686687

687688
auto PtrNode3 =
688689
sycl::detail::getSyclObjImpl(InOrderGraph)
@@ -721,7 +722,7 @@ TEST_F(CommandGraphTest, InOrderQueueWithEmptyLast) {
721722
// Record in-order queue with two regular nodes then an empty node
722723
InOrderGraph.begin_recording(InOrderQueue);
723724
auto Node1Graph = InOrderQueue.submit(
724-
[&](sycl::handler &cgh) { cgh.single_task<class TestKernel>([]() {}); });
725+
[&](sycl::handler &cgh) { cgh.single_task<TestKernel<>>([]() {}); });
725726

726727
auto PtrNode1 =
727728
sycl::detail::getSyclObjImpl(InOrderGraph)
@@ -730,7 +731,7 @@ TEST_F(CommandGraphTest, InOrderQueueWithEmptyLast) {
730731
ASSERT_TRUE(PtrNode1->MPredecessors.empty());
731732

732733
auto Node2Graph = InOrderQueue.submit(
733-
[&](sycl::handler &cgh) { cgh.single_task<class TestKernel>([]() {}); });
734+
[&](sycl::handler &cgh) { cgh.single_task<TestKernel<>>([]() {}); });
734735

735736
auto PtrNode2 =
736737
sycl::detail::getSyclObjImpl(InOrderGraph)

0 commit comments

Comments
 (0)