Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-10 12:53:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change internal copy engine to BCS3

Browse Source 
Signed-off-by: Lukasz Jobczyk <lukasz.jobczyk@intel.com>
This commit is contained in:
Lukasz Jobczyk
2022-09-15 13:53:15 +00:00
committed by Compute-Runtime-Automation
parent 218a98f7f7
commit 24b1cfbff5
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp
View File

@ -271,7 +271,7 @@ XE_HPC_CORETEST_F(HwHelperTestsXeHpcCore, givenNotAllCopyEnginesWhenIsCooperativ
hwInfo.featureTable.flags.ftrCCSNode = true;
hwInfo.featureTable.ftrBcsInfo = maxNBitValue(9);
hwInfo.featureTable.ftrBcsInfo.set(0, false);
hwInfo.featureTable.ftrBcsInfo.set(2, false);
hwInfo.featureTable.ftrBcsInfo.set(3, false);
hwInfo.featureTable.ftrBcsInfo.set(7, false);
hwInfo.featureTable.ftrBcsInfo.set(8, false);
hwInfo.capabilityTable.blitterOperationsSupported = true;
@ -297,7 +297,7 @@ XE_HPC_CORETEST_F(HwHelperTestsXeHpcCore, givenNotAllCopyEnginesWhenIsCooperativ
{aub_stream::ENGINE_CCS, true, false},
{aub_stream::ENGINE_CCS, true, false},
{aub_stream::ENGINE_BCS1, false, true},
{aub_stream::ENGINE_BCS3, false, true},
{aub_stream::ENGINE_BCS2, false, true},
{aub_stream::ENGINE_BCS4, false, true},
{aub_stream::ENGINE_BCS5, false, true},
{aub_stream::ENGINE_BCS6, false, true},
@ -344,7 +344,7 @@ XE_HPC_CORETEST_F(HwHelperTestsXeHpcCore, givenOneCcsEnabledWhenIsCooperativeEng
{aub_stream::ENGINE_BCS, false, true},
{aub_stream::ENGINE_BCS1, false, true},
{aub_stream::ENGINE_BCS2, false, true},
{aub_stream::ENGINE_BCS2, false, true},
{aub_stream::ENGINE_BCS3, false, true},
{aub_stream::ENGINE_BCS3, false, true},
{aub_stream::ENGINE_BCS4, false, true},
{aub_stream::ENGINE_BCS5, false, true},
@ -400,7 +400,7 @@ XE_HPC_CORETEST_F(HwHelperTestsXeHpcCore, givenCccsAsDefaultEngineWhenIsCooperat
{aub_stream::ENGINE_BCS, false, true},
{aub_stream::ENGINE_BCS1, false, true},
{aub_stream::ENGINE_BCS2, false, true},
{aub_stream::ENGINE_BCS2, false, true},
{aub_stream::ENGINE_BCS3, false, true},
{aub_stream::ENGINE_BCS3, false, true},
{aub_stream::ENGINE_BCS4, false, true},
{aub_stream::ENGINE_BCS5, false, true},
@ -456,7 +456,7 @@ XE_HPC_CORETEST_F(HwHelperTestsXeHpcCore, whenIsCooperativeEngineSupportedEnable
{aub_stream::ENGINE_BCS, false, true},
{aub_stream::ENGINE_BCS1, false, true},
{aub_stream::ENGINE_BCS2, false, true},
{aub_stream::ENGINE_BCS2, false, true},
{aub_stream::ENGINE_BCS3, false, true},
{aub_stream::ENGINE_BCS3, false, true},
{aub_stream::ENGINE_BCS4, false, true},
{aub_stream::ENGINE_BCS5, false, true},
@ -512,7 +512,7 @@ XE_HPC_CORETEST_F(HwHelperTestsXeHpcCore, whenIsCooperativeEngineSupportedEnable
{aub_stream::ENGINE_BCS, false, true},
{aub_stream::ENGINE_BCS1, false, true},
{aub_stream::ENGINE_BCS2, false, true},
{aub_stream::ENGINE_BCS2, false, true},
{aub_stream::ENGINE_BCS3, false, true},
{aub_stream::ENGINE_BCS3, false, true},
{aub_stream::ENGINE_BCS4, false, true},
{aub_stream::ENGINE_BCS5, false, true},

16
opencl/test/unit_test/xe_hpc_core/pvc/engine_node_helper_tests_pvc.cpp
View File

@ -54,8 +54,8 @@ PVCTEST_F(EngineNodeHelperPvcTests, givenPvcBaseDieA0AndTile1WhenGettingBcsEngin
{
auto internalUsage = true;
EXPECT_EQ(ENGINE_BCS2, EngineHelpers::getBcsEngineType(*pHwInfo, deviceBitfield, selectorCopyEngine, internalUsage));
EXPECT_EQ(ENGINE_BCS2, EngineHelpers::getBcsEngineType(*pHwInfo, deviceBitfield, selectorCopyEngine, internalUsage));
EXPECT_EQ(ENGINE_BCS3, EngineHelpers::getBcsEngineType(*pHwInfo, deviceBitfield, selectorCopyEngine, internalUsage));
EXPECT_EQ(ENGINE_BCS3, EngineHelpers::getBcsEngineType(*pHwInfo, deviceBitfield, selectorCopyEngine, internalUsage));
}
{
auto internalUsage = false;
@ -245,7 +245,7 @@ PVCTEST_F(EngineNodeHelperPvcTests, givenNotAllCopyEnginesWhenSettingEngineTable
hwInfo.featureTable.flags.ftrCCSNode = true;
hwInfo.featureTable.ftrBcsInfo = maxNBitValue(9);
hwInfo.featureTable.ftrBcsInfo.set(0, false);
hwInfo.featureTable.ftrBcsInfo.set(2, false);
hwInfo.featureTable.ftrBcsInfo.set(3, false);
hwInfo.featureTable.ftrBcsInfo.set(7, false);
hwInfo.featureTable.ftrBcsInfo.set(8, false);
hwInfo.capabilityTable.blitterOperationsSupported = true;
@ -270,7 +270,7 @@ PVCTEST_F(EngineNodeHelperPvcTests, givenNotAllCopyEnginesWhenSettingEngineTable
{aub_stream::ENGINE_CCS, true, false},
{aub_stream::ENGINE_CCS, true, false},
{aub_stream::ENGINE_BCS1, false, true},
{aub_stream::ENGINE_BCS3, false, true},
{aub_stream::ENGINE_BCS2, false, true},
{aub_stream::ENGINE_BCS4, false, true},
{aub_stream::ENGINE_BCS5, false, true},
{aub_stream::ENGINE_BCS6, false, true},
@ -314,7 +314,7 @@ PVCTEST_F(EngineNodeHelperPvcTests, givenOneCcsEnabledWhenGetEnginesCalledThenCr
{aub_stream::ENGINE_BCS, false, true},
{aub_stream::ENGINE_BCS1, false, true},
{aub_stream::ENGINE_BCS2, false, true},
{aub_stream::ENGINE_BCS2, false, true},
{aub_stream::ENGINE_BCS3, false, true},
{aub_stream::ENGINE_BCS3, false, true},
{aub_stream::ENGINE_BCS4, false, true},
{aub_stream::ENGINE_BCS5, false, true},
@ -364,7 +364,7 @@ PVCTEST_F(EngineNodeHelperPvcTests, givenCccsAsDefaultEngineWhenGetEnginesCalled
{aub_stream::ENGINE_BCS, false, true},
{aub_stream::ENGINE_BCS1, false, true},
{aub_stream::ENGINE_BCS2, false, true},
{aub_stream::ENGINE_BCS2, false, true},
{aub_stream::ENGINE_BCS3, false, true},
{aub_stream::ENGINE_BCS3, false, true},
{aub_stream::ENGINE_BCS4, false, true},
{aub_stream::ENGINE_BCS5, false, true},
@ -414,7 +414,7 @@ PVCTEST_F(EngineNodeHelperPvcTests, whenGetGpgpuEnginesThenReturnTwoCccsEnginesA
{aub_stream::ENGINE_BCS, false, true},
{aub_stream::ENGINE_BCS1, false, true},
{aub_stream::ENGINE_BCS2, false, true},
{aub_stream::ENGINE_BCS2, false, true},
{aub_stream::ENGINE_BCS3, false, true},
{aub_stream::ENGINE_BCS3, false, true},
{aub_stream::ENGINE_BCS4, false, true},
{aub_stream::ENGINE_BCS5, false, true},
@ -464,7 +464,7 @@ PVCTEST_F(EngineNodeHelperPvcTests, whenGetGpgpuEnginesThenReturnTwoCccsEnginesA
{aub_stream::ENGINE_BCS, false, true},
{aub_stream::ENGINE_BCS1, false, true},
{aub_stream::ENGINE_BCS2, false, true},
{aub_stream::ENGINE_BCS2, false, true},
{aub_stream::ENGINE_BCS3, false, true},
{aub_stream::ENGINE_BCS3, false, true},
{aub_stream::ENGINE_BCS4, false, true},
{aub_stream::ENGINE_BCS5, false, true},

2
shared/source/helpers/engine_node_helper.cpp
View File

@ -106,7 +106,7 @@ aub_stream::EngineType getBcsEngineType(const HardwareInfo &hwInfo, const Device
return DebugManager.flags.ForceBCSForInternalCopyEngine.get() == 0 ? aub_stream::EngineType::ENGINE_BCS
: static_cast<aub_stream::EngineType>(aub_stream::EngineType::ENGINE_BCS1 + DebugManager.flags.ForceBCSForInternalCopyEngine.get() - 1);
}
return aub_stream::ENGINE_BCS2;
return aub_stream::ENGINE_BCS3;
}
const bool isMainCopyEngineAlreadyUsed = selectorCopyEngine.isMainUsed.exchange(true);

4
shared/source/xe_hpc_core/hw_helper_xe_hpc_core.cpp
View File

@ -73,8 +73,8 @@ const EngineInstancesContainer HwHelperHw<Family>::getGpgpuEngineInstances(const
if (hwInfo.featureTable.ftrBcsInfo.test(i)) {
auto engineType = static_cast<aub_stream::EngineType>((i - 1) + aub_stream::ENGINE_BCS1); // Link copy engine
engines.push_back({engineType, EngineUsage::Regular});
if (i == 2) {
engines.push_back({engineType, EngineUsage::Internal}); // BCS2 for internal usage
if (i == 3) {
engines.push_back({engineType, EngineUsage::Internal}); // BCS3 for internal usage
}
}
}

4
shared/test/unit_test/helpers/engine_node_helper_tests.cpp
View File

@ -128,6 +128,6 @@ TEST(EngineNodeHelperTest, givenLinkCopyEnginesAndInternalUsageEnabledWhenGettin
DeviceBitfield deviceBitfield = 0b11;
hwInfo.featureTable.ftrBcsInfo = 0b111;
auto isInternalUsage = true;
EXPECT_EQ(aub_stream::EngineType::ENGINE_BCS2, EngineHelpers::getBcsEngineType(hwInfo, deviceBitfield, selectorCopyEngine, isInternalUsage));
EXPECT_EQ(aub_stream::EngineType::ENGINE_BCS2, EngineHelpers::getBcsEngineType(hwInfo, deviceBitfield, selectorCopyEngine, isInternalUsage));
EXPECT_EQ(aub_stream::EngineType::ENGINE_BCS3, EngineHelpers::getBcsEngineType(hwInfo, deviceBitfield, selectorCopyEngine, isInternalUsage));
EXPECT_EQ(aub_stream::EngineType::ENGINE_BCS3, EngineHelpers::getBcsEngineType(hwInfo, deviceBitfield, selectorCopyEngine, isInternalUsage));
}