intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-03 06:49:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "performance: Disable blit enqueue on xe_lpg"

Browse Source 
This reverts commit ac97b1c493.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2023-09-09 08:11:43 +02:00
committed by Compute-Runtime-Automation
parent c6aac6f2bc
commit 7b5ef1b2f4
13 changed files with 6 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opencl/source/command_queue/command_queue.cpp
View File

@@ -1026,7 +1026,7 @@ bool CommandQueue::queueDependenciesClearRequired() const {
}
bool CommandQueue::blitEnqueueAllowed(const CsrSelectionArgs &args) const {
bool blitEnqueueAllowed = device->getRootDeviceEnvironment().getProductHelper().blitEnqueueAllowed() && (getGpgpuCommandStreamReceiver().peekTimestampPacketWriteEnabled() || this->isCopyOnly);
bool blitEnqueueAllowed = getGpgpuCommandStreamReceiver().peekTimestampPacketWriteEnabled() || this->isCopyOnly;
if (DebugManager.flags.EnableBlitterForEnqueueOperations.get() != -1) {
blitEnqueueAllowed = DebugManager.flags.EnableBlitterForEnqueueOperations.get();
}

2
opencl/test/unit_test/aub_tests/fixtures/image_aub_fixture.h
View File

@@ -33,7 +33,7 @@ struct ImageAubFixture : public ClDeviceFixture, public AUBCommandStreamFixture
MockExecutionEnvironment mockExecutionEnvironment{};
auto &productHelper = mockExecutionEnvironment.rootDeviceEnvironments[rootDeviceIndex]->getHelper<ProductHelper>();
if (!productHelper.isBlitterForImagesSupported() || !productHelper.blitEnqueueAllowed()) {
if (!productHelper.isBlitterForImagesSupported()) {
GTEST_SKIP();
}

1
opencl/test/unit_test/command_queue/command_queue_fixture.h
View File

@@ -98,7 +98,6 @@ struct CommandQueueHwBlitTest : ClDeviceFixture, ContextFixture, CommandQueueHwF
DebugManager.flags.EnableBlitterOperationsSupport.set(1);
DebugManager.flags.EnableTimestampPacket.set(1);
DebugManager.flags.PreferCopyEngineForCopyBufferToBuffer.set(1);
DebugManager.flags.EnableBlitterForEnqueueOperations.set(1);
ClDeviceFixture::setUpImpl(&hwInfo);
cl_device_id device = pClDevice;
REQUIRE_FULL_BLITTER_OR_SKIP(pClDevice->getRootDeviceEnvironment());

7
opencl/test/unit_test/command_queue/command_queue_hw_2_tests.cpp
View File

@@ -383,7 +383,6 @@ HWTEST_F(IoqCommandQueueHwBlitTest, givenSplitBcsCopyWhenEnqueueReadThenEnqueueB
DebugManager.flags.DoCpuCopyOnReadBuffer.set(0);
DebugManager.flags.SplitBcsMaskD2H.set(0b1010);
DebugManager.flags.UpdateTaskCountFromWait.set(3);
DebugManager.flags.EnableBlitterForEnqueueOperations.set(1);
auto memoryManager = static_cast<MockMemoryManager *>(pDevice->getMemoryManager());
memoryManager->returnFakeAllocation = true;
@@ -436,7 +435,6 @@ HWTEST_F(IoqCommandQueueHwBlitTest, givenSplitBcsCopyAndD2HMaskWhenEnqueueReadTh
DebugManager.flags.DoCpuCopyOnReadBuffer.set(0);
DebugManager.flags.SplitBcsMaskD2H.set(0b10);
DebugManager.flags.UpdateTaskCountFromWait.set(3);
DebugManager.flags.EnableBlitterForEnqueueOperations.set(1);
auto memoryManager = static_cast<MockMemoryManager *>(pDevice->getMemoryManager());
memoryManager->returnFakeAllocation = true;
@@ -489,7 +487,6 @@ HWTEST_F(IoqCommandQueueHwBlitTest, givenSplitBcsCopyAndD2HMaskGreaterThanAvaila
DebugManager.flags.DoCpuCopyOnReadBuffer.set(0);
DebugManager.flags.SplitBcsMaskD2H.set(0b101010);
DebugManager.flags.UpdateTaskCountFromWait.set(3);
DebugManager.flags.EnableBlitterForEnqueueOperations.set(1);
auto memoryManager = static_cast<MockMemoryManager *>(pDevice->getMemoryManager());
memoryManager->returnFakeAllocation = true;
@@ -540,7 +537,6 @@ HWTEST_F(IoqCommandQueueHwBlitTest, givenSplitBcsCopyWhenEnqueueWriteThenEnqueue
DebugManagerStateRestore restorer;
DebugManager.flags.SplitBcsCopy.set(1);
DebugManager.flags.DoCpuCopyOnReadBuffer.set(0);
DebugManager.flags.EnableBlitterForEnqueueOperations.set(1);
DebugManager.flags.UpdateTaskCountFromWait.set(3);
auto memoryManager = static_cast<MockMemoryManager *>(pDevice->getMemoryManager());
memoryManager->returnFakeAllocation = true;
@@ -810,7 +806,6 @@ HWTEST_F(IoqCommandQueueHwBlitTest, givenSplitBcsCopyWhenEnqueueReadWithRequeste
DebugManager.flags.DoCpuCopyOnReadBuffer.set(0);
DebugManager.flags.UpdateTaskCountFromWait.set(3);
DebugManager.flags.SplitBcsMaskD2H.set(0b1010);
DebugManager.flags.EnableBlitterForEnqueueOperations.set(1);
auto memoryManager = static_cast<MockMemoryManager *>(pDevice->getMemoryManager());
memoryManager->returnFakeAllocation = true;
auto cmdQHw = static_cast<MockCommandQueueHw<FamilyType> *>(this->pCmdQ);
@@ -967,7 +962,6 @@ HWTEST_F(IoqCommandQueueHwBlitTest, givenSplitBcsCopyWhenEnqueueReadWithEventThe
DebugManager.flags.SplitBcsMaskD2H.set(0b1010);
DebugManager.flags.DoCpuCopyOnReadBuffer.set(0);
DebugManager.flags.UpdateTaskCountFromWait.set(3);
DebugManager.flags.EnableBlitterForEnqueueOperations.set(1);
auto memoryManager = static_cast<MockMemoryManager *>(pDevice->getMemoryManager());
memoryManager->returnFakeAllocation = true;
auto cmdQHw = static_cast<MockCommandQueueHw<FamilyType> *>(this->pCmdQ);
@@ -1082,7 +1076,6 @@ HWTEST_F(IoqCommandQueueHwBlitTest, givenGpgpuCsrWhenEnqueueingBlitAfterFlushedK
DebugManagerStateRestore restorer;
DebugManager.flags.ForceCacheFlushForBcs.set(0);
DebugManager.flags.EnableBlitterForEnqueueOperations.set(1);
MockKernelWithInternals mockKernelWithInternals(*pClDevice);
size_t offset = 0;

6
opencl/test/unit_test/command_queue/command_queue_tests.cpp
View File

@@ -1604,11 +1604,11 @@ TEST(CommandQueue, givenCopyOnlyQueueWhenCallingBlitEnqueueAllowedThenReturnTrue
CsrSelectionArgs selectionArgs{CL_COMMAND_READ_BUFFER, &multiAlloc, &multiAlloc, 0u, nullptr};
queue.isCopyOnly = false;
EXPECT_EQ(queue.getGpgpuCommandStreamReceiver().peekTimestampPacketWriteEnabled() && context.getDevice(0)->getProductHelper().blitEnqueueAllowed(),
EXPECT_EQ(queue.getGpgpuCommandStreamReceiver().peekTimestampPacketWriteEnabled(),
queue.blitEnqueueAllowed(selectionArgs));
queue.isCopyOnly = true;
EXPECT_EQ(context.getDevice(0)->getProductHelper().blitEnqueueAllowed(), queue.blitEnqueueAllowed(selectionArgs));
EXPECT_TRUE(queue.blitEnqueueAllowed(selectionArgs));
}
TEST(CommandQueue, givenSimpleClCommandWhenCallingBlitEnqueueAllowedThenReturnCorrectValue) {
@@ -1631,7 +1631,7 @@ TEST(CommandQueue, givenSimpleClCommandWhenCallingBlitEnqueueAllowedThenReturnCo
CL_COMMAND_SVM_MEMCPY}) {
CsrSelectionArgs args{cmdType, &multiAlloc, &multiAlloc, 0u, nullptr};
bool expectedValue = queue.getGpgpuCommandStreamReceiver().peekTimestampPacketWriteEnabled() && context.getDevice(0)->getProductHelper().blitEnqueueAllowed();
bool expectedValue = queue.getGpgpuCommandStreamReceiver().peekTimestampPacketWriteEnabled();
if (cmdType == CL_COMMAND_COPY_IMAGE_TO_BUFFER) {
expectedValue = false;
}

4
opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp
View File

@@ -162,10 +162,6 @@ HWTEST_F(NoBcsBufferTests, givenProductWithNoFullyBlitterSupportWhenCreatingBuff
}
HWTEST_TEMPLATED_F(BcsBufferTests, givenBcsSupportedWhenEnqueueBufferOperationIsCalledThenUseBcsCsr) {
if (!device->getRootDeviceEnvironment().getProductHelper().blitEnqueueAllowed()) {
GTEST_SKIP();
}
DebugManager.flags.EnableBlitterForEnqueueOperations.set(0);
auto mockCmdQueue = static_cast<MockCommandQueueHw<FamilyType> *>(commandQueue.get());
auto bcsEngine = mockCmdQueue->bcsEngines[0];