From cec0ea2809ded00918c6ee505b7aeafa1e7a979b Mon Sep 17 00:00:00 2001
From: Joshua Santosh Ranjan <joshua.santosh.ranjan@intel.com>
Date: Mon, 14 Feb 2022 07:31:23 +0000
Subject: [PATCH] Metrics Rename OA specific files

Rename OA specific files with _oa so that
implementation of other metric sources
could be added seamlessly.

Related-To: LOCI-2945

Signed-off-by: Joshua Santosh Ranjan <joshua.santosh.ranjan@intel.com>
---
 .../tools/source/metrics/CMakeLists.txt       | 11 +++++---
 .../tools/source/metrics/linux/CMakeLists.txt |  6 ++---
 ...=> os_metric_oa_enumeration_imp_linux.cpp} |  4 +--
 ...x.cpp => os_metric_oa_query_imp_linux.cpp} |  4 +--
 level_zero/tools/source/metrics/metric.cpp    |  6 ++---
 ..._imp.cpp => metric_oa_enumeration_imp.cpp} |  6 ++---
 ...tion_imp.h => metric_oa_enumeration_imp.h} |  0
 ..._query_imp.cpp => metric_oa_query_imp.cpp} |  6 ++---
 ...tric_query_imp.h => metric_oa_query_imp.h} |  0
 ...{metric_source_oa.h => metric_oa_source.h} |  6 ++---
 ...mer_imp.cpp => metric_oa_streamer_imp.cpp} |  8 +++---
 ...treamer_imp.h => metric_oa_streamer_imp.h} |  0
 .../source/metrics/windows/CMakeLists.txt     |  6 ++---
 ... os_metric_oa_enumeration_imp_windows.cpp} |  4 +--
 ...cpp => os_metric_oa_query_imp_windows.cpp} |  4 +--
 .../unit_tests/sources/metrics/CMakeLists.txt | 26 +++++++++----------
 .../sources/metrics/linux/CMakeLists.txt      |  4 +--
 ...pp => test_metric_oa_query_pool_linux.cpp} |  4 +--
 .../{mock_metric.cpp => mock_metric_oa.cpp}   |  6 ++---
 .../{mock_metric.h => mock_metric_oa.h}       |  6 ++---
 ...ion.cpp => mock_metric_oa_enumeration.cpp} |  6 ++---
 ...eration.h => mock_metric_oa_enumeration.h} |  4 +--
 ...1.cpp => test_metric_oa_enumeration_1.cpp} |  4 +--
 ...2.cpp => test_metric_oa_enumeration_2.cpp} |  4 +--
 ....cpp => test_metric_oa_initialization.cpp} |  4 +--
 ..._1.cpp => test_metric_oa_query_pool_1.cpp} |  4 +--
 ..._2.cpp => test_metric_oa_query_pool_2.cpp} |  4 +--
 ..._3.cpp => test_metric_oa_query_pool_3.cpp} |  4 +--
 ...er_1.cpp => test_metric_oa_streamer_1.cpp} |  4 +--
 ...er_2.cpp => test_metric_oa_streamer_2.cpp} |  4 +--
 ...er_3.cpp => test_metric_oa_streamer_3.cpp} |  4 +--
 .../sources/metrics/windows/CMakeLists.txt    |  4 +--
 ...=> test_metric_oa_enumeration_windows.cpp} |  4 +--
 33 files changed, 87 insertions(+), 84 deletions(-)
 rename level_zero/tools/source/metrics/linux/{os_metric_enumeration_imp_linux.cpp => os_metric_oa_enumeration_imp_linux.cpp} (95%)
 rename level_zero/tools/source/metrics/linux/{os_metric_query_imp_linux.cpp => os_metric_oa_query_imp_linux.cpp} (94%)
 rename level_zero/tools/source/metrics/{metric_enumeration_imp.cpp => metric_oa_enumeration_imp.cpp} (99%)
 rename level_zero/tools/source/metrics/{metric_enumeration_imp.h => metric_oa_enumeration_imp.h} (100%)
 rename level_zero/tools/source/metrics/{metric_query_imp.cpp => metric_oa_query_imp.cpp} (99%)
 rename level_zero/tools/source/metrics/{metric_query_imp.h => metric_oa_query_imp.h} (100%)
 rename level_zero/tools/source/metrics/{metric_source_oa.h => metric_oa_source.h} (92%)
 rename level_zero/tools/source/metrics/{metric_streamer_imp.cpp => metric_oa_streamer_imp.cpp} (98%)
 rename level_zero/tools/source/metrics/{metric_streamer_imp.h => metric_oa_streamer_imp.h} (100%)
 rename level_zero/tools/source/metrics/windows/{os_metric_enumeration_imp_windows.cpp => os_metric_oa_enumeration_imp_windows.cpp} (93%)
 rename level_zero/tools/source/metrics/windows/{os_metric_query_imp_windows.cpp => os_metric_oa_query_imp_windows.cpp} (95%)
 rename level_zero/tools/test/unit_tests/sources/metrics/linux/{test_metric_query_pool_linux.cpp => test_metric_oa_query_pool_linux.cpp} (99%)
 rename level_zero/tools/test/unit_tests/sources/metrics/{mock_metric.cpp => mock_metric_oa.cpp} (99%)
 rename level_zero/tools/test/unit_tests/sources/metrics/{mock_metric.h => mock_metric_oa.h} (98%)
 rename level_zero/tools/test/unit_tests/sources/metrics/{mock_metric_enumeration.cpp => mock_metric_oa_enumeration.cpp} (98%)
 rename level_zero/tools/test/unit_tests/sources/metrics/{mock_metric_enumeration.h => mock_metric_oa_enumeration.h} (98%)
 rename level_zero/tools/test/unit_tests/sources/metrics/{test_metric_enumeration_1.cpp => test_metric_oa_enumeration_1.cpp} (99%)
 rename level_zero/tools/test/unit_tests/sources/metrics/{test_metric_enumeration_2.cpp => test_metric_oa_enumeration_2.cpp} (99%)
 rename level_zero/tools/test/unit_tests/sources/metrics/{test_metric_initialization.cpp => test_metric_oa_initialization.cpp} (95%)
 rename level_zero/tools/test/unit_tests/sources/metrics/{test_metric_query_pool_1.cpp => test_metric_oa_query_pool_1.cpp} (99%)
 rename level_zero/tools/test/unit_tests/sources/metrics/{test_metric_query_pool_2.cpp => test_metric_oa_query_pool_2.cpp} (99%)
 rename level_zero/tools/test/unit_tests/sources/metrics/{test_metric_query_pool_3.cpp => test_metric_oa_query_pool_3.cpp} (99%)
 rename level_zero/tools/test/unit_tests/sources/metrics/{test_metric_streamer_1.cpp => test_metric_oa_streamer_1.cpp} (99%)
 rename level_zero/tools/test/unit_tests/sources/metrics/{test_metric_streamer_2.cpp => test_metric_oa_streamer_2.cpp} (99%)
 rename level_zero/tools/test/unit_tests/sources/metrics/{test_metric_streamer_3.cpp => test_metric_oa_streamer_3.cpp} (99%)
 rename level_zero/tools/test/unit_tests/sources/metrics/windows/{test_metric_enumeration_windows.cpp => test_metric_oa_enumeration_windows.cpp} (97%)

