Delete addDcFlushToPipeControl

Change-Id: Idd1af397a302755484f60e910929c2fe7d52857d
Signed-off-by: Maciej Dziuban <maciej.dziuban@intel.com>
This commit is contained in:
Maciej Dziuban
2019-03-25 14:18:58 +01:00
committed by sys_ocldev
parent ee1854bfe8
commit 0420c2948f
3 changed files with 11 additions and 13 deletions

View File

@@ -38,6 +38,7 @@ class CommandStreamReceiverHw : public CommandStreamReceiver {
void flushBatchedSubmissions() override;
PIPE_CONTROL *addPipeControlBase(LinearStream &commandStream, bool dcFlush);
void addPipeControl(LinearStream &commandStream, bool dcFlush) override;
int getRequiredPipeControlSize() const;
@@ -86,7 +87,6 @@ class CommandStreamReceiverHw : public CommandStreamReceiver {
virtual void initPageTableManagerRegisters(LinearStream &csr){};
void addPipeControlWA(LinearStream &commandStream);
void addDcFlushToPipeControl(typename GfxFamily::PIPE_CONTROL *pCmd, bool flushDC);
void addClearSLMWorkAround(typename GfxFamily::PIPE_CONTROL *pCmd);
PIPE_CONTROL *addPipeControlCmd(LinearStream &commandStream);
size_t getSshHeapSize();

View File

@@ -584,18 +584,13 @@ inline void CommandStreamReceiverHw<GfxFamily>::flushBatchedSubmissions() {
}
template <typename GfxFamily>
void CommandStreamReceiverHw<GfxFamily>::addPipeControl(LinearStream &commandStream, bool dcFlush) {
typedef typename GfxFamily::PIPE_CONTROL PIPE_CONTROL;
typename GfxFamily::PIPE_CONTROL *CommandStreamReceiverHw<GfxFamily>::addPipeControlBase(LinearStream &commandStream, bool dcFlush) {
addPipeControlWA(commandStream);
// Add a PIPE_CONTROL w/ CS_stall
auto pCmd = reinterpret_cast<PIPE_CONTROL *>(commandStream.getSpace(sizeof(PIPE_CONTROL)));
*pCmd = GfxFamily::cmdInitPipeControl;
pCmd->setCommandStreamerStallEnable(true);
pCmd->setDcFlushEnable(dcFlush);
//Some architectures (BDW) requires to have at least one flush bit set
addDcFlushToPipeControl(pCmd, true);
if (DebugManager.flags.FlushAllCaches.get()) {
pCmd->setDcFlushEnable(true);
@@ -607,6 +602,12 @@ void CommandStreamReceiverHw<GfxFamily>::addPipeControl(LinearStream &commandStr
pCmd->setConstantCacheInvalidationEnable(true);
pCmd->setStateCacheInvalidationEnable(true);
}
return pCmd;
}
template <typename GfxFamily>
void CommandStreamReceiverHw<GfxFamily>::addPipeControl(LinearStream &commandStream, bool dcFlush) {
CommandStreamReceiverHw<GfxFamily>::addPipeControlBase(commandStream, dcFlush);
}
template <typename GfxFamily>
@@ -805,10 +806,6 @@ template <typename GfxFamily>
void CommandStreamReceiverHw<GfxFamily>::addPipeControlWA(LinearStream &commandStream) {
}
template <typename GfxFamily>
void CommandStreamReceiverHw<GfxFamily>::addDcFlushToPipeControl(typename GfxFamily::PIPE_CONTROL *pCmd, bool flushDC) {
}
template <typename GfxFamily>
int CommandStreamReceiverHw<GfxFamily>::getRequiredPipeControlSize() const {
const auto pipeControlCount = KernelCommandsHelper<GfxFamily>::isPipeControlWArequired() ? 2u : 1u;

View File

@@ -25,8 +25,9 @@ void CommandStreamReceiverHw<Family>::programComputeMode(LinearStream &stream, D
}
template <>
void CommandStreamReceiverHw<Family>::addDcFlushToPipeControl(Family::PIPE_CONTROL *pCmd, bool flushDC) {
pCmd->setDcFlushEnable(flushDC);
void CommandStreamReceiverHw<Family>::addPipeControl(LinearStream &commandStream, bool dcFlush) {
auto pCmd = CommandStreamReceiverHw<Family>::addPipeControlBase(commandStream, dcFlush);
pCmd->setDcFlushEnable(true);
}
template <>