Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

correct name of evict flag to match wddm

Browse Source 
Signed-off-by: Zbigniew Zdanowicz <zbigniew.zdanowicz@intel.com>
This commit is contained in:
Zbigniew Zdanowicz
2022-08-22 12:11:44 +00:00
committed by Compute-Runtime-Automation
parent a6c7f341dd
commit 315f6230bf
30 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp
View File

@ -816,11 +816,11 @@ TEST_F(Wddm20Tests, GivenMultipleHandlesWhenMakingResidentThenBytesToTrimIsCorre
TEST_F(Wddm20Tests, WhenMakingNonResidentAndEvictNotNeededThenEvictIsCalledWithProperFlagSet) { TEST_F(Wddm20Tests, WhenMakingNonResidentAndEvictNotNeededThenEvictIsCalledWithProperFlagSet) {
DebugManagerStateRestore restorer{}; DebugManagerStateRestore restorer{};
DebugManager.flags.PlaformSupportEvictWhenNecessaryFlag.set(1); DebugManager.flags.PlaformSupportEvictIfNecessaryFlag.set(1);
auto productFamily = rootDeviceEnvironment->getHardwareInfo()->platform.eProductFamily; auto productFamily = rootDeviceEnvironment->getHardwareInfo()->platform.eProductFamily;
HwInfoConfig *hwConfig = HwInfoConfig::get(productFamily); HwInfoConfig *hwConfig = HwInfoConfig::get(productFamily);
wddm->setPlatformSupportEvictWhenNecessaryFlag(*hwConfig); wddm->setPlatformSupportEvictIfNecessaryFlag(*hwConfig);
D3DKMT_HANDLE handle = (D3DKMT_HANDLE)0x1234; D3DKMT_HANDLE handle = (D3DKMT_HANDLE)0x1234;

8
opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp
View File

@ -499,11 +499,11 @@ TEST_F(WddmResidencyControllerTest, GivenListSizeLessThenDoubleCandidateCountWhe
TEST_F(WddmResidencyControllerWithGdiTest, givenNotUsedAllocationsFromPreviousPeriodicTrimWhenTrimResidencyPeriodicTrimIsCalledThenAllocationsAreEvictedMarkedAndRemovedFromTrimCandidateList) { TEST_F(WddmResidencyControllerWithGdiTest, givenNotUsedAllocationsFromPreviousPeriodicTrimWhenTrimResidencyPeriodicTrimIsCalledThenAllocationsAreEvictedMarkedAndRemovedFromTrimCandidateList) {
DebugManagerStateRestore restorer{}; DebugManagerStateRestore restorer{};
DebugManager.flags.PlaformSupportEvictWhenNecessaryFlag.set(1); DebugManager.flags.PlaformSupportEvictIfNecessaryFlag.set(1);
auto productFamily = rootDeviceEnvironment->getHardwareInfo()->platform.eProductFamily; auto productFamily = rootDeviceEnvironment->getHardwareInfo()->platform.eProductFamily;
HwInfoConfig *hwConfig = HwInfoConfig::get(productFamily); HwInfoConfig *hwConfig = HwInfoConfig::get(productFamily);
wddm->setPlatformSupportEvictWhenNecessaryFlag(*hwConfig); wddm->setPlatformSupportEvictIfNecessaryFlag(*hwConfig);
D3DKMT_TRIMNOTIFICATION trimNotification = {0}; D3DKMT_TRIMNOTIFICATION trimNotification = {0};
trimNotification.Flags.PeriodicTrim = 1; trimNotification.Flags.PeriodicTrim = 1;
@ -584,11 +584,11 @@ TEST_F(WddmResidencyControllerWithGdiAndMemoryManagerTest, givenTripleAllocation
GTEST_SKIP(); GTEST_SKIP();
} }
DebugManagerStateRestore restorer{}; DebugManagerStateRestore restorer{};
DebugManager.flags.PlaformSupportEvictWhenNecessaryFlag.set(1); DebugManager.flags.PlaformSupportEvictIfNecessaryFlag.set(1);
auto productFamily = executionEnvironment->rootDeviceEnvironments[0]->getHardwareInfo()->platform.eProductFamily; auto productFamily = executionEnvironment->rootDeviceEnvironments[0]->getHardwareInfo()->platform.eProductFamily;
HwInfoConfig *hwConfig = HwInfoConfig::get(productFamily); HwInfoConfig *hwConfig = HwInfoConfig::get(productFamily);
wddm->setPlatformSupportEvictWhenNecessaryFlag(*hwConfig); wddm->setPlatformSupportEvictIfNecessaryFlag(*hwConfig);
D3DKMT_TRIMNOTIFICATION trimNotification = {0}; D3DKMT_TRIMNOTIFICATION trimNotification = {0};
trimNotification.Flags.PeriodicTrim = 1; trimNotification.Flags.PeriodicTrim = 1;

2
shared/source/debug_settings/debug_variables_base.inl
View File

@ -214,7 +214,7 @@ DECLARE_DEBUG_VARIABLE(int32_t, ForceWddmLowPriorityContextValue, -1, "Force sch
DECLARE_DEBUG_VARIABLE(int32_t, FailBuildProgramWithStatefulAccess, -1, "-1: default, 0: disable, 1: enable, Fail build program/module creation whenever stateful access is discovered (except built in kernels).") DECLARE_DEBUG_VARIABLE(int32_t, FailBuildProgramWithStatefulAccess, -1, "-1: default, 0: disable, 1: enable, Fail build program/module creation whenever stateful access is discovered (except built in kernels).")
DECLARE_DEBUG_VARIABLE(int32_t, ForceImagesSupport, -1, "-1: default, 0: disable, 1: enable. Override support for Images.") DECLARE_DEBUG_VARIABLE(int32_t, ForceImagesSupport, -1, "-1: default, 0: disable, 1: enable. Override support for Images.")
DECLARE_DEBUG_VARIABLE(int32_t, OverrideL1CachePolicyInSurfaceStateAndStateless, -1, "-1: default, >=0 : following policy will be programmed in render surface state (for regular buffers) and stateless L1 caching") DECLARE_DEBUG_VARIABLE(int32_t, OverrideL1CachePolicyInSurfaceStateAndStateless, -1, "-1: default, >=0 : following policy will be programmed in render surface state (for regular buffers) and stateless L1 caching")
DECLARE_DEBUG_VARIABLE(int32_t, PlaformSupportEvictWhenNecessaryFlag, -1, "-1: default - platform specific, 0: disable, 1: enable") DECLARE_DEBUG_VARIABLE(int32_t, PlaformSupportEvictIfNecessaryFlag, -1, "-1: default - platform specific, 0: disable, 1: enable")
DECLARE_DEBUG_VARIABLE(int32_t, ForceEvictOnlyIfNecessaryFlag, -1, "-1: default - driver selects when to use, 0: force never use this flag, 1: force always use this flag") DECLARE_DEBUG_VARIABLE(int32_t, ForceEvictOnlyIfNecessaryFlag, -1, "-1: default - driver selects when to use, 0: force never use this flag, 1: force always use this flag")
/*LOGGING FLAGS*/ /*LOGGING FLAGS*/

4
shared/source/os_interface/hw_info_config.h
View File

@ -132,7 +132,7 @@ class HwInfoConfig {
virtual bool isAdjustWalkOrderAvailable(const HardwareInfo &hwInfo) const = 0; virtual bool isAdjustWalkOrderAvailable(const HardwareInfo &hwInfo) const = 0;
virtual bool isAssignEngineRoundRobinSupported() const = 0; virtual bool isAssignEngineRoundRobinSupported() const = 0;
virtual uint32_t getL1CachePolicy() const = 0; virtual uint32_t getL1CachePolicy() const = 0;
virtual bool isEvictionWhenNecessaryFlagSupported() const = 0; virtual bool isEvictionIfNecessaryFlagSupported() const = 0;
virtual void adjustNumberOfCcs(HardwareInfo &hwInfo) const = 0; virtual void adjustNumberOfCcs(HardwareInfo &hwInfo) const = 0;
virtual bool isPrefetcherDisablingInDirectSubmissionRequired() const = 0; virtual bool isPrefetcherDisablingInDirectSubmissionRequired() const = 0;
@ -237,7 +237,7 @@ class HwInfoConfigHw : public HwInfoConfig {
bool isAdjustWalkOrderAvailable(const HardwareInfo &hwInfo) const override; bool isAdjustWalkOrderAvailable(const HardwareInfo &hwInfo) const override;
bool isAssignEngineRoundRobinSupported() const override; bool isAssignEngineRoundRobinSupported() const override;
uint32_t getL1CachePolicy() const override; uint32_t getL1CachePolicy() const override;
bool isEvictionWhenNecessaryFlagSupported() const override; bool isEvictionIfNecessaryFlagSupported() const override;
void adjustNumberOfCcs(HardwareInfo &hwInfo) const override; void adjustNumberOfCcs(HardwareInfo &hwInfo) const override;
bool isPrefetcherDisablingInDirectSubmissionRequired() const override; bool isPrefetcherDisablingInDirectSubmissionRequired() const override;

2
shared/source/os_interface/hw_info_config_bdw_and_later.inl
View File

@ -71,7 +71,7 @@ bool HwInfoConfigHw<gfxProduct>::isMatrixMultiplyAccumulateSupported(const Hardw
} }
template <PRODUCT_FAMILY gfxProduct> template <PRODUCT_FAMILY gfxProduct>
bool HwInfoConfigHw<gfxProduct>::isEvictionWhenNecessaryFlagSupported() const { bool HwInfoConfigHw<gfxProduct>::isEvictionIfNecessaryFlagSupported() const {
return true; return true;
} }

2
shared/source/os_interface/hw_info_config_xehp_and_later.inl
View File

@ -74,7 +74,7 @@ bool HwInfoConfigHw<gfxProduct>::isMatrixMultiplyAccumulateSupported(const Hardw
} }
template <PRODUCT_FAMILY gfxProduct> template <PRODUCT_FAMILY gfxProduct>
bool HwInfoConfigHw<gfxProduct>::isEvictionWhenNecessaryFlagSupported() const { bool HwInfoConfigHw<gfxProduct>::isEvictionIfNecessaryFlagSupported() const {
return true; return true;
} }

14
shared/source/os_interface/windows/wddm/wddm.cpp
View File

@ -105,7 +105,7 @@ bool Wddm::init() {
if (hwConfig->configureHwInfoWddm(hardwareInfo.get(), hardwareInfo.get(), nullptr)) { if (hwConfig->configureHwInfoWddm(hardwareInfo.get(), hardwareInfo.get(), nullptr)) {
return false; return false;
} }
setPlatformSupportEvictWhenNecessaryFlag(*hwConfig); setPlatformSupportEvictIfNecessaryFlag(*hwConfig);
auto preemptionMode = PreemptionHelper::getDefaultPreemptionMode(*hardwareInfo); auto preemptionMode = PreemptionHelper::getDefaultPreemptionMode(*hardwareInfo);
rootDeviceEnvironment.setHwInfo(hardwareInfo.get()); rootDeviceEnvironment.setHwInfo(hardwareInfo.get());
@ -140,12 +140,12 @@ bool Wddm::init() {
return configureDeviceAddressSpace(); return configureDeviceAddressSpace();
} }
void Wddm::setPlatformSupportEvictWhenNecessaryFlag(const HwInfoConfig &hwInfoConfig) { void Wddm::setPlatformSupportEvictIfNecessaryFlag(const HwInfoConfig &hwInfoConfig) {
platformSupportsEvictWhenNecessary = hwInfoConfig.isEvictionWhenNecessaryFlagSupported(); platformSupportsEvictIfNecessary = hwInfoConfig.isEvictionIfNecessaryFlagSupported();
int32_t overridePlatformSupportsEvictWhenNecessary = int32_t overridePlatformSupportsEvictIfNecessary =
DebugManager.flags.PlaformSupportEvictWhenNecessaryFlag.get(); DebugManager.flags.PlaformSupportEvictIfNecessaryFlag.get();
if (overridePlatformSupportsEvictWhenNecessary != -1) { if (overridePlatformSupportsEvictIfNecessary != -1) {
platformSupportsEvictWhenNecessary = !!overridePlatformSupportsEvictWhenNecessary; platformSupportsEvictIfNecessary = !!overridePlatformSupportsEvictIfNecessary;
} }
forceEvictOnlyIfNecessary = DebugManager.flags.ForceEvictOnlyIfNecessaryFlag.get(); forceEvictOnlyIfNecessary = DebugManager.flags.ForceEvictOnlyIfNecessaryFlag.get();
} }

6
shared/source/os_interface/windows/wddm/wddm.h
View File

@ -229,7 +229,7 @@ class Wddm : public DriverModel {
MOCKABLE_VIRTUAL void createPagingFenceLogger(); MOCKABLE_VIRTUAL void createPagingFenceLogger();
bool setLowPriorityContextParam(D3DKMT_HANDLE contextHandle); bool setLowPriorityContextParam(D3DKMT_HANDLE contextHandle);
bool adjustEvictNeededParameter(bool evictNeeded) { bool adjustEvictNeededParameter(bool evictNeeded) {
if (evictNeeded == false && platformSupportsEvictWhenNecessary == false) { if (evictNeeded == false && platformSupportsEvictIfNecessary == false) {
evictNeeded = true; evictNeeded = true;
} }
if (forceEvictOnlyIfNecessary != -1) { if (forceEvictOnlyIfNecessary != -1) {
@ -237,7 +237,7 @@ class Wddm : public DriverModel {
} }
return evictNeeded; return evictNeeded;
} }
void setPlatformSupportEvictWhenNecessaryFlag(const HwInfoConfig &hwInfoConfig); void setPlatformSupportEvictIfNecessaryFlag(const HwInfoConfig &hwInfoConfig);
void populateAdditionalAdapterInfoOptions(const ADAPTER_INFO_KMD &adapterInfo); void populateAdditionalAdapterInfoOptions(const ADAPTER_INFO_KMD &adapterInfo);
GMM_GFX_PARTITIONING gfxPartition{}; GMM_GFX_PARTITIONING gfxPartition{};
@ -285,7 +285,7 @@ class Wddm : public DriverModel {
unsigned int enablePreemptionRegValue = 1; unsigned int enablePreemptionRegValue = 1;
bool platformSupportsEvictWhenNecessary = false; bool platformSupportsEvictIfNecessary = false;
bool instrumentationEnabled = false; bool instrumentationEnabled = false;
}; };
} // namespace NEO } // namespace NEO

2
shared/test/common/mocks/mock_hw_info_config.cpp
View File

@ -392,7 +392,7 @@ uint64_t HwInfoConfigHw<IGFX_UNKNOWN>::getHostMemCapabilitiesValue() {
} }
template <> template <>
bool HwInfoConfigHw<IGFX_UNKNOWN>::isEvictionWhenNecessaryFlagSupported() const { bool HwInfoConfigHw<IGFX_UNKNOWN>::isEvictionIfNecessaryFlagSupported() const {
return true; return true;
} }

4
shared/test/common/mocks/mock_wddm.h
View File

@ -45,11 +45,11 @@ class WddmMock : public Wddm {
using Wddm::minAddress; using Wddm::minAddress;
using Wddm::pagingFenceAddress; using Wddm::pagingFenceAddress;
using Wddm::pagingQueue; using Wddm::pagingQueue;
using Wddm::platformSupportsEvictWhenNecessary; using Wddm::platformSupportsEvictIfNecessary;
using Wddm::populateAdditionalAdapterInfoOptions; using Wddm::populateAdditionalAdapterInfoOptions;
using Wddm::residencyLogger; using Wddm::residencyLogger;
using Wddm::rootDeviceEnvironment; using Wddm::rootDeviceEnvironment;
using Wddm::setPlatformSupportEvictWhenNecessaryFlag; using Wddm::setPlatformSupportEvictIfNecessaryFlag;
using Wddm::temporaryResources; using Wddm::temporaryResources;
using Wddm::timestampFrequency; using Wddm::timestampFrequency;
using Wddm::wddmInterface; using Wddm::wddmInterface;

2
shared/test/common/test_files/igdrcl.config
View File

@ -423,7 +423,7 @@ BatchBufferStartPrepatchingWaEnabled = -1
SetVmAdviseAtomicAttribute = -1 SetVmAdviseAtomicAttribute = -1
DirectSubmissionForceLocalMemoryStorageMode = -1 DirectSubmissionForceLocalMemoryStorageMode = -1
EnableRingSwitchTagUpdateWa = -1 EnableRingSwitchTagUpdateWa = -1
PlaformSupportEvictWhenNecessaryFlag = -1 PlaformSupportEvictIfNecessaryFlag = -1
DirectSubmissionReadBackCommandBuffer = -1 DirectSubmissionReadBackCommandBuffer = -1
DirectSubmissionReadBackRingBuffer = -1 DirectSubmissionReadBackRingBuffer = -1
ReadBackCommandBufferAllocation = -1 ReadBackCommandBufferAllocation = -1

4
shared/test/unit_test/gen11/ehl/test_hw_info_config_ehl.cpp
View File

@ -75,8 +75,8 @@ EHLTEST_F(EhlHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFoun
EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::EHL); EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::EHL);
} }
EHLTEST_F(EhlHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) { EHLTEST_F(EhlHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
HardwareInfo hwInfo = *defaultHwInfo; HardwareInfo hwInfo = *defaultHwInfo;
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported()); EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
} }

4
shared/test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp
View File

@ -102,8 +102,8 @@ ICLLPTEST_F(IcllpHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIs
EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(*defaultHwInfo), AOT::ICL); EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(*defaultHwInfo), AOT::ICL);
} }
ICLLPTEST_F(IcllpHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) { ICLLPTEST_F(IcllpHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
HardwareInfo hwInfo = *defaultHwInfo; HardwareInfo hwInfo = *defaultHwInfo;
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported()); EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
} }

