Metric Api: Wait events for zetCommandListAppendMetricQueryEnd

RobertKrzemien · RobertKrzemien · commit 7dc8bbc16045 · 2020-07-28T19:14:05.000+02:00
Change-Id: I6fdf470035c1fc1f44d66778ec35ec47d0521e4d
Signed-off-by: Robert Krzemien &lt;robert.krzemien@intel.com&gt;
diff --git a/level_zero/api/tools/zet_metric.cpp b/level_zero/api/tools/zet_metric.cpp
@@ -184,7 +184,17 @@ zetCommandListAppendMetricQueryEnd(
     zet_command_list_handle_t hCommandList,
     zet_metric_query_handle_t hMetricQuery,
     ze_event_handle_t hCompletionEvent) {
-    return L0::CommandList::fromHandle(hCommandList)->appendMetricQueryEnd(hMetricQuery, hCompletionEvent);
+    return L0::CommandList::fromHandle(hCommandList)->appendMetricQueryEnd(hMetricQuery, hCompletionEvent, 0, nullptr);
+}
+
+__zedllexport ze_result_t __zecall
+zetCommandListAppendMetricQueryEndExt(
+    zet_command_list_handle_t hCommandList,
+    zet_metric_query_handle_t hMetricQuery,
+    ze_event_handle_t hSignalEvent,
+    uint32_t numWaitEvents,
+    ze_event_handle_t *phWaitEvents) {
+    return L0::CommandList::fromHandle(hCommandList)->appendMetricQueryEnd(hMetricQuery, hSignalEvent, numWaitEvents, phWaitEvents);
 }
 
 __zedllexport ze_result_t __zecall