diff --git a/level_zero/tools/source/metrics/CMakeLists.txt b/level_zero/tools/source/metrics/CMakeLists.txt
index 7c2f3f5589..33d0adcf82 100644
--- a/level_zero/tools/source/metrics/CMakeLists.txt
+++ b/level_zero/tools/source/metrics/CMakeLists.txt
@@ -9,10 +9,13 @@ set(L0_SRCS_TOOLS_METRICS
 
 list(APPEND L0_SRCS_TOOLS_METRICS
      ${CMAKE_CURRENT_SOURCE_DIR}/metric.cpp
-     ${CMAKE_CURRENT_SOURCE_DIR}/metric_enumeration_imp.cpp
-     ${CMAKE_CURRENT_SOURCE_DIR}/metric_streamer_imp.cpp
-     ${CMAKE_CURRENT_SOURCE_DIR}/metric_query_imp.cpp
-     ${CMAKE_CURRENT_SOURCE_DIR}/metric_source_oa.h
+     ${CMAKE_CURRENT_SOURCE_DIR}/metric_oa_enumeration_imp.cpp
+     ${CMAKE_CURRENT_SOURCE_DIR}/metric_oa_enumeration_imp.h
+     ${CMAKE_CURRENT_SOURCE_DIR}/metric_oa_streamer_imp.cpp
+     ${CMAKE_CURRENT_SOURCE_DIR}/metric_oa_streamer_imp.h
+     ${CMAKE_CURRENT_SOURCE_DIR}/metric_oa_query_imp.cpp
+     ${CMAKE_CURRENT_SOURCE_DIR}/metric_oa_query_imp.h
+     ${CMAKE_CURRENT_SOURCE_DIR}/metric_oa_source.h
 )
 
 if(UNIX)
diff --git a/level_zero/tools/source/metrics/linux/CMakeLists.txt b/level_zero/tools/source/metrics/linux/CMakeLists.txt
index 277c5258a2..b426f6a68c 100644
--- a/level_zero/tools/source/metrics/linux/CMakeLists.txt
+++ b/level_zero/tools/source/metrics/linux/CMakeLists.txt
@@ -1,13 +1,13 @@
 #
-# Copyright (C) 2020-2021 Intel Corporation
+# Copyright (C) 2020-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 set(L0_SRCS_TOOLS_LINUX
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_query_imp_linux.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_enumeration_imp_linux.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_oa_query_imp_linux.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_oa_enumeration_imp_linux.cpp
 )
 
 if(UNIX)
