intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-24 20:39:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove platformDevices [2/n]

Browse Source 
replace **platformDevices with *defaultHwInfo
replace *platformDevices[0] with *defaultHwInfo

Related-To: NEO-4499
Change-Id: If973ceb44ede2e940969f9c666f85d9a939fbff8
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2020-03-24 11:42:54 +01:00
committed by sys_ocldev
parent 5a1d8c0b6d
commit 7a2310163e
52 changed files with 167 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
shared/test/unit_test/gen11/test_preamble_gen11.cpp
View File

@@ -18,7 +18,7 @@ typedef PreambleFixture IclSlm;
GEN11TEST_F(IclSlm, shouldBeEnabledOnGen11) {
typedef ICLFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM;
LinearStream &cs = linearStream;
uint32_t l3Config = PreambleHelper<FamilyType>::getL3Config(**platformDevices, true);
uint32_t l3Config = PreambleHelper<FamilyType>::getL3Config(*defaultHwInfo, true);
PreambleHelper<FamilyType>::programL3(&cs, l3Config);
parseCommands<ICLFamily>(cs);
@@ -33,7 +33,7 @@ GEN11TEST_F(IclSlm, shouldBeEnabledOnGen11) {
}
GEN11TEST_F(IclSlm, givenGen11WhenProgramingL3ThenErrorDetectionBehaviorControlBitSet) {
uint32_t l3Config = PreambleHelper<FamilyType>::getL3Config(**platformDevices, true);
uint32_t l3Config = PreambleHelper<FamilyType>::getL3Config(*defaultHwInfo, true);
uint32_t errorDetectionBehaviorControlBit = 1 << 9;
@@ -42,7 +42,7 @@ GEN11TEST_F(IclSlm, givenGen11WhenProgramingL3ThenErrorDetectionBehaviorControlB
GEN11TEST_F(IclSlm, givenGen11IsL3Programing) {
bool isL3Programmable =
PreambleHelper<FamilyType>::isL3Configurable(**platformDevices);
PreambleHelper<FamilyType>::isL3Configurable(*defaultHwInfo);
EXPECT_FALSE(isL3Programmable);
}
@@ -92,7 +92,7 @@ GEN11TEST_F(Gen11PreambleVfeState, WaOn) {
typedef PreambleFixture PreemptionWatermarkGen11;
GEN11TEST_F(PreemptionWatermarkGen11, givenPreambleThenPreambleWorkAroundsIsNotProgrammed) {
PreambleHelper<FamilyType>::programGenSpecificPreambleWorkArounds(&linearStream, **platformDevices);
PreambleHelper<FamilyType>::programGenSpecificPreambleWorkArounds(&linearStream, *defaultHwInfo);
parseCommands<FamilyType>(linearStream);
@@ -116,7 +116,7 @@ GEN11TEST_F(ThreadArbitrationGen11, givenPreambleWhenItIsProgrammedThenThreadArb
typedef ICLFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM;
typedef ICLFamily::PIPE_CONTROL PIPE_CONTROL;
LinearStream &cs = linearStream;
uint32_t l3Config = PreambleHelper<FamilyType>::getL3Config(**platformDevices, true);
uint32_t l3Config = PreambleHelper<FamilyType>::getL3Config(*defaultHwInfo, true);
MockDevice mockDevice;
PreambleHelper<FamilyType>::programPreamble(&linearStream, mockDevice, l3Config,
ThreadArbitrationPolicy::RoundRobin,

2
shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp
View File

@@ -32,7 +32,7 @@ TGLLPTEST_F(TglLpSlm, givenTglLpWhenPreambleIsBeingProgrammedThenThreadArbitrati
TGLLPTEST_F(TglLpSlm, givenTglLpIsL3Programing) {
bool isL3Programmable =
PreambleHelper<TGLLPFamily>::isL3Configurable(**platformDevices);
PreambleHelper<TGLLPFamily>::isL3Configurable(*defaultHwInfo);
EXPECT_FALSE(isL3Programmable);
}

10
shared/test/unit_test/gen8/test_preamble_gen8.cpp
View File

@@ -19,7 +19,7 @@ typedef PreambleFixture BdwSlm;
BDWTEST_F(BdwSlm, shouldBeEnabledOnGen8) {
typedef BDWFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM;
LinearStream &cs = linearStream;
uint32_t l3Config = PreambleHelper<BDWFamily>::getL3Config(**platformDevices, true);
uint32_t l3Config = PreambleHelper<BDWFamily>::getL3Config(*defaultHwInfo, true);
PreambleHelper<BDWFamily>::programL3(&cs, l3Config);
parseCommands<BDWFamily>(cs);
@@ -62,10 +62,10 @@ BDWTEST_F(Gen8L3Config, givenGen8IsL3Programing) {
bool isL3Programmable;
l3ConfigDifference =
PreambleHelper<BDWFamily>::getL3Config(**platformDevices, true) !=
PreambleHelper<BDWFamily>::getL3Config(**platformDevices, false);
PreambleHelper<BDWFamily>::getL3Config(*defaultHwInfo, true) !=
PreambleHelper<BDWFamily>::getL3Config(*defaultHwInfo, false);
isL3Programmable =
PreambleHelper<BDWFamily>::isL3Configurable(**platformDevices);
PreambleHelper<BDWFamily>::isL3Configurable(*defaultHwInfo);
EXPECT_EQ(l3ConfigDifference, isL3Programmable);
}
@@ -95,7 +95,7 @@ BDWTEST_F(PreambleVfeState, basic) {
typedef BDWFamily::PIPE_CONTROL PIPE_CONTROL;
LinearStream &cs = linearStream;
PreambleHelper<BDWFamily>::programVFEState(&linearStream, **platformDevices, 0, 0, 168u, aub_stream::EngineType::ENGINE_RCS);
PreambleHelper<BDWFamily>::programVFEState(&linearStream, *defaultHwInfo, 0, 0, 168u, aub_stream::EngineType::ENGINE_RCS);
parseCommands<BDWFamily>(cs);

6
shared/test/unit_test/gen9/preamble_tests_gen9.cpp
View File

@@ -54,10 +54,10 @@ GEN9TEST_F(PreambleTestGen9, givenGen9IsL3Programing) {
bool isL3Programmable;
l3ConfigDifference =
PreambleHelper<FamilyType>::getL3Config(**platformDevices, true) !=
PreambleHelper<FamilyType>::getL3Config(**platformDevices, false);
PreambleHelper<FamilyType>::getL3Config(*defaultHwInfo, true) !=
PreambleHelper<FamilyType>::getL3Config(*defaultHwInfo, false);
isL3Programmable =
PreambleHelper<FamilyType>::isL3Configurable(**platformDevices);
PreambleHelper<FamilyType>::isL3Configurable(*defaultHwInfo);
EXPECT_EQ(l3ConfigDifference, isL3Programmable);
}

4
shared/test/unit_test/gen9/skl/test_preamble_skl.cpp
View File

@@ -21,7 +21,7 @@ typedef PreambleFixture SklSlm;
SKLTEST_F(SklSlm, shouldBeEnabledOnGen9) {
typedef SKLFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM;
LinearStream &cs = linearStream;
uint32_t l3Config = PreambleHelper<FamilyType>::getL3Config(**platformDevices, true);
uint32_t l3Config = PreambleHelper<FamilyType>::getL3Config(*defaultHwInfo, true);
PreambleHelper<SKLFamily>::programL3(&cs, l3Config);
@@ -77,7 +77,7 @@ SKLTEST_F(ThreadArbitration, givenPreambleWhenItIsProgrammedThenThreadArbitratio
typedef SKLFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM;
typedef SKLFamily::PIPE_CONTROL PIPE_CONTROL;
LinearStream &cs = linearStream;
uint32_t l3Config = PreambleHelper<FamilyType>::getL3Config(**platformDevices, true);
uint32_t l3Config = PreambleHelper<FamilyType>::getL3Config(*defaultHwInfo, true);
MockDevice mockDevice;
PreambleHelper<SKLFamily>::programPreamble(&linearStream, mockDevice, l3Config,
ThreadArbitrationPolicy::RoundRobin,

2
shared/test/unit_test/os_interface/windows/wddm_preemption_tests.cpp
View File

@@ -19,7 +19,7 @@ class WddmPreemptionTests : public Test<WddmFixtureWithMockGdiDll> {
public:
void SetUp() override {
WddmFixtureWithMockGdiDll::SetUp();
const HardwareInfo hwInfo = *platformDevices[0];
const HardwareInfo hwInfo = *defaultHwInfo;
memcpy(&hwInfoTest, &hwInfo, sizeof(hwInfoTest));
dbgRestorer = new DebugManagerStateRestore();
wddm->featureTable->ftrGpGpuMidThreadLevelPreempt = true;

2
shared/test/unit_test/preamble/preamble_tests.cpp
View File

@@ -183,7 +183,7 @@ HWTEST_F(PreambleTest, givenKernelDebuggingActiveAndMidThreadPreemptionWhenGetAd
}
HWTEST_F(PreambleTest, givenDefaultPreambleWhenGetThreadsMaxNumberIsCalledThenMaximumNumberOfThreadsIsReturned) {
const HardwareInfo &hwInfo = **platformDevices;
const HardwareInfo &hwInfo = *defaultHwInfo;
uint32_t threadsPerEU = (hwInfo.gtSystemInfo.ThreadCount / hwInfo.gtSystemInfo.EUCount) + hwInfo.capabilityTable.extraQuantityThreadsPerEU;
uint32_t value = HwHelper::getMaxThreadsForVfe(hwInfo);

4
shared/test/unit_test/preemption/preemption_tests.cpp
View File

@@ -519,7 +519,7 @@ INSTANTIATE_TEST_CASE_P(
::testing::Values(PreemptionMode::Disabled, PreemptionMode::MidBatch, PreemptionMode::ThreadGroup));
HWTEST_F(MidThreadPreemptionTests, createCsrSurfaceNoWa) {
HardwareInfo hwInfo = *platformDevices[0];
HardwareInfo hwInfo = *defaultHwInfo;
hwInfo.workaroundTable.waCSRUncachable = false;
std::unique_ptr<MockDevice> mockDevice(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfo));
@@ -558,7 +558,7 @@ HWTEST_F(MidThreadPreemptionTests, givenMidThreadPreemptionWhenFailingOnCsrSurfa
}
HWTEST_F(MidThreadPreemptionTests, createCsrSurfaceWa) {
HardwareInfo hwInfo = *platformDevices[0];
HardwareInfo hwInfo = *defaultHwInfo;
hwInfo.workaroundTable.waCSRUncachable = true;
std::unique_ptr<MockDevice> mockDevice(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfo));