Add dependent events support for barrier

Author: szymon-zadworny

oneapi-rs-sys/include/queue.hpp

@@ -27,8 +27,8 @@ std::unique_ptr<Event> memset(
   std::uint8_t * ptr,
   int value,
   std::size_t num_bytes,
-  rust::Vec<EventPtr> dep_events
+  rust::Vec<EventPtr>
 );
-std::unique_ptr<Event> barrier(std::unique_ptr<Queue> &);
+std::unique_ptr<Event> barrier(std::unique_ptr<Queue> &, rust::Vec<EventPtr>);
 void wait(std::unique_ptr<Queue> &);
 } // namespace sycl_shims::queue

oneapi-rs-sys/src/queue-sys.rs

@@ -35,7 +35,7 @@ pub mod ffi {
             num_bytes: usize,
             dep_events: Vec<EventPtr>
         ) -> UniquePtr<Event>;
-        fn barrier(queue: &mut UniquePtr<Queue>) -> UniquePtr<Event>;
+        fn barrier(queue: &mut UniquePtr<Queue>, dep_events: Vec<EventPtr>) -> UniquePtr<Event>;
         fn wait(queue: &mut UniquePtr<Queue>);
     }
 }

oneapi-rs-sys/src/queue.cpp

@@ -42,8 +42,11 @@ std::unique_ptr<Event> memset(
     deps.push_back(std::move(*e.ptr.release()));
   return std::make_unique<Event>(queue->memset(ptr, value, num_bytes, deps));
 }
-std::unique_ptr<Event> barrier(std::unique_ptr<Queue> & queue) {
-  return std::make_unique<Event>(queue->ext_oneapi_submit_barrier());
+std::unique_ptr<Event> barrier(std::unique_ptr<Queue> & queue, rust::Vec<EventPtr> dep_events) {
+  std::vector<sycl::event> deps;
+  for (auto&& e: dep_events)
+    deps.push_back(std::move(*e.ptr.release()));
+  return std::make_unique<Event>(queue->ext_oneapi_submit_barrier(deps));
 }
 void wait(std::unique_ptr<Queue> & queue) {
   queue->wait();

oneapi-rs/src/queue.rs

@@ -79,7 +79,15 @@ impl Queue {
     }
 
     pub fn barrier(&mut self) -> Event {
-        ffi::barrier(&mut self.0).into()
+        self.barrier_with_deps(&[])
+    }
+
+    pub fn barrier_with_deps(&mut self, dep_events: &[&Event]) -> Event {
+        let dep_events = dep_events
+            .iter()
+            .map(|e| EventPtr { ptr: (*e).clone().0 })
+            .collect::<Vec<_>>();
+        ffi::barrier(&mut self.0, dep_events).into()
     }
 
     pub fn wait(&mut self) {