Revert "Enable copy engine in platforms which supports bcs"

This reverts commit b539b5a3ec.

Change-Id: I731b969cb82e4cfa6ec3f435c4b3178fc997c867
This commit is contained in:
Plewka, Maciej
2020-10-23 07:11:02 -07:00
committed by sys_ocldev
parent c3b8727e97
commit 39a930e122
9 changed files with 40 additions and 123 deletions

View File

@@ -45,9 +45,8 @@ GEN11TEST_F(HwHelperTestGen11, givenGen11PlatformWhenSetupHardwareCapabilitiesIs
}
GEN11TEST_F(HwHelperTestGen11, whenGetGpgpuEnginesThenReturnThreeRcsEngines) {
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
hwInfo.featureTable.ftrBcsInfo.set(0, false);
whenGetGpgpuEnginesThenReturnThreeRcsEngines<FamilyType>(hwInfo);
whenGetGpgpuEnginesThenReturnTwoRcsEngines<FamilyType>(pDevice->getHardwareInfo());
EXPECT_EQ(3u, pDevice->engines.size());
}
using MemorySynchronizatiopCommandsTestsGen11 = ::testing::Test;

View File

@@ -118,7 +118,7 @@ GEN12LPTEST_F(HwHelperTestGen12Lp, givenDifferentSizesOfAllocationWhenCheckingCo
}
}
GEN12LPTEST_F(HwHelperTestGen12Lp, givenFtrCcsNodeNotSetAndBcsInfoSetWhenGetGpgpuEnginesThenReturnThreeRcsEnginesEngine) {
GEN12LPTEST_F(HwHelperTestGen12Lp, givenFtrCcsNodeNotSetAndBcsInfoSetWhenGetGpgpuEnginesThenReturnThreeRcsEnginesAndOneBcsEngine) {
HardwareInfo hwInfo = *defaultHwInfo;
hwInfo.featureTable.ftrCCSNode = false;
hwInfo.featureTable.ftrBcsInfo = 1;

View File

@@ -52,9 +52,8 @@ GEN8TEST_F(HwHelperTestGen8, givenGen8PlatformWhenSetupHardwareCapabilitiesIsCal
}
GEN8TEST_F(HwHelperTestGen8, whenGetGpgpuEnginesThenReturnThreeEngines) {
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
hwInfo.featureTable.ftrBcsInfo.set(0, false);
whenGetGpgpuEnginesThenReturnThreeRcsEngines<FamilyType>(hwInfo);
whenGetGpgpuEnginesThenReturnTwoRcsEngines<FamilyType>(pDevice->getHardwareInfo());
EXPECT_EQ(3u, pDevice->engines.size());
}
using MemorySynchronizatiopCommandsTestsGen8 = ::testing::Test;

View File

@@ -57,9 +57,8 @@ GEN9TEST_F(HwHelperTestGen9, givenDebuggingActiveWhenSipKernelTypeIsQueriedThenD
}
GEN9TEST_F(HwHelperTestGen9, whenGetGpgpuEnginesThenReturnThreeRcsEngines) {
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
hwInfo.featureTable.ftrBcsInfo.set(0, false);
whenGetGpgpuEnginesThenReturnThreeRcsEngines<FamilyType>(hwInfo);
whenGetGpgpuEnginesThenReturnTwoRcsEngines<FamilyType>(pDevice->getHardwareInfo());
EXPECT_EQ(3u, pDevice->engines.size());
}
using MemorySynchronizatiopCommandsTestsGen9 = ::testing::Test;

View File

@@ -12,7 +12,7 @@
using namespace NEO;
template <typename FamilyType>
void whenGetGpgpuEnginesThenReturnThreeRcsEngines(const HardwareInfo &hwInfo) {
void whenGetGpgpuEnginesThenReturnTwoRcsEngines(const HardwareInfo &hwInfo) {
auto gpgpuEngines = HwHelperHw<FamilyType>::get().getGpgpuEngineInstances(hwInfo);
EXPECT_EQ(3u, gpgpuEngines.size());
EXPECT_EQ(aub_stream::ENGINE_RCS, gpgpuEngines[0].first);