[SYCL][Graph] Remove assume_data_outlives_buffer property

Implements spec feedback to remove this property, goes with spec PR #311
reble · Aug 28, 2023 · 86acba4 · 86acba4
1 parent cb49b0b
commit 86acba4
Show file tree

Hide file tree

Showing 21 changed files with 16 additions and 175 deletions.
diff --git a/sycl/include/sycl/ext/oneapi/experimental/graph.hpp b/sycl/include/sycl/ext/oneapi/experimental/graph.hpp
@@ -117,19 +117,6 @@ class assume_buffer_outlives_graph
 public:
   assume_buffer_outlives_graph() = default;
 };
-
-/// Property passed to command_graph constructor to allow buffers created with
-/// host pointers. Passing this property represents a promise from the user that
-/// the host data will outlive the buffer and by extension any graph that it is
-/// used in.
-///
-class assume_data_outlives_buffer
-    : public ::sycl::detail::DataLessProperty<
-          ::sycl::detail::GraphAssumeDataOutlivesBuffer> {
-public:
-  assume_data_outlives_buffer() = default;
-};
-
 } // namespace graph
 
 namespace node {

diff --git a/sycl/source/detail/graph_impl.cpp b/sycl/source/detail/graph_impl.cpp
@@ -271,13 +271,6 @@ graph_impl::add(sycl::detail::CG::CGTYPE CGType,
   for (auto &Req : Requirements) {
     // Track and mark the memory objects being used by the graph.
     auto MemObj = static_cast<sycl::detail::SYCLMemObjT *>(Req->MSYCLMemObj);
-    if (MemObj->getUserPtr() && !MAllowBuffersHostPointers) {
-      throw sycl::exception(
-          make_error_code(errc::invalid),
-          "Cannot use a buffer which was created with a host pointer in a "
-          "graph without passing the assume_data_outlives_buffer property on "
-          "Graph construction.");
-    }
     bool WasInserted = MMemObjs.insert(MemObj).second;
     if (WasInserted) {
       MemObj->markBeingUsedInGraph();

diff --git a/sycl/source/detail/graph_impl.hpp b/sycl/source/detail/graph_impl.hpp
@@ -305,9 +305,6 @@ class graph_impl {
     if (PropList.has_property<property::graph::no_cycle_check>()) {
       MSkipCycleChecks = true;
     }
-    if (PropList.has_property<property::graph::assume_data_outlives_buffer>()) {
-      MAllowBuffersHostPointers = true;
-    }
     if (PropList
             .has_property<property::graph::assume_buffer_outlives_graph>()) {
       MAllowBuffers = true;
@@ -615,11 +612,6 @@ class graph_impl {
   /// Unique set of SYCL Memory Objects which are currently in use in the graph.
   std::set<sycl::detail::SYCLMemObjT *> MMemObjs;
 
-  /// Controls whether we allow buffers that are created with host pointers to
-  /// be used in the graph. Set by the presence of the
-  /// assume_data_outlives_buffer property.
-  bool MAllowBuffersHostPointers = false;
-
   /// Controls whether we allow buffers to be used in the graph. Set by the
   /// presence of the assume_buffer_outlives_graph property.
   bool MAllowBuffers = false;

diff --git a/sycl/test-e2e/Graph/Explicit/assume_data_outlives_buffer_property.cpp b/sycl/test-e2e/Graph/Explicit/assume_data_outlives_buffer_property.cpp
diff --git a/sycl/test-e2e/Graph/Inputs/assume_data_outlives_buffer_property.cpp b/sycl/test-e2e/Graph/Inputs/assume_data_outlives_buffer_property.cpp
diff --git a/sycl/test-e2e/Graph/Inputs/basic_buffer.cpp b/sycl/test-e2e/Graph/Inputs/basic_buffer.cpp
@@ -28,8 +28,7 @@ int main() {
       exp_ext::command_graph Graph{
           Queue.get_context(),
           Queue.get_device(),
-          {exp_ext::property::graph::assume_buffer_outlives_graph{},
-           exp_ext::property::graph::assume_data_outlives_buffer{}}};
+          {exp_ext::property::graph::assume_buffer_outlives_graph{}}};
 
       // Add commands to graph
       add_nodes(Graph, Queue, Size, BufferA, BufferB, BufferC);

diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy.cpp
@@ -37,8 +37,7 @@ int main() {
     exp_ext::command_graph Graph{
         Queue.get_context(),
         Queue.get_device(),
-        {exp_ext::property::graph::assume_buffer_outlives_graph{},
-         exp_ext::property::graph::assume_data_outlives_buffer{}}};
+        {exp_ext::property::graph::assume_buffer_outlives_graph{}}};
 
     // Copy from B to A
     auto NodeA = add_node(Graph, Queue, [&](handler &CGH) {

diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy_2d.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy_2d.cpp
@@ -38,8 +38,7 @@ int main() {
     exp_ext::command_graph Graph{
         Queue.get_context(),
         Queue.get_device(),
-        {exp_ext::property::graph::assume_buffer_outlives_graph{},
-         exp_ext::property::graph::assume_data_outlives_buffer{}}};
+        {exp_ext::property::graph::assume_buffer_outlives_graph{}}};
 
     // Copy from B to A
     auto NodeA = add_node(Graph, Queue, [&](handler &CGH) {

diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy_host2target.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy_host2target.cpp
@@ -24,8 +24,7 @@ int main() {
     exp_ext::command_graph Graph{
         Queue.get_context(),
         Queue.get_device(),
-        {exp_ext::property::graph::assume_buffer_outlives_graph{},
-         exp_ext::property::graph::assume_data_outlives_buffer{}}};
+        {exp_ext::property::graph::assume_buffer_outlives_graph{}}};
 
     auto NodeA = add_node(Graph, Queue, [&](handler &CGH) {
       auto AccA = BufferA.get_access(CGH);

diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy_host2target_2d.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy_host2target_2d.cpp
@@ -25,8 +25,7 @@ int main() {
     exp_ext::command_graph Graph{
         Queue.get_context(),
         Queue.get_device(),
-        {exp_ext::property::graph::assume_buffer_outlives_graph{},
-         exp_ext::property::graph::assume_data_outlives_buffer{}}};
+        {exp_ext::property::graph::assume_buffer_outlives_graph{}}};
 
     auto NodeA = add_node(Graph, Queue, [&](handler &CGH) {
       auto AccA = BufferA.get_access<access::mode::write>(CGH);

diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy_host2target_offset.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy_host2target_offset.cpp
@@ -27,8 +27,7 @@ int main() {
     exp_ext::command_graph Graph{
         Queue.get_context(),
         Queue.get_device(),
-        {exp_ext::property::graph::assume_buffer_outlives_graph{},
-         exp_ext::property::graph::assume_data_outlives_buffer{}}};
+        {exp_ext::property::graph::assume_buffer_outlives_graph{}}};
 
     auto NodeA = add_node(Graph, Queue, [&](handler &CGH) {
       auto AccA = BufferA.get_access<access::mode::write>(CGH, range<1>(Size),

diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy_offsets.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy_offsets.cpp
@@ -34,8 +34,7 @@ int main() {
     exp_ext::command_graph Graph{
         Queue.get_context(),
         Queue.get_device(),
-        {exp_ext::property::graph::assume_buffer_outlives_graph{},
-         exp_ext::property::graph::assume_data_outlives_buffer{}}};
+        {exp_ext::property::graph::assume_buffer_outlives_graph{}}};
 
     // Copy from A to B
     auto NodeA = add_node(Graph, Queue, [&](handler &CGH) {

diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy_target2host.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy_target2host.cpp
@@ -25,8 +25,7 @@ int main() {
     exp_ext::command_graph Graph{
         Queue.get_context(),
         Queue.get_device(),
-        {exp_ext::property::graph::assume_buffer_outlives_graph{},
-         exp_ext::property::graph::assume_data_outlives_buffer{}}};
+        {exp_ext::property::graph::assume_buffer_outlives_graph{}}};
 
     auto NodeA = add_node(Graph, Queue, [&](handler &CGH) {
       auto AccA = BufferA.get_access<access::mode::read>(CGH);

diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy_target2host_2d.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy_target2host_2d.cpp
@@ -26,8 +26,7 @@ int main() {
     exp_ext::command_graph Graph{
         Queue.get_context(),
         Queue.get_device(),
-        {exp_ext::property::graph::assume_buffer_outlives_graph{},
-         exp_ext::property::graph::assume_data_outlives_buffer{}}};
+        {exp_ext::property::graph::assume_buffer_outlives_graph{}}};
 
     auto NodeA = add_node(Graph, Queue, [&](handler &CGH) {
       auto AccA = BufferA.get_access<access::mode::read>(CGH);

diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy_target2host_offset.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy_target2host_offset.cpp
@@ -28,8 +28,7 @@ int main() {
     exp_ext::command_graph Graph{
         Queue.get_context(),
         Queue.get_device(),
-        {exp_ext::property::graph::assume_buffer_outlives_graph{},
-         exp_ext::property::graph::assume_data_outlives_buffer{}}};
+        {exp_ext::property::graph::assume_buffer_outlives_graph{}}};
 
     auto NodeA = add_node(Graph, Queue, [&](handler &CGH) {
       auto AccA = BufferA.get_access<access::mode::read>(

diff --git a/sycl/test-e2e/Graph/Inputs/dotp_buffer_reduction.cpp b/sycl/test-e2e/Graph/Inputs/dotp_buffer_reduction.cpp
@@ -26,8 +26,7 @@ int main() {
     exp_ext::command_graph Graph{
         Queue.get_context(),
         Queue.get_device(),
-        {exp_ext::property::graph::assume_buffer_outlives_graph{},
-         exp_ext::property::graph::assume_data_outlives_buffer{}}};
+        {exp_ext::property::graph::assume_buffer_outlives_graph{}}};
 
     auto NodeI = add_node(Graph, Queue, [&](handler &CGH) {
       auto X = XBuf.get_access(CGH);

diff --git a/sycl/test-e2e/Graph/Inputs/dotp_usm_reduction.cpp b/sycl/test-e2e/Graph/Inputs/dotp_usm_reduction.cpp
@@ -6,11 +6,7 @@
 int main() {
   queue Queue;
 
-  exp_ext::command_graph Graph{
-      Queue.get_context(),
-      Queue.get_device(),
-      {exp_ext::property::graph::assume_buffer_outlives_graph{},
-       exp_ext::property::graph::assume_data_outlives_buffer{}}};
+  exp_ext::command_graph Graph{Queue.get_context(), Queue.get_device()};
 
   float *Dotp = malloc_device<float>(1, Queue);
 

diff --git a/sycl/test-e2e/Graph/Inputs/event_status_querying.cpp b/sycl/test-e2e/Graph/Inputs/event_status_querying.cpp
@@ -66,8 +66,7 @@ int main() {
     exp_ext::command_graph Graph{
         Queue.get_context(),
         Queue.get_device(),
-        {exp_ext::property::graph::assume_buffer_outlives_graph{},
-         exp_ext::property::graph::assume_data_outlives_buffer{}}};
+        {exp_ext::property::graph::assume_buffer_outlives_graph{}}};
 
     // Copy from B to A
     auto Init = add_node(Graph, Queue, [&](handler &CGH) {

diff --git a/sycl/test-e2e/Graph/Inputs/sub_graph_reduction.cpp b/sycl/test-e2e/Graph/Inputs/sub_graph_reduction.cpp
@@ -6,16 +6,8 @@
 int main() {
   queue Queue;
 
-  exp_ext::command_graph Graph{
-      Queue.get_context(),
-      Queue.get_device(),
-      {exp_ext::property::graph::assume_buffer_outlives_graph{},
-       exp_ext::property::graph::assume_data_outlives_buffer{}}};
-  exp_ext::command_graph SubGraph{
-      Queue.get_context(),
-      Queue.get_device(),
-      {exp_ext::property::graph::assume_buffer_outlives_graph{},
-       exp_ext::property::graph::assume_data_outlives_buffer{}}};
+  exp_ext::command_graph Graph{Queue.get_context(), Queue.get_device()};
+  exp_ext::command_graph SubGraph{Queue.get_context(), Queue.get_device()};
 
   float *Dotp = malloc_device<float>(1, Queue);
 

diff --git a/sycl/test-e2e/Graph/Inputs/temp_buffer_reinterpret.cpp b/sycl/test-e2e/Graph/Inputs/temp_buffer_reinterpret.cpp
@@ -30,8 +30,7 @@ int main() {
     exp_ext::command_graph Graph{
         Queue.get_context(),
         Queue.get_device(),
-        {exp_ext::property::graph::assume_buffer_outlives_graph{},
-         exp_ext::property::graph::assume_data_outlives_buffer{}}};
+        {exp_ext::property::graph::assume_buffer_outlives_graph{}}};
 
     {
       // Create some temporary buffers only for adding nodes

diff --git a/sycl/test-e2e/Graph/RecordReplay/assume_data_outlives_buffer_property.cpp b/sycl/test-e2e/Graph/RecordReplay/assume_data_outlives_buffer_property.cpp