diff --git a/shared/source/os_interface/windows/wddm/wddm_additional_adapter_info_options.cpp b/shared/source/os_interface/windows/wddm/wddm_additional_adapter_info_options.cpp index 1a09930fb1..7d078cd8c9 100644 --- a/shared/source/os_interface/windows/wddm/wddm_additional_adapter_info_options.cpp +++ b/shared/source/os_interface/windows/wddm/wddm_additional_adapter_info_options.cpp @@ -1,10 +1,13 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/source/execution_environment/root_device_environment.h" +#include "shared/source/helpers/hw_info.h" +#include "shared/source/os_interface/product_helper.h" #include "shared/source/os_interface/windows/wddm/wddm.h" namespace NEO { @@ -12,5 +15,7 @@ namespace NEO { void Wddm::populateAdditionalAdapterInfoOptions(const ADAPTER_INFO_KMD &adapterInfo) { } void Wddm::populateIpVersion(HardwareInfo &hwInfo) { + auto &productHelper = rootDeviceEnvironment.getHelper(); + hwInfo.ipVersion.value = productHelper.getProductConfigFromHwInfo(hwInfo); } } // namespace NEO diff --git a/shared/test/common/mocks/mock_wddm.h b/shared/test/common/mocks/mock_wddm.h index c408091d1e..89f84056ea 100644 --- a/shared/test/common/mocks/mock_wddm.h +++ b/shared/test/common/mocks/mock_wddm.h @@ -39,6 +39,7 @@ class WddmMock : public Wddm { using Wddm::featureTable; using Wddm::forceEvictOnlyIfNecessary; using Wddm::getSystemInfo; + using Wddm::gfxPlatform; using Wddm::gmmMemory; using Wddm::hwDeviceId; using Wddm::mapGpuVirtualAddress; diff --git a/shared/test/unit_test/os_interface/windows/CMakeLists.txt b/shared/test/unit_test/os_interface/windows/CMakeLists.txt index 888bdd5baa..475d023d99 100644 --- a/shared/test/unit_test/os_interface/windows/CMakeLists.txt +++ b/shared/test/unit_test/os_interface/windows/CMakeLists.txt @@ -25,6 +25,7 @@ if(WIN32) ${CMAKE_CURRENT_SOURCE_DIR}/registry_reader_tests.h ${CMAKE_CURRENT_SOURCE_DIR}/self_lib_win.cpp ${CMAKE_CURRENT_SOURCE_DIR}/um_km_data_translator_tests.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/${BRANCH_DIR_SUFFIX}wddm_additional_apater_info_options_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/wddm_address_space_windows_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/wddm_command_stream_l0_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/wddm_kmdaf_listener_tests.cpp diff --git a/shared/test/unit_test/os_interface/windows/wddm_additional_apater_info_options_tests.cpp b/shared/test/unit_test/os_interface/windows/wddm_additional_apater_info_options_tests.cpp new file mode 100644 index 0000000000..1c302f2092 --- /dev/null +++ b/shared/test/unit_test/os_interface/windows/wddm_additional_apater_info_options_tests.cpp @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2023 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#include "shared/source/execution_environment/root_device_environment.h" +#include "shared/source/helpers/hw_info.h" +#include "shared/source/os_interface/product_helper.h" +#include "shared/test/common/os_interface/windows/wddm_fixture.h" +#include "shared/test/common/test_macros/hw_test.h" + +using namespace NEO; + +TEST_F(WddmTest, WhenPopulateIpVersionWddmIsCalledThenIpVersionIsSet) { + + auto &productHelper = wddm->rootDeviceEnvironment.getHelper(); + HardwareInfo hwInfo = *defaultHwInfo; + auto config = productHelper.getProductConfigFromHwInfo(hwInfo); + wddm->populateIpVersion(hwInfo); + + EXPECT_EQ(config, hwInfo.ipVersion.value); +}