[SYCL][Graph] Verbose E2E error messages

The current error output from Graph E2E tests isn't particularly informative on the data that caused an assert to fail verification. As asserts are done on the whole container, rather than individual values. This change verifies each value individually so that a more informative error message can be printed when the assert fails. This is helpful for debugging issues that appear in CI but are hard to reproduce locally. Co-authored-by: Maxime France-Pillois <maxime.francepillois@codeplay.com>
reble · Oct 26, 2023 · d65e8d9 · d65e8d9
1 parent 8d7396d
commit d65e8d9
Show file tree

Hide file tree

Showing 48 changed files with 198 additions and 133 deletions.
diff --git a/sycl/test-e2e/Graph/Explicit/depends_on.cpp b/sycl/test-e2e/Graph/Explicit/depends_on.cpp
@@ -37,11 +37,11 @@ int main() {
 
  Queue.submit([&](handler &CGH) { CGH.ext_oneapi_graph(ExecGraph); }).wait();
 
- constexpr int ref = 42 * 2;
+ constexpr int Ref = 42 * 2;
  std::vector<int> Output(N);
  Queue.memcpy(Output.data(), Arr, N * sizeof(int)).wait();
- for (int i = 0; i < N; i++)
- assert(Output[i] == ref);
+ for (size_t i = 0; i < N; i++)
+ assert(check_value(i, Output[i], Ref, "Ref"));
 
  sycl::free(Arr, Queue);
 

diff --git a/sycl/test-e2e/Graph/Explicit/enqueue_ordering.cpp b/sycl/test-e2e/Graph/Explicit/enqueue_ordering.cpp
@@ -80,8 +80,9 @@ int main() {
 
  Queue.wait();
 
+ const int Expected = 22;
  for (size_t i = 0; i < N; i++) {
- assert(Arr[i] == 22);
+ assert(check_value(i, Arr[i], Expected, "Expected"));
  }
 
  // Free the allocated memory

diff --git a/sycl/test-e2e/Graph/Explicit/node_ordering.cpp b/sycl/test-e2e/Graph/Explicit/node_ordering.cpp
@@ -42,8 +42,9 @@ int main() {
  std::vector<int> Output(N);
  Queue.memcpy(Output.data(), X, N * sizeof(int)).wait();
 
- for (int i = 0; i < N; i++)
- assert(Output[i] == 8);
+ const int Expected = 8;
+ for (size_t i = 0; i < N; i++)
+ assert(check_value(i, Output[i], Expected, "Expected"));
 
  sycl::free(X, Queue);
 

diff --git a/sycl/test-e2e/Graph/Explicit/single_node.cpp b/sycl/test-e2e/Graph/Explicit/single_node.cpp
@@ -31,20 +31,22 @@ int main() {
 
  std::vector<int> Output(N);
  Queue.memcpy(Output.data(), Arr, N * sizeof(int)).wait();
- for (int i = 0; i < N; i++)
- assert(Output[i] == 0);
+ int Expected = 0;
+ for (size_t i = 0; i < N; i++)
+ assert(check_value(i, Output[i], Expected, "Expected"));
 
  auto ExecGraph = Graph.finalize();
 
  Queue.memcpy(Output.data(), Arr, N * sizeof(int)).wait();
- for (int i = 0; i < N; i++)
- assert(Output[i] == 0);
+ for (size_t i = 0; i < N; i++)
+ assert(check_value(i, Output[i], Expected, "Expected"));
 
  Queue.submit([&](handler &CGH) { CGH.ext_oneapi_graph(ExecGraph); }).wait();
 
  Queue.memcpy(Output.data(), Arr, N * sizeof(int)).wait();
- for (int i = 0; i < N; i++)
- assert(Output[i] == 3);
+ Expected = 3;
+ for (size_t i = 0; i < N; i++)
+ assert(check_value(i, Output[i], Expected, "Expected"));
 
  sycl::free(Arr, Queue);
 

diff --git a/sycl/test-e2e/Graph/Inputs/add_nodes_after_finalize.cpp b/sycl/test-e2e/Graph/Inputs/add_nodes_after_finalize.cpp
@@ -85,8 +85,10 @@ int main() {
  free(PtrC, Queue);
  free(PtrOut, Queue);
 
- assert(ReferenceC == DataC);
- assert(ReferenceOut == DataOut);
+ for (size_t i = 0; i < Size; i++) {
+ assert(check_value(i, ReferenceC[i], DataC[i], "DataC"));
+ assert(check_value(i, ReferenceOut[i], DataOut[i], "DataOut"));
+ }
 
  return 0;
 }
diff --git a/sycl/test-e2e/Graph/Inputs/basic_buffer.cpp b/sycl/test-e2e/Graph/Inputs/basic_buffer.cpp
@@ -51,9 +51,9 @@ int main() {
  host_accessor HostAccC(BufferC);
 
  for (size_t i = 0; i < Size; i++) {
- assert(ReferenceA[i] == HostAccA[i]);
- assert(ReferenceB[i] == HostAccB[i]);
- assert(ReferenceC[i] == HostAccC[i]);
+ assert(check_value(i, ReferenceA[i], HostAccA[i], "HostAccA"));
+ assert(check_value(i, ReferenceB[i], HostAccB[i], "HostAccB"));
+ assert(check_value(i, ReferenceC[i], HostAccC[i], "HostAccC"));
  }
 
  return 0;

diff --git a/sycl/test-e2e/Graph/Inputs/basic_usm.cpp b/sycl/test-e2e/Graph/Inputs/basic_usm.cpp
@@ -63,9 +63,11 @@ int main() {
  free(PtrB, Queue);
  free(PtrC, Queue);
 
- assert(ReferenceA == DataA);
- assert(ReferenceB == DataB);
- assert(ReferenceC == DataC);
+ for (size_t i = 0; i < Size; i++) {
+ assert(check_value(i, ReferenceA[i], DataA[i], "DataA"));
+ assert(check_value(i, ReferenceB[i], DataB[i], "DataB"));
+ assert(check_value(i, ReferenceC[i], DataC[i], "DataC"));
+ }
 
  return 0;
 }
diff --git a/sycl/test-e2e/Graph/Inputs/basic_usm_host.cpp b/sycl/test-e2e/Graph/Inputs/basic_usm_host.cpp
@@ -58,9 +58,11 @@ int main() {
  free(PtrB, Queue);
  free(PtrC, Queue);
 
- assert(ReferenceA == DataA);
- assert(ReferenceB == DataB);
- assert(ReferenceC == DataC);
+ for (size_t i = 0; i < Size; i++) {
+ assert(check_value(i, ReferenceA[i], DataA[i], "DataA"));
+ assert(check_value(i, ReferenceB[i], DataB[i], "DataB"));
+ assert(check_value(i, ReferenceC[i], DataC[i], "DataC"));
+ }
 
  return 0;
 }
diff --git a/sycl/test-e2e/Graph/Inputs/basic_usm_mixed.cpp b/sycl/test-e2e/Graph/Inputs/basic_usm_mixed.cpp
@@ -61,9 +61,11 @@ int main() {
  free(PtrB, Queue);
  free(PtrC, Queue);
 
- assert(ReferenceA == DataA);
- assert(ReferenceB == DataB);
- assert(ReferenceC == DataC);
+ for (size_t i = 0; i < Size; i++) {
+ assert(check_value(i, ReferenceA[i], DataA[i], "DataA"));
+ assert(check_value(i, ReferenceB[i], DataB[i], "DataB"));
+ assert(check_value(i, ReferenceC[i], DataC[i], "DataC"));
+ }
 
  return 0;
 }
diff --git a/sycl/test-e2e/Graph/Inputs/basic_usm_shared.cpp b/sycl/test-e2e/Graph/Inputs/basic_usm_shared.cpp
@@ -58,9 +58,11 @@ int main() {
  free(PtrB, Queue);
  free(PtrC, Queue);
 
- assert(ReferenceA == DataA);
- assert(ReferenceB == DataB);
- assert(ReferenceC == DataC);
+ for (size_t i = 0; i < Size; i++) {
+ assert(check_value(i, ReferenceA[i], DataA[i], "DataA"));
+ assert(check_value(i, ReferenceB[i], DataB[i], "DataB"));
+ assert(check_value(i, ReferenceC[i], DataC[i], "DataC"));
+ }
 
  return 0;
 }
diff --git a/sycl/test-e2e/Graph/Inputs/basic_usm_system.cpp b/sycl/test-e2e/Graph/Inputs/basic_usm_system.cpp
@@ -57,9 +57,11 @@ int main() {
  free(PtrB, Queue);
  delete[] PtrC;
 
- assert(ReferenceA == DataA);
- assert(ReferenceB == DataB);
- assert(ReferenceC == DataC);
+ for (size_t i = 0; i < Size; i++) {
+ assert(check_value(i, ReferenceA[i], DataA[i], "DataA"));
+ assert(check_value(i, ReferenceB[i], DataB[i], "DataB"));
+ assert(check_value(i, ReferenceC[i], DataC[i], "DataC"));
+ }
 
  return 0;
 }
diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy.cpp
@@ -16,7 +16,7 @@ int main() {
 
  // Create reference data for output
  std::vector<T> ReferenceA(DataA), ReferenceB(DataB), ReferenceC(DataC);
- for (unsigned i = 0; i < Iterations; i++) {
+ for (size_t i = 0; i < Iterations; i++) {
  for (size_t j = 0; j < Size; j++) {
  ReferenceA[j] = ReferenceB[j];
  ReferenceA[j] += ModValue;
@@ -120,9 +120,9 @@ int main() {
  host_accessor HostAccC(BufferC);
 
  for (size_t i = 0; i < Size; i++) {
- assert(ReferenceA[i] == HostAccA[i]);
- assert(ReferenceB[i] == HostAccB[i]);
- assert(ReferenceC[i] == HostAccC[i]);
+ assert(check_value(i, ReferenceA[i], HostAccA[i], "HostAccA"));
+ assert(check_value(i, ReferenceB[i], HostAccB[i], "HostAccB"));
+ assert(check_value(i, ReferenceC[i], HostAccC[i], "HostAccC"));
  }
 
  return 0;

diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy_2d.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy_2d.cpp
@@ -17,7 +17,7 @@ int main() {
 
  // Create reference data for output
  std::vector<T> ReferenceA(DataA), ReferenceB(DataB), ReferenceC(DataC);
- for (unsigned i = 0; i < Iterations; i++) {
+ for (size_t i = 0; i < Iterations; i++) {
  for (size_t j = 0; j < Size * Size; j++) {
  ReferenceA[j] = ReferenceB[j];
  ReferenceA[j] += ModValue;
@@ -116,9 +116,10 @@ int main() {
 
  for (size_t i = 0; i < Size; i++) {
  for (size_t j = 0; j < Size; j++) {
- assert(ReferenceA[i * Size + j] == HostAccA[i][j]);
- assert(ReferenceB[i * Size + j] == HostAccB[i][j]);
- assert(ReferenceC[i * Size + j] == HostAccC[i][j]);
+ const size_t index = i * Size + j;
+ assert(check_value(index, ReferenceA[index], HostAccA[i][j], "HostAccA"));
+ assert(check_value(index, ReferenceB[index], HostAccB[i][j], "HostAccB"));
+ assert(check_value(index, ReferenceC[index], HostAccC[i][j], "HostAccC"));
  }
  }
 

diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy_host2target.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy_host2target.cpp
@@ -38,7 +38,7 @@ int main() {
  host_accessor HostAccA(BufferA);
 
  for (size_t i = 0; i < Size; i++) {
- assert(ReferenceA[i] == HostAccA[i]);
+ assert(check_value(i, ReferenceA[i], HostAccA[i], "HostAccA"));
  }
 
  return 0;

diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy_host2target_2d.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy_host2target_2d.cpp
@@ -39,7 +39,8 @@ int main() {
 
  for (size_t i = 0; i < Size; i++) {
  for (size_t j = 0; j < Size; j++) {
- assert(ReferenceA[i * Size + j] == HostAccA[i][j]);
+ const size_t index = i * Size + j;
+ assert(check_value(index, ReferenceA[index], HostAccA[i][j], "HostAccA"));
  }
  }
 

diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy_host2target_offset.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy_host2target_offset.cpp
@@ -42,7 +42,7 @@ int main() {
  host_accessor HostAccA(BufferA);
 
  for (size_t i = 0; i < Size + Offset; i++) {
- assert(ReferenceA[i] == HostAccA[i]);
+ assert(check_value(i, ReferenceA[i], HostAccA[i], "HostAccA"));
  }
 
  return 0;

diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy_offsets.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy_offsets.cpp
@@ -53,8 +53,8 @@ int main() {
  host_accessor HostAccB(BufferB);
 
  for (size_t i = 0; i < Size; i++) {
- assert(ReferenceA[i] == HostAccA[i]);
- assert(ReferenceB[i] == HostAccB[i]);
+ assert(check_value(i, ReferenceA[i], HostAccA[i], "HostAccA"));
+ assert(check_value(i, ReferenceB[i], HostAccB[i], "HostAccB"));
  }
 
  return 0;

diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy_target2host.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy_target2host.cpp
@@ -37,8 +37,8 @@ int main() {
  }
 
  for (size_t i = 0; i < Size; i++) {
- assert(ReferenceA[i] == DataA[i]);
- assert(ReferenceB[i] == DataB[i]);
+ assert(check_value(i, ReferenceA[i], DataA[i], "DataA"));
+ assert(check_value(i, ReferenceB[i], DataB[i], "DataB"));
  }
 
  return 0;

diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy_target2host_2d.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy_target2host_2d.cpp
@@ -40,8 +40,8 @@ int main() {
  host_accessor HostAccA(BufferA);
 
  for (size_t i = 0; i < Size * Size; i++) {
- assert(ReferenceA[i] == DataA[i]);
- assert(ReferenceB[i] == DataB[i]);
+ assert(check_value(i, ReferenceA[i], DataA[i], "DataA"));
+ assert(check_value(i, ReferenceB[i], DataB[i], "DataB"));
  }
 
  return 0;

diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy_target2host_offset.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy_target2host_offset.cpp
@@ -41,8 +41,8 @@ int main() {
  }
 
  for (size_t i = 0; i < Size; i++) {
- assert(ReferenceA[i] == DataA[i]);
- assert(ReferenceB[i] == DataB[i]);
+ assert(check_value(i, ReferenceA[i], DataA[i], "DataA"));
+ assert(check_value(i, ReferenceB[i], DataB[i], "DataB"));
  }
 
  return 0;

diff --git a/sycl/test-e2e/Graph/Inputs/buffer_ordering.cpp b/sycl/test-e2e/Graph/Inputs/buffer_ordering.cpp
@@ -44,8 +44,9 @@ int main() {
  });
  });
 
+ const int Zero = 0;
  for (size_t i = 0; i < N; i++) {
- assert(Arr[i] == 0);
+ assert(check_value(i, Arr[i], Zero, "Zero"));
  }
 
  // Buffer elements set to 4
@@ -60,7 +61,7 @@ int main() {
  auto ExecGraph = Graph.finalize();
 
  for (size_t i = 0; i < N; i++) {
- assert(Arr[i] == 0);
+ assert(check_value(i, Arr[i], Zero, "Zero"));
  }
 
  // Buffer elements set to 8
@@ -96,8 +97,9 @@ int main() {
  Queue.wait();
  }
 
+ const int Expected = 22;
  for (size_t i = 0; i < N; i++) {
- assert(Arr[i] == 22);
+ assert(check_value(i, Arr[i], Expected, "Expected"));
  }
 
  return 0;

diff --git a/sycl/test-e2e/Graph/Inputs/double_buffer.cpp b/sycl/test-e2e/Graph/Inputs/double_buffer.cpp
@@ -56,7 +56,7 @@ int main() {
  add_nodes(GraphUpdate, Queue, Size, PtrA, PtrB, PtrC);
 
  event Event;
- for (unsigned i = 0; i < Iterations; i++) {
+ for (size_t i = 0; i < Iterations; i++) {
  Event = Queue.submit([&](handler &CGH) {
  CGH.depends_on(Event);
  CGH.ext_oneapi_graph(ExecGraph);
@@ -90,13 +90,15 @@ int main() {
  free(PtrB2, Queue);
  free(PtrC2, Queue);
 
- assert(ReferenceA == DataA);
- assert(ReferenceB == DataB);
- assert(ReferenceC == DataC);
+ for (size_t i = 0; i < Size; i++) {
+ assert(check_value(i, ReferenceA[i], DataA[i], "DataA"));
+ assert(check_value(i, ReferenceB[i], DataB[i], "DataB"));
+ assert(check_value(i, ReferenceC[i], DataC[i], "DataC"));
 
- assert(ReferenceA2 == DataA2);
- assert(ReferenceB2 == DataB2);
- assert(ReferenceC2 == DataC2);
+ assert(check_value(i, ReferenceA2[i], DataA2[i], "DataA2"));
+ assert(check_value(i, ReferenceB2[i], DataB2[i], "DataB2"));
+ assert(check_value(i, ReferenceC2[i], DataC2[i], "DataC2"));
+ }
 
  return 0;
 }
diff --git a/sycl/test-e2e/Graph/Inputs/empty_node.cpp b/sycl/test-e2e/Graph/Inputs/empty_node.cpp
@@ -50,8 +50,9 @@ int main() {
  std::vector<int> HostData(N);
  Queue.memcpy(HostData.data(), Arr, N * sizeof(int)).wait();
 
- for (int i = 0; i < N; i++)
- assert(HostData[i] == 1);
+ const int Expected = 1;
+ for (size_t i = 0; i < N; i++)
+ assert(check_value(i, HostData[i], Expected, "Expected"));
 
  sycl::free(Arr, Queue);
 

diff --git a/sycl/test-e2e/Graph/Inputs/event_status_querying.cpp b/sycl/test-e2e/Graph/Inputs/event_status_querying.cpp
@@ -137,9 +137,9 @@ int main() {
  host_accessor HostAccC(BufferC);
 
  for (size_t i = 0; i < Size; i++) {
- assert(ReferenceA[i] == HostAccA[i]);
- assert(ReferenceB[i] == HostAccB[i]);
- assert(ReferenceC[i] == HostAccC[i]);
+ assert(check_value(i, ReferenceA[i], HostAccA[i], "HostAccA"));
+ assert(check_value(i, ReferenceB[i], HostAccB[i], "HostAccB"));
+ assert(check_value(i, ReferenceC[i], HostAccC[i], "HostAccC"));
  }
 
  return 0;

diff --git a/sycl/test-e2e/Graph/Inputs/executable_graph_update.cpp b/sycl/test-e2e/Graph/Inputs/executable_graph_update.cpp
@@ -89,13 +89,15 @@ int main() {
  free(PtrB2, Queue);
  free(PtrC2, Queue);
 
- assert(ReferenceA == DataA);
- assert(ReferenceB == DataB);
- assert(ReferenceC == DataC);
-
- assert(ReferenceA == DataA2);
- assert(ReferenceB == DataB2);
- assert(ReferenceC == DataC2);
+ for (size_t i = 0; i < Size; i++) {
+ assert(check_value(i, ReferenceA[i], DataA[i], "DataA"));
+ assert(check_value(i, ReferenceB[i], DataB[i], "DataB"));
+ assert(check_value(i, ReferenceC[i], DataC[i], "DataC"));
+
+ assert(check_value(i, ReferenceA[i], DataA2[i], "DataA2"));
+ assert(check_value(i, ReferenceB[i], DataB2[i], "DataB2"));
+ assert(check_value(i, ReferenceC[i], DataC2[i], "DataC2"));
+ }
 
  return 0;
 }