4
shared/test/unit_test/gen11/lkf/test_hw_info_config_lkf.cpp
View File

@ -94,8 +94,8 @@ LKFTEST_F(LkfHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFoun
EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::LKF); EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::LKF);
} }
LKFTEST_F(LkfHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) { LKFTEST_F(LkfHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
HardwareInfo hwInfo = *defaultHwInfo; HardwareInfo hwInfo = *defaultHwInfo;
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported()); EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
} }

4
shared/test/unit_test/gen12lp/adln/test_hw_info_config_adln.cpp
View File

@ -77,8 +77,8 @@ ADLNTEST_F(AdlnHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFo
EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::ADL_N); EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::ADL_N);
} }
ADLNTEST_F(AdlnHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) { ADLNTEST_F(AdlnHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
HardwareInfo hwInfo = *defaultHwInfo; HardwareInfo hwInfo = *defaultHwInfo;
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported()); EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
} }

4
shared/test/unit_test/gen12lp/adlp/test_hw_info_config_adlp.cpp
View File

@ -77,8 +77,8 @@ ADLPTEST_F(AdlpHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFo
EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::ADL_P); EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::ADL_P);
} }
ADLPTEST_F(AdlpHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) { ADLPTEST_F(AdlpHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
HardwareInfo hwInfo = *defaultHwInfo; HardwareInfo hwInfo = *defaultHwInfo;
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported()); EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
} }

