Publishing 2019 R1 content

[platform/upstream/dldt.git] / inference-engine / thirdparty / clDNN / src / gpu / ocl_base_event.h

diff --git a/inference-engine/thirdparty/clDNN/src/gpu/ocl_base_event.h b/inference-engine/thirdparty/clDNN/src/gpu/ocl_base_event.h
index 8e015ab..7c9f820 100644 (file)
--- a/inference-engine/thirdparty/clDNN/src/gpu/ocl_base_event.h
+++ b/inference-engine/thirdparty/clDNN/src/gpu/ocl_base_event.h
@@ -14,7 +14,11 @@ struct profiling_period_ocl_start_stop
 struct ocl_base_event : virtual public event_impl
 {
 public:
-    ocl_base_event(uint64_t queue_stamp = 0) : _queue_stamp(queue_stamp) {}
+    ocl_base_event(uint64_t queue_stamp = 0, bool valid = false) 
+        : _queue_stamp(queue_stamp)
+    {
+        _attached = valid;
+    }
     uint64_t get_queue_stamp() const { return _queue_stamp; }
 protected:
     uint64_t _queue_stamp = 0;
@@ -23,20 +27,31 @@ protected:
 struct base_event : virtual public ocl_base_event
 {
 public:
-    base_event(std::shared_ptr<gpu_toolkit> ctx, cl::Event const& ev, uint64_t queue_stamp = 0) : ocl_base_event(queue_stamp), _ctx(ctx), _event(ev)
+    base_event(std::shared_ptr<gpu_toolkit> ctx, cl::Event const& ev, uint64_t queue_stamp = 0) 
+        : ocl_base_event(queue_stamp, true)
+        , _ctx(ctx)
+        , _event(ev)
+    {}
+
+    base_event(std::shared_ptr<gpu_toolkit> ctx)
+        : ocl_base_event(0, false)
+        , _ctx(ctx)
     {}
 
+    void attach_ocl_event(const cl::Event& ev, const uint64_t q_stamp)
+    {
+        _event = ev;
+        _queue_stamp = q_stamp;
+        _attached = true;
+    }
+
     std::shared_ptr<gpu_toolkit> get_context() const { return _ctx; }
     cl::Event get() { return _event; }
 
-
 private:
     std::shared_ptr<gpu_toolkit> _ctx;
-    cl::Event _event;
     bool _callback_set = false;
-
     void set_ocl_callback();
-
     static void CL_CALLBACK ocl_event_completion_callback(cl_event, cl_int, void* me);
 
 private:
@@ -46,26 +61,50 @@ private:
     bool get_profiling_info_impl(std::list<cldnn_profiling_interval>& info) override;
 
     friend struct base_events;
+
+protected:
+    cl::Event _event;
 };
 
 struct base_events : virtual public ocl_base_event
 {
 public:
-    base_events(std::shared_ptr<gpu_toolkit> ctx, std::vector<event_impl::ptr> const &ev) : ocl_base_event(0), _ctx(ctx), _events(ev)
+    base_events(std::shared_ptr<gpu_toolkit> ctx, std::vector<event_impl::ptr> const &ev) 
+        : ocl_base_event(0, true)
+        , _ctx(ctx)
+        , _events(ev)
+    {
+        set_queue_stamp();
+    }
+
+    base_events(std::shared_ptr<gpu_toolkit> ctx)
+        : ocl_base_event(0, false)
+        , _ctx(ctx)
+    {}
+
+    void attach_events(const std::vector<event_impl::ptr>& ev) 
+    { 
+        if (_attached)
+            throw std::runtime_error("Trying to attach events to valid event object.");
+        _events = ev;
+        _attached = true;
+        set_queue_stamp();
+    }
+
+    std::shared_ptr<gpu_toolkit> get_context() const { return _ctx; }
+
+private:
+    void set_queue_stamp()
     {
         uint64_t _queue_stamp_max = 0;
-        for (size_t i = 0; i < ev.size(); i++)
+        for (size_t i = 0; i < _events.size(); i++)
         {
-            auto * _base_event = dynamic_cast<base_event*>(ev[i].get());
+            auto * _base_event = dynamic_cast<base_event*>(_events[i].get());
             if (_base_event->get_queue_stamp() > _queue_stamp_max)
                 _queue_stamp_max = _base_event->get_queue_stamp();
         }
         _queue_stamp = _queue_stamp_max;
     }
-
-    std::shared_ptr<gpu_toolkit> get_context() const { return _ctx; }
-
-private:
     void wait_impl() override;
     bool is_set_impl() override;