diff --git a/level_zero/tools/source/metrics/linux/os_metric_enumeration_imp_linux.cpp b/level_zero/tools/source/metrics/linux/os_metric_oa_enumeration_imp_linux.cpp
similarity index 95%
rename from level_zero/tools/source/metrics/linux/os_metric_enumeration_imp_linux.cpp
rename to level_zero/tools/source/metrics/linux/os_metric_oa_enumeration_imp_linux.cpp
index ddad2aa896..e9f47511ea 100644
--- a/level_zero/tools/source/metrics/linux/os_metric_enumeration_imp_linux.cpp
+++ b/level_zero/tools/source/metrics/linux/os_metric_oa_enumeration_imp_linux.cpp
@@ -9,8 +9,8 @@
 #include "shared/source/os_interface/linux/sys_calls.h"
 #include "shared/source/os_interface/os_interface.h"
 
-#include "level_zero/tools/source/metrics/metric_enumeration_imp.h"
-#include "level_zero/tools/source/metrics/metric_source_oa.h"
+#include "level_zero/tools/source/metrics/metric_oa_enumeration_imp.h"
+#include "level_zero/tools/source/metrics/metric_oa_source.h"
 
 #include <sys/stat.h>
 #include <sys/sysmacros.h>
diff --git a/level_zero/tools/source/metrics/linux/os_metric_query_imp_linux.cpp b/level_zero/tools/source/metrics/linux/os_metric_oa_query_imp_linux.cpp
similarity index 94%
rename from level_zero/tools/source/metrics/linux/os_metric_query_imp_linux.cpp
rename to level_zero/tools/source/metrics/linux/os_metric_oa_query_imp_linux.cpp
index 7dee93773f..89f81fa2c7 100644
--- a/level_zero/tools/source/metrics/linux/os_metric_query_imp_linux.cpp
+++ b/level_zero/tools/source/metrics/linux/os_metric_oa_query_imp_linux.cpp
@@ -9,8 +9,8 @@
 #include "shared/source/os_interface/os_interface.h"
 
 #include "level_zero/core/source/device/device.h"
-#include "level_zero/tools/source/metrics/metric_query_imp.h"
-#include "level_zero/tools/source/metrics/metric_source_oa.h"
+#include "level_zero/tools/source/metrics/metric_oa_query_imp.h"
+#include "level_zero/tools/source/metrics/metric_oa_source.h"
 
 using namespace MetricsLibraryApi;
 
diff --git a/level_zero/tools/source/metrics/metric.cpp b/level_zero/tools/source/metrics/metric.cpp
index 3d1efd9891..de95b99709 100644
--- a/level_zero/tools/source/metrics/metric.cpp
+++ b/level_zero/tools/source/metrics/metric.cpp
@@ -14,9 +14,9 @@
 #include "level_zero/core/source/driver/driver.h"
 #include "level_zero/core/source/driver/driver_handle_imp.h"
 #include "level_zero/source/inc/ze_intel_gpu.h"
-#include "level_zero/tools/source/metrics/metric_enumeration_imp.h"
-#include "level_zero/tools/source/metrics/metric_query_imp.h"
-#include "level_zero/tools/source/metrics/metric_source_oa.h"
+#include "level_zero/tools/source/metrics/metric_oa_enumeration_imp.h"
+#include "level_zero/tools/source/metrics/metric_oa_query_imp.h"
+#include "level_zero/tools/source/metrics/metric_oa_source.h"
 
 #include <map>
 #include <utility>
