Skip to content

[SYCL][Graph] Make debug print tests deterministic #12407

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
merged 2 commits into from
Jan 18, 2024
Merged

[SYCL][Graph] Make debug print tests deterministic #12407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e63b3d
[SYCL][Graph] Make debug print tests deterministic
mfrancepillois Jan 16, 2024
b975f52
Removes all unnecessary variables.
mfrancepillois Jan 17, 2024
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
2 changes: 2 additions & 0 deletions sycl/test-e2e/Graph/Explicit/debug_print_graph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@
// CHECK-DAG: "0x[[#NODE4]]" -> "0x[[#NODE5]]
// CHECK-NEXT: "0x[[#%x,NODE6:]]"
// CHECK-SAME: [style=bold, label="ID = 0x[[#NODE6]]\nTYPE = CGCopy Device-to-Host \n"];
// CHECK-DAG: "0x[[#NODE4]]" -> "0x[[#NODE6]]"
// CHECK-NEXT: "0x[[#%x,NODE7:]]"
// CHECK-SAME: [style=bold, label="ID = 0x[[#NODE7]]\nTYPE = None \n"];
// CHECK-DAG: "0x[[#NODE6]]" -> "0x[[#NODE7]]"

#define GRAPH_E2E_EXPLICIT

Expand Down
2 changes: 2 additions & 0 deletions sycl/test-e2e/Graph/Explicit/debug_print_graph_verbose.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@
// CHECK-DAG: "0x[[#NODE4]]" -> "0x[[#NODE5]]
// CHECK-NEXT: "0x[[#%x,NODE6:]]"
// CHECK-SAME: [style=bold, label="ID = 0x[[#NODE6]]\nTYPE = CGCopy Device-to-Host \nSrc: 0x[[#%x,ADDR27:]] Dst: 0x[[#%x,ADDR28:]]\n"];
// CHECK-DAG: "0x[[#NODE4]]" -> "0x[[#NODE6]]"
// CHECK-NEXT: "0x[[#%x,NODE7:]]"
// CHECK-SAME: [style=bold, label="ID = 0x[[#NODE7]]\nTYPE = None \n"];
// CHECK-DAG: "0x[[#NODE6]]" -> "0x[[#NODE7]]"

#define GRAPH_E2E_EXPLICIT

