Move test to unitest + typo

reble · Feb 29, 2024 · e4ee57e · e4ee57e
1 parent 49630d8
commit e4ee57e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 17 deletions.
diff --git a/sycl/doc/extensions/experimental/sycl_ext_oneapi_graph.asciidoc b/sycl/doc/extensions/experimental/sycl_ext_oneapi_graph.asciidoc
@@ -342,8 +342,9 @@ class assume_buffer_outlives_graph {
     assume_buffer_outlives_graph() = default;
 };
 
-public:
-  enable_profiling() = default;
+class enable_profiling {
+  public:
+    enable_profiling() = default;
 };
 } // namespace graph
 

diff --git a/sycl/test-e2e/Graph/event_profiling_info.cpp b/sycl/test-e2e/Graph/event_profiling_info.cpp
@@ -182,21 +182,6 @@ int main() {
     assert(verifyProfiling(CopyEvent) && verifyProfiling(KernelEvent1) &&
            verifyProfiling(KernelEvent2) &&
            compareProfiling(KernelEvent1, KernelEvent2));
-
-    // Checks exception thrown if profiling is requested while the
-    // enable_profiling property has not been passed to `finalize()`.
-    auto CopyGraphExecInOrder = CopyGraph.finalize();
-    auto EventInOrder = Queue.submit(
-        [&](handler &CGH) { CGH.ext_oneapi_graph(CopyGraphExecInOrder); });
-    Queue.wait_and_throw();
-    bool Success = false;
-    try {
-      EventInOrder
-          .get_profiling_info<sycl::info::event_profiling::command_start>();
-    } catch (sycl::exception &E) {
-      Success = true;
-    }
-    assert(Success);
   }
 
   host_accessor HostData(BufferTo);

diff --git a/sycl/unittests/Extensions/CommandGraph.cpp b/sycl/unittests/Extensions/CommandGraph.cpp
@@ -2265,6 +2265,34 @@ TEST_F(CommandGraphTest, ProfilingException) {
   }
 }
 
+TEST_F(CommandGraphTest, ProfilingExceptionProperty) {
+  Graph.begin_recording(Queue);
+  auto Event1 = Queue.submit(
+      [&](sycl::handler &cgh) { cgh.single_task<TestKernel<>>([]() {}); });
+  Graph.end_recording(Queue);
+
+  // Checks exception thrown if profiling is requested while the
+  // enable_profiling property has not been passed to `finalize()`.
+  auto GraphExecInOrder = Graph.finalize();
+  queue QueueProfile{Dev, {sycl::property::queue::enable_profiling()}};
+  auto EventInOrder = QueueProfile.submit(
+      [&](handler &CGH) { CGH.ext_oneapi_graph(GraphExecInOrder); });
+  QueueProfile.wait_and_throw();
+  bool Success = true;
+  try {
+    EventInOrder
+        .get_profiling_info<sycl::info::event_profiling::command_start>();
+  } catch (sycl::exception &Exception) {
+    ASSERT_FALSE(std::string(Exception.what())
+                     .find("Profiling information is unavailable as the queue "
+                           "associated with the event does not have the "
+                           "'enable_profiling' property.") ==
+                 std::string::npos);
+    Success = false;
+  }
+  ASSERT_EQ(Success, false);
+}
+
 class MultiThreadGraphTest : public CommandGraphTest {
 public:
   MultiThreadGraphTest()