Metrics Refactor Metric Streamer

joshuaranjan · Compute-Runtime-Automation · commit 596fe02dd34d · 2022-02-08T22:42:05.000+01:00
This patch moves OA specific Metric Streamer implementation
to OA specific classes.

Related-To: LOCI-2905

Signed-off-by: Joshua Santosh Ranjan &lt;joshua.santosh.ranjan@intel.com&gt;
diff --git a/level_zero/core/source/cmdlist/cmdlist_imp.cpp b/level_zero/core/source/cmdlist/cmdlist_imp.cpp
@@ -42,7 +42,7 @@ ze_result_t CommandListImp::appendMetricMemoryBarrier() {
 
 ze_result_t CommandListImp::appendMetricStreamerMarker(zet_metric_streamer_handle_t hMetricStreamer,
                                                        uint32_t value) {
-    return MetricStreamer::appendStreamerMarker(*this, hMetricStreamer, value);
+    return MetricStreamer::fromHandle(hMetricStreamer)->appendStreamerMarker(*this, value);
 }
 
 ze_result_t CommandListImp::appendMetricQueryBegin(zet_metric_query_handle_t hMetricQuery) {
diff --git a/level_zero/tools/source/metrics/metric.h b/level_zero/tools/source/metrics/metric.h
@@ -127,8 +127,7 @@ struct MetricStreamer : _zet_metric_streamer_handle_t {
     static MetricStreamer *fromHandle(zet_metric_streamer_handle_t handle) {
         return static_cast<MetricStreamer *>(handle);
     }
-    static ze_result_t appendStreamerMarker(CommandList &commandList,
-                                            zet_metric_streamer_handle_t hMetricStreamer, uint32_t value);
+    virtual ze_result_t appendStreamerMarker(CommandList &commandList, uint32_t value) = 0;
     virtual Event::State getNotificationState() = 0;
     inline zet_metric_streamer_handle_t toHandle() { return this; }
 };
diff --git a/level_zero/tools/source/metrics/metric_streamer_imp.cpp b/level_zero/tools/source/metrics/metric_streamer_imp.cpp
@@ -338,9 +338,7 @@ ze_result_t OaMetricGroupImp::streamerOpen(
     return result;
 }
 
-ze_result_t MetricStreamer::appendStreamerMarker(CommandList &commandList,
-                                                 zet_metric_streamer_handle_t hMetricStreamer,
-                                                 uint32_t value) {
+ze_result_t OaMetricStreamerImp::appendStreamerMarker(CommandList &commandList, uint32_t value) {
 
     DeviceImp *pDeviceImp = static_cast<DeviceImp *>(commandList.device);
 
diff --git a/level_zero/tools/source/metrics/metric_streamer_imp.h b/level_zero/tools/source/metrics/metric_streamer_imp.h
@@ -25,6 +25,7 @@ struct OaMetricStreamerImp : MetricStreamer {
     void attachEvent(ze_event_handle_t hNotificationEvent);
     void detachEvent();
 
+    ze_result_t appendStreamerMarker(CommandList &commandList, uint32_t value) override;
     std::vector<zet_metric_streamer_handle_t> &getMetricStreamers();
 
   protected:

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ ze_result_t CommandListImp::appendMetricMemoryBarrier() {`
`42`	`42`
`43`	`43`	`ze_result_t CommandListImp::appendMetricStreamerMarker(zet_metric_streamer_handle_t hMetricStreamer,`
`44`	`44`	`uint32_t value) {`
`45`		`- return MetricStreamer::appendStreamerMarker(*this, hMetricStreamer, value);`
	`45`	`+ return MetricStreamer::fromHandle(hMetricStreamer)->appendStreamerMarker(*this, value);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`ze_result_t CommandListImp::appendMetricQueryBegin(zet_metric_query_handle_t hMetricQuery) {`
Original file line number	Diff line number	Diff line change
`@@ -338,9 +338,7 @@ ze_result_t OaMetricGroupImp::streamerOpen(`
`338`	`338`	`return result;`
`339`	`339`	`}`
`340`	`340`
`341`		`-ze_result_t MetricStreamer::appendStreamerMarker(CommandList &commandList,`
`342`		`- zet_metric_streamer_handle_t hMetricStreamer,`
`343`		`- uint32_t value) {`
	`341`	`+ze_result_t OaMetricStreamerImp::appendStreamerMarker(CommandList &commandList, uint32_t value) {`
`344`	`342`
`345`	`343`	`DeviceImp pDeviceImp = static_cast<DeviceImp >(commandList.device);`
`346`	`344`