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

refactor: correct naming of MemoryPool enum values

Browse Source 
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2023-12-12 09:11:27 +00:00
committed by Compute-Runtime-Automation
parent 2007ec2f6a
commit 01dd503e47
130 changed files with 830 additions and 830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
level_zero/core/source/cmdlist/cmdlist_hw.inl
View File

@@ -3126,9 +3126,9 @@ inline NEO::MemoryPool getMemoryPoolFromAllocDataForSplit(bool allocFound, const
if (allocFound) {
return allocData->gpuAllocations.getDefaultGraphicsAllocation()->getMemoryPool();
} else if (NEO::debugManager.flags.SplitBcsCopyHostptr.get() != 0) {
return NEO::MemoryPool::System4KBPages;
return NEO::MemoryPool::system4KBPages;
}
return NEO::MemoryPool::MemoryNull;
return NEO::MemoryPool::memoryNull;
}
template <GFXCORE_FAMILY gfxCoreFamily>
@@ -3145,7 +3145,7 @@ bool CommandListCoreFamily<gfxCoreFamily>::isAppendSplitNeeded(void *dstPtr, con
auto srcMemoryPool = getMemoryPoolFromAllocDataForSplit(srcAllocFound, srcAllocData);
auto dstMemoryPool = getMemoryPoolFromAllocDataForSplit(dstAllocFound, dstAllocData);
for (const auto memoryPool : {srcMemoryPool, dstMemoryPool}) {
if (memoryPool == NEO::MemoryPool::MemoryNull) {
if (memoryPool == NEO::MemoryPool::memoryNull) {
return false;
}
}

2
level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl
View File

@@ -1108,7 +1108,7 @@ void *CommandListCoreFamilyImmediate<gfxCoreFamily>::obtainLockedPtrFromDevice(N
}
auto alloc = allocData->gpuAllocations.getGraphicsAllocation(this->device->getRootDeviceIndex());
if (alloc->getMemoryPool() != NEO::MemoryPool::LocalMemory) {
if (alloc->getMemoryPool() != NEO::MemoryPool::localMemory) {
return nullptr;
}

18
level_zero/core/test/unit_tests/fixtures/memory_ipc_fixture.cpp
View File

@@ -322,7 +322,7 @@ NEO::GraphicsAllocation *MemoryManagerOpenIpcMock::allocateGraphicsMemoryWithPro
ptr,
0x1000,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
alloc->setGpuBaseAddress(0xabcd);
@@ -342,7 +342,7 @@ NEO::GraphicsAllocation *MemoryManagerOpenIpcMock::createGraphicsAllocationFromS
ptr,
0x1000,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
alloc->setGpuBaseAddress(0xabcd);
@@ -361,7 +361,7 @@ NEO::GraphicsAllocation *MemoryManagerOpenIpcMock::createGraphicsAllocationFromM
ptr,
0x1000,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
alloc->setGpuBaseAddress(0xabcd);
@@ -377,7 +377,7 @@ NEO::GraphicsAllocation *MemoryManagerOpenIpcMock::createGraphicsAllocationFromN
ptr,
0x1000,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
alloc->setGpuBaseAddress(0xabcd);
@@ -437,7 +437,7 @@ NEO::GraphicsAllocation *MemoryManagerIpcImplicitScalingMock::allocateGraphicsMe
ptr,
0x1000,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
alloc->setGpuBaseAddress(0xabcd);
@@ -454,7 +454,7 @@ NEO::GraphicsAllocation *MemoryManagerIpcImplicitScalingMock::allocateGraphicsMe
ptr,
0x1000,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
alloc->setGpuBaseAddress(0xabcd);
@@ -474,7 +474,7 @@ NEO::GraphicsAllocation *MemoryManagerIpcImplicitScalingMock::createGraphicsAllo
ptr,
0x1000,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
alloc->setGpuBaseAddress(0xabcd);
@@ -495,7 +495,7 @@ NEO::GraphicsAllocation *MemoryManagerIpcImplicitScalingMock::createGraphicsAllo
ptr,
0x1000,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
alloc->setGpuBaseAddress(0xabcd);
@@ -514,7 +514,7 @@ NEO::GraphicsAllocation *MemoryManagerIpcImplicitScalingMock::createGraphicsAllo
ptr,
0x1000,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
alloc->setGpuBaseAddress(0xabcd);

8
level_zero/core/test/unit_tests/fixtures/memory_ipc_fixture.h
View File

@@ -242,16 +242,16 @@ class IpcImplicitScalingMockGraphicsAllocation : public NEO::MemoryAllocation {
using MemoryAllocation::usageInfos;
IpcImplicitScalingMockGraphicsAllocation()
: NEO::MemoryAllocation(0, AllocationType::unknown, nullptr, 0u, 0, MemoryPool::MemoryNull, MemoryManager::maxOsContextCount, 0llu) {}
: NEO::MemoryAllocation(0, AllocationType::unknown, nullptr, 0u, 0, MemoryPool::memoryNull, MemoryManager::maxOsContextCount, 0llu) {}
IpcImplicitScalingMockGraphicsAllocation(void *buffer, size_t sizeIn)
: NEO::MemoryAllocation(0, AllocationType::unknown, buffer, castToUint64(buffer), 0llu, sizeIn, MemoryPool::MemoryNull, MemoryManager::maxOsContextCount) {}
: NEO::MemoryAllocation(0, AllocationType::unknown, buffer, castToUint64(buffer), 0llu, sizeIn, MemoryPool::memoryNull, MemoryManager::maxOsContextCount) {}
IpcImplicitScalingMockGraphicsAllocation(void *buffer, uint64_t gpuAddr, size_t sizeIn)
: NEO::MemoryAllocation(0, AllocationType::unknown, buffer, gpuAddr, 0llu, sizeIn, MemoryPool::MemoryNull, MemoryManager::maxOsContextCount) {}
: NEO::MemoryAllocation(0, AllocationType::unknown, buffer, gpuAddr, 0llu, sizeIn, MemoryPool::memoryNull, MemoryManager::maxOsContextCount) {}
IpcImplicitScalingMockGraphicsAllocation(uint32_t rootDeviceIndex, void *buffer, size_t sizeIn)
: NEO::MemoryAllocation(rootDeviceIndex, AllocationType::unknown, buffer, castToUint64(buffer), 0llu, sizeIn, MemoryPool::MemoryNull, MemoryManager::maxOsContextCount) {}
: NEO::MemoryAllocation(rootDeviceIndex, AllocationType::unknown, buffer, castToUint64(buffer), 0llu, sizeIn, MemoryPool::memoryNull, MemoryManager::maxOsContextCount) {}
uint32_t getNumHandles() override {
return 2u;

8
level_zero/core/test/unit_tests/fixtures/module_fixture.cpp
View File

@@ -39,7 +39,7 @@ ModuleImmutableDataFixture::MockImmutableData::MockImmutableData(uint32_t perHwT
ptr,
0x1000,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
castToUint64(ptr)));
kernelInfo->kernelAllocation = isaGraphicsAllocation.get();
@@ -233,7 +233,7 @@ ModuleWithZebinFixture::MockImmutableData::MockImmutableData(L0::Device *device)
ptr,
0x1000,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
castToUint64(ptr)));
}
@@ -254,7 +254,7 @@ void ModuleWithZebinFixture::MockModuleWithZebin::addSegments() {
ptr,
0x1000,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
translationUnit->globalConstBuffer = new NEO::MockGraphicsAllocation(0,
@@ -262,7 +262,7 @@ void ModuleWithZebinFixture::MockModuleWithZebin::addSegments() {
ptr,
0x1000,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);

2
level_zero/core/test/unit_tests/gen9/test_cmdlist_create_gen9.cpp
View File

@@ -66,7 +66,7 @@ class CommandListCreateGen9 : public DeviceFixture, public testing::Test {
reinterpret_cast<uint64_t>(buffer),
0,
isaSize,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount);
if (isaBuffer != nullptr) {
memcpy_s(allocation->getUnderlyingBuffer(), allocation->getUnderlyingBufferSize(), isaBuffer, isaSize);

2
level_zero/core/test/unit_tests/mocks/mock_cmdlist.cpp
View File

@@ -24,7 +24,7 @@ MockCommandList::MockCommandList(Device *device) : WhiteBox<::L0::CommandListImp
reinterpret_cast<uint64_t>(&batchBuffer),
0,
sizeof(batchBufferSize),
NEO::MemoryPool::System4KBPages,
NEO::MemoryPool::system4KBPages,
NEO::MemoryManager::maxOsContextCount);
}

2
level_zero/core/test/unit_tests/mocks/mock_event.cpp
View File

@@ -17,7 +17,7 @@ Mock<Event>::Mock() : WhiteBox<::L0::Event>(nullptr, 0, nullptr),
reinterpret_cast<uint64_t>(&memory),
0,
sizeof(memory),
NEO::MemoryPool::System4KBPages,
NEO::MemoryPool::system4KBPages,
NEO::MemoryManager::maxOsContextCount) {}
Mock<Event>::~Mock() {}

2
level_zero/core/test/unit_tests/mocks/mock_event.h
View File

@@ -117,7 +117,7 @@ class MockEvent : public ::L0::Event {
0x1000,
0,
sizeof(uint32_t),
NEO::MemoryPool::System4KBPages,
NEO::MemoryPool::system4KBPages,
NEO::MemoryManager::maxOsContextCount));
this->timestampSizeInDw = 1;
this->contextStartOffset = 0;

