intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-23 03:33:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Extend ZE_AFFINITY_MASK to OCL"

Browse Source 
This reverts commit 452b53fb4d02ebf4205018b9fd982422e2d85f30.

Signed-off-by: Lukasz Jobczyk <lukasz.jobczyk@intel.com>
This commit is contained in:
Lukasz Jobczyk
2021-01-20 14:43:42 +00:00
committed by Compute-Runtime-Automation
parent bcd4e38eca
commit 18bfc3be8b
13 changed files with 103 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
opencl/test/unit_test/os_interface/device_factory_tests.cpp
View File

@@ -12,8 +12,6 @@
#include "shared/source/os_interface/os_interface.h"
#include "shared/source/os_interface/os_library.h"
#include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
#include "shared/test/unit_test/helpers/ult_hw_config.h"
#include "shared/test/unit_test/helpers/variable_backup.h"
#include "shared/test/unit_test/mocks/ult_device_factory.h"
#include "opencl/source/platform/platform.h"
@@ -96,67 +94,6 @@ TEST_F(DeviceFactoryTest, WhenOverridingUsingDebugManagerThenOverridesAreApplied
hwInfo->capabilityTable.kmdNotifyProperties.delayQuickKmdSleepForSporadicWaitsMicroseconds);
}
TEST_F(DeviceFactoryTest, givenZeAffinityMaskSetWhenCreateDevicesThenProperNumberOfDevicesIsReturned) {
DebugManagerStateRestore restorer;
DebugManager.flags.CreateMultipleRootDevices.set(5);
DebugManager.flags.CreateMultipleSubDevices.set(4);
DebugManager.flags.ZE_AFFINITY_MASK.set("1.0,2.3,2.1,1.3,0,2.0,4.0,4.2,4.3,4.1");
VariableBackup<UltHwConfig> backup(&ultHwConfig);
ultHwConfig.useMockedPrepareDeviceEnvironmentsFunc = false;
auto devices = DeviceFactory::createDevices(*executionEnvironment);
EXPECT_EQ(devices.size(), 4u);
EXPECT_EQ(devices[0]->getNumAvailableDevices(), 4u);
EXPECT_EQ(devices[1]->getNumAvailableDevices(), 2u);
EXPECT_EQ(devices[2]->getNumAvailableDevices(), 3u);
EXPECT_EQ(devices[3]->getNumAvailableDevices(), 4u);
}
TEST_F(DeviceFactoryTest, givenZeAffinityMaskSetToGreaterRootDeviceThanAvailableWhenCreateDevicesThenProperNumberOfDevicesIsReturned) {
DebugManagerStateRestore restorer;
DebugManager.flags.CreateMultipleRootDevices.set(2);
DebugManager.flags.CreateMultipleSubDevices.set(4);
DebugManager.flags.ZE_AFFINITY_MASK.set("0,92,1.1");
VariableBackup<UltHwConfig> backup(&ultHwConfig);
ultHwConfig.useMockedPrepareDeviceEnvironmentsFunc = false;
auto devices = DeviceFactory::createDevices(*executionEnvironment);
EXPECT_EQ(devices.size(), 2u);
EXPECT_EQ(devices[0]->getNumAvailableDevices(), 4u);
EXPECT_EQ(devices[1]->getNumAvailableDevices(), 1u);
}
TEST_F(DeviceFactoryTest, givenZeAffinityMaskSetToGreaterSubDeviceThanAvailableWhenCreateDevicesThenProperNumberOfDevicesIsReturned) {
DebugManagerStateRestore restorer;
DebugManager.flags.CreateMultipleRootDevices.set(2);
DebugManager.flags.CreateMultipleSubDevices.set(4);
DebugManager.flags.ZE_AFFINITY_MASK.set("0,1.54");
VariableBackup<UltHwConfig> backup(&ultHwConfig);
ultHwConfig.useMockedPrepareDeviceEnvironmentsFunc = false;
auto devices = DeviceFactory::createDevices(*executionEnvironment);
EXPECT_EQ(devices.size(), 1u);
EXPECT_EQ(devices[0]->getNumAvailableDevices(), 4u);
}
TEST_F(DeviceFactoryTest, givenZeAffinityMaskSetToRootDevicesOnlyWhenCreateDevicesThenProperNumberOfDevicesIsReturned) {
DebugManagerStateRestore restorer;
DebugManager.flags.CreateMultipleRootDevices.set(2);
DebugManager.flags.CreateMultipleSubDevices.set(4);
DebugManager.flags.ZE_AFFINITY_MASK.set("0,1");
VariableBackup<UltHwConfig> backup(&ultHwConfig);
ultHwConfig.useMockedPrepareDeviceEnvironmentsFunc = false;
auto devices = DeviceFactory::createDevices(*executionEnvironment);
EXPECT_EQ(devices.size(), 2u);
EXPECT_EQ(devices[0]->getNumAvailableDevices(), 4u);
EXPECT_EQ(devices[1]->getNumAvailableDevices(), 4u);
}
TEST_F(DeviceFactoryTest, WhenOverridingEngineTypeThenDebugEngineIsReported) {
DebugManagerStateRestore dbgRestorer;
int32_t debugEngineType = 2;

1
opencl/test/unit_test/test_files/igdrcl.config
View File

@@ -9,7 +9,6 @@ AUBDumpFilterKernelName = unk
AUBDumpToggleFileName = unk
OverrideGdiPath = unk
AubDumpAddMmioRegistersList = unk
ZE_AFFINITY_MASK = default
AUBDumpFilterNamedKernelStartIdx = 0
AUBDumpFilterNamedKernelEndIdx = -1
AUBDumpSubCaptureMode = 0