diff --git a/level_zero/tools/source/metrics/metric_enumeration_imp.cpp b/level_zero/tools/source/metrics/metric_oa_enumeration_imp.cpp
similarity index 99%
rename from level_zero/tools/source/metrics/metric_enumeration_imp.cpp
rename to level_zero/tools/source/metrics/metric_oa_enumeration_imp.cpp
index e0a4c1ab62..b41a57ef7a 100644
--- a/level_zero/tools/source/metrics/metric_enumeration_imp.cpp
+++ b/level_zero/tools/source/metrics/metric_oa_enumeration_imp.cpp
@@ -5,15 +5,15 @@
  *
  */
 
-#include "level_zero/tools/source/metrics/metric_enumeration_imp.h"
+#include "level_zero/tools/source/metrics/metric_oa_enumeration_imp.h"
 
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/os_interface/os_library.h"
 
 #include "level_zero/core/source/device/device_imp.h"
-#include "level_zero/tools/source/metrics/metric_query_imp.h"
-#include "level_zero/tools/source/metrics/metric_source_oa.h"
+#include "level_zero/tools/source/metrics/metric_oa_query_imp.h"
+#include "level_zero/tools/source/metrics/metric_oa_source.h"
 
 #include <algorithm>
 
diff --git a/level_zero/tools/source/metrics/metric_enumeration_imp.h b/level_zero/tools/source/metrics/metric_oa_enumeration_imp.h
similarity index 100%
rename from level_zero/tools/source/metrics/metric_enumeration_imp.h
rename to level_zero/tools/source/metrics/metric_oa_enumeration_imp.h
diff --git a/level_zero/tools/source/metrics/metric_query_imp.cpp b/level_zero/tools/source/metrics/metric_oa_query_imp.cpp
similarity index 99%
rename from level_zero/tools/source/metrics/metric_query_imp.cpp
rename to level_zero/tools/source/metrics/metric_oa_query_imp.cpp
index 2e900ef4aa..cec38e1e4b 100644
--- a/level_zero/tools/source/metrics/metric_query_imp.cpp
+++ b/level_zero/tools/source/metrics/metric_oa_query_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/tools/source/metrics/metric_query_imp.h"
+#include "level_zero/tools/source/metrics/metric_oa_query_imp.h"
 
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/device/device.h"
@@ -19,8 +19,8 @@
 #include "level_zero/core/source/cmdlist/cmdlist_imp.h"
 #include "level_zero/core/source/device/device.h"
 #include "level_zero/core/source/device/device_imp.h"
-#include "level_zero/tools/source/metrics/metric_enumeration_imp.h"
-#include "level_zero/tools/source/metrics/metric_source_oa.h"
+#include "level_zero/tools/source/metrics/metric_oa_enumeration_imp.h"
+#include "level_zero/tools/source/metrics/metric_oa_source.h"
 
 using namespace MetricsLibraryApi;
 
diff --git a/level_zero/tools/source/metrics/metric_query_imp.h b/level_zero/tools/source/metrics/metric_oa_query_imp.h
similarity index 100%
rename from level_zero/tools/source/metrics/metric_query_imp.h
rename to level_zero/tools/source/metrics/metric_oa_query_imp.h
diff --git a/level_zero/tools/source/metrics/metric_source_oa.h b/level_zero/tools/source/metrics/metric_oa_source.h
similarity index 92%
rename from level_zero/tools/source/metrics/metric_source_oa.h
rename to level_zero/tools/source/metrics/metric_oa_source.h
index 465feb3b5a..e8c0019ae3 100644
--- a/level_zero/tools/source/metrics/metric_source_oa.h
+++ b/level_zero/tools/source/metrics/metric_oa_source.h
@@ -8,9 +8,9 @@
 #pragma once
 
 #include "level_zero/tools/source/metrics/metric.h"