4
shared/test/unit_test/gen12lp/adls/test_hw_info_config_adls.cpp
View File

@ -77,8 +77,8 @@ ADLSTEST_F(AdlsHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFo
EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::ADL_S); EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::ADL_S);
} }
ADLSTEST_F(AdlsHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) { ADLSTEST_F(AdlsHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
HardwareInfo hwInfo = *defaultHwInfo; HardwareInfo hwInfo = *defaultHwInfo;
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported()); EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
} }

4
shared/test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp
View File

@ -143,8 +143,8 @@ DG1TEST_F(Dg1HwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFoun
EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(*defaultHwInfo), AOT::DG1); EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(*defaultHwInfo), AOT::DG1);
} }
DG1TEST_F(Dg1HwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) { DG1TEST_F(Dg1HwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
HardwareInfo hwInfo = *defaultHwInfo; HardwareInfo hwInfo = *defaultHwInfo;
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported()); EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
} }

4
shared/test/unit_test/gen12lp/rkl/test_hw_info_config_rkl.cpp
View File

@ -87,8 +87,8 @@ RKLTEST_F(RklHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFoun
EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::RKL); EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::RKL);
} }
RKLTEST_F(RklHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) { RKLTEST_F(RklHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
HardwareInfo hwInfo = *defaultHwInfo; HardwareInfo hwInfo = *defaultHwInfo;
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported()); EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
} }

