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

Remove EngineInstance parameter from pollForCompletion call 

Change-Id: I07652db2de656032cdb3452239b671edbe876b75
Signed-off-by: Dunajski, Bartosz <bartosz.dunajski@intel.com>
This commit is contained in:
Dunajski, Bartosz 2019-01-28 14:20:58 +01:00 committed by sys_ocldev
parent c870628d08
commit c878590162
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/command_stream/aub_command_stream_receiver_hw.h
View File

@ -60,7 +60,7 @@ class AUBCommandStreamReceiverHw : public CommandStreamReceiverSimulatedHw<GfxFa
// Family specific version
MOCKABLE_VIRTUAL void submitBatchBuffer(size_t engineIndex, uint64_t batchBufferGpuAddress, const void *batchBuffer, size_t batchBufferSize, uint32_t memoryBank, uint64_t entryBits);
MOCKABLE_VIRTUAL void pollForCompletion(EngineInstanceT engineInstance);
MOCKABLE_VIRTUAL void pollForCompletion();
uint32_t getDumpHandle();
MOCKABLE_VIRTUAL void addContextToken(uint32_t dumpHandle);

6
runtime/command_stream/aub_command_stream_receiver_hw.inl
View File

@ -345,7 +345,7 @@ FlushStamp AUBCommandStreamReceiverHw<GfxFamily>::flush(BatchBuffer &batchBuffer
submitBatchBuffer(engineIndex, batchBufferGpuAddress, pBatchBuffer, sizeBatchBuffer, this->getMemoryBank(batchBuffer.commandBufferAllocation), this->getPPGTTAdditionalBits(batchBuffer.commandBufferAllocation));
if (!DebugManager.flags.AUBDumpConcurrentCS.get()) {
pollForCompletion(osContext->getEngineType());
pollForCompletion();
}
if (this->standalone) {
@ -563,13 +563,13 @@ void AUBCommandStreamReceiverHw<GfxFamily>::submitBatchBuffer(size_t engineIndex
}
template <typename GfxFamily>
void AUBCommandStreamReceiverHw<GfxFamily>::pollForCompletion(EngineInstanceT engineInstance) {
void AUBCommandStreamReceiverHw<GfxFamily>::pollForCompletion() {
if (hardwareContext) {
hardwareContext->pollForCompletion();
return;
}
const auto mmioBase = this->getCsTraits(engineInstance).mmioBase;
const auto mmioBase = this->getCsTraits(osContext->getEngineType()).mmioBase;
const bool pollNotEqual = false;
const uint32_t mask = getMaskAndValueForPollForCompletion();
const uint32_t value = mask;

2
runtime/command_stream/tbx_command_stream_receiver_hw.h
View File

@ -49,7 +49,7 @@ class TbxCommandStreamReceiverHw : public CommandStreamReceiverSimulatedHw<GfxFa
// Family specific version
MOCKABLE_VIRTUAL void submitBatchBuffer(size_t engineIndex, uint64_t batchBufferGpuAddress, const void *batchBuffer, size_t batchBufferSize, uint32_t memoryBank, uint64_t entryBits);
MOCKABLE_VIRTUAL void pollForCompletion(EngineInstanceT engineInstance);
MOCKABLE_VIRTUAL void pollForCompletion();
static CommandStreamReceiver *create(const HardwareInfo &hwInfoIn, bool withAubDump, ExecutionEnvironment &executionEnvironment);

6
runtime/command_stream/tbx_command_stream_receiver_hw.inl
View File

@ -210,7 +210,7 @@ FlushStamp TbxCommandStreamReceiverHw<GfxFamily>::flush(BatchBuffer &batchBuffer
submitBatchBuffer(engineIndex, batchBufferGpuAddress, pBatchBuffer, sizeBatchBuffer, this->getMemoryBank(batchBuffer.commandBufferAllocation), this->getPPGTTAdditionalBits(batchBuffer.commandBufferAllocation));
pollForCompletion(osContext->getEngineType());
pollForCompletion();
return 0;
}
@ -344,7 +344,7 @@ void TbxCommandStreamReceiverHw<GfxFamily>::submitBatchBuffer(size_t engineIndex
}
template <typename GfxFamily>
void TbxCommandStreamReceiverHw<GfxFamily>::pollForCompletion(EngineInstanceT engineInstance) {
void TbxCommandStreamReceiverHw<GfxFamily>::pollForCompletion() {
if (hardwareContext) {
hardwareContext->pollForCompletion();
return;
@ -352,7 +352,7 @@ void TbxCommandStreamReceiverHw<GfxFamily>::pollForCompletion(EngineInstanceT en
typedef typename AubMemDump::CmdServicesMemTraceRegisterPoll CmdServicesMemTraceRegisterPoll;
auto mmioBase = this->getCsTraits(engineInstance).mmioBase;
auto mmioBase = this->getCsTraits(osContext->getEngineType()).mmioBase;
bool pollNotEqual = false;
tbxStream.registerPoll(
AubMemDump::computeRegisterOffset(mmioBase, 0x2234), //EXECLIST_STATUS

2
unit_tests/aub_tests/command_stream/aub_command_stream_fixture.h
View File

@ -84,7 +84,7 @@ class AUBCommandStreamFixture : public CommandStreamFixture {
}
auto aubCsr = reinterpret_cast<AUBCommandStreamReceiverHw<FamilyType> *>(csr);
aubCsr->pollForCompletion(csr->getOsContext().getEngineType());
aubCsr->pollForCompletion();
}
GraphicsAllocation *createResidentAllocationAndStoreItInCsr(const void *address, size_t size) {

4
unit_tests/mocks/mock_aub_csr.h
View File

@ -86,8 +86,8 @@ struct MockAubCsr : public AUBCommandStreamReceiverHw<GfxFamily> {
AUBCommandStreamReceiverHw<GfxFamily>::submitBatchBuffer(engineIndex, batchBufferGpuAddress, batchBuffer, batchBufferSize, memoryBank, entryBits);
submitBatchBufferCalled = true;
}
void pollForCompletion(EngineInstanceT engineInstance) override {
AUBCommandStreamReceiverHw<GfxFamily>::pollForCompletion(engineInstance);
void pollForCompletion() override {
AUBCommandStreamReceiverHw<GfxFamily>::pollForCompletion();
pollForCompletionCalled = true;
}
void expectMemoryEqual(void *gfxAddress, const void *srcAddress, size_t length) {

4
unit_tests/mocks/mock_tbx_csr.h
View File

@ -50,8 +50,8 @@ class MockTbxCsr : public TbxCommandStreamReceiverHw<GfxFamily> {
TbxCommandStreamReceiverHw<GfxFamily>::submitBatchBuffer(engineIndex, batchBufferGpuAddress, batchBuffer, batchBufferSize, memoryBank, entryBits);
submitBatchBufferCalled = true;
}
void pollForCompletion(EngineInstanceT engineInstance) override {
TbxCommandStreamReceiverHw<GfxFamily>::pollForCompletion(engineInstance);
void pollForCompletion() override {
TbxCommandStreamReceiverHw<GfxFamily>::pollForCompletion();
pollForCompletionCalled = true;
}
void makeCoherent(GraphicsAllocation &gfxAllocation) override {