Rename getDevices functions

getDevices -> prepareDeviceEnvironments

Change-Id: Ie5bbc0e9f1fe9b1c34ba012249ffa33c4d2ebd05
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2020-03-23 09:13:25 +01:00
committed by sys_ocldev
parent 38f53cab8a
commit 688c95ce3c
24 changed files with 90 additions and 91 deletions

View File

@ -1874,9 +1874,9 @@ TEST(WddmMemoryManager, givenMultipleRootDeviceWhenMemoryManagerGetsWddmThenWddm
DebugManagerStateRestore restorer;
DebugManager.flags.CreateMultipleRootDevices.set(4);
VariableBackup<UltHwConfig> backup{&ultHwConfig};
ultHwConfig.useMockedGetDevicesFunc = false;
ultHwConfig.useMockedPrepareDeviceEnvironmentsFunc = false;
auto executionEnvironment = platform()->peekExecutionEnvironment();
getDevices(*executionEnvironment);
prepareDeviceEnvironments(*executionEnvironment);
MockWddmMemoryManager wddmMemoryManager(*executionEnvironment);
for (auto i = 0u; i < executionEnvironment->rootDeviceEnvironments.size(); i++) {
@ -1890,9 +1890,9 @@ TEST(WddmMemoryManager, givenMultipleRootDeviceWhenCreateMemoryManagerThenTakeMa
DebugManagerStateRestore restorer;
DebugManager.flags.CreateMultipleRootDevices.set(numRootDevices);
VariableBackup<UltHwConfig> backup{&ultHwConfig};
ultHwConfig.useMockedGetDevicesFunc = false;
ultHwConfig.useMockedPrepareDeviceEnvironmentsFunc = false;
auto executionEnvironment = platform()->peekExecutionEnvironment();
getDevices(*executionEnvironment);
prepareDeviceEnvironments(*executionEnvironment);
for (auto i = 0u; i < numRootDevices; i++) {
auto wddm = static_cast<WddmMock *>(executionEnvironment->rootDeviceEnvironments[i]->osInterface->get()->getWddm());
wddm->minAddress = i * (numRootDevices - i);
@ -1907,9 +1907,9 @@ TEST(WddmMemoryManager, givenNoLocalMemoryOnAnyDeviceWhenIsCpuCopyRequiredIsCall
DebugManagerStateRestore restorer;
DebugManager.flags.EnableLocalMemory.set(false);
VariableBackup<UltHwConfig> backup{&ultHwConfig};
ultHwConfig.useMockedGetDevicesFunc = false;
ultHwConfig.useMockedPrepareDeviceEnvironmentsFunc = false;
auto executionEnvironment = platform()->peekExecutionEnvironment();
getDevices(*executionEnvironment);
prepareDeviceEnvironments(*executionEnvironment);
MockWddmMemoryManager wddmMemoryManager(*executionEnvironment);
EXPECT_FALSE(wddmMemoryManager.isCpuCopyRequired(&restorer));
}
@ -1917,8 +1917,8 @@ TEST(WddmMemoryManager, givenNoLocalMemoryOnAnyDeviceWhenIsCpuCopyRequiredIsCall
TEST(WddmMemoryManager, givenLocalPointerPassedToIsCpuCopyRequiredThenFalseIsReturned) {
auto executionEnvironment = platform()->peekExecutionEnvironment();
VariableBackup<UltHwConfig> backup{&ultHwConfig};
ultHwConfig.useMockedGetDevicesFunc = false;
getDevices(*executionEnvironment);
ultHwConfig.useMockedPrepareDeviceEnvironmentsFunc = false;
prepareDeviceEnvironments(*executionEnvironment);
MockWddmMemoryManager wddmMemoryManager(*executionEnvironment);
EXPECT_FALSE(wddmMemoryManager.isCpuCopyRequired(&backup));
//call multiple times to make sure that result is constant

View File

@ -94,7 +94,7 @@ TEST_F(WddmMemoryOperationsHandlerTest, givenVariousAllocationsWhenEvictingResid
TEST(WddmResidentBufferTests, whenBuffersIsCreatedWithMakeResidentFlagSetThenItIsMadeResidentUponCreation) {
VariableBackup<UltHwConfig> backup(&ultHwConfig);
ultHwConfig.useMockedGetDevicesFunc = false;
ultHwConfig.useMockedPrepareDeviceEnvironmentsFunc = false;
DebugManagerStateRestore restorer;
DebugManager.flags.MakeAllBuffersResident.set(true);