4
shared/test/unit_test/gen12lp/tgllp/hw_info_config_tests_tgllp.cpp
View File

@ -15,8 +15,8 @@ using namespace NEO;
using HwInfoConfigTestTgllp = ::testing::Test; using HwInfoConfigTestTgllp = ::testing::Test;
TGLLPTEST_F(HwInfoConfigTestTgllp, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) { TGLLPTEST_F(HwInfoConfigTestTgllp, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
HardwareInfo hwInfo = *defaultHwInfo; HardwareInfo hwInfo = *defaultHwInfo;
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported()); EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
} }

4
shared/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp
View File

@ -90,10 +90,10 @@ BDWTEST_F(BdwHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFoun
EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::BDW); EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::BDW);
} }
BDWTEST_F(BdwHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) { BDWTEST_F(BdwHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
HardwareInfo hwInfo = *defaultHwInfo; HardwareInfo hwInfo = *defaultHwInfo;
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported()); EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
} }
using CompilerHwInfoConfigHelperTestsBdw = ::testing::Test; using CompilerHwInfoConfigHelperTestsBdw = ::testing::Test;

4
shared/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp
View File

@ -101,8 +101,8 @@ BXTTEST_F(BxtHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFoun
EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::APL); EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::APL);
} }
BXTTEST_F(BxtHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) { BXTTEST_F(BxtHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
HardwareInfo hwInfo = *defaultHwInfo; HardwareInfo hwInfo = *defaultHwInfo;
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported()); EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
} }

