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>
This commit is contained in:
Joshua Santosh Ranjan 2022-02-14 07:31:23 +00:00 committed by Compute-Runtime-Automation
parent 1e5f126bcf
commit cec0ea2809
33 changed files with 87 additions and 84 deletions

View File

@ -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)

View File

@ -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)

View File

@ -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>

View File

@ -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;

View File

@ -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>

View File

@ -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>

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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)

View File

@ -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"

View File

@ -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"

View File

@ -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
)

View File

@ -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()

View File

@ -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"

View File

@ -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;

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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;

View File

@ -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;

View File

@ -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()

View File

@ -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"