Skip to content

Commit 5f7d58e

Browse files
HoppeMateuszCompute-Runtime-Automation
HoppeMateusz
authored and
Compute-Runtime-Automation
committed
Set root device index in OsContext
- correclty choose default engine context accounting for root device index and subdevices bitfield Related-To: NEO-7516 Source: f19abda Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
1 parent ed9ec9a commit 5f7d58e

File tree

53 files changed

+350
-221
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+350
-221
lines changed

‎level_zero/core/test/unit_tests/os_interface/os_context_l0_tests.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021 Intel Corporation
2+
* Copyright (C) 2021-2022 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -24,7 +24,7 @@ struct DeferredOsContextCreationL0Tests : ::testing::Test {
2424

2525
std::unique_ptr<OsContext> createOsContext(EngineTypeUsage engineTypeUsage, bool defaultEngine) {
2626
OSInterface *osInterface = device->getRootDeviceEnvironment().osInterface.get();
27-
std::unique_ptr<OsContext> osContext{OsContext::create(osInterface, 0, EngineDescriptorHelper::getDefaultDescriptor(engineTypeUsage))};
27+
std::unique_ptr<OsContext> osContext{OsContext::create(osInterface, 0, 0, EngineDescriptorHelper::getDefaultDescriptor(engineTypeUsage))};
2828
EXPECT_FALSE(osContext->isInitialized());
2929
return osContext;
3030
}

‎level_zero/core/test/unit_tests/sources/device/device_drm_or_wddm/test_device.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ class MockDriverModelWDDMLUID : public NEO::Wddm {
6868

6969
class MockOsContextWin : public OsContextWin {
7070
public:
71-
MockOsContextWin(MockDriverModelWDDMLUID &wddm, uint32_t contextId, const EngineDescriptor &engineDescriptor)
72-
: OsContextWin(wddm, contextId, engineDescriptor) {}
71+
MockOsContextWin(MockDriverModelWDDMLUID &wddm, uint32_t rootDeviceIndex, uint32_t contextId, const EngineDescriptor &engineDescriptor)
72+
: OsContextWin(wddm, rootDeviceIndex, contextId, engineDescriptor) {}
7373
};
7474

7575
using LuidDeviceTest = Test<DeviceFixture>;
@@ -78,7 +78,7 @@ TEST_F(LuidDeviceTest, givenOsContextWinAndGetLUIDArrayThenLUIDisValid) {
7878
DebugManager.flags.EnableL0ReadLUIDExtension.set(true);
7979
auto luidMock = new MockDriverModelWDDMLUID(*neoDevice->executionEnvironment->rootDeviceEnvironments[0]);
8080
auto defaultEngine = defaultHwInfo->capabilityTable.defaultEngineType;
81-
OsContextWin osContext(*luidMock, 0u, EngineDescriptorHelper::getDefaultDescriptor({defaultEngine, EngineUsage::Regular}));
81+
OsContextWin osContext(*luidMock, 0, 0u, EngineDescriptorHelper::getDefaultDescriptor({defaultEngine, EngineUsage::Regular}));
8282
std::vector<uint8_t> luidData;
8383
size_t arraySize = 8;
8484
osContext.getDeviceLuidArray(luidData, arraySize);
@@ -95,7 +95,7 @@ TEST_F(LuidDeviceTest, givenLuidDevicePropertiesStructureAndWDDMDriverTypeThenSu
9595
auto luidMock = new MockDriverModelWDDMLUID(*neoDevice->executionEnvironment->rootDeviceEnvironments[0]);
9696
neoDevice->executionEnvironment->rootDeviceEnvironments[0]->osInterface.reset(new NEO::OSInterface());
9797
neoDevice->executionEnvironment->rootDeviceEnvironments[0]->osInterface->setDriverModel(std::unique_ptr<DriverModel>(luidMock));
98-
MockOsContextWin mockContext(*luidMock, 0u, EngineDescriptorHelper::getDefaultDescriptor({defaultEngine, EngineUsage::Regular}));
98+
MockOsContextWin mockContext(*luidMock, 0, 0u, EngineDescriptorHelper::getDefaultDescriptor({defaultEngine, EngineUsage::Regular}));
9999
auto &deviceRegularEngines = neoDevice->getRegularEngineGroups();
100100
auto &deviceEngine = deviceRegularEngines[0].engines[0];
101101
auto csr = deviceEngine.commandStreamReceiver;

‎level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1618,7 +1618,7 @@ struct KernelIsaTests : Test<ModuleFixture> {
16181618

16191619
if (createBcsEngine) {
16201620
auto &engine = device->getNEODevice()->getEngine(0);
1621-
bcsOsContext.reset(OsContext::create(nullptr, 0,
1621+
bcsOsContext.reset(OsContext::create(nullptr, device->getNEODevice()->getRootDeviceIndex(), 0,
16221622
EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_BCS, EngineUsage::Regular}, device->getNEODevice()->getDeviceBitfield())));
16231623
engine.osContext = bcsOsContext.get();
16241624
engine.commandStreamReceiver->setupContext(*bcsOsContext);

‎opencl/test/unit_test/command_queue/blit_enqueue_fixture.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ struct BlitEnqueueTests : public ::testing::Test {
3737
class BcsMockContext : public MockContext {
3838
public:
3939
BcsMockContext(ClDevice *device) : MockContext(device) {
40-
bcsOsContext.reset(OsContext::create(nullptr, 0, EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_BCS, EngineUsage::Regular})));
40+
bcsOsContext.reset(OsContext::create(nullptr, device->getRootDeviceIndex(), 0, EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_BCS, EngineUsage::Regular})));
4141
bcsCsr.reset(createCommandStream(*device->getExecutionEnvironment(), device->getRootDeviceIndex(), device->getDeviceBitfield()));
4242
bcsCsr->setupContext(*bcsOsContext);
4343
bcsCsr->initializeTagAllocation();
@@ -93,7 +93,7 @@ struct BlitEnqueueTests : public ::testing::Test {
9393
}
9494
if (createBcsEngine) {
9595
auto &engine = device->getEngine(getChosenEngineType(device->getHardwareInfo()), EngineUsage::LowPriority);
96-
bcsOsContext.reset(OsContext::create(nullptr, 1,
96+
bcsOsContext.reset(OsContext::create(nullptr, device->getRootDeviceIndex(), 1,
9797
EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_BCS, EngineUsage::Regular}, device->getDeviceBitfield())));
9898
engine.osContext = bcsOsContext.get();
9999
engine.commandStreamReceiver->setupContext(*bcsOsContext);

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -366,15 +366,15 @@ HWTEST_F(IoqCommandQueueHwBlitTest, givenSplitBcsCopyWhenEnqueueReadThenEnqueueB
366366
auto cmdQHw = std::make_unique<MockCommandQueueHw<FamilyType>>(context, pClDevice, nullptr);
367367

368368
auto csr1 = std::make_unique<CommandStreamReceiverHw<FamilyType>>(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield());
369-
std::unique_ptr<OsContext> osContext1(OsContext::create(pDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]->osInterface.get(), 0,
369+
std::unique_ptr<OsContext> osContext1(OsContext::create(pDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]->osInterface.get(), pDevice->getRootDeviceIndex(), 0,
370370
EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_BCS1, EngineUsage::Regular},
371371
PreemptionMode::ThreadGroup, pDevice->getDeviceBitfield())));
372372
csr1->setupContext(*osContext1);
373373
csr1->initializeTagAllocation();
374374
EngineControl control1(csr1.get(), osContext1.get());
375375

376376
auto csr2 = std::make_unique<CommandStreamReceiverHw<FamilyType>>(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield());
377-
std::unique_ptr<OsContext> osContext2(OsContext::create(pDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]->osInterface.get(), 0,
377+
std::unique_ptr<OsContext> osContext2(OsContext::create(pDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]->osInterface.get(), pDevice->getRootDeviceIndex(), 0,
378378
EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_BCS3, EngineUsage::Regular},
379379
PreemptionMode::ThreadGroup, pDevice->getDeviceBitfield())));
380380
csr2->setupContext(*osContext2);
@@ -416,15 +416,15 @@ HWTEST_F(IoqCommandQueueHwBlitTest, givenSplitBcsCopyWhenEnqueueBlockingReadThen
416416
auto cmdQHw = static_cast<MockCommandQueueHw<FamilyType> *>(this->pCmdQ);
417417

418418
auto csr1 = std::make_unique<CommandStreamReceiverHw<FamilyType>>(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield());
419-
std::unique_ptr<OsContext> osContext1(OsContext::create(pDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]->osInterface.get(), 0,
419+
std::unique_ptr<OsContext> osContext1(OsContext::create(pDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]->osInterface.get(), pDevice->getRootDeviceIndex(), 0,
420420
EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_BCS1, EngineUsage::Regular},
421421
PreemptionMode::ThreadGroup, pDevice->getDeviceBitfield())));
422422
csr1->setupContext(*osContext1);
423423
csr1->initializeTagAllocation();
424424
EngineControl control1(csr1.get(), osContext1.get());
425425

426426
auto csr2 = std::make_unique<CommandStreamReceiverHw<FamilyType>>(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield());
427-
std::unique_ptr<OsContext> osContext2(OsContext::create(pDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]->osInterface.get(), 0,
427+
std::unique_ptr<OsContext> osContext2(OsContext::create(pDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]->osInterface.get(), pDevice->getRootDeviceIndex(), 0,
428428
EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_BCS3, EngineUsage::Regular},
429429
PreemptionMode::ThreadGroup, pDevice->getDeviceBitfield())));
430430
csr2->setupContext(*osContext2);
@@ -465,15 +465,15 @@ HWTEST_F(IoqCommandQueueHwBlitTest, givenSplitBcsCopyWhenEnqueueReadWithEventThe
465465
auto cmdQHw = static_cast<MockCommandQueueHw<FamilyType> *>(this->pCmdQ);
466466

467467
auto csr1 = std::make_unique<CommandStreamReceiverHw<FamilyType>>(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield());
468-
std::unique_ptr<OsContext> osContext1(OsContext::create(pDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]->osInterface.get(), 0,
468+
std::unique_ptr<OsContext> osContext1(OsContext::create(pDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]->osInterface.get(), pDevice->getRootDeviceIndex(), 0,
469469
EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_BCS1, EngineUsage::Regular},
470470
PreemptionMode::ThreadGroup, pDevice->getDeviceBitfield())));
471471
csr1->setupContext(*osContext1);
472472
csr1->initializeTagAllocation();
473473
EngineControl control1(csr1.get(), osContext1.get());
474474

