Skip to content

Commit 0dd7af2

Browse files
fhazubski-IntelCompute-Runtime-Automation
fhazubski-Intel
authored and
Compute-Runtime-Automation
committed
Revert "feature: Append recorded commandlist into immediate (8/N)"
This reverts commit acfeffe. Signed-off-by: Filip Hazubski <[email protected]> Source: 3997d2a
1 parent fe2c12e commit 0dd7af2

File tree

14 files changed

+108
-331
lines changed

14 files changed

+108
-331
lines changed

‎level_zero/core/source/cmdlist/cmdlist_hw.inl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2020-2024 Intel Corporation
2+
* Copyright (C) 2020-2025 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -242,7 +242,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::initialize(Device *device, NEO
242242
this->l1CachePolicyData.init(productHelper);
243243
this->cmdListHeapAddressModel = L0GfxCoreHelper::getHeapAddressModel(rootDeviceEnvironment);
244244
this->dummyBlitWa.rootDeviceEnvironment = &(neoDevice->getRootDeviceEnvironmentRef());
245-
this->dispatchCmdListBatchBufferAsPrimary = L0GfxCoreHelper::dispatchCmdListBatchBufferAsPrimary(rootDeviceEnvironment, !(isImmediateType() && this->internalUsage));
245+
this->dispatchCmdListBatchBufferAsPrimary = L0GfxCoreHelper::dispatchCmdListBatchBufferAsPrimary(rootDeviceEnvironment, !isImmediateType());
246246
this->useOnlyGlobalTimestamps = gfxCoreHelper.useOnlyGlobalTimestamps();
247247
this->maxFillPaternSizeForCopyEngine = productHelper.getMaxFillPaternSizeForCopyEngine();
248248
this->heaplessModeEnabled = compilerProductHelper.isHeaplessModeEnabled();

‎level_zero/core/source/cmdlist/cmdlist_hw_immediate.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2020-2024 Intel Corporation
2+
* Copyright (C) 2020-2025 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -193,7 +193,7 @@ struct CommandListCoreFamilyImmediate : public CommandListCoreFamily<gfxCoreFami
193193
void handleHeapsAndResidencyForImmediateRegularTask(void *&sshCpuBaseAddress);
194194
void handleDebugSurfaceStateUpdate(NEO::IndirectHeap *ssh);
195195

196-
void checkAvailableSpace(uint32_t numEvents, bool hasRelaxedOrderingDependencies, size_t commandSize, bool requestCommandBufferInLocalMem);
196+
void checkAvailableSpace(uint32_t numEvents, bool hasRelaxedOrderingDependencies, size_t commandSize);
197197
void updateDispatchFlagsWithRequiredStreamState(NEO::DispatchFlags &dispatchFlags);
198198

199199
MOCKABLE_VIRTUAL ze_result_t flushImmediate(ze_result_t inputRet, bool performMigration, bool hasStallingCmds, bool hasRelaxedOrderingDependencies, bool kernelOperation, bool copyOffloadSubmission, ze_event_handle_t hSignalEvent, bool requireTaskCountUpdate);

‎level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl‎

Lines changed: 26 additions & 45 deletions
Large diffs are not rendered by default.

‎level_zero/core/source/cmdqueue/cmdqueue.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2020-2024 Intel Corporation
2+
* Copyright (C) 2020-2025 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -98,7 +98,7 @@ ze_result_t CommandQueueImp::initialize(bool copyOnly, bool isInternal, bool imm
9898
auto &productHelper = rootDeviceEnvironment.getHelper<NEO::ProductHelper>();
9999
this->doubleSbaWa = productHelper.isAdditionalStateBaseAddressWARequired(hwInfo);
100100
this->cmdListHeapAddressModel = L0GfxCoreHelper::getHeapAddressModel(rootDeviceEnvironment);
101-
this->dispatchCmdListBatchBufferAsPrimary = L0GfxCoreHelper::dispatchCmdListBatchBufferAsPrimary(rootDeviceEnvironment, !(immediateCmdListQueue && internalUsage));
101+
this->dispatchCmdListBatchBufferAsPrimary = L0GfxCoreHelper::dispatchCmdListBatchBufferAsPrimary(rootDeviceEnvironment, !immediateCmdListQueue);
102102
auto &compilerProductHelper = rootDeviceEnvironment.getHelper<NEO::CompilerProductHelper>();
103103
this->heaplessModeEnabled = compilerProductHelper.isHeaplessModeEnabled();
104104
this->heaplessStateInitEnabled = compilerProductHelper.isHeaplessStateInitEnabled(this->heaplessModeEnabled);

‎level_zero/core/source/cmdqueue/cmdqueue_hw.inl‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2020-2024 Intel Corporation
2+
* Copyright (C) 2020-2025 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -1287,6 +1287,10 @@ void CommandQueueHw<gfxCoreFamily>::programOneCmdListBatchBufferStartSecondaryBa
12871287
}
12881288
}
12891289
}
1290+
1291+
if (ctx.containsParentImmediateStream) {
1292+
NEO::EncodeBatchBufferStartOrEnd<GfxFamily>::programBatchBufferEnd(commandContainer);
1293+
}
12901294
}
12911295