-#include "level_zero/tools/source/metrics/metric_enumeration_imp.h"
-#include "level_zero/tools/source/metrics/metric_query_imp.h"
-#include "level_zero/tools/source/metrics/metric_streamer_imp.h"
+#include "level_zero/tools/source/metrics/metric_oa_enumeration_imp.h"
+#include "level_zero/tools/source/metrics/metric_oa_query_imp.h"
+#include "level_zero/tools/source/metrics/metric_oa_streamer_imp.h"
 
 namespace NEO {
 class OsLibrary;
diff --git a/level_zero/tools/source/metrics/metric_streamer_imp.cpp b/level_zero/tools/source/metrics/metric_oa_streamer_imp.cpp
similarity index 98%
rename from level_zero/tools/source/metrics/metric_streamer_imp.cpp
rename to level_zero/tools/source/metrics/metric_oa_streamer_imp.cpp
index 41a241bcc0..5b12a86dc6 100644
--- a/level_zero/tools/source/metrics/metric_streamer_imp.cpp
+++ b/level_zero/tools/source/metrics/metric_oa_streamer_imp.cpp
@@ -5,14 +5,14 @@
  *
  */
 
-#include "level_zero/tools/source/metrics/metric_streamer_imp.h"
+#include "level_zero/tools/source/metrics/metric_oa_streamer_imp.h"
 
 #include "shared/source/helpers/debug_helpers.h"
 
 #include "level_zero/core/source/device/device_imp.h"
-#include "level_zero/tools/source/metrics/metric_enumeration_imp.h"
-#include "level_zero/tools/source/metrics/metric_query_imp.h"
-#include "level_zero/tools/source/metrics/metric_source_oa.h"
+#include "level_zero/tools/source/metrics/metric_oa_enumeration_imp.h"
+#include "level_zero/tools/source/metrics/metric_oa_query_imp.h"
+#include "level_zero/tools/source/metrics/metric_oa_source.h"
 
 using namespace MetricsLibraryApi;
 
diff --git a/level_zero/tools/source/metrics/metric_streamer_imp.h b/level_zero/tools/source/metrics/metric_oa_streamer_imp.h
similarity index 100%
rename from level_zero/tools/source/metrics/metric_streamer_imp.h
rename to level_zero/tools/source/metrics/metric_oa_streamer_imp.h
diff --git a/level_zero/tools/source/metrics/windows/CMakeLists.txt b/level_zero/tools/source/metrics/windows/CMakeLists.txt
index 68011ae193..193393d0b1 100644
--- a/level_zero/tools/source/metrics/windows/CMakeLists.txt
+++ b/level_zero/tools/source/metrics/windows/CMakeLists.txt
@@ -1,13 +1,13 @@
 #
-# Copyright (C) 2020-2021 Intel Corporation
+# Copyright (C) 2020-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 set(L0_SRCS_TOOLS_WINDOWS
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_query_imp_windows.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_enumeration_imp_windows.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_oa_query_imp_windows.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_oa_enumeration_imp_windows.cpp
 )
 
 if(WIN32)
diff --git a/level_zero/tools/source/metrics/windows/os_metric_enumeration_imp_windows.cpp b/level_zero/tools/source/metrics/windows/os_metric_oa_enumeration_imp_windows.cpp
similarity index 93%
rename from level_zero/tools/source/metrics/windows/os_metric_enumeration_imp_windows.cpp
rename to level_zero/tools/source/metrics/windows/os_metric_oa_enumeration_imp_windows.cpp
index 56d0280dcb..c3cf9e4d7f 100644
--- a/level_zero/tools/source/metrics/windows/os_metric_enumeration_imp_windows.cpp
+++ b/level_zero/tools/source/metrics/windows/os_metric_oa_enumeration_imp_windows.cpp
@@ -8,8 +8,8 @@
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/source/os_interface/windows/wddm/wddm.h"
 
-#include "level_zero/tools/source/metrics/metric_enumeration_imp.h"
-#include "level_zero/tools/source/metrics/metric_source_oa.h"
+#include "level_zero/tools/source/metrics/metric_oa_enumeration_imp.h"
+#include "level_zero/tools/source/metrics/metric_oa_source.h"
 
 #if defined(_WIN64)
 #define METRICS_DISCOVERY_NAME "igdmd64.dll"
diff --git a/level_zero/tools/source/metrics/windows/os_metric_query_imp_windows.cpp b/level_zero/tools/source/metrics/windows/os_metric_oa_query_imp_windows.cpp
similarity index 95%
rename from level_zero/tools/source/metrics/windows/os_metric_query_imp_windows.cpp
rename to level_zero/tools/source/metrics/windows/os_metric_oa_query_imp_windows.cpp
index c3d0a7b4dd..300dcde54c 100644
--- a/level_zero/tools/source/metrics/windows/os_metric_query_imp_windows.cpp
+++ b/level_zero/tools/source/metrics/windows/os_metric_oa_query_imp_windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,7 +9,7 @@
 #include "shared/source/os_interface/windows/wddm/wddm.h"
 
 #include "level_zero/core/source/device/device.h"