475475
auto csr2 = std::make_unique<CommandStreamReceiverHw<FamilyType>>(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield());
476-
std::unique_ptr<OsContext> osContext2(OsContext::create(pDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]->osInterface.get(), 0,
476+
std::unique_ptr<OsContext> osContext2(OsContext::create(pDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]->osInterface.get(), pDevice->getRootDeviceIndex(), 0,
477477
EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_BCS3, EngineUsage::Regular},
478478
PreemptionMode::ThreadGroup, pDevice->getDeviceBitfield())));
479479
csr2->setupContext(*osContext2);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ HWTEST_F(BcsTests, givenUpdateTaskCountFromWaitWhenBlitBufferThenCsrHasProperTas
381381
}
382382

383383
HWTEST_F(BcsTests, givenProfilingEnabledWhenBlitBufferThenCommandBufferIsConstructedProperly) {
384-
auto bcsOsContext = std::unique_ptr<OsContext>(OsContext::create(nullptr, 0,
384+
auto bcsOsContext = std::unique_ptr<OsContext>(OsContext::create(nullptr, pDevice->getRootDeviceIndex(), 0,
385385
EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_BCS, EngineUsage::Regular}, pDevice->getDeviceBitfield())));
386386
auto bcsCsr = std::make_unique<UltCommandStreamReceiver<FamilyType>>(*pDevice->getExecutionEnvironment(), pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield());
387387
bcsCsr->setupContext(*bcsOsContext);
@@ -430,7 +430,7 @@ HWTEST_F(BcsTests, givenProfilingEnabledWhenBlitBufferThenCommandBufferIsConstru
430430
}
431431

432432
HWTEST_F(BcsTests, givenNotInitializedOsContextWhenBlitBufferIsCalledThenInitializeContext) {
433-
auto bcsOsContext = std::unique_ptr<OsContext>(OsContext::create(nullptr, 0, EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_BCS, EngineUsage::Regular}, pDevice->getDeviceBitfield())));
433+
auto bcsOsContext = std::unique_ptr<OsContext>(OsContext::create(nullptr, pDevice->getRootDeviceIndex(), 0, EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_BCS, EngineUsage::Regular}, pDevice->getDeviceBitfield())));
434434
auto bcsCsr = std::make_unique<UltCommandStreamReceiver<FamilyType>>(*pDevice->getExecutionEnvironment(), pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield());
435435
bcsCsr->setupContext(*bcsOsContext);
436436
bcsCsr->initializeTagAllocation();
@@ -513,7 +513,7 @@ HWTEST_F(BcsTests, givenInputAllocationsWhenBlitDispatchedThenMakeAllAllocations
513513
HWTEST_F(BcsTests, givenFenceAllocationIsRequiredWhenBlitDispatchedThenMakeAllAllocationsResident) {
514514
RAIIHwHelperFactory<MockHwHelperWithFenceAllocation<FamilyType>> hwHelperBackup{pDevice->getHardwareInfo().platform.eRenderCoreFamily};
515515

516-
auto bcsOsContext = std::unique_ptr<OsContext>(OsContext::create(nullptr, 0, EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_BCS, EngineUsage::Regular}, pDevice->getDeviceBitfield())));
516+
auto bcsOsContext = std::unique_ptr<OsContext>(OsContext::create(nullptr, pDevice->getRootDeviceIndex(), 0, EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_BCS, EngineUsage::Regular}, pDevice->getDeviceBitfield())));
517517
auto bcsCsr = std::make_unique<UltCommandStreamReceiver<FamilyType>>(*pDevice->getExecutionEnvironment(), pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield());
518518
bcsCsr->setupContext(*bcsOsContext);
519519
bcsCsr->initializeTagAllocation();

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,9 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, WhenOsCont
131131
ExecutionEnvironment *executionEnvironment = platform()->peekExecutionEnvironment();
132132
executionEnvironment->memoryManager.reset(new MockMemoryManager(false, true, *executionEnvironment));
133133
uint32_t tileMask = 0b11;
134-
std::unique_ptr<OsContext> osContext(OsContext::create(nullptr, 0u, EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_CCS, EngineUsage::Regular}, PreemptionMode::MidThread, tileMask)));
135-
auto commandStreamReceiver = std::make_unique<MockCsrHw<FamilyType>>(*executionEnvironment, 0, tileMask);
134+
uint32_t rootDeviceIndex = 0;
135+
std::unique_ptr<OsContext> osContext(OsContext::create(nullptr, rootDeviceIndex, 0u, EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_CCS, EngineUsage::Regular}, PreemptionMode::MidThread, tileMask)));
136+
auto commandStreamReceiver = std::make_unique<MockCsrHw<FamilyType>>(*executionEnvironment, rootDeviceIndex, tileMask);
136137
initPlatform();
137138