Expand Down
16 changes: 6 additions & 10 deletions sycl/test-e2e/Graph/Inputs/debug_print_graph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,19 @@ int main() {

using T = unsigned short;

std::vector<T> DataA(Size), DataB(Size), DataC(Size);
std::vector<T> DataA2D(Size * Size), DataB2D(Size * Size);
std::vector<T> DataA(Size), DataB(Size), DataC(Size), DataD(Size);

std::iota(DataA.begin(), DataA.end(), 1);
std::iota(DataB.begin(), DataB.end(), 10);
std::iota(DataC.begin(), DataC.end(), 1000);
std::iota(DataA2D.begin(), DataA2D.end(), 1);
std::iota(DataB2D.begin(), DataB2D.end(), 10);
std::iota(DataD.begin(), DataD.end(), 1);

buffer<T> BufferA{DataA.data(), range<1>{DataA.size()}};
BufferA.set_write_back(false);
buffer<T> BufferB{DataB.data(), range<1>{DataB.size()}};
BufferB.set_write_back(false);
buffer<T> BufferC{DataC.data(), range<1>{DataC.size()}};
BufferC.set_write_back(false);
buffer BufferA2D{DataA2D.data(), range<2>(Size, Size)};
BufferA2D.set_write_back(false);
{
exp_ext::command_graph Graph{
Queue.get_context(),
Expand All @@ -45,12 +41,12 @@ int main() {
CGH.copy(AccB, AccA);
});

add_node(Graph, Queue, [&](handler &CGH) {
auto AccA = BufferA2D.get_access<access::mode::read>(CGH);
CGH.copy(AccA, DataB2D.data());
auto Last = add_node(Graph, Queue, [&](handler &CGH) {
auto Acc = BufferC.get_access<access::mode::read>(CGH);
CGH.copy(Acc, DataD.data());
});

add_empty_node(Graph, Queue);
add_empty_node(Graph, Queue, Last);

Graph.print_graph("graph.dot");

Expand Down
16 changes: 6 additions & 10 deletions sycl/test-e2e/Graph/Inputs/debug_print_graph_verbose.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,19 @@ int main() {

using T = unsigned short;

std::vector<T> DataA(Size), DataB(Size), DataC(Size);
std::vector<T> DataA2D(Size * Size), DataB2D(Size * Size);
std::vector<T> DataA(Size), DataB(Size), DataC(Size), DataD(Size);

std::iota(DataA.begin(), DataA.end(), 1);
std::iota(DataB.begin(), DataB.end(), 10);
std::iota(DataC.begin(), DataC.end(), 1000);
std::iota(DataA2D.begin(), DataA2D.end(), 1);
std::iota(DataB2D.begin(), DataB2D.end(), 10);
std::iota(DataD.begin(), DataD.end(), 1);

buffer<T> BufferA{DataA.data(), range<1>{DataA.size()}};
BufferA.set_write_back(false);
buffer<T> BufferB{DataB.data(), range<1>{DataB.size()}};
BufferB.set_write_back(false);
buffer<T> BufferC{DataC.data(), range<1>{DataC.size()}};
BufferC.set_write_back(false);
buffer BufferA2D{DataA2D.data(), range<2>(Size, Size)};
BufferA2D.set_write_back(false);
{
exp_ext::command_graph Graph{
Queue.get_context(),
Expand All @@ -45,12 +41,12 @@ int main() {
CGH.copy(AccB, AccA);
});

add_node(Graph, Queue, [&](handler &CGH) {
auto AccA = BufferA2D.get_access<access::mode::read>(CGH);
CGH.copy(AccA, DataB2D.data());
auto Last = add_node(Graph, Queue, [&](handler &CGH) {
auto AccA = BufferC.get_access<access::mode::read>(CGH);
CGH.copy(AccA, DataD.data());
});

add_node(Graph, Queue, [&](handler &CGH) { /* empty node */ });
add_empty_node(Graph, Queue, Last);

Graph.print_graph("graph_verbose.dot", true);
}
Expand Down
2 changes: 2 additions & 0 deletions sycl/test-e2e/Graph/RecordReplay/debug_print_graph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@
// CHECK-DAG: "0x[[#NODE4]]" -> "0x[[#NODE5]]
// CHECK-NEXT: "0x[[#%x,NODE6:]]"
// CHECK-SAME: [style=bold, label="ID = 0x[[#NODE6]]\nTYPE = CGCopy Device-to-Host \n"];
// CHECK-DAG: "0x[[#NODE4]]" -> "0x[[#NODE6]]"
// CHECK-NEXT: "0x[[#%x,NODE7:]]"
// CHECK-SAME: [style=bold, label="ID = 0x[[#NODE7]]\nTYPE = None \n"];
// CHECK-DAG: "0x[[#NODE6]]" -> "0x[[#NODE7]]"

#define GRAPH_E2E_RECORD_REPLAY

Expand Down
2 changes: 2 additions & 0 deletions sycl/test-e2e/Graph/RecordReplay/debug_print_graph_verbose.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@
// CHECK-DAG: "0x[[#NODE4]]" -> "0x[[#NODE5]]
// CHECK-NEXT: "0x[[#%x,NODE6:]]"
// CHECK-SAME: [style=bold, label="ID = 0x[[#NODE6]]\nTYPE = CGCopy Device-to-Host \nSrc: 0x[[#%x,ADDR27:]] Dst: 0x[[#%x,ADDR28:]]\n"];
// CHECK-DAG: "0x[[#NODE4]]" -> "0x[[#NODE6]]"
// CHECK-NEXT: "0x[[#%x,NODE7:]]"
// CHECK-SAME: [style=bold, label="ID = 0x[[#NODE7]]\nTYPE = None \n"];
// CHECK-DAG: "0x[[#NODE6]]" -> "0x[[#NODE7]]"

#define GRAPH_E2E_RECORD_REPLAY

Expand Down