-#include "level_zero/tools/source/metrics/metric_query_imp.h"
+#include "level_zero/tools/source/metrics/metric_oa_query_imp.h"
 
 #if defined(_WIN64)
 #define METRICS_LIBRARY_NAME "igdml64.dll"
diff --git a/level_zero/tools/test/unit_tests/sources/metrics/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/metrics/CMakeLists.txt
index cbaa722b42..2921476860 100644
--- a/level_zero/tools/test/unit_tests/sources/metrics/CMakeLists.txt
+++ b/level_zero/tools/test/unit_tests/sources/metrics/CMakeLists.txt
@@ -6,19 +6,19 @@
 
 target_sources(${TARGET_NAME} PRIVATE
                ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-               ${CMAKE_CURRENT_SOURCE_DIR}/mock_metric.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/mock_metric.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/mock_metric_enumeration.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/mock_metric_enumeration.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_enumeration_1.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_enumeration_2.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_query_pool_1.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_query_pool_2.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_query_pool_3.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_streamer_1.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_streamer_2.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_streamer_3.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_initialization.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/mock_metric_oa.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/mock_metric_oa.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/mock_metric_oa_enumeration.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/mock_metric_oa_enumeration.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_oa_enumeration_1.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_oa_enumeration_2.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_oa_query_pool_1.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_oa_query_pool_2.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_oa_query_pool_3.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_oa_streamer_1.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_oa_streamer_2.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_oa_streamer_3.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_oa_initialization.cpp
 
 )
 
diff --git a/level_zero/tools/test/unit_tests/sources/metrics/linux/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/metrics/linux/CMakeLists.txt
index 723f5fc2d4..4d2c8f6938 100644
--- a/level_zero/tools/test/unit_tests/sources/metrics/linux/CMakeLists.txt
+++ b/level_zero/tools/test/unit_tests/sources/metrics/linux/CMakeLists.txt
@@ -1,11 +1,11 @@
 #
-# Copyright (C) 2020-2021 Intel Corporation
+# Copyright (C) 2020-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 if(UNIX)
   target_sources(${TARGET_NAME} PRIVATE
-                 ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_query_pool_linux.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_oa_query_pool_linux.cpp
   )
 endif()
diff --git a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_query_pool_linux.cpp b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_oa_query_pool_linux.cpp
similarity index 99%
rename from level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_query_pool_linux.cpp
rename to level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_oa_query_pool_linux.cpp
index 0110feb133..1002ee1226 100644
--- a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_query_pool_linux.cpp
+++ b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_oa_query_pool_linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -12,7 +12,7 @@
 #include "shared/test/common/mocks/mock_io_functions.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric.h"
+#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/level_zero/tools/test/unit_tests/sources/metrics/mock_metric.cpp b/level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.cpp
similarity index 99%
rename from level_zero/tools/test/unit_tests/sources/metrics/mock_metric.cpp
rename to level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.cpp
index de824518b0..37068eaff5 100644
--- a/level_zero/tools/test/unit_tests/sources/metrics/mock_metric.cpp
+++ b/level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.cpp
@@ -5,13 +5,13 @@
  *
  */
 
-#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric.h"
+#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h"
 
 #include "shared/source/command_container/implicit_scaling.h"
 #include "shared/test/common/mocks/mock_os_library.h"
 
-#include "level_zero/tools/source/metrics/metric_source_oa.h"
-#include "level_zero/tools/source/metrics/metric_streamer_imp.h"
+#include "level_zero/tools/source/metrics/metric_oa_source.h"
+#include "level_zero/tools/source/metrics/metric_oa_streamer_imp.h"
 
 using namespace MetricsLibraryApi;
 
diff --git a/level_zero/tools/test/unit_tests/sources/metrics/mock_metric.h b/level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h
similarity index 98%
rename from level_zero/tools/test/unit_tests/sources/metrics/mock_metric.h
rename to level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h
index 95dba14f13..c429e1bac9 100644
--- a/level_zero/tools/test/unit_tests/sources/metrics/mock_metric.h
+++ b/level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h
@@ -13,9 +13,9 @@
 #include "level_zero/core/test/unit_tests/mock.h"
 #include "level_zero/core/test/unit_tests/white_box.h"
 #include "level_zero/tools/source/metrics/metric.h"