12921296
template <GFXCORE_FAMILY gfxCoreFamily>

‎level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_2.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2020-2024 Intel Corporation
2+
* Copyright (C) 2020-2025 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -1733,10 +1733,10 @@ HWTEST_F(PrimaryBatchBufferCmdListTest, givenForcedPrimaryBatchBufferWhenRegular
17331733
EXPECT_TRUE(commandList->dispatchCmdListBatchBufferAsPrimary);
17341734
EXPECT_TRUE(commandQueue->dispatchCmdListBatchBufferAsPrimary);
17351735

1736-
EXPECT_TRUE(commandListImmediate->dispatchCmdListBatchBufferAsPrimary);
1736+
EXPECT_FALSE(commandListImmediate->dispatchCmdListBatchBufferAsPrimary);
17371737
ASSERT_NE(nullptr, commandListImmediate->cmdQImmediate);
17381738
auto immediateCmdQueue = static_cast<L0::ult::CommandQueue *>(commandListImmediate->cmdQImmediate);
1739-
EXPECT_TRUE(immediateCmdQueue->dispatchCmdListBatchBufferAsPrimary);
1739+
EXPECT_FALSE(immediateCmdQueue->dispatchCmdListBatchBufferAsPrimary);
17401740
}
17411741

17421742
HWTEST_F(PrimaryBatchBufferCmdListTest, givenPrimaryBatchBufferWhenAppendingKernelAndClosingCommandListThenExpectAlignedSpaceForBatchBufferStart) {

‎level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_5.cpp‎

Lines changed: 3 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2020-2024 Intel Corporation
2+
* Copyright (C) 2020-2025 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -927,7 +927,7 @@ HWTEST2_F(CommandListCreate, givenSecondaryCommandStreamForImmediateCmdListWhenC
927927
auto immediateCmdList = static_cast<CommandListCoreFamilyImmediate<gfxCoreFamily> *>(commandList.get());
928928
auto secondaryCmdStream = reinterpret_cast<CmdContainerMock *>(&commandList->getCmdContainer())->secondaryCommandStreamForImmediateCmdList.get();
929929

930-
immediateCmdList->checkAvailableSpace(0u, false, commonImmediateCommandSize, false);
930+
immediateCmdList->checkAvailableSpace(0u, false, commonImmediateCommandSize);
931931

932932
EXPECT_EQ(commandList->getCmdContainer().getCommandStream(), secondaryCmdStream);
933933
EXPECT_TRUE(MemoryPoolHelper::isSystemMemoryPool(commandList->getCmdContainer().getCommandStream()->getGraphicsAllocation()->getMemoryPool()));
@@ -938,144 +938,6 @@ HWTEST2_F(CommandListCreate, givenSecondaryCommandStreamForImmediateCmdListWhenC
938938
EXPECT_TRUE(MemoryPoolHelper::isSystemMemoryPool(reinterpret_cast<CmdContainerMock *>(&commandList->getCmdContainer())->secondaryCommandStreamForImmediateCmdList->getGraphicsAllocation()->getMemoryPool()));
939939
}
940940

941-
HWTEST2_F(CommandListCreate, givenSecondaryCommandStreamInHostMemForImmediateCmdListWhenCheckAvailableSpaceForRelaxedOrderingThenSwapCommandStreams, MatchAny) {
942-
auto &gfxCoreHelper = device->getGfxCoreHelper();
943-
auto &productHelper = device->getProductHelper();
944-
if (!gfxCoreHelper.isPlatformFlushTaskEnabled(productHelper)) {
945-
GTEST_SKIP();
946-
}
947-
DebugManagerStateRestore restorer;
948-
debugManager.flags.DirectSubmissionFlatRingBuffer.set(-1);
949-
950-
static_cast<MockMemoryManager *>(device->getNEODevice()->getMemoryManager())->localMemorySupported[0] = true;
951-
ze_command_queue_desc_t desc = {};
952-
desc.mode = ZE_COMMAND_QUEUE_MODE_ASYNCHRONOUS;
953-
ze_result_t returnValue;
954-
CommandStreamReceiver *csr = nullptr;
955-
device->getCsrForOrdinalAndIndex(&csr, desc.ordinal, desc.index, ZE_COMMAND_QUEUE_PRIORITY_NORMAL, false);
956-
reinterpret_cast<UltCommandStreamReceiver<FamilyType> *>(csr)->directSubmissionAvailable = true;
957-
std::unique_ptr<L0::CommandList> commandList(CommandList::createImmediate(productFamily, device, &desc, false, NEO::EngineGroupType::copy, returnValue));
958-
ASSERT_NE(nullptr, commandList);
959-
EXPECT_NE(reinterpret_cast<CmdContainerMock *>(&commandList->getCmdContainer())->secondaryCommandStreamForImmediateCmdList.get(), nullptr);
960-
EXPECT_TRUE(MemoryPoolHelper::isSystemMemoryPool(reinterpret_cast<CmdContainerMock *>(&commandList->getCmdContainer())->secondaryCommandStreamForImmediateCmdList->getGraphicsAllocation()->getMemoryPool()));
961-
962-
auto immediateCmdList = static_cast<CommandListCoreFamilyImmediate<gfxCoreFamily> *>(commandList.get());
963-
964-
auto secondaryCmdStream = reinterpret_cast<CmdContainerMock *>(&commandList->getCmdContainer())->secondaryCommandStreamForImmediateCmdList.get();
965-
966-
immediateCmdList->getCmdContainer().swapStreams();
967-
EXPECT_EQ(commandList->getCmdContainer().getCommandStream(), secondaryCmdStream);
968-
EXPECT_TRUE(MemoryPoolHelper::isSystemMemoryPool(commandList->getCmdContainer().getCommandStream()->getGraphicsAllocation()->getMemoryPool()));
969-
970-
immediateCmdList->checkAvailableSpace(0u, true, commonImmediateCommandSize, false);
971-
972-
EXPECT_NE(commandList->getCmdContainer().getCommandStream(), secondaryCmdStream);
973-
}
974-
975-
struct CmdContainerMockLocalAllocTests : public CommandContainer {
976-
using CommandContainer::secondaryCommandStreamForImmediateCmdList;
977-
};
978-
979-
HWTEST2_F(CommandListCreate, givenSecondaryCommandStreamForImmediateCmdListButNotYetUsingHostAllocWhenCallingAppendCmdlistsThenDoNotSwapCommandStreams, IsPVC) {
980-
DebugManagerStateRestore restorer;
981-
debugManager.flags.DirectSubmissionFlatRingBuffer.set(-1);
982-
983-
static_cast<MockMemoryManager *>(device->getNEODevice()->getMemoryManager())->localMemorySupported[0] = true;
984-
ze_command_queue_desc_t desc = {};
985-
desc.mode = ZE_COMMAND_QUEUE_MODE_ASYNCHRONOUS;
986-
ze_result_t returnValue;
987-
CommandStreamReceiver *csr = nullptr;
988-
device->getCsrForOrdinalAndIndex(&csr, desc.ordinal, desc.index, ZE_COMMAND_QUEUE_PRIORITY_NORMAL, false);
989-
reinterpret_cast<UltCommandStreamReceiver<FamilyType> *>(csr)->directSubmissionAvailable = true;
990-
std::unique_ptr<L0::CommandList> commandList(CommandList::createImmediate(productFamily, device, &desc, false, NEO::EngineGroupType::copy, returnValue));
991-
ASSERT_NE(nullptr, commandList);
992-
EXPECT_NE(reinterpret_cast<CmdContainerMockLocalAllocTests *>(&commandList->getCmdContainer())->secondaryCommandStreamForImmediateCmdList.get(), nullptr);
993-
EXPECT_TRUE(MemoryPoolHelper::isSystemMemoryPool(reinterpret_cast<CmdContainerMockLocalAllocTests *>(&commandList->getCmdContainer())->secondaryCommandStreamForImmediateCmdList->getGraphicsAllocation()->getMemoryPool()));
994-
995-
auto secondaryCmdStream = reinterpret_cast<CmdContainerMockLocalAllocTests *>(&commandList->getCmdContainer())->secondaryCommandStreamForImmediateCmdList.get();
996-
997-
std::unique_ptr<L0::CommandList> commandListRegular(CommandList::create(productFamily, device, NEO::EngineGroupType::copy, 0u, returnValue, false));
998-
commandListRegular->close();
999-
auto commandListHandle = commandListRegular->toHandle();
1000-
1001-
ze_result_t result = ZE_RESULT_SUCCESS;
1002-
result = commandList->appendCommandLists(1u, &commandListHandle, nullptr, 0u, nullptr);
1003-
EXPECT_EQ(ZE_RESULT_SUCCESS, result);
1004-
1005-
EXPECT_NE(commandList->getCmdContainer().getCommandStream(), secondaryCmdStream);
1006-
EXPECT_FALSE(MemoryPoolHelper::isSystemMemoryPool(commandList->getCmdContainer().getCommandStream()->getGraphicsAllocation()->getMemoryPool()));
1007-
}
1008-
1009-
HWTEST2_F(CommandListCreate, givenSecondaryCommandStreamForImmediateCmdListButAndUsingHostAllocWhenCallingAppendCmdlistsThenSwapCommandStreamsAndAppendSucceeds, IsAtLeastXeHpcCore) {
1010-
DebugManagerStateRestore restorer;
1011-
debugManager.flags.DirectSubmissionFlatRingBuffer.set(-1);
1012-
1013-
static_cast<MockMemoryManager *>(device->getNEODevice()->getMemoryManager())->localMemorySupported[0] = true;
1014-
ze_command_queue_desc_t desc = {};
1015-
desc.mode = ZE_COMMAND_QUEUE_MODE_ASYNCHRONOUS;
1016-
ze_result_t returnValue;
1017-
CommandStreamReceiver *csr = nullptr;
1018-
device->getCsrForOrdinalAndIndex(&csr, desc.ordinal, desc.index, ZE_COMMAND_QUEUE_PRIORITY_NORMAL, false);
1019-
reinterpret_cast<UltCommandStreamReceiver<FamilyType> *>(csr)->directSubmissionAvailable = true;
1020-
std::unique_ptr<L0::CommandList> commandList(CommandList::createImmediate(productFamily, device, &desc, false, NEO::EngineGroupType::copy, returnValue));
1021-
ASSERT_NE(nullptr, commandList);
1022-
EXPECT_NE(reinterpret_cast<CmdContainerMockLocalAllocTests *>(&commandList->getCmdContainer())->secondaryCommandStreamForImmediateCmdList.get(), nullptr);
1023-
EXPECT_TRUE(MemoryPoolHelper::isSystemMemoryPool(reinterpret_cast<CmdContainerMockLocalAllocTests *>(&commandList->getCmdContainer())->secondaryCommandStreamForImmediateCmdList->getGraphicsAllocation()->getMemoryPool()));
1024-
1025-
auto secondaryCmdStream = reinterpret_cast<CmdContainerMockLocalAllocTests *>(&commandList->getCmdContainer())->secondaryCommandStreamForImmediateCmdList.get();
1026-
1027-
std::unique_ptr<L0::CommandList> commandListRegular(CommandList::create(productFamily, device, NEO::EngineGroupType::compute, 0u, returnValue, false));
1028-
commandListRegular->close();
1029-
auto commandListHandle = commandListRegular->toHandle();
1030-
1031-
commandList->getCmdContainer().swapStreams();
1032-
EXPECT_EQ(commandList->getCmdContainer().getCommandStream(), secondaryCmdStream);
1033-
1034-
ze_result_t result = ZE_RESULT_SUCCESS;
1035-
result = commandList->appendCommandLists(1u, &commandListHandle, nullptr, 0u, nullptr);
1036-
EXPECT_EQ(ZE_RESULT_SUCCESS, result);
1037-
1038-
EXPECT_NE(commandList->getCmdContainer().getCommandStream(), secondaryCmdStream);
1039-
}
1040-
1041-
HWTEST2_F(CommandListCreate, givenSecondaryCommandStreamForImmediateCmdListAndAlreadyUsingHostAllocThenAppendingRegularCommandlistsIntoImmediateUsesLocalAndRestoresHostAlloc, MatchAny) {
1042-
if (!device->getHwInfo().featureTable.flags.ftrLocalMemory) {
1043-
GTEST_SKIP();
1044-
}
1045-
DebugManagerStateRestore restorer;
1046-
debugManager.flags.DirectSubmissionFlatRingBuffer.set(-1);
1047-
1048-
static_cast<MockMemoryManager *>(device->getNEODevice()->getMemoryManager())->localMemorySupported[0] = true;
1049-
ze_command_queue_desc_t desc = {};
1050-
desc.mode = ZE_COMMAND_QUEUE_MODE_ASYNCHRONOUS;
1051-
ze_result_t returnValue;
1052-
CommandStreamReceiver *csr = nullptr;
1053-
device->getCsrForOrdinalAndIndex(&csr, desc.ordinal, desc.index, ZE_COMMAND_QUEUE_PRIORITY_NORMAL, false);
1054-
reinterpret_cast<UltCommandStreamReceiver<FamilyType> *>(csr)->directSubmissionAvailable = true;
1055-
std::unique_ptr<L0::CommandList> commandList(CommandList::createImmediate(productFamily, device, &desc, false, NEO::EngineGroupType::copy, returnValue));
1056-
ASSERT_NE(nullptr, commandList);
1057-
EXPECT_NE(reinterpret_cast<CmdContainerMock *>(&commandList->getCmdContainer())->secondaryCommandStreamForImmediateCmdList.get(), nullptr);
1058-
EXPECT_TRUE(MemoryPoolHelper::isSystemMemoryPool(reinterpret_cast<CmdContainerMock *>(&commandList->getCmdContainer())->secondaryCommandStreamForImmediateCmdList->getGraphicsAllocation()->getMemoryPool()));
1059-
1060-
auto immediateCmdList = static_cast<CommandListCoreFamilyImmediate<gfxCoreFamily> *>(commandList.get());
1061-
auto secondaryCmdStream = reinterpret_cast<CmdContainerMock *>(&commandList->getCmdContainer())->secondaryCommandStreamForImmediateCmdList.get();
1062-
1063-
immediateCmdList->checkAvailableSpace(0u, false, commonImmediateCommandSize, false);
1064-
1065-
EXPECT_EQ(commandList->getCmdContainer().getCommandStream(), secondaryCmdStream);
1066-
EXPECT_TRUE(MemoryPoolHelper::isSystemMemoryPool(commandList->getCmdContainer().getCommandStream()->getGraphicsAllocation()->getMemoryPool()));
1067-
1068-
std::unique_ptr<L0::CommandList> commandListRegular(CommandList::create(productFamily, device, NEO::EngineGroupType::copy, 0u, returnValue, false));
1069-
commandListRegular->close();
1070-
auto commandListHandle = commandListRegular->toHandle();
1071-
1072-
ze_result_t result = ZE_RESULT_SUCCESS;
1073-
result = commandList->appendCommandLists(1u, &commandListHandle, nullptr, 0u, nullptr);
1074-
EXPECT_EQ(ZE_RESULT_SUCCESS, result);
1075-
EXPECT_EQ(commandList->getCmdContainer().getCommandStream(), secondaryCmdStream);
1076-
EXPECT_TRUE(commandList->getCmdContainer().usingSecondaryCmdbufInHostMem());
1077-
}
1078-
1079941
HWTEST2_F(CommandListCreate, givenNoSecondaryCommandStreamForImmediateCmdListWhenCheckAvailableSpaceThenNotSwapCommandStreams, MatchAny) {
1080942
if (!device->getHwInfo().featureTable.flags.ftrLocalMemory) {
1081943
GTEST_SKIP();
@@ -1094,7 +956,7 @@ HWTEST2_F(CommandListCreate, givenNoSecondaryCommandStreamForImmediateCmdListWhe
1094956
auto immediateCmdList = static_cast<CommandListCoreFamilyImmediate<gfxCoreFamily> *>(commandList.get());
1095957
auto cmdStream = commandList->getCmdContainer().getCommandStream();
1096958

1097-
immediateCmdList->checkAvailableSpace(0u, false, commonImmediateCommandSize, false);
959+
immediateCmdList->checkAvailableSpace(0u, false, commonImmediateCommandSize);
1098960

1099961
EXPECT_EQ(commandList->getCmdContainer().getCommandStream(), cmdStream);
1100962
EXPECT_FALSE(MemoryPoolHelper::isSystemMemoryPool(commandList->getCmdContainer().getCommandStream()->getGraphicsAllocation()->getMemoryPool()));

‎level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_7.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2022-2024 Intel Corporation
2+
* Copyright (C) 2022-2025 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -1889,12 +1889,12 @@ HWTEST2_F(CommandListCreate, givenImmediateCommandListWhenThereIsNoEnoughSpaceFo
18891889

18901890
commandList->getCmdContainer().getCommandStream()->getGraphicsAllocation()->updateTaskCount(0u, 0u);
18911891
commandList->getCmdContainer().getCommandStream()->getSpace(useSize);
1892-
reinterpret_cast<CommandListCoreFamilyImmediate<gfxCoreFamily> *>(commandList.get())->checkAvailableSpace(0, false, commonImmediateCommandSize, false);
1892+
reinterpret_cast<CommandListCoreFamilyImmediate<gfxCoreFamily> *>(commandList.get())->checkAvailableSpace(0, false, commonImmediateCommandSize);
18931893
EXPECT_EQ(1U, commandList->getCmdContainer().getCmdBufferAllocations().size());
18941894

18951895
commandList->getCmdContainer().getCommandStream()->getSpace(useSize);
18961896
auto latestFlushedTaskCount = whiteBoxCmdList->getCsr(false)->peekLatestFlushedTaskCount();
1897-
reinterpret_cast<CommandListCoreFamilyImmediate<gfxCoreFamily> *>(commandList.get())->checkAvailableSpace(0, false, commonImmediateCommandSize, false);
1897+
reinterpret_cast<CommandListCoreFamilyImmediate<gfxCoreFamily> *>(commandList.get())->checkAvailableSpace(0, false, commonImmediateCommandSize);
18981898
EXPECT_EQ(1U, commandList->getCmdContainer().getCmdBufferAllocations().size());
18991899
EXPECT_EQ(latestFlushedTaskCount + 1, whiteBoxCmdList->getCsr(false)->peekLatestFlushedTaskCount());
19001900
}
@@ -1916,12 +1916,12 @@ HWTEST2_F(CommandListCreate, givenImmediateCommandListWhenThereIsNoEnoughSpaceFo
19161916

19171917
commandList->getCmdContainer().getCommandStream()->getGraphicsAllocation()->updateTaskCount(0u, 0u);
19181918
commandList->getCmdContainer().getCommandStream()->getSpace(useSize);
1919-
reinterpret_cast<CommandListCoreFamilyImmediate<gfxCoreFamily> *>(commandList.get())->checkAvailableSpace(numEvents, false, commonImmediateCommandSize, false);
1919+
reinterpret_cast<CommandListCoreFamilyImmediate<gfxCoreFamily> *>(commandList.get())->checkAvailableSpace(numEvents, false, commonImmediateCommandSize);
19201920
EXPECT_EQ(1U, commandList->getCmdContainer().getCmdBufferAllocations().size());
19211921

19221922
commandList->getCmdContainer().getCommandStream()->getSpace(useSize);
19231923
auto latestFlushedTaskCount = whiteBoxCmdList->getCsr(false)->peekLatestFlushedTaskCount();
1924-
reinterpret_cast<CommandListCoreFamilyImmediate<gfxCoreFamily> *>(commandList.get())->checkAvailableSpace(numEvents, false, commonImmediateCommandSize, false);
1924+
reinterpret_cast<CommandListCoreFamilyImmediate<gfxCoreFamily> *>(commandList.get())->checkAvailableSpace(numEvents, false, commonImmediateCommandSize);
19251925
EXPECT_EQ(1U, commandList->getCmdContainer().getCmdBufferAllocations().size());
19261926
EXPECT_EQ(latestFlushedTaskCount + 1, whiteBoxCmdList->getCsr(false)->peekLatestFlushedTaskCount());
19271927
}

‎level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2022-2024 Intel Corporation
2+
* Copyright (C) 2022-2025 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -1280,7 +1280,7 @@ HWTEST2_F(MultiTileImmediateCommandListAppendLaunchKernelXeHpCoreTest, givenImpl
12801280
auto itorBbStart = find<MI_BATCH_BUFFER_START *>(cmdList.begin(), cmdList.end());
12811281
ASSERT_NE(cmdList.end(), itorBbStart);
12821282
auto cmdBbStart = genCmdCast<MI_BATCH_BUFFER_START *>(*itorBbStart);
1283-
EXPECT_NE(MI_BATCH_BUFFER_START::SECOND_LEVEL_BATCH_BUFFER::SECOND_LEVEL_BATCH_BUFFER_SECOND_LEVEL_BATCH, cmdBbStart->getSecondLevelBatchBuffer());
1283+
EXPECT_EQ(MI_BATCH_BUFFER_START::SECOND_LEVEL_BATCH_BUFFER::SECOND_LEVEL_BATCH_BUFFER_SECOND_LEVEL_BATCH, cmdBbStart->getSecondLevelBatchBuffer());
12841284
}
12851285
} // namespace ult
12861286
} // namespace L0

0 commit comments

Comments
 (0)