4
shared/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp
View File

@ -108,8 +108,8 @@ CFLTEST_F(CflHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFoun
EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::UNKNOWN_ISA); EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::UNKNOWN_ISA);
} }
CFLTEST_F(CflHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) { CFLTEST_F(CflHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
HardwareInfo hwInfo = *defaultHwInfo; HardwareInfo hwInfo = *defaultHwInfo;
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported()); EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
} }

4
shared/test/unit_test/gen9/glk/test_hw_info_config_glk.cpp
View File

@ -91,8 +91,8 @@ GLKTEST_F(GlkHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFoun
EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::GLK); EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::GLK);
} }
GLKTEST_F(GlkHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) { GLKTEST_F(GlkHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
HardwareInfo hwInfo = *defaultHwInfo; HardwareInfo hwInfo = *defaultHwInfo;
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported()); EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
} }

4
shared/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp
View File

@ -115,8 +115,8 @@ KBLTEST_F(KblHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFoun
EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::UNKNOWN_ISA); EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::UNKNOWN_ISA);
} }
KBLTEST_F(KblHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) { KBLTEST_F(KblHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
HardwareInfo hwInfo = *defaultHwInfo; HardwareInfo hwInfo = *defaultHwInfo;
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported()); EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
} }

4
shared/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp
View File

