Skip to content

Commit 717bc0c

Browse files
BartoszDunajskiCompute-Runtime-Automation
BartoszDunajski
authored and
Compute-Runtime-Automation
committed
refactor: pass InOrderExecInfo to encode method
Related-To: NEO-7966 Signed-off-by: Dunajski, Bartosz <[email protected]>
1 parent b182917 commit 717bc0c

20 files changed

+264
-62
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ struct CommandListCoreFamily : public CommandListImp {
171171

172172
ze_result_t appendSignalEvent(ze_event_handle_t hEvent) override;
173173
ze_result_t appendWaitOnEvents(uint32_t numEvents, ze_event_handle_t *phEvent, bool relaxedOrderingAllowed, bool trackDependencies, bool apiRequest) override;
174-
void appendWaitOnInOrderDependency(std::shared_ptr<InOrderExecInfo> &inOrderExecInfo, uint64_t waitValue, uint32_t offset, bool relaxedOrderingAllowed, bool implicitDependency);
174+
void appendWaitOnInOrderDependency(std::shared_ptr<NEO::InOrderExecInfo> &inOrderExecInfo, uint64_t waitValue, uint32_t offset, bool relaxedOrderingAllowed, bool implicitDependency);
175175
void appendSignalInOrderDependencyCounter(Event *signalEvent);
176176
void handleInOrderDependencyCounter(Event *signalEvent, bool nonWalkerInOrderCmdsChaining);
177177

@@ -340,12 +340,12 @@ struct CommandListCoreFamily : public CommandListImp {
340340
bool isInOrderNonWalkerSignalingRequired(const Event *event) const;
341341
bool hasInOrderDependencies() const;
342342

343-
void addCmdForPatching(std::shared_ptr<InOrderExecInfo> *externalInOrderExecInfo, void *cmd1, void *cmd2, uint64_t counterValue, InOrderPatchCommandHelpers::PatchCmdType patchCmdType);
343+
void addCmdForPatching(std::shared_ptr<NEO::InOrderExecInfo> *externalInOrderExecInfo, void *cmd1, void *cmd2, uint64_t counterValue, NEO::InOrderPatchCommandHelpers::PatchCmdType patchCmdType);
344344

345345
bool inOrderAtomicSignallingEnabled() const override;
346346
uint64_t getInOrderIncrementValue() const;
347347

348-
InOrderPatchCommandsContainer<GfxFamily> inOrderPatchCmds;
348+
NEO::InOrderPatchCommandsContainer<GfxFamily> inOrderPatchCmds;
349349

350350
uint64_t latestHostWaitedInOrderSyncValue = 0;
351351
bool latestOperationRequiredNonWalkerInOrderCmdsChaining = false;

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "shared/source/helpers/definitions/command_encoder_args.h"
2121
#include "shared/source/helpers/gfx_core_helper.h"
2222
#include "shared/source/helpers/hw_info.h"
23+
#include "shared/source/helpers/in_order_cmd_helpers.h"
2324
#include "shared/source/helpers/kernel_helpers.h"
2425
#include "shared/source/helpers/pipe_control_args.h"
2526
#include "shared/source/helpers/preamble.h"
@@ -46,7 +47,6 @@
4647
#include "level_zero/core/source/driver/driver_handle_imp.h"
4748
#include "level_zero/core/source/event/event.h"
4849
#include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
49-
#include "level_zero/core/source/helpers/in_order_cmd_helpers.h"
5050
#include "level_zero/core/source/image/image.h"
5151
#include "level_zero/core/source/kernel/kernel.h"
5252
#include "level_zero/core/source/kernel/kernel_imp.h"
@@ -2408,7 +2408,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendSignalEvent(ze_event_han
24082408
}
24092409

24102410
template <GFXCORE_FAMILY gfxCoreFamily>
2411-
void CommandListCoreFamily<gfxCoreFamily>::appendWaitOnInOrderDependency(std::shared_ptr<InOrderExecInfo> &inOrderExecInfo, uint64_t waitValue, uint32_t offset, bool relaxedOrderingAllowed, bool implicitDependency) {
2411+
void CommandListCoreFamily<gfxCoreFamily>::appendWaitOnInOrderDependency(std::shared_ptr<NEO::InOrderExecInfo> &inOrderExecInfo, uint64_t waitValue, uint32_t offset, bool relaxedOrderingAllowed, bool implicitDependency) {
24122412
using COMPARE_OPERATION = typename GfxFamily::MI_SEMAPHORE_WAIT::COMPARE_OPERATION;
24132413

24142414
UNRECOVERABLE_IF(waitValue > static_cast<uint64_t>(std::numeric_limits<uint32_t>::max()) && !isQwordInOrderCounter());
@@ -2435,7 +2435,7 @@ void CommandListCoreFamily<gfxCoreFamily>::appendWaitOnInOrderDependency(std::sh
24352435
auto lri2 = NEO::LriHelper<GfxFamily>::program(commandContainer.getCommandStream(), RegisterOffsets::csGprR0 + 4, getHighPart(waitValue), true);
24362436

24372437
if (inOrderExecInfo->isRegularCmdList()) {
2438-
addCmdForPatching((implicitDependency ? nullptr : &inOrderExecInfo), lri1, lri2, waitValue, InOrderPatchCommandHelpers::PatchCmdType::Lri64b);
2438+
addCmdForPatching((implicitDependency ? nullptr : &inOrderExecInfo), lri1, lri2, waitValue, NEO::InOrderPatchCommandHelpers::PatchCmdType::Lri64b);
24392439
}
24402440
}
24412441

@@ -2445,7 +2445,7 @@ void CommandListCoreFamily<gfxCoreFamily>::appendWaitOnInOrderDependency(std::sh
24452445
false, true, isQwordInOrderCounter(), indirectMode);
24462446

24472447
if (inOrderExecInfo->isRegularCmdList() && !isQwordInOrderCounter()) {
2448-
addCmdForPatching((implicitDependency ? nullptr : &inOrderExecInfo), semaphoreCommand, nullptr, waitValue, InOrderPatchCommandHelpers::PatchCmdType::Semaphore);
2448+
addCmdForPatching((implicitDependency ? nullptr : &inOrderExecInfo), semaphoreCommand, nullptr, waitValue, NEO::InOrderPatchCommandHelpers::PatchCmdType::Semaphore);
24492449
}
24502450
}
24512451

@@ -2564,7 +2564,7 @@ void CommandListCoreFamily<gfxCoreFamily>::appendSdiInOrderCounterSignalling(uin
25642564
NEO::EncodeStoreMemory<GfxFamily>::programStoreDataImm(miStoreCmd, gpuVa, getLowPart(signalValue), getHighPart(signalValue),
25652565
isQwordInOrderCounter(), (this->partitionCount > 1));
25662566

2567-
addCmdForPatching(nullptr, miStoreCmd, nullptr, signalValue, InOrderPatchCommandHelpers::PatchCmdType::Sdi);
2567+
addCmdForPatching(nullptr, miStoreCmd, nullptr, signalValue, NEO::InOrderPatchCommandHelpers::PatchCmdType::Sdi);
25682568
}
25692569

25702570
template <GFXCORE_FAMILY gfxCoreFamily>
@@ -3640,7 +3640,7 @@ void CommandListCoreFamily<gfxCoreFamily>::appendWaitOnSingleEvent(Event *event,
36403640
}
36413641

36423642
template <GFXCORE_FAMILY gfxCoreFamily>
3643-
void CommandListCoreFamily<gfxCoreFamily>::addCmdForPatching(std::shared_ptr<InOrderExecInfo> *externalInOrderExecInfo, void *cmd1, void *cmd2, uint64_t counterValue, InOrderPatchCommandHelpers::PatchCmdType patchCmdType) {
3643+
void CommandListCoreFamily<gfxCoreFamily>::addCmdForPatching(std::shared_ptr<NEO::InOrderExecInfo> *externalInOrderExecInfo, void *cmd1, void *cmd2, uint64_t counterValue, NEO::InOrderPatchCommandHelpers::PatchCmdType patchCmdType) {
36443644
if ((NEO::debugManager.flags.EnableInOrderRegularCmdListPatching.get() != 0) && (this->cmdListType == TYPE_REGULAR)) {
36453645
this->inOrderPatchCmds.emplace_back(externalInOrderExecInfo, cmd1, cmd2, counterValue, patchCmdType);
36463646
}
@@ -3649,7 +3649,7 @@ void CommandListCoreFamily<gfxCoreFamily>::addCmdForPatching(std::shared_ptr<InO
36493649
template <GFXCORE_FAMILY gfxCoreFamily>
36503650
void CommandListCoreFamily<gfxCoreFamily>::patchInOrderCmds() {
36513651
if (isInOrderExecutionEnabled()) {
3652-
auto implicitAppendCounter = InOrderPatchCommandHelpers::getAppendCounterValue(*inOrderExecInfo);
3652+
auto implicitAppendCounter = NEO::InOrderPatchCommandHelpers::getAppendCounterValue(*inOrderExecInfo);
36533653

36543654
for (auto &cmd : inOrderPatchCmds) {
36553655
if (cmd.isExternalDependency() || (inOrderExecInfo->getRegularCmdListSubmissionCounter() > 1)) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "shared/source/helpers/bindless_heaps_helper.h"
2121
#include "shared/source/helpers/blit_commands_helper.h"
2222
#include "shared/source/helpers/completion_stamp.h"
23+
#include "shared/source/helpers/in_order_cmd_helpers.h"
2324
#include "shared/source/helpers/surface_format_info.h"
2425
#include "shared/source/memory_manager/internal_allocation_storage.h"
2526
#include "shared/source/memory_manager/unified_memory_manager.h"
@@ -33,7 +34,6 @@
3334
#include "level_zero/core/source/driver/driver_handle.h"
3435
#include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
3536
#include "level_zero/core/source/helpers/error_code_helper_l0.h"
36-
#include "level_zero/core/source/helpers/in_order_cmd_helpers.h"
3737
#include "level_zero/core/source/image/image.h"
3838
#include "level_zero/core/source/kernel/kernel_imp.h"
3939

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,9 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendLaunchKernelWithParams(K
192192
NEO::EncodeDispatchKernelArgs dispatchKernelArgs{
193193
0, // eventAddress
194194
static_cast<uint64_t>(Event::STATE_SIGNALED), // postSyncImmValue
195+
0, // inOrderCounterValue
195196
neoDevice, // device
197+
nullptr, // inOrderExecInfo
196198
kernel, // dispatchInterface
197199
ssh, // surfaceStateHeap
198200
dsh, // dynamicStateHeap

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

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -275,10 +275,27 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendLaunchKernelWithParams(K
275275
appendEventForProfilingAllWalkers(compactEvent, true, true);
276276
}
277277

278+
bool inOrderExecSignalRequired = (this->isInOrderExecutionEnabled() && !launchParams.isKernelSplitOperation);
279+
bool inOrderNonWalkerSignalling = isInOrderNonWalkerSignalingRequired(eventForInOrderExec);
280+
281+
uint64_t inOrderCounterValue = 0;
282+
NEO::InOrderExecInfo *inOrderExecInfo = nullptr;
283+
284+
if (inOrderExecSignalRequired) {
285+
if (inOrderNonWalkerSignalling) {
286+
dispatchEventPostSyncOperation(eventForInOrderExec, Event::STATE_CLEARED, false, false, false, false);
287+
} else {
288+
inOrderCounterValue = this->inOrderExecInfo->getCounterValue() + getInOrderIncrementValue();
289+
inOrderExecInfo = this->inOrderExecInfo.get();
290+
}
291+
}
292+
278293
NEO::EncodeDispatchKernelArgs dispatchKernelArgs{
279294
eventAddress, // eventAddress
280295
static_cast<uint64_t>(Event::STATE_SIGNALED), // postSyncImmValue
296+
inOrderCounterValue, // inOrderCounterValue
281297
neoDevice, // device
298+
inOrderExecInfo, // inOrderExecInfo
282299
kernel, // dispatchInterface
283300
ssh, // surfaceStateHeap
284301
dsh, // dynamicStateHeap
@@ -302,21 +319,9 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendLaunchKernelWithParams(K
302319
cmdListType == CommandListType::TYPE_IMMEDIATE, // isKernelDispatchedFromImmediateCmdList
303320
engineGroupType == NEO::EngineGroupType::renderCompute, // isRcs
304321
this->dcFlushSupport, // dcFlushEnable
305-
this->heaplessModeEnabled // isHeaplessModeEnabled
322+
this->heaplessModeEnabled, // isHeaplessModeEnabled
306323
};
307324

308-
bool inOrderExecSignalRequired = (this->isInOrderExecutionEnabled() && !launchParams.isKernelSplitOperation);
309-
bool inOrderNonWalkerSignalling = isInOrderNonWalkerSignalingRequired(eventForInOrderExec);
310-
311-
if (inOrderExecSignalRequired) {
312-
if (inOrderNonWalkerSignalling) {
313-
dispatchEventPostSyncOperation(eventForInOrderExec, Event::STATE_CLEARED, false, false, false, false);
314-
} else {
315-
dispatchKernelArgs.eventAddress = inOrderExecInfo->getDeviceCounterAllocation().getGpuAddress() + inOrderExecInfo->getAllocationOffset();
316-
dispatchKernelArgs.postSyncImmValue = inOrderExecInfo->getCounterValue() + 1;
317-
}
318-
}
319-
320325
NEO::EncodeDispatchKernel<GfxFamily>::encodeCommon(commandContainer, dispatchKernelArgs);
321326

322327
if (!this->isFlushTaskSubmissionEnabled) {
@@ -343,7 +348,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendLaunchKernelWithParams(K
343348
}
344349
} else {
345350
UNRECOVERABLE_IF(!dispatchKernelArgs.outWalkerPtr);
346-
addCmdForPatching(nullptr, dispatchKernelArgs.outWalkerPtr, nullptr, dispatchKernelArgs.postSyncImmValue, InOrderPatchCommandHelpers::PatchCmdType::Walker);
351+
addCmdForPatching(nullptr, dispatchKernelArgs.outWalkerPtr, nullptr, inOrderCounterValue, NEO::InOrderPatchCommandHelpers::PatchCmdType::Walker);
347352
}
348353
}
349354

‎level_zero/core/source/cmdlist/cmdlist_imp.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@ void CommandListImp::enableInOrderExecution() {
247247

248248
UNRECOVERABLE_IF(!inOrderDependencyCounterAllocation);
249249

250-
inOrderExecInfo = std::make_shared<InOrderExecInfo>(*inOrderDependencyCounterAllocation, hostCounterAllocation, *device->getMemoryManager(), this->partitionCount,
251-
(this->cmdListType == TYPE_REGULAR), inOrderAtomicSignallingEnabled());
250+
inOrderExecInfo = std::make_shared<NEO::InOrderExecInfo>(*inOrderDependencyCounterAllocation, hostCounterAllocation, *device->getMemoryManager(), this->partitionCount,
251+
(this->cmdListType == TYPE_REGULAR), inOrderAtomicSignallingEnabled());
252252
}
253253

254254
void CommandListImp::storeReferenceTsToMappedEvents(bool isClearEnabled) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
*/
77

88
#pragma once
9+
#include "shared/source/helpers/in_order_cmd_helpers.h"
910
#include "shared/source/os_interface/os_time.h"
1011

1112
#include "level_zero/core/source/cmdlist/cmdlist.h"
12-
#include "level_zero/core/source/helpers/in_order_cmd_helpers.h"
1313

1414
#include <memory>
1515

@@ -39,7 +39,7 @@ struct CommandListImp : public CommandList {
3939
virtual void patchInOrderCmds() = 0;
4040

4141
protected:
42-
std::shared_ptr<InOrderExecInfo> inOrderExecInfo;
42+
std::shared_ptr<NEO::InOrderExecInfo> inOrderExecInfo;
4343

4444
~CommandListImp() override = default;
4545

‎level_zero/core/source/event/event.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ void Event::setIsCompleted() {
423423
unsetCmdQueue();
424424
}
425425

426-
void Event::updateInOrderExecState(std::shared_ptr<InOrderExecInfo> &newInOrderExecInfo, uint64_t signalValue, uint32_t allocationOffset) {
426+
void Event::updateInOrderExecState(std::shared_ptr<NEO::InOrderExecInfo> &newInOrderExecInfo, uint64_t signalValue, uint32_t allocationOffset) {
427427
resetCompletionStatus();
428428

429429
if (this->inOrderExecInfo.get() != newInOrderExecInfo.get()) {
@@ -435,7 +435,7 @@ void Event::updateInOrderExecState(std::shared_ptr<InOrderExecInfo> &newInOrderE
435435
}
436436

437437
uint64_t Event::getInOrderExecSignalValueWithSubmissionCounter() const {
438-
return (inOrderExecSignalValue + InOrderPatchCommandHelpers::getAppendCounterValue(*inOrderExecInfo));
438+
return (inOrderExecSignalValue + NEO::InOrderPatchCommandHelpers::getAppendCounterValue(*inOrderExecInfo));
439439
}
440440

441441
void Event::setLatestUsedCmdQueue(CommandQueue *newCmdQ) {

‎level_zero/core/source/event/event.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ class CommandStreamReceiver;
3030
class GraphicsAllocation;
3131
class MultiGraphicsAllocation;
3232
struct RootDeviceEnvironment;
33+
class InOrderExecInfo;
3334
} // namespace NEO
3435

3536
namespace L0 {
@@ -43,7 +44,6 @@ struct DriverHandle;
4344
struct DriverHandleImp;
4445
struct Device;
4546
struct Kernel;
46-
class InOrderExecInfo;
4747

4848
#pragma pack(1)
4949
struct IpcEventPoolData {
@@ -238,7 +238,7 @@ struct Event : _ze_event_handle_t {
238238
void setMetricNotification(MetricCollectorEventNotify *metricNotification) {
239239
this->metricNotification = metricNotification;
240240
}
241-
void updateInOrderExecState(std::shared_ptr<InOrderExecInfo> &newInOrderExecInfo, uint64_t signalValue, uint32_t allocationOffset);
241+
void updateInOrderExecState(std::shared_ptr<NEO::InOrderExecInfo> &newInOrderExecInfo, uint64_t signalValue, uint32_t allocationOffset);
242242
bool isCounterBased() const { return ((counterBasedMode == CounterBasedMode::ExplicitlyEnabled) || (counterBasedMode == CounterBasedMode::ImplicitlyEnabled)); }
243243
bool isCounterBasedExplicitlyEnabled() const { return (counterBasedMode == CounterBasedMode::ExplicitlyEnabled); }
244244
void enableCounterBasedMode(bool apiRequest);
@@ -254,7 +254,7 @@ struct Event : _ze_event_handle_t {
254254
void setReferenceTs(uint64_t currentCpuTimeStamp);
255255
const CommandQueue *getLatestUsedCmdQueue() const { return latestUsedCmdQueue; }
256256
bool hasKerneMappedTsCapability = false;
257-
std::shared_ptr<InOrderExecInfo> &getInOrderExecInfo() { return inOrderExecInfo; }
257+
std::shared_ptr<NEO::InOrderExecInfo> &getInOrderExecInfo() { return inOrderExecInfo; }
258258
void enableKmdWaitMode() { kmdWaitMode = true; }
259259
bool isKmdWaitModeEnabled() const { return kmdWaitMode; }
260260
void unsetInOrderExecInfo();
@@ -296,7 +296,7 @@ struct Event : _ze_event_handle_t {
296296
EventPool *eventPool = nullptr;
297297
std::weak_ptr<Kernel> kernelWithPrintf = std::weak_ptr<Kernel>{};
298298
std::mutex *kernelWithPrintfDeviceMutex = nullptr;
299-
std::shared_ptr<InOrderExecInfo> inOrderExecInfo;
299+
std::shared_ptr<NEO::InOrderExecInfo> inOrderExecInfo;
300300
CommandQueue *latestUsedCmdQueue = nullptr;
301301

302302
uint32_t maxKernelCount = 0;

‎level_zero/core/source/helpers/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ target_sources(${L0_STATIC_LIB_NAME}
1111
${CMAKE_CURRENT_SOURCE_DIR}/error_code_helper_l0.cpp
1212
${CMAKE_CURRENT_SOURCE_DIR}/error_code_helper_l0.h
1313
${CMAKE_CURRENT_SOURCE_DIR}/implicit_scaling_l0.cpp
14-
${CMAKE_CURRENT_SOURCE_DIR}/in_order_cmd_helpers.cpp
15-
${CMAKE_CURRENT_SOURCE_DIR}/in_order_cmd_helpers.h
1614
${CMAKE_CURRENT_SOURCE_DIR}/l0_gfx_core_helper_factory_init.inl
1715
${CMAKE_CURRENT_SOURCE_DIR}/l0_populate_factory.h
1816
${CMAKE_CURRENT_SOURCE_DIR}/properties_parser.h

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,9 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenNotEnoughSpaceInCommandStreamWhenA
186186
NEO::EncodeDispatchKernelArgs dispatchKernelArgs{
187187
0, // eventAddress
188188
0, // postSyncImmValue
189+
0, // inOrderCounterValue
189190
device->getNEODevice(), // device
191+
nullptr, // inOrderExecInfo
190192
kernel.get(), // dispatchInterface
191193
nullptr, // surfaceStateHeap
192194
nullptr, // dynamicStateHeap

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,9 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenNotEnoughSpaceInCommandStreamWhenA
637637
NEO::EncodeDispatchKernelArgs dispatchKernelArgs{
638638
0, // eventAddress
639639
0, // postSyncImmValue
640+
0, // inOrderCounterValue
640641
device->getNEODevice(), // device
642+
nullptr, // inOrderExecInfo
641643
kernel.get(), // dispatchInterface
642644
nullptr, // surfaceStateHeap
643645
nullptr, // dynamicStateHeap
@@ -2628,11 +2630,11 @@ HWTEST2_F(InOrderCmdListTests, givenEmptyTempAllocationsStorageWhenCallingSynchr
26282630
using NonPostSyncWalkerMatcher = IsWithinGfxCore<IGFX_GEN9_CORE, IGFX_GEN12LP_CORE>;
26292631

26302632
HWTEST2_F(InOrderCmdListTests, givenNonPostSyncWalkerWhenPatchingThenThrow, NonPostSyncWalkerMatcher) {
2631-
InOrderPatchCommandHelpers::PatchCmd<FamilyType> incorrectCmd(nullptr, nullptr, nullptr, 1, InOrderPatchCommandHelpers::PatchCmdType::None);
2633+
InOrderPatchCommandHelpers::PatchCmd<FamilyType> incorrectCmd(nullptr, nullptr, nullptr, 1, NEO::InOrderPatchCommandHelpers::PatchCmdType::None);
26322634

26332635
EXPECT_ANY_THROW(incorrectCmd.patch(1));
26342636

2635-
InOrderPatchCommandHelpers::PatchCmd<FamilyType> walkerCmd(nullptr, nullptr, nullptr, 1, InOrderPatchCommandHelpers::PatchCmdType::Walker);
2637+
InOrderPatchCommandHelpers::PatchCmd<FamilyType> walkerCmd(nullptr, nullptr, nullptr, 1, NEO::InOrderPatchCommandHelpers::PatchCmdType::Walker);
26362638

26372639
EXPECT_ANY_THROW(walkerCmd.patch(1));
26382640
}
@@ -3022,9 +3024,9 @@ HWTEST2_F(InOrderCmdListTests, givenImmediateEventWhenWaitingFromRegularCmdListT
30223024
ASSERT_EQ(1u, regularCmdList->inOrderPatchCmds.size());
30233025

30243026
if (NonPostSyncWalkerMatcher::isMatched<productFamily>()) {
3025-
EXPECT_EQ(InOrderPatchCommandHelpers::PatchCmdType::Sdi, regularCmdList->inOrderPatchCmds[0].patchCmdType);
3027+
EXPECT_EQ(NEO::InOrderPatchCommandHelpers::PatchCmdType::Sdi, regularCmdList->inOrderPatchCmds[0].patchCmdType);
30263028
} else {
3027-
EXPECT_EQ(InOrderPatchCommandHelpers::PatchCmdType::Walker, regularCmdList->inOrderPatchCmds[0].patchCmdType);
3029+
EXPECT_EQ(NEO::InOrderPatchCommandHelpers::PatchCmdType::Walker, regularCmdList->inOrderPatchCmds[0].patchCmdType);
30283030
}
30293031

30303032
GenCmdList cmdList;

0 commit comments

Comments
 (0)