diff --git a/level_zero/tools/source/metrics/CMakeLists.txt b/level_zero/tools/source/metrics/CMakeLists.txt index 88f02733b9..396821796d 100644 --- a/level_zero/tools/source/metrics/CMakeLists.txt +++ b/level_zero/tools/source/metrics/CMakeLists.txt @@ -23,6 +23,7 @@ target_sources(${L0_STATIC_LIB_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/metric_ip_sampling_streamer.h ${CMAKE_CURRENT_SOURCE_DIR}/metric_ip_sampling_streamer.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_metric.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_oa_enumeration_${DRIVER_MODEL}.cpp ${CMAKE_CURRENT_SOURCE_DIR}/${BRANCH_DIR_SUFFIX}/metric_device_context_create.cpp ) add_subdirectories() diff --git a/level_zero/tools/source/metrics/linux/CMakeLists.txt b/level_zero/tools/source/metrics/linux/CMakeLists.txt index 6d97c36e90..7f155116cb 100644 --- a/level_zero/tools/source/metrics/linux/CMakeLists.txt +++ b/level_zero/tools/source/metrics/linux/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2020-2023 Intel Corporation +# Copyright (C) 2020-2024 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -10,6 +10,7 @@ if(UNIX) ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_oa_query_imp_linux.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_oa_enumeration_imp_linux.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_oa_enumeration_imp_linux.h ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_oa_streamer_imp_linux.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_ip_sampling_imp_linux.cpp ) diff --git a/level_zero/tools/source/metrics/linux/os_metric_oa_enumeration_imp_linux.cpp b/level_zero/tools/source/metrics/linux/os_metric_oa_enumeration_imp_linux.cpp index 70e57451c4..7d5ce7bb46 100644 --- a/level_zero/tools/source/metrics/linux/os_metric_oa_enumeration_imp_linux.cpp +++ b/level_zero/tools/source/metrics/linux/os_metric_oa_enumeration_imp_linux.cpp @@ -1,10 +1,12 @@ /* - * Copyright (C) 2020-2023 Intel Corporation + * Copyright (C) 2020-2024 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "level_zero/tools/source/metrics/linux/os_metric_oa_enumeration_imp_linux.h" + #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/os_interface/linux/drm_neo.h" #include "shared/source/os_interface/linux/sys_calls.h" @@ -26,9 +28,7 @@ void MetricEnumeration::getMetricsDiscoveryFilename(std::vector &n names.push_back("libmd.so.1"); } -bool MetricEnumeration::getAdapterId(uint32_t &adapterMajor, uint32_t &adapterMinor) { - - auto &device = metricSource.getMetricDeviceContext().getDevice(); +bool getDrmAdapterId(uint32_t &adapterMajor, uint32_t &adapterMinor, Device &device) { auto &osInterface = device.getOsInterface(); auto drm = osInterface.getDriverModel()->as(); auto drmFile = drm->getFileDescriptor(); @@ -42,15 +42,16 @@ bool MetricEnumeration::getAdapterId(uint32_t &adapterMajor, uint32_t &adapterMi return result == 0; } -MetricsDiscovery::IAdapter_1_9 *MetricEnumeration::getMetricsAdapter() { - - UNRECOVERABLE_IF(pAdapterGroup == nullptr); - +MetricsDiscovery::IAdapter_1_9 *getDrmMetricsAdapter(MetricEnumeration *metricEnumeration) { // Obtain drm minor / major version. uint32_t drmMajor = 0; uint32_t drmMinor = 0; - UNRECOVERABLE_IF(getAdapterId(drmMajor, drmMinor) == false); + auto pAdapterGroup = metricEnumeration->getMdapiAdapterGroup(); + auto &device = metricEnumeration->getMetricSource().getMetricDeviceContext().getDevice(); + + UNRECOVERABLE_IF(pAdapterGroup == nullptr); + UNRECOVERABLE_IF(getDrmAdapterId(drmMajor, drmMinor, device) == false); // Driver drm major/minor version. const int32_t drmNodePrimary = 0; // From xf86drm.h @@ -61,15 +62,15 @@ MetricsDiscovery::IAdapter_1_9 *MetricEnumeration::getMetricsAdapter() { const int32_t drmMinorPrimary = drmMinor - (drmNodePrimary * drmMaxDevices); // Enumerate metrics discovery adapters. - for (uint32_t index = 0, count = getAdapterGroupParams(pAdapterGroup)->AdapterCount; + for (uint32_t index = 0, count = metricEnumeration->getAdapterGroupParams(pAdapterGroup)->AdapterCount; index < count; ++index) { UNRECOVERABLE_IF(pAdapterGroup->GetAdapter(index) == nullptr); UNRECOVERABLE_IF(pAdapterGroup->GetAdapter(index)->GetParams() == nullptr); - auto adapter = getAdapterFromAdapterGroup(pAdapterGroup, index); - auto adapterParams = getAdapterParams(adapter); + auto adapter = metricEnumeration->getAdapterFromAdapterGroup(pAdapterGroup, index); + auto adapterParams = metricEnumeration->getAdapterParams(adapter); const bool validAdapterType = adapterParams->SystemId.Type == MetricsDiscovery::ADAPTER_ID_TYPE_MAJOR_MINOR; const bool validAdapterMajor = adapterParams->SystemId.MajorMinor.Major == static_cast(drmMajor); @@ -83,22 +84,9 @@ MetricsDiscovery::IAdapter_1_9 *MetricEnumeration::getMetricsAdapter() { return nullptr; } -class MetricOALinuxImp : public MetricOAOsInterface { - public: - MetricOALinuxImp(Device &device); - ~MetricOALinuxImp() override = default; - ze_result_t getMetricsTimerResolution(uint64_t &timerResolution) override; - - private: - Device &device; -}; MetricOALinuxImp::MetricOALinuxImp(Device &device) : device(device) {} -std::unique_ptr MetricOAOsInterface::create(Device &device) { - return std::make_unique(device); -} - ze_result_t MetricOALinuxImp::getMetricsTimerResolution(uint64_t &timerResolution) { ze_result_t result = ZE_RESULT_SUCCESS; diff --git a/level_zero/tools/source/metrics/linux/os_metric_oa_enumeration_imp_linux.h b/level_zero/tools/source/metrics/linux/os_metric_oa_enumeration_imp_linux.h new file mode 100644 index 0000000000..4827e4e951 --- /dev/null +++ b/level_zero/tools/source/metrics/linux/os_metric_oa_enumeration_imp_linux.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2024 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#pragma once +#include "level_zero/tools/source/metrics/os_interface_metric.h" + +#include "metrics_discovery_api.h" + +namespace L0 { +struct Device; +struct MetricEnumeration; + +bool getDrmAdapterId(uint32_t &adapterMajor, uint32_t &adapterMinor, Device &device); + +MetricsDiscovery::IAdapter_1_9 *getDrmMetricsAdapter(MetricEnumeration *metricEnumeration); + +class MetricOALinuxImp : public MetricOAOsInterface { + public: + MetricOALinuxImp(Device &device); + ~MetricOALinuxImp() override = default; + ze_result_t getMetricsTimerResolution(uint64_t &timerResolution) override; + + private: + Device &device; +}; + +} // namespace L0 diff --git a/level_zero/tools/source/metrics/metric_oa_enumeration_imp.h b/level_zero/tools/source/metrics/metric_oa_enumeration_imp.h index 452639b0e2..70f0e5071c 100644 --- a/level_zero/tools/source/metrics/metric_oa_enumeration_imp.h +++ b/level_zero/tools/source/metrics/metric_oa_enumeration_imp.h @@ -38,6 +38,8 @@ struct MetricEnumeration { MetricsDiscovery::IMetricsDevice_1_5 *getMdapiDevice() { return pMetricsDevice; } MetricsDiscovery::IAdapter_1_9 *getMdapiAdapter() { return pAdapter; } + MetricsDiscovery::IAdapterGroup_1_9 *getMdapiAdapterGroup() { return pAdapterGroup; } + OaMetricSourceImp &getMetricSource() { return metricSource; } virtual MetricsDiscovery::IAdapter_1_9 *getAdapterFromAdapterGroup( MetricsDiscovery::IAdapterGroup_1_9 *adapterGroup, uint32_t index) { diff --git a/level_zero/tools/source/metrics/os_metric_oa_enumeration_drm.cpp b/level_zero/tools/source/metrics/os_metric_oa_enumeration_drm.cpp new file mode 100644 index 0000000000..d3779b46a6 --- /dev/null +++ b/level_zero/tools/source/metrics/os_metric_oa_enumeration_drm.cpp @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2024 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#include "level_zero/tools/source/metrics/linux/os_metric_oa_enumeration_imp_linux.h" +#include "level_zero/tools/source/metrics/metric_oa_enumeration_imp.h" + +namespace L0 { + +bool MetricEnumeration::getAdapterId(uint32_t &major, uint32_t &minor) { + auto &device = metricSource.getMetricDeviceContext().getDevice(); + return getDrmAdapterId(major, minor, device); +} + +MetricsDiscovery::IAdapter_1_9 *MetricEnumeration::getMetricsAdapter() { + return getDrmMetricsAdapter(this); +} + +std::unique_ptr MetricOAOsInterface::create(Device &device) { + return std::make_unique(device); +} + +} // namespace L0 diff --git a/level_zero/tools/source/metrics/os_metric_oa_enumeration_drm_or_wddm.cpp b/level_zero/tools/source/metrics/os_metric_oa_enumeration_drm_or_wddm.cpp new file mode 100644 index 0000000000..6d2be40eac --- /dev/null +++ b/level_zero/tools/source/metrics/os_metric_oa_enumeration_drm_or_wddm.cpp @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2024 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#include "shared/source/device/device.h" +#include "shared/source/execution_environment/root_device_environment.h" +#include "shared/source/helpers/driver_model_type.h" +#include "shared/source/os_interface/os_interface.h" + +#include "level_zero/core/source/device/device.h" +#include "level_zero/tools/source/metrics/linux/os_metric_oa_enumeration_imp_linux.h" +#include "level_zero/tools/source/metrics/metric_oa_enumeration_imp.h" +#include "level_zero/tools/source/metrics/wddm/os_metric_oa_enumeration_imp_wddm.h" + +namespace L0 { + +bool MetricEnumeration::getAdapterId(uint32_t &major, uint32_t &minor) { + auto &device = metricSource.getMetricDeviceContext().getDevice(); + auto osInterface = device.getNEODevice()->getRootDeviceEnvironment().osInterface.get(); + + if (osInterface && osInterface->getDriverModel()->getDriverModelType() == NEO::DriverModelType::wddm) + return getWddmAdapterId(major, minor, device); + else + return getDrmAdapterId(major, minor, device); +} + +MetricsDiscovery::IAdapter_1_9 *MetricEnumeration::getMetricsAdapter() { + auto osInterface = metricSource.getMetricDeviceContext().getDevice().getNEODevice()->getRootDeviceEnvironment().osInterface.get(); + + if (osInterface && osInterface->getDriverModel()->getDriverModelType() == NEO::DriverModelType::wddm) + return getWddmMetricsAdapter(this); + else + return getDrmMetricsAdapter(this); +} + +std::unique_ptr MetricOAOsInterface::create(Device &device) { + auto osInterface = device.getNEODevice()->getRootDeviceEnvironment().osInterface.get(); + + if (osInterface && osInterface->getDriverModel()->getDriverModelType() == NEO::DriverModelType::wddm) + return std::make_unique(); + else + return std::make_unique(device); +} + +} // namespace L0 diff --git a/level_zero/tools/source/metrics/os_metric_oa_enumeration_imp_drm.cpp b/level_zero/tools/source/metrics/os_metric_oa_enumeration_imp_drm.cpp new file mode 100644 index 0000000000..d3779b46a6 --- /dev/null +++ b/level_zero/tools/source/metrics/os_metric_oa_enumeration_imp_drm.cpp @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2024 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#include "level_zero/tools/source/metrics/linux/os_metric_oa_enumeration_imp_linux.h" +#include "level_zero/tools/source/metrics/metric_oa_enumeration_imp.h" + +namespace L0 { + +bool MetricEnumeration::getAdapterId(uint32_t &major, uint32_t &minor) { + auto &device = metricSource.getMetricDeviceContext().getDevice(); + return getDrmAdapterId(major, minor, device); +} + +MetricsDiscovery::IAdapter_1_9 *MetricEnumeration::getMetricsAdapter() { + return getDrmMetricsAdapter(this); +} + +std::unique_ptr MetricOAOsInterface::create(Device &device) { + return std::make_unique(device); +} + +} // namespace L0 diff --git a/level_zero/tools/source/metrics/os_metric_oa_enumeration_wddm.cpp b/level_zero/tools/source/metrics/os_metric_oa_enumeration_wddm.cpp new file mode 100644 index 0000000000..f62258729e --- /dev/null +++ b/level_zero/tools/source/metrics/os_metric_oa_enumeration_wddm.cpp @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2024 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#include "level_zero/tools/source/metrics/metric_oa_enumeration_imp.h" +#include "level_zero/tools/source/metrics/wddm/os_metric_oa_enumeration_imp_wddm.h" + +namespace L0 { + +bool MetricEnumeration::getAdapterId(uint32_t &major, uint32_t &minor) { + auto &device = metricSource.getMetricDeviceContext().getDevice(); + return getWddmAdapterId(major, minor, device); +} + +MetricsDiscovery::IAdapter_1_9 *MetricEnumeration::getMetricsAdapter() { + return getWddmMetricsAdapter(this); +} + +std::unique_ptr MetricOAOsInterface::create(Device &device) { + return std::make_unique(); +} + +} // namespace L0 diff --git a/level_zero/tools/source/metrics/wddm/CMakeLists.txt b/level_zero/tools/source/metrics/wddm/CMakeLists.txt new file mode 100644 index 0000000000..7f27fe5831 --- /dev/null +++ b/level_zero/tools/source/metrics/wddm/CMakeLists.txt @@ -0,0 +1,14 @@ +# +# Copyright (C) 2024 Intel Corporation +# +# SPDX-License-Identifier: MIT +# + +if(WIN32 OR NOT DISABLE_WDDM_LINUX) + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_oa_enumeration_imp_wddm.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_oa_enumeration_imp_wddm.h + ) +endif() diff --git a/level_zero/tools/source/metrics/wddm/os_metric_oa_enumeration_imp_wddm.cpp b/level_zero/tools/source/metrics/wddm/os_metric_oa_enumeration_imp_wddm.cpp new file mode 100644 index 0000000000..ef5174194b --- /dev/null +++ b/level_zero/tools/source/metrics/wddm/os_metric_oa_enumeration_imp_wddm.cpp @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2024 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#include "level_zero/tools/source/metrics/wddm/os_metric_oa_enumeration_imp_wddm.h" + +#include "shared/source/os_interface/windows/wddm/wddm.h" + +#include "level_zero/core/source/device/device.h" +#include "level_zero/tools/source/metrics/metric_oa_enumeration_imp.h" + +namespace L0 { + +bool getWddmAdapterId(uint32_t &major, uint32_t &minor, Device &device) { + auto wddm = device.getOsInterface().getDriverModel()->as(); + auto luid = wddm->getAdapterLuid(); + + major = luid.HighPart; + minor = luid.LowPart; + + return true; +} + +MetricsDiscovery::IAdapter_1_9 *getWddmMetricsAdapter(MetricEnumeration *metricEnumeration) { + uint32_t major = 0; + uint32_t minor = 0; + + auto pAdapterGroup = metricEnumeration->getMdapiAdapterGroup(); + auto &device = metricEnumeration->getMetricSource().getMetricDeviceContext().getDevice(); + + UNRECOVERABLE_IF(pAdapterGroup == nullptr); + UNRECOVERABLE_IF(getWddmAdapterId(major, minor, device) == false); + + // Enumerate metrics discovery adapters. + for (uint32_t index = 0, count = metricEnumeration->getAdapterGroupParams(pAdapterGroup)->AdapterCount; + index < count; + ++index) { + + UNRECOVERABLE_IF(pAdapterGroup->GetAdapter(index) == nullptr); + UNRECOVERABLE_IF(pAdapterGroup->GetAdapter(index)->GetParams() == nullptr); + + auto adapter = metricEnumeration->getAdapterFromAdapterGroup(pAdapterGroup, index); + auto adapterParams = metricEnumeration->getAdapterParams(adapter); + + const bool validAdapterInfo = adapterParams->SystemId.Type == MetricsDiscovery::ADAPTER_ID_TYPE_LUID; + const bool validAdapterMatch = (static_cast(adapterParams->SystemId.Luid.HighPart) == major) && + (adapterParams->SystemId.Luid.LowPart == minor); + + if (validAdapterInfo && validAdapterMatch) { + return adapter; + } + } + + return nullptr; +} + +ze_result_t MetricOAWindowsImp::getMetricsTimerResolution(uint64_t &timerResolution) { + return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE; +} + +} // namespace L0 diff --git a/level_zero/tools/source/metrics/wddm/os_metric_oa_enumeration_imp_wddm.h b/level_zero/tools/source/metrics/wddm/os_metric_oa_enumeration_imp_wddm.h new file mode 100644 index 0000000000..245007c8ec --- /dev/null +++ b/level_zero/tools/source/metrics/wddm/os_metric_oa_enumeration_imp_wddm.h @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2024 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#pragma once + +#include "level_zero/tools/source/metrics/os_interface_metric.h" + +#include "metrics_discovery_api.h" + +namespace L0 { +struct Device; +struct MetricEnumeration; + +bool getWddmAdapterId(uint32_t &major, uint32_t &minor, Device &device); + +MetricsDiscovery::IAdapter_1_9 *getWddmMetricsAdapter(MetricEnumeration *metricEnumeration); + +class MetricOAWindowsImp : public MetricOAOsInterface { + public: + MetricOAWindowsImp() = default; + ~MetricOAWindowsImp() override = default; + ze_result_t getMetricsTimerResolution(uint64_t &timerResolution) override; +}; + +} // namespace L0 diff --git a/level_zero/tools/source/metrics/windows/os_metric_oa_enumeration_imp_windows.cpp b/level_zero/tools/source/metrics/windows/os_metric_oa_enumeration_imp_windows.cpp index 7c1c8387f9..428fb82f97 100644 --- a/level_zero/tools/source/metrics/windows/os_metric_oa_enumeration_imp_windows.cpp +++ b/level_zero/tools/source/metrics/windows/os_metric_oa_enumeration_imp_windows.cpp @@ -1,16 +1,11 @@ /* - * Copyright (C) 2020-2023 Intel Corporation + * Copyright (C) 2024 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/os_interface/os_interface.h" -#include "shared/source/os_interface/windows/wddm/wddm.h" - -#include "level_zero/core/source/device/device.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" @@ -27,62 +22,4 @@ void MetricEnumeration::getMetricsDiscoveryFilename(std::vector &n names.push_back(METRICS_DISCOVERY_NAME); } -bool MetricEnumeration::getAdapterId(uint32_t &major, uint32_t &minor) { - - auto &device = metricSource.getMetricDeviceContext().getDevice(); - auto wddm = device.getOsInterface().getDriverModel()->as(); - auto luid = wddm->getAdapterLuid(); - - major = luid.HighPart; - minor = luid.LowPart; - - return true; -} - -MetricsDiscovery::IAdapter_1_9 *MetricEnumeration::getMetricsAdapter() { - - uint32_t major = 0; - uint32_t minor = 0; - - UNRECOVERABLE_IF(pAdapterGroup == nullptr); - UNRECOVERABLE_IF(getAdapterId(major, minor) == false); - - // Enumerate metrics discovery adapters. - for (uint32_t index = 0, count = getAdapterGroupParams(pAdapterGroup)->AdapterCount; - index < count; - ++index) { - - UNRECOVERABLE_IF(pAdapterGroup->GetAdapter(index) == nullptr); - UNRECOVERABLE_IF(pAdapterGroup->GetAdapter(index)->GetParams() == nullptr); - - auto adapter = getAdapterFromAdapterGroup(pAdapterGroup, index); - auto adapterParams = getAdapterParams(adapter); - - const bool validAdapterInfo = adapterParams->SystemId.Type == MetricsDiscovery::ADAPTER_ID_TYPE_LUID; - const bool validAdapterMatch = (static_cast(adapterParams->SystemId.Luid.HighPart) == major) && - (adapterParams->SystemId.Luid.LowPart == minor); - - if (validAdapterInfo && validAdapterMatch) { - return adapter; - } - } - - return nullptr; -} - -class MetricOAWindowsImp : public MetricOAOsInterface { - public: - MetricOAWindowsImp() = default; - ~MetricOAWindowsImp() override = default; - ze_result_t getMetricsTimerResolution(uint64_t &timerResolution) override; -}; - -std::unique_ptr MetricOAOsInterface::create(Device &device) { - return std::make_unique(); -} - -ze_result_t MetricOAWindowsImp::getMetricsTimerResolution(uint64_t &timerResolution) { - return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE; -} - } // namespace L0 diff --git a/level_zero/tools/test/unit_tests/sources/metrics/wddm/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/metrics/wddm/CMakeLists.txt new file mode 100644 index 0000000000..d650e43560 --- /dev/null +++ b/level_zero/tools/test/unit_tests/sources/metrics/wddm/CMakeLists.txt @@ -0,0 +1,12 @@ +# +# Copyright (C) 2024 Intel Corporation +# +# SPDX-License-Identifier: MIT +# + +if(WIN32 OR NOT DISABLE_WDDM_LINUX) + target_sources(${TARGET_NAME} PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_oa_enumeration_wddm.cpp + ) +endif() diff --git a/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_oa_enumeration_windows.cpp b/level_zero/tools/test/unit_tests/sources/metrics/wddm/test_metric_oa_enumeration_wddm.cpp similarity index 87% rename from level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_oa_enumeration_windows.cpp rename to level_zero/tools/test/unit_tests/sources/metrics/wddm/test_metric_oa_enumeration_wddm.cpp index 79af7d3939..ca67896d04 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_oa_enumeration_windows.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/wddm/test_metric_oa_enumeration_wddm.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_wddm.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/test.h" #include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h" @@ -17,9 +17,9 @@ namespace L0 { namespace ult { -using MetricEnumerationTestWindows = Test; +using MetricEnumerationTestWddm = Test; -TEST_F(MetricEnumerationTestWindows, givenCorrectWindowsAdapterWhenGetMetricsAdapterThenReturnSuccess) { +TEST_F(MetricEnumerationTestWddm, givenCorrectWddmAdapterWhenGetMetricsAdapterThenReturnSuccess) { auto &rootDevice = neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[device->getRootDeviceIndex()]; auto &osInterface = rootDevice->osInterface; 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 25c6fb5de1..c2011034c8 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 @@ -6,7 +6,7 @@ if(WIN32) target_sources(${TARGET_NAME} PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_oa_enumeration_windows.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_ip_sampling.cpp ) endif()