Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove enabling preemption watermark 

Change-Id: I2de768907193c8b2b104536ce9972743a2af7d92
This commit is contained in:
Kamil Diedrich 2018-06-22 16:53:44 +02:00 committed by sys_ocldev
parent 5d357fb646
commit 3b726b76ee
2 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
runtime/gen10/preamble_gen10.cpp
View File

@ -66,26 +66,11 @@ size_t PreambleHelper<CNLFamily>::getThreadArbitrationCommandsSize() {
template <>
size_t PreambleHelper<CNLFamily>::getAdditionalCommandsSize(const Device &device) {
typedef typename CNLFamily::MI_LOAD_REGISTER_REG MI_LOAD_REGISTER_REG;
typedef typename CNLFamily::PIPE_CONTROL PIPE_CONTROL;
typedef typename CNLFamily::MI_MATH MI_MATH;
typedef typename CNLFamily::MI_MATH_ALU_INST_INLINE MI_MATH_ALU_INST_INLINE;
size_t size = PreemptionHelper::getRequiredPreambleSize<CNLFamily>(device) + sizeof(MI_LOAD_REGISTER_IMM);
size_t size = PreemptionHelper::getRequiredPreambleSize<CNLFamily>(device);
size += getKernelDebuggingCommandsSize(device.isSourceLevelDebuggerActive());
return size;
}
template <>
void PreambleHelper<CNLFamily>::programGenSpecificPreambleWorkArounds(LinearStream *pCommandStream, const HardwareInfo &hwInfo) {
typedef typename CNLFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM;
auto pCmd = reinterpret_cast<MI_LOAD_REGISTER_IMM *>(pCommandStream->getSpace(sizeof(MI_LOAD_REGISTER_IMM)));
*pCmd = MI_LOAD_REGISTER_IMM::sInit();
pCmd->setRegisterOffset(FfSliceCsChknReg2::address);
pCmd->setDataDword(FfSliceCsChknReg2::regVal);
}
template <>
uint32_t PreambleHelper<CNLFamily>::getUrbEntryAllocationSize() {
return 1024;

10
unit_tests/gen10/test_preamble_gen10.cpp
View File

@ -152,7 +152,7 @@ TEST(L3CNTLREGConfig, checkValidValues) {
}
typedef PreambleFixture PreemptionWatermarkGen10;
GEN10TEST_F(PreemptionWatermarkGen10, givenPreambleWhenPreambleWorkAroundsIsProgrammedThenPreemptionWatermarkIsDisabled) {
GEN10TEST_F(PreemptionWatermarkGen10, givenPreambleThenPreambleWorkAroundsIsNotProgrammed) {
typedef CNLFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM;
typedef CNLFamily::PIPE_CONTROL PIPE_CONTROL;
PreambleHelper<FamilyType>::programGenSpecificPreambleWorkArounds(&linearStream, **platformDevices);
@ -160,11 +160,9 @@ GEN10TEST_F(PreemptionWatermarkGen10, givenPreambleWhenPreambleWorkAroundsIsProg
parseCommands<FamilyType>(linearStream);
auto cmd = findMmioCmd<FamilyType>(cmdList.begin(), cmdList.end(), FfSliceCsChknReg2::address);
ASSERT_NE(nullptr, cmd);
ASSERT_EQ(nullptr, cmd);
EXPECT_EQ(FfSliceCsChknReg2::regVal, cmd->getDataDword());
size_t expectedSize = PreemptionHelper::getRequiredPreambleSize<FamilyType>(MockDevice(*platformDevices[0])) + sizeof(MI_LOAD_REGISTER_IMM);
size_t expectedSize = PreemptionHelper::getRequiredPreambleSize<FamilyType>(MockDevice(*platformDevices[0]));
EXPECT_EQ(expectedSize, PreambleHelper<FamilyType>::getAdditionalCommandsSize(MockDevice(*platformDevices[0])));
}
@ -191,7 +189,7 @@ GEN10TEST_F(ThreadArbitrationGen10, givenPreambleWhenItIsProgrammedThenThreadArb
EXPECT_EQ(RowChickenReg4::regDataForArbitrationPolicy[ThreadArbitrationPolicy::RoundRobin], cmd->getDataDword());
EXPECT_EQ(sizeof(MI_LOAD_REGISTER_IMM), PreambleHelper<CNLFamily>::getAdditionalCommandsSize(MockDevice(*platformDevices[0])));
EXPECT_EQ(0u, PreambleHelper<CNLFamily>::getAdditionalCommandsSize(MockDevice(*platformDevices[0])));
EXPECT_EQ(sizeof(MI_LOAD_REGISTER_IMM) + sizeof(PIPE_CONTROL), PreambleHelper<CNLFamily>::getThreadArbitrationCommandsSize());
}