@ -115,8 +115,8 @@ SKLTEST_F(SklHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFoun
EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::SKL); EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::SKL);
} }
SKLTEST_F(SklHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) { SKLTEST_F(SklHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
HardwareInfo hwInfo = *defaultHwInfo; HardwareInfo hwInfo = *defaultHwInfo;
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported()); EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
} }

40
shared/test/unit_test/os_interface/windows/wddm_tests.cpp
View File

@ -123,39 +123,39 @@ TEST_F(WddmTests, whenGetAdapterLuidThenLuidIsReturned) {
EXPECT_TRUE(luid.HighPart == 0 && luid.LowPart == 0); EXPECT_TRUE(luid.HighPart == 0 && luid.LowPart == 0);
} }
TEST_F(WddmTests, GivenDebugFlagDisablesEvictWhenNecessarySupportThenFlagIsFalse) { TEST_F(WddmTests, GivenDebugFlagDisablesEvictIfNecessarySupportThenFlagIsFalse) {
DebugManagerStateRestore restorer{}; DebugManagerStateRestore restorer{};
DebugManager.flags.PlaformSupportEvictWhenNecessaryFlag.set(0); DebugManager.flags.PlaformSupportEvictIfNecessaryFlag.set(0);
auto hwInfoConfig = HwInfoConfig::get(rootDeviceEnvironment->getHardwareInfo()->platform.eProductFamily); auto hwInfoConfig = HwInfoConfig::get(rootDeviceEnvironment->getHardwareInfo()->platform.eProductFamily);
wddm->setPlatformSupportEvictWhenNecessaryFlag(*hwInfoConfig); wddm->setPlatformSupportEvictIfNecessaryFlag(*hwInfoConfig);
EXPECT_FALSE(wddm->platformSupportsEvictWhenNecessary); EXPECT_FALSE(wddm->platformSupportsEvictIfNecessary);
} }
TEST_F(WddmTests, GivenDebugFlagEnablesEvictWhenNecessarySupportThenFlagIsTrue) { TEST_F(WddmTests, GivenDebugFlagEnablesEvictIfNecessarySupportThenFlagIsTrue) {
DebugManagerStateRestore restorer{}; DebugManagerStateRestore restorer{};
DebugManager.flags.PlaformSupportEvictWhenNecessaryFlag.set(1); DebugManager.flags.PlaformSupportEvictIfNecessaryFlag.set(1);
auto hwInfoConfig = HwInfoConfig::get(rootDeviceEnvironment->getHardwareInfo()->platform.eProductFamily); auto hwInfoConfig = HwInfoConfig::get(rootDeviceEnvironment->getHardwareInfo()->platform.eProductFamily);
wddm->setPlatformSupportEvictWhenNecessaryFlag(*hwInfoConfig); wddm->setPlatformSupportEvictIfNecessaryFlag(*hwInfoConfig);
EXPECT_TRUE(wddm->platformSupportsEvictWhenNecessary); EXPECT_TRUE(wddm->platformSupportsEvictIfNecessary);
} }
TEST_F(WddmTests, givenDebugFlagForceEvictOnlyIfNecessaryAllValuesThenForceSettingIsSetCorrectly) { TEST_F(WddmTests, givenDebugFlagForceEvictOnlyIfNecessaryAllValuesThenForceSettingIsSetCorrectly) {
DebugManagerStateRestore restorer{}; DebugManagerStateRestore restorer{};
auto hwInfoConfig = HwInfoConfig::get(rootDeviceEnvironment->getHardwareInfo()->platform.eProductFamily); auto hwInfoConfig = HwInfoConfig::get(rootDeviceEnvironment->getHardwareInfo()->platform.eProductFamily);
wddm->setPlatformSupportEvictWhenNecessaryFlag(*hwInfoConfig); wddm->setPlatformSupportEvictIfNecessaryFlag(*hwInfoConfig);
EXPECT_EQ(-1, wddm->forceEvictOnlyIfNecessary); EXPECT_EQ(-1, wddm->forceEvictOnlyIfNecessary);
DebugManager.flags.ForceEvictOnlyIfNecessaryFlag.set(0); DebugManager.flags.ForceEvictOnlyIfNecessaryFlag.set(0);
wddm->setPlatformSupportEvictWhenNecessaryFlag(*hwInfoConfig); wddm->setPlatformSupportEvictIfNecessaryFlag(*hwInfoConfig);
EXPECT_EQ(0, wddm->forceEvictOnlyIfNecessary); EXPECT_EQ(0, wddm->forceEvictOnlyIfNecessary);
DebugManager.flags.ForceEvictOnlyIfNecessaryFlag.set(1); DebugManager.flags.ForceEvictOnlyIfNecessaryFlag.set(1);
wddm->setPlatformSupportEvictWhenNecessaryFlag(*hwInfoConfig); wddm->setPlatformSupportEvictIfNecessaryFlag(*hwInfoConfig);
EXPECT_EQ(1, wddm->forceEvictOnlyIfNecessary); EXPECT_EQ(1, wddm->forceEvictOnlyIfNecessary);
} }
@ -311,8 +311,8 @@ TEST_F(WddmTests, GivenNoSliceEnabledWhenQueryingTopologyThenExpectFalse) {
EXPECT_FALSE(wddm->buildTopologyMapping()); EXPECT_FALSE(wddm->buildTopologyMapping());
} }
TEST_F(WddmTests, GivenPlatformSupportsEvictWhenNecessaryWhenAdjustingEvictNeededTrueThenExpectTrue) { TEST_F(WddmTests, GivenPlatformSupportsEvictIfNecessaryWhenAdjustingEvictNeededTrueThenExpectTrue) {
wddm->platformSupportsEvictWhenNecessary = true; wddm->platformSupportsEvictIfNecessary = true;
bool value = wddm->adjustEvictNeededParameter(true); bool value = wddm->adjustEvictNeededParameter(true);
EXPECT_TRUE(value); EXPECT_TRUE(value);
} }
@ -322,20 +322,20 @@ TEST_F(WddmTests, GivenWddmWhenAdditionalAdapterInfoOptionIsSetThenCorrectValueI
EXPECT_EQ(13u, wddm->getAdditionalAdapterInfoOptions()); EXPECT_EQ(13u, wddm->getAdditionalAdapterInfoOptions());
} }
TEST_F(WddmTests, GivenPlatformNotSupportEvictWhenNecessaryWhenAdjustingEvictNeededTrueThenExpectTrue) { TEST_F(WddmTests, GivenPlatformNotSupportEvictIfNecessaryWhenAdjustingEvictNeededTrueThenExpectTrue) {
wddm->platformSupportsEvictWhenNecessary = false; wddm->platformSupportsEvictIfNecessary = false;
bool value = wddm->adjustEvictNeededParameter(true); bool value = wddm->adjustEvictNeededParameter(true);
EXPECT_TRUE(value); EXPECT_TRUE(value);
} }
TEST_F(WddmTests, GivenPlatformSupportsEvictWhenNecessaryWhenAdjustingEvictNeededFalseThenExpectFalse) { TEST_F(WddmTests, GivenPlatformSupportsEvictIfNecessaryWhenAdjustingEvictNeededFalseThenExpectFalse) {
wddm->platformSupportsEvictWhenNecessary = true; wddm->platformSupportsEvictIfNecessary = true;
bool value = wddm->adjustEvictNeededParameter(false); bool value = wddm->adjustEvictNeededParameter(false);
EXPECT_FALSE(value); EXPECT_FALSE(value);
} }
TEST_F(WddmTests, GivenForceEvictOnlyIfNecessarySetToNotUseTheEvictFlagWhenAdjustingEvictNeededAlwaysIsFalseThenExpectTrue) { TEST_F(WddmTests, GivenForceEvictOnlyIfNecessarySetToNotUseTheEvictFlagWhenAdjustingEvictNeededAlwaysIsFalseThenExpectTrue) {
wddm->platformSupportsEvictWhenNecessary = true; wddm->platformSupportsEvictIfNecessary = true;
wddm->forceEvictOnlyIfNecessary = 0; wddm->forceEvictOnlyIfNecessary = 0;
bool value = wddm->adjustEvictNeededParameter(false); bool value = wddm->adjustEvictNeededParameter(false);
EXPECT_TRUE(value); EXPECT_TRUE(value);
@ -347,8 +347,8 @@ TEST_F(WddmTests, GivenForceEvictOnlyIfNecessarySetToUseEvictFlagWhenAdjustingEv
EXPECT_FALSE(value); EXPECT_FALSE(value);
} }
TEST_F(WddmTests, GivenPlatformNotSupportEvictWhenNecessaryWhenAdjustingEvictNeededFalseThenExpectTrue) { TEST_F(WddmTests, GivenPlatformNotSupportEvictIfNecessaryWhenAdjustingEvictNeededFalseThenExpectTrue) {
wddm->platformSupportsEvictWhenNecessary = false; wddm->platformSupportsEvictIfNecessary = false;
bool value = wddm->adjustEvictNeededParameter(false); bool value = wddm->adjustEvictNeededParameter(false);
EXPECT_TRUE(value); EXPECT_TRUE(value);
} }

4
shared/test/unit_test/xe_hp_core/xe_hp_sdv/hw_info_config_tests_xe_hp_sdv.cpp
View File

@ -15,8 +15,8 @@ using namespace NEO;
using HwInfoConfigTestXeHpSdv = ::testing::Test; using HwInfoConfigTestXeHpSdv = ::testing::Test;
XEHPTEST_F(HwInfoConfigTestXeHpSdv, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) { XEHPTEST_F(HwInfoConfigTestXeHpSdv, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
HardwareInfo hwInfo = *defaultHwInfo; HardwareInfo hwInfo = *defaultHwInfo;
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported()); EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
} }

4
shared/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp
View File

@ -64,10 +64,10 @@ PVCTEST_F(PVCHwInfoConfig, givenPvcHwInfoWhenIsIpSamplingSupportedThenCorrectRes
} }
} }
PVCTEST_F(PVCHwInfoConfig, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) { PVCTEST_F(PVCHwInfoConfig, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
HardwareInfo hwInfo = *defaultHwInfo; HardwareInfo hwInfo = *defaultHwInfo;
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported()); EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
} }
PVCTEST_F(PVCHwInfoConfig, givenPVCHwInfoConfigWhenIsPrefetcherDisablingInDirectSubmissionRequiredThenFalseIsReturned) { PVCTEST_F(PVCHwInfoConfig, givenPVCHwInfoConfigWhenIsPrefetcherDisablingInDirectSubmissionRequiredThenFalseIsReturned) {

4
shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp
View File

@ -504,8 +504,8 @@ DG2TEST_F(HwInfoConfigTestDg2, givenHwInfoConfigWhenAskedIfStorageInfoAdjustment
} }
} }
DG2TEST_F(HwInfoConfigTestDg2, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) { DG2TEST_F(HwInfoConfigTestDg2, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
HardwareInfo hwInfo = *defaultHwInfo; HardwareInfo hwInfo = *defaultHwInfo;
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported()); EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
} }