Disable default support for second level affinity mask

For now, it will stay enabled with debug key, to allow
customers easier transition to this model. This may be
reenabled by default after customers feel their code
is ready for it.

Signed-off-by: Jaime Arteaga <jaime.a.arteaga.molina@intel.com>
This commit is contained in:
Jaime Arteaga
2021-11-11 22:46:22 +00:00
committed by Compute-Runtime-Automation
parent ea373d2664
commit aaa5e6d358
3 changed files with 17 additions and 2 deletions

View File

@ -394,6 +394,7 @@ TEST_F(EngineInstancedDeviceTests, givenDebugFlagSetAndMoreThanOneCcsWhenCreatin
constexpr uint32_t genericDevicesCount = 1;
constexpr uint32_t ccsCount = 2;
DebugManager.flags.EngineInstancedSubDevices.set(true);
DebugManager.flags.AllowSingleTileEngineInstancedSubDevices.set(true);
if (!createDevices(genericDevicesCount, ccsCount)) {
@ -517,6 +518,8 @@ TEST_F(EngineInstancedDeviceTests, givenDebugFlagSetWhenCreatingRootDeviceWithGe
constexpr uint32_t genericDevicesCount = 2;
constexpr uint32_t ccsCount = 2;
DebugManager.flags.EngineInstancedSubDevices.set(true);
if (!createDevices(genericDevicesCount, ccsCount)) {
GTEST_SKIP();
}
@ -568,6 +571,8 @@ TEST_F(EngineInstancedDeviceTests, givenMultipleSubDevicesWhenCallingGetSubDevic
constexpr uint32_t genericDevicesCount = 2;
constexpr uint32_t ccsCount = 2;
DebugManager.flags.EngineInstancedSubDevices.set(true);
if (!createDevices(genericDevicesCount, ccsCount)) {
GTEST_SKIP();
}
@ -621,6 +626,8 @@ TEST_F(EngineInstancedDeviceTests, givenMultipleClSubDevicesWhenCallingGetSubDev
constexpr uint32_t genericDevicesCount = 2;
constexpr uint32_t ccsCount = 2;
DebugManager.flags.EngineInstancedSubDevices.set(true);
if (!createDevices(genericDevicesCount, ccsCount)) {
GTEST_SKIP();
}
@ -646,6 +653,7 @@ TEST_F(EngineInstancedDeviceTests, givenAffinityMaskSetWhenCreatingDevicesThenFi
{false, false, false, false},
{false, false, true, true}};
DebugManager.flags.EngineInstancedSubDevices.set(true);
DebugManager.flags.ZE_AFFINITY_MASK.set("0.0.0, 0.0.1, 0.0.2, 0.2.2, 0.2.3, 0.1.5");
if (!createDevices(genericDevicesCount, ccsCount)) {
@ -693,6 +701,7 @@ TEST_F(EngineInstancedDeviceTests, givenAffinityMaskForSingle3rdLevelDeviceWhenC
constexpr uint32_t create2ndLevelAsEngineInstanced[2] = {false, true};
constexpr uint32_t engineInstanced2ndLevelEngineIndex = 1;
DebugManager.flags.EngineInstancedSubDevices.set(true);
DebugManager.flags.ZE_AFFINITY_MASK.set("0.0, 0.1.1");
if (!createDevices(genericDevicesCount, ccsCount)) {
@ -802,6 +811,7 @@ TEST_F(EngineInstancedDeviceTests, givenAffinityMaskForSecondLevelOnSingleTileDe
constexpr uint32_t genericDevicesCount = 1;
constexpr uint32_t ccsCount = 2;
DebugManager.flags.EngineInstancedSubDevices.set(true);
DebugManager.flags.AllowSingleTileEngineInstancedSubDevices.set(true);
DebugManager.flags.ZE_AFFINITY_MASK.set("0.0, 0.4");
@ -821,6 +831,7 @@ TEST_F(EngineInstancedDeviceTests, givenAffinityMaskForSecondLevelOnSingleTileDe
constexpr uint32_t genericDevicesCount = 1;
constexpr uint32_t ccsCount = 1;
DebugManager.flags.EngineInstancedSubDevices.set(true);
DebugManager.flags.AllowSingleTileEngineInstancedSubDevices.set(true);
DebugManager.flags.ZE_AFFINITY_MASK.set("0.0");
@ -873,6 +884,8 @@ TEST_F(EngineInstancedDeviceTests, givenAffinityMaskWhenCreatingClSubDevicesThen
HWTEST2_F(EngineInstancedDeviceTests, givenEngineInstancedDeviceWhenProgrammingCfeStateThenSetSingleSliceDispatch, IsAtLeastXeHpCore) {
using CFE_STATE = typename FamilyType::CFE_STATE;
DebugManager.flags.EngineInstancedSubDevices.set(true);
constexpr uint32_t genericDevicesCount = 1;
constexpr uint32_t ccsCount = 2;
@ -902,6 +915,8 @@ HWTEST_F(EngineInstancedDeviceTests, givenEngineInstancedDeviceWhenCreatingProgr
constexpr uint32_t genericDevicesCount = 2;
constexpr uint32_t ccsCount = 2;
DebugManager.flags.EngineInstancedSubDevices.set(true);
if (!createDevices(genericDevicesCount, ccsCount)) {
GTEST_SKIP();
}

View File

@ -251,7 +251,7 @@ DeferOsContextInitialization = -1
DebuggerOptDisable = -1
ExperimentalEnableCustomLocalMemoryAlignment = 0
AlignLocalMemoryVaTo2MB = -1
EngineInstancedSubDevices = 1
EngineInstancedSubDevices = 0
OverrideTimestampPacketSize = -1
CFEComputeOverdispatchDisable = -1
CFEWeightedDispatchModeDisable = -1

View File

@ -261,7 +261,7 @@ DECLARE_DEBUG_VARIABLE(bool, EnableExtendedVaFormats, false, "Enable more format
DECLARE_DEBUG_VARIABLE(bool, EnableFormatQuery, true, "Enable sharing format querying")
DECLARE_DEBUG_VARIABLE(bool, EnableFreeMemory, false, "Enable freeMemory in memory manager")
DECLARE_DEBUG_VARIABLE(bool, ForceSamplerLowFilteringPrecision, false, "Force Low Filtering Precision Sampler mode")
DECLARE_DEBUG_VARIABLE(bool, EngineInstancedSubDevices, true, "Create subdevices assigned to specific engine")
DECLARE_DEBUG_VARIABLE(bool, EngineInstancedSubDevices, false, "Create subdevices assigned to specific engine")
DECLARE_DEBUG_VARIABLE(bool, AllowSingleTileEngineInstancedSubDevices, false, "Create subdevices assigned to specific engine on single tile config")
DECLARE_DEBUG_VARIABLE(int32_t, AddClGlSharing, -1, "Add cl-gl extension")
DECLARE_DEBUG_VARIABLE(int32_t, EnableKernelTunning, -1, "Perform a tunning of enqueue kernel, -1:default(disabled), 0:disable, 1:enable simple kernel tunning, 2:enable full kernel tunning")