138139
void *ssh = alignedMalloc(512, 4096);
@@ -716,10 +717,10 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenBlock
716717
HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, WhenOsContextSupportsMultipleDevicesThenCommandStreamReceiverIsMultiOsContextCapable) {
717718
uint32_t multiDeviceMask = 0b11;
718719
uint32_t singleDeviceMask = 0b10;
719-
std::unique_ptr<OsContext> multiDeviceOsContext(OsContext::create(nullptr, 0u,
720+
std::unique_ptr<OsContext> multiDeviceOsContext(OsContext::create(nullptr, pDevice->getRootDeviceIndex(), 0u,
720721
EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_RCS, EngineUsage::Regular}, PreemptionMode::MidThread,
721722
multiDeviceMask)));
722-
std::unique_ptr<OsContext> singleDeviceOsContext(OsContext::create(nullptr, 0u,
723+
std::unique_ptr<OsContext> singleDeviceOsContext(OsContext::create(nullptr, pDevice->getRootDeviceIndex(), 0u,
723724
EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_RCS, EngineUsage::Regular}, PreemptionMode::MidThread,
724725
singleDeviceMask)));
725726

‎opencl/test/unit_test/mocks/mock_context.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ MockUnrestrictiveContextMultiGPU::MockUnrestrictiveContextMultiGPU() : MockConte
171171
}
172172

