Skip to content

Commit 52c6973

Browse files
BartoszDunajskiCompute-Runtime-Automation
BartoszDunajski
authored and
Compute-Runtime-Automation
committed
Rename blitBuffer method
Signed-off-by: Bartosz Dunajski <[email protected]>
1 parent dd63f1d commit 52c6973

23 files changed

+124
-124
lines changed

‎opencl/source/command_queue/enqueue_common.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@ CompletionStamp CommandQueueHw<GfxFamily>::enqueueNonBlocked(
800800
}
801801

802802
if (enqueueProperties.blitPropertiesContainer->size() > 0) {
803-
const auto newTaskCount = bcsCsr->blitBuffer(*enqueueProperties.blitPropertiesContainer, false, this->isProfilingEnabled(), getDevice());
803+
const auto newTaskCount = bcsCsr->flushBcsTask(*enqueueProperties.blitPropertiesContainer, false, this->isProfilingEnabled(), getDevice());
804804
this->updateBcsTaskCount(bcsCsr->getOsContext().getEngineType(), newTaskCount);
805805
dispatchFlags.implicitFlush = true;
806806
}
@@ -1029,7 +1029,7 @@ CompletionStamp CommandQueueHw<GfxFamily>::enqueueCommandWithoutKernel(
10291029

10301030
if (enqueueProperties.operation == EnqueueProperties::Operation::Blit) {
10311031
UNRECOVERABLE_IF(!enqueueProperties.blitPropertiesContainer);
1032-
const auto newTaskCount = bcsCsr->blitBuffer(*enqueueProperties.blitPropertiesContainer, false, this->isProfilingEnabled(), getDevice());
1032+
const auto newTaskCount = bcsCsr->flushBcsTask(*enqueueProperties.blitPropertiesContainer, false, this->isProfilingEnabled(), getDevice());
10331033
this->updateBcsTaskCount(bcsCsr->getOsContext().getEngineType(), newTaskCount);
10341034
}
10351035

‎opencl/source/helpers/task_information.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ CompletionStamp &CommandComputeKernel::submit(uint32_t taskLevel, bool terminate
260260
}
261261

262262
if (kernelOperation->blitPropertiesContainer.size() > 0) {
263-
const auto newTaskCount = bcsCsrForAuxTranslation->blitBuffer(kernelOperation->blitPropertiesContainer, false, commandQueue.isProfilingEnabled(), commandQueue.getDevice());
263+
const auto newTaskCount = bcsCsrForAuxTranslation->flushBcsTask(kernelOperation->blitPropertiesContainer, false, commandQueue.isProfilingEnabled(), commandQueue.getDevice());
264264
commandQueue.updateBcsTaskCount(bcsCsrForAuxTranslation->getOsContext().getEngineType(), newTaskCount);
265265
}
266266
commandQueue.updateLatestSentEnqueueType(EnqueueProperties::Operation::GpuKernel);
@@ -298,7 +298,7 @@ void CommandWithoutKernel::dispatchBlitOperation() {
298298
eventsRequest.fillCsrDependenciesForTaskCountContainer(blitProperties.csrDependencies, *bcsCsr);
299299
}
300300

301-
const auto newTaskCount = bcsCsr->blitBuffer(kernelOperation->blitPropertiesContainer, false, commandQueue.isProfilingEnabled(), commandQueue.getDevice());
301+
const auto newTaskCount = bcsCsr->flushBcsTask(kernelOperation->blitPropertiesContainer, false, commandQueue.isProfilingEnabled(), commandQueue.getDevice());
302302
commandQueue.updateBcsTaskCount(bcsCsr->getOsContext().getEngineType(), newTaskCount);
303303
commandQueue.setLastBcsPacket(bcsCsr->getOsContext().getEngineType());
304304
}

‎opencl/source/program/printf_handler.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ void PrintfHandler::printEnqueueOutput() {
108108
printfOutputDecompressed.get(),
109109
printfSurface->getGpuAddress(),
110110
0, 0, 0, Vec3<size_t>(printfOutputSize, 0, 0), 0, 0, 0, 0));
111-
bcsEngine.commandStreamReceiver->blitBuffer(blitPropertiesContainer, true, false, device.getDevice());
111+
bcsEngine.commandStreamReceiver->flushBcsTask(blitPropertiesContainer, true, false, device.getDevice());
112112
}
113113

