Skip to content

Commit 0337b58

Browse files
Remove dcFlush parameter from finish call
Change-Id: Ifc808822399a100745a9d81bb5f6e45903a895fa Signed-off-by: Dunajski, Bartosz <bartosz.dunajski@intel.com>
1 parent c0c6a46 commit 0337b58

33 files changed

+56
-68
lines changed

runtime/api/api.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2045,7 +2045,7 @@ cl_int CL_API_CALL clFinish(cl_command_queue commandQueue) {
20452045
auto pCommandQueue = castToObject<CommandQueue>(commandQueue);
20462046

20472047
retVal = pCommandQueue
2048-
? pCommandQueue->finish(false)
2048+
? pCommandQueue->finish()
20492049
: CL_INVALID_COMMAND_QUEUE;
20502050
TRACING_EXIT(clFinish, &retVal);
20512051
return retVal;

runtime/command_queue/command_queue.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ cl_int CommandQueue::enqueueWriteMemObjForUnmap(MemObj *memObj, void *mappedPtr,
347347
mustCallFinish = (CommandQueue::getTaskLevelFromWaitList(this->taskLevel, eventsRequest.numEventsInWaitList, eventsRequest.eventWaitList) != Event::eventNotReady);
348348
}
349349
if (mustCallFinish) {
350-
finish(true);
350+
finish();
351351
}
352352
}
353353
} else {

runtime/command_queue/command_queue.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ class CommandQueue : public BaseObject<_cl_command_queue> {
308308
return CL_SUCCESS;
309309
}
310310

311-
virtual cl_int finish(bool dcFlush) { return CL_SUCCESS; }
311+
virtual cl_int finish() { return CL_SUCCESS; }
312312

313313
virtual cl_int flush() { return CL_SUCCESS; }
314314

runtime/command_queue/command_queue_hw.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ class CommandQueueHw : public CommandQueue {
286286
const cl_event *eventWaitList,
287287
cl_event *event) override;
288288

289-
cl_int finish(bool dcFlush) override;
289+
cl_int finish() override;
290290
cl_int flush() override;
291291

292292
template <uint32_t enqueueType>

runtime/command_queue/cpu_data_transfer_handler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ void *CommandQueue::cpuDataTransferHandler(TransferProperties &transferPropertie
9292
//wait for the completness of previous commands
9393
if (transferProperties.cmdType != CL_COMMAND_UNMAP_MEM_OBJECT) {
9494
if (!transferProperties.memObj->isMemObjZeroCopy() || transferProperties.blocking) {
95-
finish(true);
95+
finish();
9696
eventCompleted = true;
9797
}
9898
}

runtime/command_queue/finish.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
namespace NEO {
1616

1717
template <typename GfxFamily>
18-
cl_int CommandQueueHw<GfxFamily>::finish(bool dcFlush) {
18+
cl_int CommandQueueHw<GfxFamily>::finish() {
1919
getGpgpuCommandStreamReceiver().flushBatchedSubmissions();
2020

2121
//as long as queue is blocked we need to stall.

runtime/memory_manager/cpu_page_fault_manager_memory_sync.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ void PageFaultManager::transferToGpu(void *ptr, void *cmdQ) {
2020
auto commandQueue = static_cast<CommandQueue *>(cmdQ);
2121
auto retVal = commandQueue->enqueueSVMUnmap(ptr, 0, nullptr, nullptr, false);
2222
UNRECOVERABLE_IF(retVal);
23-
retVal = commandQueue->finish(false);
23+
retVal = commandQueue->finish();
2424
UNRECOVERABLE_IF(retVal);
2525
}
2626
} // namespace NEO

runtime/os_interface/windows/api_win.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -170,15 +170,15 @@ cl_int CL_API_CALL clEnqueueReleaseDX9ObjectsINTEL(cl_command_queue commandQueue
170170
for (unsigned int object = 0; object < numObjects; object++) {
171171
auto memObject = castToObject<MemObj>(memObjects[object]);
172172
if (!static_cast<D3DSharing<D3DTypesHelper::D3D9> *>(memObject->peekSharingHandler())->isSharedResource()) {
173-
cmdQ->finish(true);
173+
cmdQ->finish();
174174
break;
175175
}
176176
}
177177

178178
retVal = cmdQ->enqueueReleaseSharedObjects(numObjects, memObjects, numEventsInWaitList,
179179
eventWaitList, event, CL_COMMAND_RELEASE_DX9_OBJECTS_INTEL);
180180
if (!cmdQ->getContext().getInteropUserSyncEnabled()) {
181-
cmdQ->finish(true);
181+
cmdQ->finish();
182182
}
183183
return retVal;
184184
}
@@ -264,7 +264,7 @@ cl_int CL_API_CALL clEnqueueReleaseDX9MediaSurfacesKHR(cl_command_queue commandQ
264264
auto memObject = castToObject<MemObj>(memObjects[object]);
265265
if (memObject) {
266266
if (!static_cast<D3DSharing<D3DTypesHelper::D3D9> *>(memObject->peekSharingHandler())->isSharedResource()) {
267-
cmdQ->finish(true);
267+
cmdQ->finish();
268268
break;
269269
}
270270

@@ -277,7 +277,7 @@ cl_int CL_API_CALL clEnqueueReleaseDX9MediaSurfacesKHR(cl_command_queue commandQ
277277
retVal = cmdQ->enqueueReleaseSharedObjects(numObjects, memObjects, numEventsInWaitList,
278278
eventWaitList, event, CL_COMMAND_RELEASE_DX9_MEDIA_SURFACES_KHR);
279279
if (!cmdQ->getContext().getInteropUserSyncEnabled()) {
280-
cmdQ->finish(true);
280+
cmdQ->finish();
281281
}
282282
return retVal;
283283
}
@@ -477,15 +477,15 @@ cl_int CL_API_CALL clEnqueueReleaseD3D10ObjectsKHR(cl_command_queue commandQueue
477477
return retVal;
478478
}
479479
if (!static_cast<D3DSharing<D3DTypesHelper::D3D10> *>(memObject->peekSharingHandler())->isSharedResource()) {
480-
cmdQ->finish(true);
480+
cmdQ->finish();
481481
break;
482482
}
483483
}
484484

485485
retVal = cmdQ->enqueueReleaseSharedObjects(numObjects, memObjects, numEventsInWaitList,
486486
eventWaitList, event, CL_COMMAND_RELEASE_D3D10_OBJECTS_KHR);
487487
if (!cmdQ->getContext().getInteropUserSyncEnabled()) {
488-
cmdQ->finish(true);
488+
cmdQ->finish();
489489
}
490490
return retVal;
491491
}
@@ -682,15 +682,15 @@ cl_int CL_API_CALL clEnqueueReleaseD3D11ObjectsKHR(cl_command_queue commandQueue
682682
return retVal;
683683
}
684684
if (!static_cast<D3DSharing<D3DTypesHelper::D3D11> *>(memObject->peekSharingHandler())->isSharedResource()) {
685-
cmdQ->finish(true);
685+
cmdQ->finish();
686686
break;
687687
}
688688
}
689689

690690
retVal = cmdQ->enqueueReleaseSharedObjects(numObjects, memObjects, numEventsInWaitList,
691691
eventWaitList, event, CL_COMMAND_RELEASE_D3D11_OBJECTS_KHR);
692692
if (!cmdQ->getContext().getInteropUserSyncEnabled()) {
693-
cmdQ->finish(true);
693+
cmdQ->finish();
694694
}
695695
return retVal;
696696
}

runtime/sharings/gl/cl_gl_api.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ cl_int CL_API_CALL clEnqueueReleaseGLObjects(cl_command_queue commandQueue, cl_u
273273
return retVal;
274274
}
275275

276-
pCommandQueue->finish(false);
276+
pCommandQueue->finish();
277277
retVal = pCommandQueue->enqueueReleaseSharedObjects(numObjects, memObjects, numEventsInWaitList, eventWaitList, event,
278278
CL_COMMAND_RELEASE_GL_OBJECTS);
279279
}

unit_tests/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ struct AUBReadBufferRectUnaligned
181181
AUBCommandStreamFixture::expectMemory<FamilyType>(dstMemoryGPUPtr, referenceMemory, offset);
182182
AUBCommandStreamFixture::expectMemory<FamilyType>(ptrOffset(dstMemoryGPUPtr, offset), &srcMemory[rowPitch * bufferOrigin[1]], size);
183183
AUBCommandStreamFixture::expectMemory<FamilyType>(ptrOffset(dstMemoryGPUPtr, size + offset), referenceMemory, bufferSize - offset - size);
184-
pCmdQ->finish(true);
184+
pCmdQ->finish();
185185
alignedFree(dstMemory);
186186
}
187187
};

0 commit comments

Comments
 (0)