173173
BcsMockContext::BcsMockContext(ClDevice *device) : MockContext(device) {
174-
bcsOsContext.reset(OsContext::create(nullptr, 0, EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_BCS, EngineUsage::Regular}, device->getDeviceBitfield())));
174+
bcsOsContext.reset(OsContext::create(nullptr, device->getRootDeviceIndex(), 0, EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_BCS, EngineUsage::Regular}, device->getDeviceBitfield())));
175175
bcsCsr.reset(createCommandStream(*device->getExecutionEnvironment(), device->getRootDeviceIndex(), device->getDeviceBitfield()));
176176
bcsCsr->setupContext(*bcsOsContext);
177177
bcsCsr->initializeTagAllocation();

‎opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_2.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1412,7 +1412,7 @@ HWTEST_TEMPLATED_F(DrmCommandStreamEnhancedTest, givenMergeWithResidencyContaine
14121412
auto operationHandler = static_cast<MockMergeResidencyContainerMemoryOperationsHandler *>(executionEnvironment->rootDeviceEnvironments[0]->memoryOperationsInterface.get());
14131413
operationHandler->mergeWithResidencyContainerResult = NEO::MemoryOperationsStatus::FAILED;
14141414

1415-
auto osContext = std::make_unique<OsContextLinux>(*mock, 0u,
1415+
auto osContext = std::make_unique<OsContextLinux>(*mock, rootDeviceIndex, 0u,
14161416
EngineDescriptorHelper::getDefaultDescriptor(HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
14171417
PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo)));
14181418

@@ -1443,7 +1443,7 @@ HWTEST_TEMPLATED_F(DrmCommandStreamEnhancedTest, givenMergeWithResidencyContaine
14431443
auto operationHandler = static_cast<MockMergeResidencyContainerMemoryOperationsHandler *>(executionEnvironment->rootDeviceEnvironments[0]->memoryOperationsInterface.get());
14441444
operationHandler->mergeWithResidencyContainerResult = NEO::MemoryOperationsStatus::OUT_OF_MEMORY;
14451445

1446-
auto osContext = std::make_unique<OsContextLinux>(*mock, 0u,
1446+
auto osContext = std::make_unique<OsContextLinux>(*mock, rootDeviceIndex, 0u,
14471447
EngineDescriptorHelper::getDefaultDescriptor(HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
14481448
PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo)));
14491449

@@ -1477,7 +1477,7 @@ HWTEST_TEMPLATED_F(DrmCommandStreamEnhancedTest, givenNoAllocsInMemoryOperationH
14771477
}
14781478
};
14791479

1480-
auto osContext = std::make_unique<OsContextLinux>(*mock, 0u,
1480+
auto osContext = std::make_unique<OsContextLinux>(*mock, rootDeviceIndex, 0u,
14811481
EngineDescriptorHelper::getDefaultDescriptor(HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
14821482
PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo)));
14831483

@@ -1508,7 +1508,7 @@ HWTEST_TEMPLATED_F(DrmCommandStreamEnhancedTest, givenAllocsInMemoryOperationHan
15081508
}
15091509
};
15101510

1511-
auto osContext = std::make_unique<OsContextLinux>(*mock, 0u,
1511+
auto osContext = std::make_unique<OsContextLinux>(*mock, rootDeviceIndex, 0u,
15121512
EngineDescriptorHelper::getDefaultDescriptor(HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
15131513
PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo)));
15141514

0 commit comments

Comments
 (0)