-#include "level_zero/tools/source/metrics/metric_enumeration_imp.h"
-#include "level_zero/tools/source/metrics/metric_query_imp.h"
-#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_enumeration.h"
+#include "level_zero/tools/source/metrics/metric_oa_enumeration_imp.h"
+#include "level_zero/tools/source/metrics/metric_oa_query_imp.h"
+#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa_enumeration.h"
 
 namespace L0 {
 namespace ult {
diff --git a/level_zero/tools/test/unit_tests/sources/metrics/mock_metric_enumeration.cpp b/level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa_enumeration.cpp
similarity index 98%
rename from level_zero/tools/test/unit_tests/sources/metrics/mock_metric_enumeration.cpp
rename to level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa_enumeration.cpp
index c75e8f16e0..54c8f0cb49 100644
--- a/level_zero/tools/test/unit_tests/sources/metrics/mock_metric_enumeration.cpp
+++ b/level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa_enumeration.cpp
@@ -5,9 +5,9 @@
  *
  */
 
-#include "level_zero/tools/source/metrics/metric_enumeration_imp.h"
-#include "level_zero/tools/source/metrics/metric_source_oa.h"
-#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric.h"
+#include "level_zero/tools/source/metrics/metric_oa_enumeration_imp.h"
+#include "level_zero/tools/source/metrics/metric_oa_source.h"
+#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h"
 
 namespace L0 {
 namespace ult {
diff --git a/level_zero/tools/test/unit_tests/sources/metrics/mock_metric_enumeration.h b/level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa_enumeration.h
similarity index 98%
rename from level_zero/tools/test/unit_tests/sources/metrics/mock_metric_enumeration.h
rename to level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa_enumeration.h
index 1295568d47..eae1b4228b 100644
--- a/level_zero/tools/test/unit_tests/sources/metrics/mock_metric_enumeration.h
+++ b/level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa_enumeration.h
@@ -11,8 +11,8 @@
 #include "level_zero/core/test/unit_tests/mock.h"
 #include "level_zero/core/test/unit_tests/white_box.h"
 #include "level_zero/tools/source/metrics/metric.h"
-#include "level_zero/tools/source/metrics/metric_enumeration_imp.h"
-#include "level_zero/tools/source/metrics/metric_query_imp.h"
+#include "level_zero/tools/source/metrics/metric_oa_enumeration_imp.h"
+#include "level_zero/tools/source/metrics/metric_oa_query_imp.h"
 
 namespace L0 {
 namespace ult {
diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_enumeration_1.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_enumeration_1.cpp
similarity index 99%
rename from level_zero/tools/test/unit_tests/sources/metrics/test_metric_enumeration_1.cpp
rename to level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_enumeration_1.cpp
index 8680d699cc..74a99b2d15 100644
--- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_enumeration_1.cpp
+++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_enumeration_1.cpp
@@ -9,8 +9,8 @@
 
 #include "level_zero/core/source/device/device_imp.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_driver.h"
-#include "level_zero/tools/source/metrics/metric_source_oa.h"
-#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric.h"
+#include "level_zero/tools/source/metrics/metric_oa_source.h"
+#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_enumeration_2.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_enumeration_2.cpp
similarity index 99%
rename from level_zero/tools/test/unit_tests/sources/metrics/test_metric_enumeration_2.cpp
rename to level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_enumeration_2.cpp
index ab018b591c..a122a72b39 100644
--- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_enumeration_2.cpp
+++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_enumeration_2.cpp
@@ -9,8 +9,8 @@
 
 #include "level_zero/core/source/device/device_imp.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_driver.h"
-#include "level_zero/tools/source/metrics/metric_source_oa.h"
-#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric.h"
+#include "level_zero/tools/source/metrics/metric_oa_source.h"
+#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_initialization.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_initialization.cpp
similarity index 95%
rename from level_zero/tools/test/unit_tests/sources/metrics/test_metric_initialization.cpp
rename to level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_initialization.cpp
index 38fca613ac..2e0d606039 100644
--- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_initialization.cpp
+++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_initialization.cpp
@@ -8,8 +8,8 @@
 #include "shared/source/os_interface/os_library.h"
 
 #include "level_zero/core/test/unit_tests/mocks/mock_driver.h"
-#include "level_zero/tools/source/metrics/metric_source_oa.h"
-#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric.h"
+#include "level_zero/tools/source/metrics/metric_oa_source.h"
+#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_query_pool_1.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_1.cpp
similarity index 99%
rename from level_zero/tools/test/unit_tests/sources/metrics/test_metric_query_pool_1.cpp
rename to level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_1.cpp
index 4a1cab5c9a..7a4d6b0d9d 100644
--- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_query_pool_1.cpp
+++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_1.cpp
@@ -12,8 +12,8 @@
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_device.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h"
-#include "level_zero/tools/source/metrics/metric_source_oa.h"
-#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric.h"
+#include "level_zero/tools/source/metrics/metric_oa_source.h"
+#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_query_pool_2.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_2.cpp
similarity index 99%
rename from level_zero/tools/test/unit_tests/sources/metrics/test_metric_query_pool_2.cpp
rename to level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_2.cpp
index 0affd5f847..46eb62ee6a 100644
--- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_query_pool_2.cpp
+++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_2.cpp
@@ -13,8 +13,8 @@
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_device.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h"
-#include "level_zero/tools/source/metrics/metric_source_oa.h"
-#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric.h"
+#include "level_zero/tools/source/metrics/metric_oa_source.h"
+#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_query_pool_3.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_3.cpp
similarity index 99%
rename from level_zero/tools/test/unit_tests/sources/metrics/test_metric_query_pool_3.cpp
rename to level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_3.cpp
index 291a3ea5dd..5f3f95e817 100644
--- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_query_pool_3.cpp
+++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_3.cpp
@@ -13,8 +13,8 @@
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_device.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h"
-#include "level_zero/tools/source/metrics/metric_source_oa.h"
-#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric.h"
+#include "level_zero/tools/source/metrics/metric_oa_source.h"
+#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_streamer_1.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_1.cpp
similarity index 99%
rename from level_zero/tools/test/unit_tests/sources/metrics/test_metric_streamer_1.cpp
rename to level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_1.cpp
index 3f0356d950..8d1da039b4 100644
--- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_streamer_1.cpp
+++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_1.cpp
@@ -9,8 +9,8 @@
 
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_driver.h"
-#include "level_zero/tools/source/metrics/metric_source_oa.h"
-#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric.h"
+#include "level_zero/tools/source/metrics/metric_oa_source.h"
+#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_streamer_2.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_2.cpp
similarity index 99%
rename from level_zero/tools/test/unit_tests/sources/metrics/test_metric_streamer_2.cpp
rename to level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_2.cpp
index 3bcb76e7ab..cda57ba79b 100644
--- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_streamer_2.cpp
+++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_2.cpp
@@ -7,8 +7,8 @@
 
 #include "shared/test/common/test_macros/test.h"
 
-#include "level_zero/tools/source/metrics/metric_source_oa.h"
-#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric.h"
+#include "level_zero/tools/source/metrics/metric_oa_source.h"
+#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h"
 
 using ::testing::_;
 using ::testing::Return;
diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_streamer_3.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_3.cpp
similarity index 99%
rename from level_zero/tools/test/unit_tests/sources/metrics/test_metric_streamer_3.cpp
rename to level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_3.cpp
index 1d6503f710..80408f8c18 100644
--- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_streamer_3.cpp
+++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_3.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,7 @@
 
 #include "shared/test/common/test_macros/test.h"
 
-#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric.h"
+#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h"
 
 using ::testing::_;
 using ::testing::Return;
diff --git a/level_zero/tools/test/unit_tests/sources/metrics/windows/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/metrics/windows/CMakeLists.txt
index 0821d285c5..43e028b980 100644
--- a/level_zero/tools/test/unit_tests/sources/metrics/windows/CMakeLists.txt
+++ b/level_zero/tools/test/unit_tests/sources/metrics/windows/CMakeLists.txt
@@ -1,11 +1,11 @@
 #
-# Copyright (C) 2021 Intel Corporation
+# Copyright (C) 2021-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 if(WIN32)
   target_sources(${TARGET_NAME} PRIVATE
-                 ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_enumeration_windows.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_oa_enumeration_windows.cpp
   )
 endif()
diff --git a/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_enumeration_windows.cpp b/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_oa_enumeration_windows.cpp
similarity index 97%
rename from level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_enumeration_windows.cpp
rename to level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_oa_enumeration_windows.cpp
index d96122d5ab..8800d6976c 100644
--- a/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_enumeration_windows.cpp
+++ b/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_oa_enumeration_windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,7 +9,7 @@
 #include "shared/test/common/mocks/mock_wddm.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric.h"
+#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"