2
level_zero/core/test/unit_tests/mocks/mock_kernel.cpp
View File

@@ -32,7 +32,7 @@ Mock<::L0::KernelImp>::Mock() : BaseClass() {
0,
0,
4096,
NEO::MemoryPool::System4KBPages,
NEO::MemoryPool::system4KBPages,
NEO::MemoryManager::maxOsContextCount);
immutableData.isaGraphicsAllocation.reset(allocation);

50
level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_2.cpp
View File

@@ -321,7 +321,7 @@ HWTEST2_F(CommandListCreate, givenCommandListWhenPageFaultCopyCalledThenappendPa
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
NEO::MockGraphicsAllocation mockAllocationDst(0,
@@ -329,7 +329,7 @@ HWTEST2_F(CommandListCreate, givenCommandListWhenPageFaultCopyCalledThenappendPa
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
cmdList.appendPageFaultCopy(&mockAllocationDst, &mockAllocationSrc, size, false);
@@ -349,7 +349,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenPageFaultCopyCalledWithCopyEngi
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
NEO::MockGraphicsAllocation mockAllocationDst(0,
@@ -357,7 +357,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenPageFaultCopyCalledWithCopyEngi
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
cmdList.appendPageFaultCopy(&mockAllocationDst, &mockAllocationSrc, size, false);
@@ -376,7 +376,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenPageFaultCopyCalledThenappendPa
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
NEO::MockGraphicsAllocation mockAllocationDst(0,
@@ -384,7 +384,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenPageFaultCopyCalledThenappendPa
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
cmdList.appendPageFaultCopy(&mockAllocationDst, &mockAllocationSrc, size, false);
@@ -404,7 +404,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenPageFaultCopyCalledAndErrorOnMi
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
NEO::MockGraphicsAllocation mockAllocationDst(0,
@@ -412,7 +412,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenPageFaultCopyCalledAndErrorOnMi
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
cmdList.appendPageFaultCopy(&mockAllocationDst, &mockAllocationSrc, size, false);
@@ -432,7 +432,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenPageFaultCopyCalledWithCopyEngi
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
NEO::MockGraphicsAllocation mockAllocationDst(0,
@@ -440,7 +440,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenPageFaultCopyCalledWithCopyEngi
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
cmdList.appendPageFaultCopy(&mockAllocationDst, &mockAllocationSrc, size, false);
@@ -459,7 +459,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenPageFaultCopyCalledWithCopyEngi
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
NEO::MockGraphicsAllocation mockAllocationDst(0,
@@ -467,7 +467,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenPageFaultCopyCalledWithCopyEngi
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
cmdList.appendPageFaultCopy(&mockAllocationDst, &mockAllocationSrc, size, false);
@@ -486,7 +486,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhen4GBytePageFaultCopyCalledThenPa
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
NEO::MockGraphicsAllocation mockAllocationDst(0,
@@ -494,7 +494,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhen4GBytePageFaultCopyCalledThenPa
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
cmdList.appendPageFaultCopy(&mockAllocationDst, &mockAllocationSrc, size, false);
@@ -514,7 +514,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhen4GBytePageFaultCopyCalledThenPa
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
NEO::MockGraphicsAllocation mockAllocationDst(0,
@@ -522,7 +522,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhen4GBytePageFaultCopyCalledThenPa
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
cmdList.appendPageFaultCopy(&mockAllocationDst, &mockAllocationSrc, size, false);
@@ -1106,7 +1106,7 @@ HWTEST2_F(CommandListCreate, givenCopyCommandListWhenCopyRegionWithinMaxBlitSize
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
NEO::MockGraphicsAllocation mockAllocationDst(0,
@@ -1114,7 +1114,7 @@ HWTEST2_F(CommandListCreate, givenCopyCommandListWhenCopyRegionWithinMaxBlitSize
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
AlignedAllocationData srcAllocationData = {mockAllocationSrc.gpuAddress, 0, &mockAllocationSrc, false};
@@ -1155,7 +1155,7 @@ HWTEST2_F(CommandListCreate, givenCopyCommandListWhenCopyRegionWithinMaxBlitSize
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
NEO::MockGraphicsAllocation mockAllocationDst(0,
@@ -1163,7 +1163,7 @@ HWTEST2_F(CommandListCreate, givenCopyCommandListWhenCopyRegionWithinMaxBlitSize
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
AlignedAllocationData srcAllocationData = {mockAllocationSrc.gpuAddress, 0, &mockAllocationSrc, false};
@@ -1203,7 +1203,7 @@ HWTEST2_F(CommandListCreate, givenCopyCommandListWhenCopyRegionGreaterThanMaxBli
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
NEO::MockGraphicsAllocation mockAllocationDst(0,
@@ -1211,7 +1211,7 @@ HWTEST2_F(CommandListCreate, givenCopyCommandListWhenCopyRegionGreaterThanMaxBli
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
AlignedAllocationData srcAllocationData = {mockAllocationSrc.gpuAddress, 0, &mockAllocationSrc, false};
@@ -1257,7 +1257,7 @@ class MockCommandListForRegionSize : public WhiteBox<::L0::CommandListCoreFamily
reinterpret_cast<void *>(0x1234),
1,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
0x1234};
};
@@ -1336,7 +1336,7 @@ HWTEST2_F(CommandListAppendMemoryCopyBlit, whenAppendMemoryCopyBlitIsAppendedAnd
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
void *srcPtr = reinterpret_cast<void *>(mockAllocationSrc.getGpuAddress());
@@ -1345,7 +1345,7 @@ HWTEST2_F(CommandListAppendMemoryCopyBlit, whenAppendMemoryCopyBlitIsAppendedAnd
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
MemoryManager::maxOsContextCount,
canonizedGpuAddress);
void *dstPtr = reinterpret_cast<void *>(mockAllocationDst.getGpuAddress());

8
level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_4.cpp
View File

@@ -386,10 +386,10 @@ HWTEST_F(CommandListImmediateFlushTaskComputeTests, givenUseCsrImmediateSubmissi
size_t size = 0x100000001;
NEO::MockGraphicsAllocation mockAllocationSrc(0, NEO::AllocationType::internalHostMemory,
reinterpret_cast<void *>(0x1234), size, 0, sizeof(uint32_t),
MemoryPool::System4KBPages, MemoryManager::maxOsContextCount);
MemoryPool::system4KBPages, MemoryManager::maxOsContextCount);
NEO::MockGraphicsAllocation mockAllocationDst(0, NEO::AllocationType::internalHostMemory,
reinterpret_cast<void *>(0x100003456), size, 0, sizeof(uint32_t),
MemoryPool::System4KBPages, MemoryManager::maxOsContextCount);
MemoryPool::system4KBPages, MemoryManager::maxOsContextCount);
ze_command_queue_desc_t queueDesc = {};
ze_result_t returnValue = ZE_RESULT_SUCCESS;
std::unique_ptr<L0::CommandList> commandList(CommandList::createImmediate(productFamily, device, &queueDesc, false, NEO::EngineGroupType::compute, returnValue));
@@ -410,10 +410,10 @@ HWTEST_F(CommandListImmediateFlushTaskComputeTests, givenBindlessModeAndUseCsrIm
size_t size = 0x100000001;
NEO::MockGraphicsAllocation mockAllocationSrc(0, NEO::AllocationType::internalHostMemory,
reinterpret_cast<void *>(0x1234), size, 0, sizeof(uint32_t),
MemoryPool::System4KBPages, MemoryManager::maxOsContextCount);
MemoryPool::system4KBPages, MemoryManager::maxOsContextCount);
NEO::MockGraphicsAllocation mockAllocationDst(0, NEO::AllocationType::internalHostMemory,
reinterpret_cast<void *>(0x100003456), size, 0, sizeof(uint32_t),
MemoryPool::System4KBPages, MemoryManager::maxOsContextCount);
MemoryPool::system4KBPages, MemoryManager::maxOsContextCount);
ze_command_queue_desc_t queueDesc = {};
ze_result_t returnValue = ZE_RESULT_SUCCESS;
std::unique_ptr<L0::CommandList> commandList(CommandList::createImmediate(productFamily, device, &queueDesc, false, NEO::EngineGroupType::compute, returnValue));

4
level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp
View File

@@ -1776,7 +1776,7 @@ HWTEST2_F(InOrderCmdListTests, givenImmediateCmdListWhenDispatchingWithRegularEv
NEO::MockGraphicsAllocation mockAllocation(0, NEO::AllocationType::internalHostMemory,
reinterpret_cast<void *>(0x1234), 0x1000, 0, sizeof(uint32_t),
MemoryPool::System4KBPages, MemoryManager::maxOsContextCount);
MemoryPool::system4KBPages, MemoryManager::maxOsContextCount);
AlignedAllocationData allocationData = {mockAllocation.gpuAddress, 0, &mockAllocation, false};
@@ -1868,7 +1868,7 @@ HWTEST2_F(InOrderCmdListTests, givenNonInOrderCmdListWhenPassingCounterBasedEven
NEO::MockGraphicsAllocation mockAllocation(0, NEO::AllocationType::internalHostMemory,
reinterpret_cast<void *>(0x1234), 0x1000, 0, sizeof(uint32_t),
MemoryPool::System4KBPages, MemoryManager::maxOsContextCount);
MemoryPool::system4KBPages, MemoryManager::maxOsContextCount);
AlignedAllocationData allocationData = {mockAllocation.gpuAddress, 0, &mockAllocation, false};

14
level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_blit.cpp
View File

@@ -51,7 +51,7 @@ class MockDriverHandle : public L0::DriverHandleImp {
NEO::SvmAllocationData *&allocData) override {
mockAllocation.reset(new NEO::MockGraphicsAllocation(rootDeviceIndex, NEO::AllocationType::internalHostMemory,
reinterpret_cast<void *>(0x1234), 0x1000, 0, sizeof(uint32_t),
MemoryPool::System4KBPages, MemoryManager::maxOsContextCount));
MemoryPool::system4KBPages, MemoryManager::maxOsContextCount));
data.gpuAllocations.addAllocation(mockAllocation.get());
allocData = &data;
return true;
@@ -204,10 +204,10 @@ HWTEST2_F(AppendMemoryCopy, givenCopyOnlyCommandListThenDcFlushIsNotAddedAfterBl
uint64_t copySize = 0x301;
NEO::MockGraphicsAllocation mockAllocationSrc(0, NEO::AllocationType::internalHostMemory,
reinterpret_cast<void *>(srcPtr), 0x1000, 0, sizeof(uint32_t),
MemoryPool::System4KBPages, MemoryManager::maxOsContextCount);
MemoryPool::system4KBPages, MemoryManager::maxOsContextCount);
NEO::MockGraphicsAllocation mockAllocationDst(0, NEO::AllocationType::internalHostMemory,
reinterpret_cast<void *>(dstPtr), 0x1000, 0, sizeof(uint32_t),
MemoryPool::System4KBPages, MemoryManager::maxOsContextCount);
MemoryPool::system4KBPages, MemoryManager::maxOsContextCount);
commandList->appendMemoryCopyBlit(ptrOffset(dstPtr, dstOffset), &mockAllocationDst, 0, ptrOffset(srcPtr, srcOffset), &mockAllocationSrc, 0, copySize);
auto &commandContainer = commandList->getCmdContainer();
@@ -241,10 +241,10 @@ HWTEST2_F(AppendMemoryCopy, givenCopyCommandListWhenTimestampPassedToMemoryCopyR
ze_copy_region_t dstRegion = {4, 4, 4, 2, 2, 2};
NEO::MockGraphicsAllocation mockAllocationSrc(0, NEO::AllocationType::internalHostMemory,
reinterpret_cast<void *>(0x1234), 0x1000, 0, sizeof(uint32_t),
MemoryPool::System4KBPages, MemoryManager::maxOsContextCount);
MemoryPool::system4KBPages, MemoryManager::maxOsContextCount);
NEO::MockGraphicsAllocation mockAllocationDst(0, NEO::AllocationType::internalHostMemory,
reinterpret_cast<void *>(0x1234), 0x1000, 0, sizeof(uint32_t),
MemoryPool::System4KBPages, MemoryManager::maxOsContextCount);
MemoryPool::system4KBPages, MemoryManager::maxOsContextCount);
AlignedAllocationData srcAllocationData = {mockAllocationSrc.gpuAddress, 0, &mockAllocationSrc, false};
AlignedAllocationData dstAllocationData = {mockAllocationDst.gpuAddress, 0, &mockAllocationDst, false};
@@ -302,10 +302,10 @@ HWTEST2_F(AppendMemoryCopy, givenCopyCommandListWhenTimestampPassedToImageCopyBl
NEO::MockGraphicsAllocation mockAllocationSrc(0, NEO::AllocationType::internalHostMemory,
reinterpret_cast<void *>(0x1234), 0x1000, 0, sizeof(uint32_t),
MemoryPool::System4KBPages, MemoryManager::maxOsContextCount);
MemoryPool::system4KBPages, MemoryManager::maxOsContextCount);
NEO::MockGraphicsAllocation mockAllocationDst(0, NEO::AllocationType::internalHostMemory,
reinterpret_cast<void *>(0x1234), 0x1000, 0, sizeof(uint32_t),
MemoryPool::System4KBPages, MemoryManager::maxOsContextCount);
MemoryPool::system4KBPages, MemoryManager::maxOsContextCount);
commandList->appendCopyImageBlit(&mockAllocationDst, &mockAllocationSrc, {0, 0, 0}, {0, 0, 0}, 1, 1, 1, 1, 1, {1, 1, 1}, {1, 1, 1}, {1, 1, 1}, event.get());
GenCmdList cmdList;

20
level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_1.cpp
View File

@@ -1113,8 +1113,8 @@ HWTEST2_F(ExecuteCommandListTests, givenExecuteCommandListWhenItReturnsThenConta
commandList->close();
void *alloc = alignedMalloc(0x100, 0x100);
NEO::GraphicsAllocation graphicsAllocation1(0, NEO::AllocationType::buffer, alloc, 0u, 0u, 1u, MemoryPool::System4KBPages, 1u);
NEO::GraphicsAllocation graphicsAllocation2(0, NEO::AllocationType::buffer, alloc, 0u, 0u, 1u, MemoryPool::System4KBPages, 1u);
NEO::GraphicsAllocation graphicsAllocation1(0, NEO::AllocationType::buffer, alloc, 0u, 0u, 1u, MemoryPool::system4KBPages, 1u);
NEO::GraphicsAllocation graphicsAllocation2(0, NEO::AllocationType::buffer, alloc, 0u, 0u, 1u, MemoryPool::system4KBPages, 1u);
commandList->commandContainer.getSshAllocations().push_back(&graphicsAllocation1);
commandList->commandContainer.getSshAllocations().push_back(&graphicsAllocation2);
@@ -1212,8 +1212,8 @@ HWTEST2_F(CommandQueueDestroy, givenCommandQueueAndCommandListWithSshAndScratchW
commandList->close();
void *alloc = alignedMalloc(0x100, 0x100);
NEO::GraphicsAllocation graphicsAllocation1(0, NEO::AllocationType::buffer, alloc, 0u, 0u, 1u, MemoryPool::System4KBPages, 1u);
NEO::GraphicsAllocation graphicsAllocation2(0, NEO::AllocationType::buffer, alloc, 0u, 0u, 1u, MemoryPool::System4KBPages, 1u);
NEO::GraphicsAllocation graphicsAllocation1(0, NEO::AllocationType::buffer, alloc, 0u, 0u, 1u, MemoryPool::system4KBPages, 1u);
NEO::GraphicsAllocation graphicsAllocation2(0, NEO::AllocationType::buffer, alloc, 0u, 0u, 1u, MemoryPool::system4KBPages, 1u);
commandList->commandContainer.getSshAllocations().push_back(&graphicsAllocation1);
commandList->commandContainer.getSshAllocations().push_back(&graphicsAllocation2);
@@ -1239,8 +1239,8 @@ HWTEST2_F(CommandQueueDestroy, givenCommandQueueAndCommandListWithSshAndPrivateS
commandList->close();
void *alloc = alignedMalloc(0x100, 0x100);
NEO::GraphicsAllocation graphicsAllocation1(0, NEO::AllocationType::buffer, alloc, 0u, 0u, 1u, MemoryPool::System4KBPages, 1u);
NEO::GraphicsAllocation graphicsAllocation2(0, NEO::AllocationType::buffer, alloc, 0u, 0u, 1u, MemoryPool::System4KBPages, 1u);
NEO::GraphicsAllocation graphicsAllocation1(0, NEO::AllocationType::buffer, alloc, 0u, 0u, 1u, MemoryPool::system4KBPages, 1u);
NEO::GraphicsAllocation graphicsAllocation2(0, NEO::AllocationType::buffer, alloc, 0u, 0u, 1u, MemoryPool::system4KBPages, 1u);
commandList->commandContainer.getSshAllocations().push_back(&graphicsAllocation1);
commandList->commandContainer.getSshAllocations().push_back(&graphicsAllocation2);
@@ -1314,8 +1314,8 @@ HWTEST2_F(ExecuteCommandListTests, givenFailingSubmitBatchBufferThenResetGraphic
commandList->close();
void *alloc = alignedMalloc(0x100, 0x100);
NEO::GraphicsAllocation graphicsAllocation1(0, NEO::AllocationType::buffer, alloc, 0u, 0u, 1u, MemoryPool::System4KBPages, 1u);
NEO::GraphicsAllocation graphicsAllocation2(0, NEO::AllocationType::buffer, alloc, 0u, 0u, 1u, MemoryPool::System4KBPages, 1u);
NEO::GraphicsAllocation graphicsAllocation1(0, NEO::AllocationType::buffer, alloc, 0u, 0u, 1u, MemoryPool::system4KBPages, 1u);
NEO::GraphicsAllocation graphicsAllocation2(0, NEO::AllocationType::buffer, alloc, 0u, 0u, 1u, MemoryPool::system4KBPages, 1u);
commandList->commandContainer.addToResidencyContainer(&graphicsAllocation1);
commandList->commandContainer.addToResidencyContainer(&graphicsAllocation2);
static_cast<NEO::UltCommandStreamReceiver<FamilyType> *>(csr)->taskCount = 0;
@@ -1345,8 +1345,8 @@ HWTEST2_F(ExecuteCommandListTests, givenFailingSubmitBatchBufferThenResetGraphic
commandList->close();
void *alloc = alignedMalloc(0x100, 0x100);
NEO::GraphicsAllocation graphicsAllocation1(0, NEO::AllocationType::buffer, alloc, 0u, 0u, 1u, MemoryPool::System4KBPages, 1u);
NEO::GraphicsAllocation graphicsAllocation2(0, NEO::AllocationType::buffer, alloc, 0u, 0u, 1u, MemoryPool::System4KBPages, 1u);
NEO::GraphicsAllocation graphicsAllocation1(0, NEO::AllocationType::buffer, alloc, 0u, 0u, 1u, MemoryPool::system4KBPages, 1u);
NEO::GraphicsAllocation graphicsAllocation2(0, NEO::AllocationType::buffer, alloc, 0u, 0u, 1u, MemoryPool::system4KBPages, 1u);
commandList->commandContainer.addToResidencyContainer(&graphicsAllocation1);
commandList->commandContainer.addToResidencyContainer(&graphicsAllocation2);
static_cast<NEO::UltCommandStreamReceiver<FamilyType> *>(csr)->taskCount = 2;

6
level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_2.cpp
View File

@@ -875,12 +875,12 @@ HWTEST2_F(CommandQueueScratchTests, givenCommandQueueWhenHandleScratchSpaceThenP
NEO::HeapContainer heapContainer;
void *surfaceHeap = alignedMalloc(0x1000, 0x1000);
NEO::GraphicsAllocation graphicsAllocationHeap(0, NEO::AllocationType::buffer, surfaceHeap, 0u, 0u, 1u, MemoryPool::System4KBPages, 1u);
NEO::GraphicsAllocation graphicsAllocationHeap(0, NEO::AllocationType::buffer, surfaceHeap, 0u, 0u, 1u, MemoryPool::system4KBPages, 1u);
heapContainer.push_back(&graphicsAllocationHeap);
bool gsbaStateDirty = false;
bool frontEndStateDirty = false;
NEO::GraphicsAllocation graphicsAllocation(1u, NEO::AllocationType::buffer, nullptr, 0u, 0u, 0u, MemoryPool::System4KBPages, 0u);
NEO::GraphicsAllocation graphicsAllocation(1u, NEO::AllocationType::buffer, nullptr, 0u, 0u, 0u, MemoryPool::system4KBPages, 0u);
auto scratch = static_cast<MockScratchSpaceControllerXeHPAndLater *>(scratchController.get());
scratch->scratchAllocation = &graphicsAllocation;
@@ -934,7 +934,7 @@ HWTEST2_F(CommandQueueScratchTests, givenCommandQueueWhenHandleScratchSpaceAndHe
bool gsbaStateDirty = false;
bool frontEndStateDirty = false;
NEO::GraphicsAllocation graphicsAllocation(1u, NEO::AllocationType::buffer, nullptr, 0u, 0u, 0u, MemoryPool::System4KBPages, 0u);
NEO::GraphicsAllocation graphicsAllocation(1u, NEO::AllocationType::buffer, nullptr, 0u, 0u, 0u, MemoryPool::system4KBPages, 0u);
auto scratch = static_cast<MockScratchSpaceControllerXeHPAndLater *>(scratchController.get());
scratch->scratchAllocation = &graphicsAllocation;

14
level_zero/core/test/unit_tests/sources/debugger/linux/test_l0_debugger_linux.cpp
View File

@@ -230,7 +230,7 @@ TEST_F(L0DebuggerLinuxTest, whenRegisterElfAndLinkWithAllocationIsCalledThenItRe
NEO::DebugData debugData;
debugData.vIsa = "01234567890";
debugData.vIsaSize = 10;
MockDrmAllocation isaAllocation(rootDeviceIndex, AllocationType::kernelIsa, MemoryPool::System4KBPages);
MockDrmAllocation isaAllocation(rootDeviceIndex, AllocationType::kernelIsa, MemoryPool::system4KBPages);
MockBufferObject bo(rootDeviceIndex, drmMock, 3, 0, 0, 1);
isaAllocation.bufferObjects[0] = &bo;
device->getL0Debugger()->registerElfAndLinkWithAllocation(&debugData, &isaAllocation);
@@ -250,7 +250,7 @@ TEST_F(L0DebuggerLinuxTest, whenRegisterElfAndLinkWithAllocationIsCalledInAlloca
NEO::DebugData debugData;
debugData.vIsa = "01234567890";
debugData.vIsaSize = 10;
MockDrmAllocation isaAllocation(rootDeviceIndex, AllocationType::kernelIsa, MemoryPool::System4KBPages);
MockDrmAllocation isaAllocation(rootDeviceIndex, AllocationType::kernelIsa, MemoryPool::system4KBPages);
device->getL0Debugger()->registerElfAndLinkWithAllocation(&debugData, &isaAllocation);
EXPECT_EQ(static_cast<size_t>(10u), drmMock->registeredDataSize);
@@ -260,7 +260,7 @@ HWTEST_F(L0DebuggerLinuxTest, givenFailureToRegisterElfWhenRegisterElfAndLinkWit
NEO::DebugData debugData;
debugData.vIsa = "01234567890";
debugData.vIsaSize = 10;
MockDrmAllocation isaAllocation(rootDeviceIndex, AllocationType::kernelIsa, MemoryPool::System4KBPages);
MockDrmAllocation isaAllocation(rootDeviceIndex, AllocationType::kernelIsa, MemoryPool::system4KBPages);
MockBufferObject bo(rootDeviceIndex, drmMock, 3, 0, 0, 1);
isaAllocation.bufferObjects[0] = &bo;
@@ -278,11 +278,11 @@ HWTEST_F(L0DebuggerLinuxTest, givenFailureToRegisterElfWhenRegisterElfAndLinkWit
}
TEST_F(L0DebuggerLinuxTest, givenAllocationsWhenAttachingZebinModuleThenAllAllocationsHaveRegisteredHandles) {
MockDrmAllocation isaAllocation(rootDeviceIndex, AllocationType::kernelIsa, MemoryPool::System4KBPages);
MockDrmAllocation isaAllocation(rootDeviceIndex, AllocationType::kernelIsa, MemoryPool::system4KBPages);
MockBufferObject bo(rootDeviceIndex, drmMock, 3, 0, 0, 1);
isaAllocation.bufferObjects[0] = &bo;
MockDrmAllocation isaAllocation2(rootDeviceIndex, AllocationType::kernelIsa, MemoryPool::System4KBPages);
MockDrmAllocation isaAllocation2(rootDeviceIndex, AllocationType::kernelIsa, MemoryPool::system4KBPages);
MockBufferObject bo2(rootDeviceIndex, drmMock, 3, 0, 0, 1);
isaAllocation2.bufferObjects[0] = &bo2;
@@ -318,11 +318,11 @@ TEST_F(L0DebuggerLinuxTest, givenAllocationsWhenAttachingZebinModuleThenAllAlloc
}
TEST_F(L0DebuggerLinuxTest, givenModuleAllocationsWhenAttachingZebinModuleThenBosRequireImmediateBind) {
MockDrmAllocation isaAllocation(rootDeviceIndex, AllocationType::kernelIsa, MemoryPool::System4KBPages);
MockDrmAllocation isaAllocation(rootDeviceIndex, AllocationType::kernelIsa, MemoryPool::system4KBPages);
MockBufferObject bo(rootDeviceIndex, drmMock, 3, 0, 0, 1);
isaAllocation.bufferObjects[0] = &bo;
MockDrmAllocation isaAllocation2(rootDeviceIndex, AllocationType::constantSurface, MemoryPool::System4KBPages);
MockDrmAllocation isaAllocation2(rootDeviceIndex, AllocationType::constantSurface, MemoryPool::system4KBPages);
MockBufferObject bo2(rootDeviceIndex, drmMock, 3, 0, 0, 1);
isaAllocation2.bufferObjects[0] = &bo2;

8
level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp
View File

@@ -563,10 +563,10 @@ HWTEST2_F(L0DebuggerSimpleTest, givenUseCsrImmediateSubmissionEnabledCommandList
NEO::GraphicsAllocation srcPtr(0, NEO::AllocationType::internalHostMemory,
reinterpret_cast<void *>(0x1234), size, 0, sizeof(uint32_t),
MemoryPool::System4KBPages, MemoryManager::maxOsContextCount);
MemoryPool::system4KBPages, MemoryManager::maxOsContextCount);
NEO::GraphicsAllocation dstPtr(0, NEO::AllocationType::internalHostMemory,
reinterpret_cast<void *>(0x2345), size, 0, sizeof(uint32_t),
MemoryPool::System4KBPages, MemoryManager::maxOsContextCount);
MemoryPool::system4KBPages, MemoryManager::maxOsContextCount);
auto result = commandList->appendPageFaultCopy(&dstPtr, &srcPtr, 0x100, false);
ASSERT_EQ(ZE_RESULT_SUCCESS, result);
@@ -586,10 +586,10 @@ HWTEST2_F(L0DebuggerSimpleTest, givenUseCsrImmediateSubmissionDisabledCommandLis
NEO::GraphicsAllocation srcPtr(0, NEO::AllocationType::internalHostMemory,
reinterpret_cast<void *>(0x1234), size, 0, sizeof(uint32_t),
MemoryPool::System4KBPages, MemoryManager::maxOsContextCount);
MemoryPool::system4KBPages, MemoryManager::maxOsContextCount);
NEO::GraphicsAllocation dstPtr(0, NEO::AllocationType::internalHostMemory,
reinterpret_cast<void *>(0x2345), size, 0, sizeof(uint32_t),
MemoryPool::System4KBPages, MemoryManager::maxOsContextCount);
MemoryPool::system4KBPages, MemoryManager::maxOsContextCount);
auto result = commandList->appendPageFaultCopy(&dstPtr, &srcPtr, 0x100, false);
ASSERT_EQ(ZE_RESULT_SUCCESS, result);

2
level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_sba_tracking.cpp
View File

@@ -56,7 +56,7 @@ HWTEST_P(L0DebuggerParameterizedTests, givenL0DebuggerWhenCreatedThenPerContextS
allocations.push_back(sbaAllocation);
EXPECT_EQ(NEO::AllocationType::debugSbaTrackingBuffer, sbaAllocation->getAllocationType());
EXPECT_EQ(MemoryPool::System4KBPages, sbaAllocation->getMemoryPool());
EXPECT_EQ(MemoryPool::system4KBPages, sbaAllocation->getMemoryPool());
}
for (uint32_t i = 0; i < allocations.size() - 1; i++) {

2
level_zero/core/test/unit_tests/sources/driver/test_driver.cpp
View File

@@ -206,7 +206,7 @@ class MemoryManagerNTHandleMock : public NEO::OsAgnosticMemoryManager {
NEO::GraphicsAllocation *createGraphicsAllocationFromNTHandle(void *handle, uint32_t rootDeviceIndex, AllocationType allocType) override {
auto graphicsAllocation = createMemoryAllocation(allocType, nullptr, reinterpret_cast<void *>(1), 1,
4096u, reinterpret_cast<uint64_t>(handle), MemoryPool::SystemCpuInaccessible,
4096u, reinterpret_cast<uint64_t>(handle), MemoryPool::systemCpuInaccessible,
rootDeviceIndex, false, false, false);
graphicsAllocation->setSharedHandle(static_cast<osHandle>(reinterpret_cast<uint64_t>(handle)));
graphicsAllocation->set32BitAllocation(false);

2
level_zero/core/test/unit_tests/sources/helper/heap_assigner_l0_tests.cpp
View File

@@ -43,7 +43,7 @@ TEST_F(AlocationHelperTests, givenLinearStreamAllocationWhenSelectingHeapWithUse
DebugManagerStateRestore dbgRestorer;
debugManager.flags.UseExternalAllocatorForSshAndDsh.set(true);
std::unique_ptr<MemoryManagerMock> mockMemoryManager(new MemoryManagerMock(*device->getNEODevice()->getExecutionEnvironment()));
GraphicsAllocation allocation{0, AllocationType::linearStream, nullptr, 0, 0, MemoryPool::MemoryNull, MemoryManager::maxOsContextCount, 0llu};
GraphicsAllocation allocation{0, AllocationType::linearStream, nullptr, 0, 0, MemoryPool::memoryNull, MemoryManager::maxOsContextCount, 0llu};
allocation.set32BitAllocation(false);
EXPECT_EQ(MemoryManager::selectExternalHeap(allocation.isAllocatedInLocalMemoryPool()), mockMemoryManager->selectHeap(&allocation, false, false, false));

2
level_zero/core/test/unit_tests/sources/image/test_image.cpp
View File

@@ -361,7 +361,7 @@ class MemoryManagerNTHandleMock : public NEO::OsAgnosticMemoryManager {
NEO::GraphicsAllocation *createGraphicsAllocationFromNTHandle(void *handle, uint32_t rootDeviceIndex, AllocationType allocType) override {
auto graphicsAllocation = createMemoryAllocation(AllocationType::internalHostMemory, nullptr, reinterpret_cast<void *>(1), 1,
4096u, reinterpret_cast<uint64_t>(handle), MemoryPool::SystemCpuInaccessible,
4096u, reinterpret_cast<uint64_t>(handle), MemoryPool::systemCpuInaccessible,
rootDeviceIndex, false, false, false);
graphicsAllocation->setSharedHandle(static_cast<osHandle>(reinterpret_cast<uint64_t>(handle)));
graphicsAllocation->set32BitAllocation(false);

8
level_zero/core/test/unit_tests/sources/memory/linux/test_memory_linux.cpp
View File

@@ -110,7 +110,7 @@ class MemoryManagerIpcImplicitScalingObtainFdMock : public NEO::DrmMemoryManager
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
canonizedGpuAddress);
auto &drm = this->getDrm(0u);
alloc->bufferObjects[0] = mockBos.emplace_back(new MockBufferObject{properties.rootDeviceIndex, &drm}).get();
@@ -138,7 +138,7 @@ class MemoryManagerIpcImplicitScalingObtainFdMock : public NEO::DrmMemoryManager
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
canonizedGpuAddress);
auto &drm = this->getDrm(0u);
alloc->bufferObjects[0] = mockBos.emplace_back(new MockBufferObject{properties.rootDeviceIndex, &drm}).get();
@@ -526,7 +526,7 @@ class MemoryManagerIpcObtainFdMock : public NEO::DrmMemoryManager {
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
canonizedGpuAddress);
auto &drm = this->getDrm(0u);
alloc->bufferObjects[0] = mockBos.emplace_back(new MockBufferObject{properties.rootDeviceIndex, &drm}).get();
@@ -553,7 +553,7 @@ class MemoryManagerIpcObtainFdMock : public NEO::DrmMemoryManager {
ptr,
size,
0u,
MemoryPool::System4KBPages,
MemoryPool::system4KBPages,
canonizedGpuAddress);
auto &drm = this->getDrm(0u);
alloc->bufferObjects[0] = mockBos.emplace_back(new MockBufferObject{properties.rootDeviceIndex, &drm}).get();

6
level_zero/core/test/unit_tests/sources/memory/test_memory.cpp
View File

@@ -3160,7 +3160,7 @@ TEST_F(MemoryExportImportTest,
givenCallToMemAllocPropertiesWithExtendedExportPropertiesAndNoFdHandleThenErrorIsReturned) {
class ExportImportMockGraphicsAllocation : public NEO::MemoryAllocation {
public:
ExportImportMockGraphicsAllocation() : NEO::MemoryAllocation(0, AllocationType::buffer, nullptr, 0u, 0, MemoryPool::MemoryNull, MemoryManager::maxOsContextCount, 0llu) {}
ExportImportMockGraphicsAllocation() : NEO::MemoryAllocation(0, AllocationType::buffer, nullptr, 0u, 0, MemoryPool::memoryNull, MemoryManager::maxOsContextCount, 0llu) {}
int peekInternalHandle(NEO::MemoryManager *memoryManager, uint64_t &handle) override {
return -1;
@@ -3183,7 +3183,7 @@ TEST_F(MemoryExportImportTest,
givenCallToMemAllocPropertiesWithExtendedExportPropertiesAndNoFdHandleForWin32FormatThenErrorIsReturned) {
class ExportImportMockGraphicsAllocation : public NEO::MemoryAllocation {
public:
ExportImportMockGraphicsAllocation() : NEO::MemoryAllocation(0, AllocationType::buffer, nullptr, 0u, 0, MemoryPool::MemoryNull, MemoryManager::maxOsContextCount, 0llu) {}
ExportImportMockGraphicsAllocation() : NEO::MemoryAllocation(0, AllocationType::buffer, nullptr, 0u, 0, MemoryPool::memoryNull, MemoryManager::maxOsContextCount, 0llu) {}
int peekInternalHandle(NEO::MemoryManager *memoryManager, uint64_t &handle) override {
return -1;
@@ -5718,7 +5718,7 @@ TEST_F(MemAllocMultiSubDeviceTestsEnabledImplicitScaling, GivenImplicitScalingDi
class ExportImportMockGraphicsAllocation : public NEO::MemoryAllocation {
public:
ExportImportMockGraphicsAllocation() : NEO::MemoryAllocation(0, AllocationType::buffer, nullptr, 0u, 0, MemoryPool::MemoryNull, MemoryManager::maxOsContextCount, 0llu) {}
ExportImportMockGraphicsAllocation() : NEO::MemoryAllocation(0, AllocationType::buffer, nullptr, 0u, 0, MemoryPool::memoryNull, MemoryManager::maxOsContextCount, 0llu) {}
int peekInternalHandle(NEO::MemoryManager *memoryManager, uint64_t &handle) override {
return -1;

2
level_zero/core/test/unit_tests/sources/module/test_module.cpp
View File

@@ -3714,7 +3714,7 @@ TEST_F(ModuleTest, whenContainsStatefulAccessIsCalledThenResultIsCorrect) {
template <bool localMemEnabled>
struct ModuleIsaAllocationsFixture : public DeviceFixture {
static constexpr size_t isaAllocationPageSize = (localMemEnabled ? MemoryConstants::pageSize64k : MemoryConstants::pageSize);
static constexpr NEO::MemoryPool isaAllocationMemoryPool = (localMemEnabled ? NEO::MemoryPool::LocalMemory : NEO::MemoryPool::System4KBPagesWith32BitGpuAddressing);
static constexpr NEO::MemoryPool isaAllocationMemoryPool = (localMemEnabled ? NEO::MemoryPool::localMemory : NEO::MemoryPool::system4KBPagesWith32BitGpuAddressing);
void setUp() {
this->dbgRestorer = std::make_unique<DebugManagerStateRestore>();