From 2ca541a34334248b403f36254c44595f3337b106 Mon Sep 17 00:00:00 2001 From: "Mrozek, Michal" Date: Mon, 7 Oct 2019 00:41:05 -0700 Subject: [PATCH] Revert "Allow for blit enqueue on read/write buffer operations" This reverts commit dd75cdcf041288b2c35a5ec38bb3884e57b837eb. Change-Id: I0e653d25b190036cc0fdbc6765dd79a5646df3d8 --- runtime/command_queue/command_queue.cpp | 5 +++-- unit_tests/mem_obj/buffer_tests.cpp | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/runtime/command_queue/command_queue.cpp b/runtime/command_queue/command_queue.cpp index 7fb3e91980..ae0f7a47b3 100644 --- a/runtime/command_queue/command_queue.cpp +++ b/runtime/command_queue/command_queue.cpp @@ -578,10 +578,11 @@ bool CommandQueue::queueDependenciesClearRequired() const { } bool CommandQueue::blitEnqueueAllowed(cl_command_type cmdType) const { - bool blitAllowed = device->getExecutionEnvironment()->getHardwareInfo()->capabilityTable.blitterOperationsSupported; + bool blitAllowed = false; if (DebugManager.flags.EnableBlitterOperationsForReadWriteBuffers.get() != -1) { - blitAllowed &= !!DebugManager.flags.EnableBlitterOperationsForReadWriteBuffers.get(); + blitAllowed = !!DebugManager.flags.EnableBlitterOperationsForReadWriteBuffers.get() && + device->getExecutionEnvironment()->getHardwareInfo()->capabilityTable.blitterOperationsSupported; } bool commandAllowed = (CL_COMMAND_READ_BUFFER == cmdType) || (CL_COMMAND_WRITE_BUFFER == cmdType); diff --git a/unit_tests/mem_obj/buffer_tests.cpp b/unit_tests/mem_obj/buffer_tests.cpp index 476f1af76e..9efc9e6675 100644 --- a/unit_tests/mem_obj/buffer_tests.cpp +++ b/unit_tests/mem_obj/buffer_tests.cpp @@ -757,14 +757,14 @@ HWTEST_TEMPLATED_F(BcsBufferTests, givenBcsSupportedWhenEnqueueReadWriteBufferIs commandQueue->enqueueWriteBuffer(bufferForBlt.get(), CL_TRUE, 0, 1, &hostPtr, nullptr, 0, nullptr, nullptr); commandQueue->enqueueReadBuffer(bufferForBlt.get(), CL_TRUE, 0, 1, &hostPtr, nullptr, 0, nullptr, nullptr); - EXPECT_EQ(2u, bcsCsr->blitBufferCalled); + EXPECT_EQ(0u, bcsCsr->blitBufferCalled); DebugManager.flags.EnableBlitterOperationsForReadWriteBuffers.set(1); hwInfo->capabilityTable.blitterOperationsSupported = true; commandQueue->enqueueWriteBuffer(bufferForBlt.get(), CL_TRUE, 0, 1, &hostPtr, nullptr, 0, nullptr, nullptr); - EXPECT_EQ(3u, bcsCsr->blitBufferCalled); + EXPECT_EQ(1u, bcsCsr->blitBufferCalled); commandQueue->enqueueReadBuffer(bufferForBlt.get(), CL_TRUE, 0, 1, &hostPtr, nullptr, 0, nullptr, nullptr); - EXPECT_EQ(4u, bcsCsr->blitBufferCalled); + EXPECT_EQ(2u, bcsCsr->blitBufferCalled); } HWTEST_TEMPLATED_F(BcsBufferTests, givenBcsSupportedWhenQueueIsBlockedThenDispatchBlitWhenUnblocked) {