diff --git a/level_zero/core/source/cmdlist/cmdlist.h b/level_zero/core/source/cmdlist/cmdlist.h
@@ -111,8 +111,8 @@ struct CommandList : _ze_command_list_handle_t {
     virtual ze_result_t appendMetricTracerMarker(zet_metric_tracer_handle_t hMetricTracer,
                                                  uint32_t value) = 0;
     virtual ze_result_t appendMetricQueryBegin(zet_metric_query_handle_t hMetricQuery) = 0;
-    virtual ze_result_t appendMetricQueryEnd(zet_metric_query_handle_t hMetricQuery,
-                                             ze_event_handle_t hCompletionEvent) = 0;
+    virtual ze_result_t appendMetricQueryEnd(zet_metric_query_handle_t hMetricQuery, ze_event_handle_t hSignalEvent,
+                                             uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) = 0;
 
     virtual ze_result_t appendMILoadRegImm(uint32_t reg, uint32_t value) = 0;
     virtual ze_result_t appendMILoadRegReg(uint32_t reg1, uint32_t reg2) = 0;
diff --git a/level_zero/core/source/cmdlist/cmdlist_imp.cpp b/level_zero/core/source/cmdlist/cmdlist_imp.cpp
@@ -52,9 +52,9 @@ ze_result_t CommandListImp::appendMetricQueryBegin(zet_metric_query_handle_t hMe
     return MetricQuery::fromHandle(hMetricQuery)->appendBegin(*this);
 }
 
-ze_result_t CommandListImp::appendMetricQueryEnd(zet_metric_query_handle_t hMetricQuery,
-                                                 ze_event_handle_t hCompletionEvent) {
-    return MetricQuery::fromHandle(hMetricQuery)->appendEnd(*this, hCompletionEvent);
+ze_result_t CommandListImp::appendMetricQueryEnd(zet_metric_query_handle_t hMetricQuery, ze_event_handle_t hSignalEvent,
+                                                 uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) {
+    return MetricQuery::fromHandle(hMetricQuery)->appendEnd(*this, hSignalEvent, numWaitEvents, phWaitEvents);
 }
 
 CommandList *CommandList::create(uint32_t productFamily, Device *device, bool isCopyOnly) {
diff --git a/level_zero/core/source/cmdlist/cmdlist_imp.h b/level_zero/core/source/cmdlist/cmdlist_imp.h
@@ -23,8 +23,8 @@ struct CommandListImp : CommandList {
     ze_result_t appendMetricTracerMarker(zet_metric_tracer_handle_t hMetricTracer,
                                          uint32_t value) override;
     ze_result_t appendMetricQueryBegin(zet_metric_query_handle_t hMetricQuery) override;
-    ze_result_t appendMetricQueryEnd(zet_metric_query_handle_t hMetricQuery,
-                                     ze_event_handle_t hCompletionEvent) override;
+    ze_result_t appendMetricQueryEnd(zet_metric_query_handle_t hMetricQuery, ze_event_handle_t hSignalEvent,
+                                     uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) override;
 
   protected:
     ~CommandListImp() override = default;
diff --git a/level_zero/core/test/unit_tests/mocks/mock_cmdlist.h b/level_zero/core/test/unit_tests/mocks/mock_cmdlist.h
@@ -252,7 +252,9 @@ struct MockCommandList : public CommandList {
 
     ADDMETHOD_NOBASE(appendMetricQueryEnd, ze_result_t, ZE_RESULT_SUCCESS,
                      (zet_metric_query_handle_t hMetricQuery,
-                      ze_event_handle_t hCompletionEvent));
+                      ze_event_handle_t hSignalEvent,
+                      uint32_t numWaitEvents,
+                      ze_event_handle_t *phWaitEvents));
 
     ADDMETHOD_NOBASE(appendMILoadRegImm, ze_result_t, ZE_RESULT_SUCCESS,
                      (uint32_t reg,
diff --git a/level_zero/tools/source/metrics/metric.h b/level_zero/tools/source/metrics/metric.h
@@ -142,7 +142,8 @@ struct MetricQuery : _zet_metric_query_handle_t {
     virtual ~MetricQuery() = default;
 
     virtual ze_result_t appendBegin(CommandList &commandList) = 0;
-    virtual ze_result_t appendEnd(CommandList &commandList, ze_event_handle_t hCompletionEvent) = 0;
+    virtual ze_result_t appendEnd(CommandList &commandList, ze_event_handle_t hSignalEvent,
+                                  uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) = 0;
 
     static ze_result_t appendMemoryBarrier(CommandList &commandList);
     static ze_result_t appendStreamerMarker(CommandList &commandList,
diff --git a/level_zero/tools/source/metrics/metric_query_imp.cpp b/level_zero/tools/source/metrics/metric_query_imp.cpp
@@ -489,19 +489,19 @@ ze_result_t MetricQueryImp::appendBegin(CommandList &commandList) {
 
     switch (pool.description.flags) {
     case ZET_METRIC_QUERY_POOL_FLAG_PERFORMANCE:
-        return writeMetricQuery(commandList, nullptr, true);
+        return writeMetricQuery(commandList, nullptr, 0, nullptr, true);
 
     default:
         DEBUG_BREAK_IF(true);
         return ZE_RESULT_ERROR_INVALID_ARGUMENT;
     }
 }
 
-ze_result_t MetricQueryImp::appendEnd(CommandList &commandList,
-                                      ze_event_handle_t hCompletionEvent) {
+ze_result_t MetricQueryImp::appendEnd(CommandList &commandList, ze_event_handle_t hSignalEvent,
+                                      uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) {
     switch (pool.description.flags) {
     case ZET_METRIC_QUERY_POOL_FLAG_PERFORMANCE:
-        return writeMetricQuery(commandList, hCompletionEvent, false);
+        return writeMetricQuery(commandList, hSignalEvent, numWaitEvents, phWaitEvents, false);
 
     default:
         DEBUG_BREAK_IF(true);
@@ -529,8 +529,13 @@ ze_result_t MetricQueryImp::destroy() {
     return ZE_RESULT_SUCCESS;
 }
 
-ze_result_t MetricQueryImp::writeMetricQuery(CommandList &commandList,
-                                             ze_event_handle_t hCompletionEvent, const bool begin) {
+ze_result_t MetricQueryImp::writeMetricQuery(CommandList &commandList, ze_event_handle_t hSignalEvent,
+                                             uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents,
+                                             const bool begin) {
+
+    bool writeCompletionEvent = hSignalEvent && !begin;
+    bool result = false;
+
     // Make gpu allocation visible.
     commandList.commandContainer.addToResidencyContainer(pool.pAllocation);
 
@@ -546,12 +551,18 @@ ze_result_t MetricQueryImp::writeMetricQuery(CommandList &commandList,
                              ? GpuCommandBufferType::Compute
                              : GpuCommandBufferType::Render;
 
-    bool writeCompletionEvent = hCompletionEvent && !begin;
-    bool result = metricsLibrary.getGpuCommands(commandList, commandBuffer);
+    // Wait for events before executing query.
+    result = zeCommandListAppendWaitOnEvents(commandList.toHandle(), numWaitEvents, phWaitEvents) ==
+             ZE_RESULT_SUCCESS;
+
+    // Get query commands.
+    if (result) {
+        result = metricsLibrary.getGpuCommands(commandList, commandBuffer);
+    }
 
     // Write completion event.
     if (result && writeCompletionEvent) {
-        result = zeCommandListAppendSignalEvent(commandList.toHandle(), hCompletionEvent) ==
+        result = zeCommandListAppendSignalEvent(commandList.toHandle(), hSignalEvent) ==
                  ZE_RESULT_SUCCESS;
     }
 
diff --git a/level_zero/tools/source/metrics/metric_query_imp.h b/level_zero/tools/source/metrics/metric_query_imp.h
@@ -101,15 +101,17 @@ struct MetricQueryImp : MetricQuery {
                    const uint32_t slot);
 
     ze_result_t appendBegin(CommandList &commandList) override;
-    ze_result_t appendEnd(CommandList &commandList, ze_event_handle_t hCompletionEvent) override;
+    ze_result_t appendEnd(CommandList &commandList, ze_event_handle_t hSignalEvent,
+                          uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) override;
 
     ze_result_t getData(size_t *pRawDataSize, uint8_t *pRawData) override;
 
     ze_result_t reset() override;
     ze_result_t destroy() override;
 
   protected:
-    ze_result_t writeMetricQuery(CommandList &commandList, ze_event_handle_t hCompletionEvent,
+    ze_result_t writeMetricQuery(CommandList &commandList, ze_event_handle_t hSignalEvent,
+                                 uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents,
                                  const bool begin);
 
   protected:
diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_query_pool.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_query_pool.cpp
diff --git a/third_party/level_zero/zet_api_ext.h b/third_party/level_zero/zet_api_ext.h

Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,9 @@ ze_result_t CommandListImp::appendMetricQueryBegin(zet_metric_query_handle_t hMe`
`52`	`52`	`return MetricQuery::fromHandle(hMetricQuery)->appendBegin(*this);`
`53`	`53`	`}`
`54`	`54`
`55`		`-ze_result_t CommandListImp::appendMetricQueryEnd(zet_metric_query_handle_t hMetricQuery,`
`56`		`- ze_event_handle_t hCompletionEvent) {`
`57`		`- return MetricQuery::fromHandle(hMetricQuery)->appendEnd(*this, hCompletionEvent);`
	`55`	`+ze_result_t CommandListImp::appendMetricQueryEnd(zet_metric_query_handle_t hMetricQuery, ze_event_handle_t hSignalEvent,`
	`56`	`+ uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) {`
	`57`	`+ return MetricQuery::fromHandle(hMetricQuery)->appendEnd(*this, hSignalEvent, numWaitEvents, phWaitEvents);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`CommandList CommandList::create(uint32_t productFamily, Device device, bool isCopyOnly) {`