114114
PrintFormatter printFormatter(printfOutputBuffer, printfOutputSize, kernel->is32Bit(),

‎opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and_later.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ struct CopyEngineXeHPAndLater : public MulticontextAubFixture, public ::testing:
107107
void executeBlitCommand(const BlitProperties &blitProperties, bool blocking) {
108108
BlitPropertiesContainer blitPropertiesContainer;
109109
blitPropertiesContainer.push_back(blitProperties);
110-
bcsCsr->blitBuffer(blitPropertiesContainer, blocking, false, rootDevice->getDevice());
110+
bcsCsr->flushBcsTask(blitPropertiesContainer, blocking, false, rootDevice->getDevice());
111111
}
112112

113113
template <typename FamilyType>

‎opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ struct BlitEnqueueTests : public ::testing::Test {
5757

5858
BlitPropertiesContainer container;
5959
container.push_back(blitProperties);
60-
bcsCsr->blitBuffer(container, true, false, const_cast<Device &>(device));
60+
bcsCsr->flushBcsTask(container, true, false, const_cast<Device &>(device));
6161

6262
return BlitOperationResult::Success;
6363
};

‎opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1450,7 +1450,7 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, givenPageTableManagerPointerWhenCa
14501450
BlitPropertiesContainer container;
14511451
container.push_back(blitProperties);
14521452

1453-
bcsCsr->blitBuffer(container, true, false, *pDevice);
1453+
bcsCsr->flushBcsTask(container, true, false, *pDevice);
14541454

14551455
EXPECT_TRUE(bcsCsr->pageTableManagerInitialized);
14561456
EXPECT_FALSE(bcsCsr2->pageTableManagerInitialized);
@@ -1459,7 +1459,7 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, givenPageTableManagerPointerWhenCa
14591459
EXPECT_EQ(bcsCsr, pageTableManager->initContextAuxTableRegisterParamsPassed[0].initialBBHandle);
14601460

14611461
pDevice->resetCommandStreamReceiver(bcsCsr2);
1462-
bcsCsr2->blitBuffer(container, true, false, *pDevice);
1462+
bcsCsr2->flushBcsTask(container, true, false, *pDevice);
14631463

14641464
EXPECT_TRUE(bcsCsr2->pageTableManagerInitialized);
14651465

@@ -1495,11 +1495,11 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, givenPageTableManagerPointerWhenCa
14951495
BlitPropertiesContainer container;
14961496
container.push_back(blitProperties);
14971497

1498-
bcsCsr->blitBuffer(container, true, false, *pDevice);
1498+
bcsCsr->flushBcsTask(container, true, false, *pDevice);
14991499

15001500
EXPECT_TRUE(bcsCsr->pageTableManagerInitialized);
15011501

1502-
bcsCsr->blitBuffer(container, true, false, *pDevice);
1502+
bcsCsr->flushBcsTask(container, true, false, *pDevice);
15031503

15041504
memoryManager->freeGraphicsMemory(graphicsAllocation);
15051505

@@ -1536,18 +1536,18 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, givenNullPageTableManagerWhenCallB
15361536
BlitPropertiesContainer container;
15371537
container.push_back(blitProperties);
15381538

1539-
bcsCsr->blitBuffer(container, true, false, *pDevice);
1539+
bcsCsr->flushBcsTask(container, true, false, *pDevice);
15401540

15411541
EXPECT_FALSE(bcsCsr->pageTableManagerInitialized);
15421542
EXPECT_FALSE(bcsCsr2->pageTableManagerInitialized);
15431543

15441544
pDevice->resetCommandStreamReceiver(bcsCsr2);
1545-
bcsCsr2->blitBuffer(container, true, false, *pDevice);
1545+
bcsCsr2->flushBcsTask(container, true, false, *pDevice);
15461546

15471547
EXPECT_FALSE(bcsCsr2->pageTableManagerInitialized);
15481548

15491549
bcsCsr2->pageTableManagerInitialized = true;
1550-
EXPECT_NO_THROW(bcsCsr2->blitBuffer(container, true, false, *pDevice));
1550+
EXPECT_NO_THROW(bcsCsr2->flushBcsTask(container, true, false, *pDevice));
15511551

15521552
memoryManager->freeGraphicsMemory(graphicsAllocation);
15531553
}

‎opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -958,7 +958,7 @@ HWTEST_F(BcsTests, givenBltSizeWithLeftoverWhenDispatchedThenProgramAllRequiredC
958958
}
959959

960960
EXPECT_EQ(expectedResursiveLockCount, csr.recursiveLockCounter.load());
961-
blitBuffer(&csr, blitProperties, true, *pDevice);
961+
flushBcsTask(&csr, blitProperties, true, *pDevice);
962962
EXPECT_EQ(newTaskCount, csr.taskCount);
963963
EXPECT_EQ(newTaskCount, csr.latestFlushedTaskCount);
964964
EXPECT_EQ(newTaskCount, csr.latestSentTaskCount);
@@ -1173,7 +1173,7 @@ HWTEST_P(BcsDetaliedTestsWithParams, givenBltSizeWithLeftoverWhenDispatchedThenP
11731173
);
11741174

11751175
memoryManager->returnFakeAllocation = false;
1176-
blitBuffer(&csr, blitProperties, true, *pDevice);
1176+
flushBcsTask(&csr, blitProperties, true, *pDevice);
11771177

11781178
HardwareParse hwParser;
11791179
hwParser.parseCommands<FamilyType>(csr.commandStream);
@@ -1275,7 +1275,7 @@ HWTEST_P(BcsDetaliedTestsWithParams, givenBltSizeWithLeftoverWhenDispatchedThenP
12751275
);
12761276

12771277
memoryManager->returnFakeAllocation = false;
1278-
blitBuffer(&csr, blitProperties, true, *pDevice);
1278+
flushBcsTask(&csr, blitProperties, true, *pDevice);
12791279

12801280
HardwareParse hwParser;
12811281
hwParser.parseCommands<FamilyType>(csr.commandStream);
@@ -1363,7 +1363,7 @@ HWTEST_P(BcsDetaliedTestsWithParams, givenBltSizeWithLeftoverWhenDispatchedThenP
13631363
buffer2SlicePitch, //dstSlicePitch
13641364
csr.getClearColorAllocation() //clearColorAllocation
13651365
);
1366-
blitBuffer(&csr, blitProperties, true, *pDevice);
1366+
flushBcsTask(&csr, blitProperties, true, *pDevice);
13671367

13681368
HardwareParse hwParser;
13691369
hwParser.parseCommands<FamilyType>(csr.commandStream);

0 commit comments

Comments
 (0)