Merge remote-tracking branch 'intel/sycl' into steffen/event_with_enq…

…ueue
intel · Mar 5, 2024 · 19926ab · 19926ab
2 parents 85f47a3 + 6e8cdb1
commit 19926ab
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/sycl/include/sycl/ext/intel/experimental/grf_size_properties.hpp b/sycl/include/sycl/ext/intel/experimental/grf_size_properties.hpp
@@ -36,7 +36,7 @@ inline constexpr grf_size_key::value_t<Size> grf_size;
 inline constexpr grf_size_automatic_key::value_t grf_size_automatic;
 
 } // namespace ext::intel::experimental
-namespace ext::oneapi::experimental {
+namespace ext::oneapi::experimental::detail {
 template <unsigned int Size>
 struct PropertyMetaInfo<
  sycl::ext::intel::experimental::grf_size_key::value_t<Size>> {
@@ -79,7 +79,6 @@ struct ConflictingProperties<sycl::detail::register_alloc_mode_key, Properties>
  sycl::ext::intel::experimental::grf_size_automatic_key,
  Properties>::value> {};
 
-} // namespace detail
-} // namespace ext::oneapi::experimental
+} // namespace ext::oneapi::experimental::detail
 } // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/event_impl.hpp b/sycl/source/detail/event_impl.hpp
@@ -289,6 +289,10 @@ class event_impl {
  return MEventFromSubmittedExecCommandBuffer;
  }
 
+ const std::vector<EventImplPtr> &getPostCompleteEvents() const {
+ return MPostCompleteEvents;
+ }
+
  void markAsProfilingTagEvent() { MProfilingTagEvent = true; }
 
  bool isProfilingTagEvent() const noexcept { return MProfilingTagEvent; }

diff --git a/sycl/source/detail/graph_impl.cpp b/sycl/source/detail/graph_impl.cpp
@@ -764,7 +764,9 @@ exec_graph_impl::enqueue(const std::shared_ptr<sycl::detail::queue_impl> &Queue,
  sycl::detail::CG::StorageInitHelper CGData) {
  WriteLock Lock(MMutex);
 
- std::vector<sycl::detail::EventImplPtr> PartitionEvents;
+ // Map of the partitions to their execution events
+ std::unordered_map<std::shared_ptr<partition>, sycl::detail::EventImplPtr>
+ PartitionsExecutionEvents;
 
  auto CreateNewEvent([&]() {
  auto NewEvent = std::make_shared<sycl::detail::event_impl>(Queue);
@@ -787,7 +789,7 @@ exec_graph_impl::enqueue(const std::shared_ptr<sycl::detail::queue_impl> &Queue,
  }
 
  for (auto const &DepPartition : CurrentPartition->MPredecessors) {
- CGData.MEvents.push_back(MPartitionsExecutionEvents[DepPartition]);
+ CGData.MEvents.push_back(PartitionsExecutionEvents[DepPartition]);
  }
 
  auto CommandBuffer =
@@ -819,7 +821,13 @@ exec_graph_impl::enqueue(const std::shared_ptr<sycl::detail::queue_impl> &Queue,
  sycl::backend::ext_oneapi_level_zero) {
  Event->wait(Event);
  } else {
+ auto &AttachedEventsList = Event->getPostCompleteEvents();
+ CGData.MEvents.reserve(AttachedEventsList.size() + 1);
  CGData.MEvents.push_back(Event);
+ // Add events of the previous execution of all graph partitions.
+ for (auto &AttachedEvent : AttachedEventsList) {
+ CGData.MEvents.push_back(AttachedEvent);
+ }
  }
  ++It;
  } else {
@@ -929,15 +937,15 @@ exec_graph_impl::enqueue(const std::shared_ptr<sycl::detail::queue_impl> &Queue,
  NewEvent->setStateIncomplete();
  NewEvent->getPreparedDepsEvents() = ScheduledEvents;
  }
- MPartitionsExecutionEvents[CurrentPartition] = NewEvent;
+ PartitionsExecutionEvents[CurrentPartition] = NewEvent;
  }
 
  // Keep track of this execution event so we can make sure it's completed in
  // the destructor.
  MExecutionEvents.push_back(NewEvent);
  // Attach events of previous partitions to ensure that when the returned event
  // is complete all execution associated with the graph have been completed.
- for (auto const &Elem : MPartitionsExecutionEvents) {
+ for (auto const &Elem : PartitionsExecutionEvents) {
  if (Elem.second != NewEvent) {
  NewEvent->attachEventToComplete(Elem.second);
  }

diff --git a/sycl/source/detail/graph_impl.hpp b/sycl/source/detail/graph_impl.hpp
@@ -1192,9 +1192,6 @@ class exec_graph_impl {
  std::vector<sycl::detail::EventImplPtr> MExecutionEvents;
  /// List of the partitions that compose the exec graph.
  std::vector<std::shared_ptr<partition>> MPartitions;
- /// Map of the partitions to their execution events
- std::unordered_map<std::shared_ptr<partition>, sycl::detail::EventImplPtr>
- MPartitionsExecutionEvents;
  /// Storage for copies of nodes from the original modifiable graph.
  std::vector<std::shared_ptr<node_impl>> MNodeStorage;
 };