Skip to content

Commit f50ca44

Browse files
jwarchulCompute-Runtime-Automation
jwarchul
authored and
Compute-Runtime-Automation
committed
refactor: cleanup includes
Signed-off-by: Jaroslaw Warchulski <[email protected]>
1 parent 8db9224 commit f50ca44

File tree

50 files changed

+354
-282
lines changed

Some content is hidden

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

50 files changed

+354
-282
lines changed

‎level_zero/core/source/context/context_imp.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,10 @@ ze_result_t ContextImp::allocHostMem(const ze_host_mem_alloc_desc_t *hostMemDesc
153153
return ZE_RESULT_SUCCESS;
154154
}
155155

156-
NEO::SVMAllocsManager::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory,
157-
alignment,
158-
this->rootDeviceIndices,
159-
this->deviceBitfields);
156+
NEO::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory,
157+
alignment,
158+
this->rootDeviceIndices,
159+
this->deviceBitfields);
160160

161161
if (hostMemDesc->flags & ZE_HOST_MEM_ALLOC_FLAG_BIAS_UNCACHED) {
162162
unifiedMemoryProperties.allocationFlags.flags.locallyUncachedResource = 1;
@@ -309,7 +309,7 @@ ze_result_t ContextImp::allocDeviceMem(ze_device_handle_t hDevice,
309309
}
310310

311311
deviceBitfields[rootDeviceIndex] = neoDevice->getDeviceBitfield();
312-
NEO::SVMAllocsManager::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::deviceUnifiedMemory, alignment, this->driverHandle->rootDeviceIndices, deviceBitfields);
312+
NEO::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::deviceUnifiedMemory, alignment, this->driverHandle->rootDeviceIndices, deviceBitfields);
313313
unifiedMemoryProperties.allocationFlags.flags.shareableWithoutNTHandle = 0;
314314
auto &productHelper = neoDevice->getProductHelper();
315315
if (NEO::debugManager.flags.EnableShareableWithoutNTHandle.get()) {
@@ -418,10 +418,10 @@ ze_result_t ContextImp::allocSharedMem(ze_device_handle_t hDevice,
418418
deviceBitfields[rootDeviceIndex] = neoDevice->getDeviceBitfield();
419419
}
420420

421-
NEO::SVMAllocsManager::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::sharedUnifiedMemory,
422-
alignment,
423-
this->rootDeviceIndices,
424-
deviceBitfields);
421+
NEO::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::sharedUnifiedMemory,
422+
alignment,
423+
this->rootDeviceIndices,
424+
deviceBitfields);
425425
unifiedMemoryProperties.device = unifiedMemoryPropertiesDevice;
426426

427427
if (deviceMemDesc->flags & ZE_DEVICE_MEM_ALLOC_FLAG_BIAS_UNCACHED) {

‎level_zero/core/source/device/device_imp.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1122,10 +1122,10 @@ ze_result_t DeviceImp::getGlobalTimestampsUsingSubmission(uint64_t *hostTimestam
11221122
std::map<uint32_t, NEO::DeviceBitfield> deviceBitfields;
11231123
deviceBitfields.insert({this->getNEODevice()->getRootDeviceIndex(), this->getNEODevice()->getDeviceBitfield()});
11241124

1125-
NEO::SVMAllocsManager::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory,
1126-
sizeof(uint64_t),
1127-
rootDeviceIndices,
1128-
deviceBitfields);
1125+
NEO::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory,
1126+
sizeof(uint64_t),
1127+
rootDeviceIndices,
1128+
deviceBitfields);
11291129

11301130
this->globalTimestampAllocation = this->getDriverHandle()->getSvmAllocsManager()->createHostUnifiedMemoryAllocation(sizeof(uint64_t),
11311131
unifiedMemoryProperties);

‎level_zero/core/source/driver/driver_handle_imp.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,8 @@ void DriverHandleImp::initHostUsmAllocPool() {
412412
usmHostMemAllocPoolManager.reset(new NEO::UsmMemAllocPoolsManager(InternalMemoryType::hostUnifiedMemory, rootDeviceIndices, deviceBitfields, nullptr));
413413
usmHostMemAllocPoolManager->initialize(this->svmAllocsManager);
414414
} else {
415-
NEO::SVMAllocsManager::UnifiedMemoryProperties memoryProperties(InternalMemoryType::hostUnifiedMemory, MemoryConstants::pageSize2M,
416-
rootDeviceIndices, deviceBitfields);
415+
NEO::UnifiedMemoryProperties memoryProperties(InternalMemoryType::hostUnifiedMemory, MemoryConstants::pageSize2M,
416+
rootDeviceIndices, deviceBitfields);
417417
usmHostMemAllocPool.reset(new NEO::UsmMemAllocPool);
418418
usmHostMemAllocPool->initialize(svmAllocsManager, memoryProperties, poolParams.poolSize, poolParams.minServicedSize, poolParams.maxServicedSize);
419419
}
@@ -428,10 +428,10 @@ void DriverHandleImp::initDeviceUsmAllocPool(NEO::Device &device, bool multiDevi
428428
auto &hwInfo = device.getHardwareInfo();
429429
auto &l0GfxCoreHelper = device.getRootDeviceEnvironment().getHelper<L0GfxCoreHelper>();
430430
const bool compressionEnabledByDefault = l0GfxCoreHelper.usmCompressionSupported(hwInfo) && l0GfxCoreHelper.forceDefaultUsmCompressionSupport();
431-
NEO::SVMAllocsManager::UnifiedMemoryProperties poolMemoryProperties(InternalMemoryType::deviceUnifiedMemory,
432-
MemoryConstants::pageSize2M,
433-
rootDeviceIndices,
434-
deviceBitfields);
431+
NEO::UnifiedMemoryProperties poolMemoryProperties(InternalMemoryType::deviceUnifiedMemory,
432+
MemoryConstants::pageSize2M,
433+
rootDeviceIndices,
434+
deviceBitfields);
435435
poolMemoryProperties.device = &device;
436436
poolMemoryProperties.allocationFlags.flags.compressedHint = compressionEnabledByDefault;
437437

‎level_zero/core/test/aub_tests/aub_hello_world_test.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ TEST_F(AUBHelloWorldL0, whenAppendMemoryCopyIsCalledThenMemoryIsProperlyCopied)
2626
uint8_t size = 8;
2727
uint8_t val = 255;
2828

29-
NEO::SVMAllocsManager::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory,
30-
1,
31-
context->rootDeviceIndices,
32-
context->deviceBitfields);
29+
NEO::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory,
30+
1,
31+
context->rootDeviceIndices,
32+
context->deviceBitfields);
3333

3434
auto srcMemory = driverHandle->svmAllocsManager->createHostUnifiedMemoryAllocation(size, unifiedMemoryProperties);
3535
auto dstMemory = driverHandle->svmAllocsManager->createHostUnifiedMemoryAllocation(size, unifiedMemoryProperties);

‎level_zero/core/test/aub_tests/bindless/bindless_kernel_aub_tests.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ HWTEST_F(L0BindlessAub, DISABLED_GivenBindlessKernelWhenExecutedThenOutputIsCorr
4444

4545
NEO::debugManager.flags.UpdateCrossThreadDataSize.set(true);
4646

47-
NEO::SVMAllocsManager::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory,
48-
1,
49-
context->rootDeviceIndices,
50-
context->deviceBitfields);
47+
NEO::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory,
48+
1,
49+
context->rootDeviceIndices,
50+
context->deviceBitfields);
5151

5252
auto bufferSrc = driverHandle->svmAllocsManager->createHostUnifiedMemoryAllocation(bufferSize, unifiedMemoryProperties);
5353
memset(bufferSrc, 55, bufferSize);

‎level_zero/core/test/aub_tests/cmdlist/cmdlist_aub_tests.cpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ TEST_F(AUBAppendKernelIndirectL0, whenAppendKernelIndirectThenGlobalWorkSizeIsPr
3838
groupSize[2] * groupCount[2]};
3939
uint8_t size = 3 * sizeof(uint32_t);
4040

41-
NEO::SVMAllocsManager::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory,
42-
1,
43-
context->rootDeviceIndices,
44-
context->deviceBitfields);
41+
NEO::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory,
42+
1,
43+
context->rootDeviceIndices,
44+
context->deviceBitfields);
4545

4646
auto pDispatchTraits = driverHandle->svmAllocsManager->createHostUnifiedMemoryAllocation(sizeof(ze_group_count_t), unifiedMemoryProperties);
4747

@@ -83,10 +83,10 @@ TEST_F(AUBAppendKernelIndirectL0, whenAppendKernelIndirectThenGroupCountIsProper
8383
const uint32_t groupCount[] = {4, 3, 1};
8484
uint8_t size = 3 * sizeof(uint32_t);
8585

86-
NEO::SVMAllocsManager::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory,
87-
1,
88-
context->rootDeviceIndices,
89-
context->deviceBitfields);
86+
NEO::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory,
87+
1,
88+
context->rootDeviceIndices,
89+
context->deviceBitfields);
9090

9191
auto pDispatchTraits = driverHandle->svmAllocsManager->createHostUnifiedMemoryAllocation(sizeof(ze_group_count_t), unifiedMemoryProperties);
9292

@@ -129,10 +129,10 @@ TEST_F(AUBAppendKernelIndirectL0, whenAppendMultipleKernelsIndirectThenGroupCoun
129129
const uint32_t groupCount2[] = {7, 6, 4};
130130
uint8_t size = 3 * sizeof(uint32_t);
131131

132-
NEO::SVMAllocsManager::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory,
133-
1,
134-
context->rootDeviceIndices,
135-
context->deviceBitfields);
132+
NEO::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory,
133+
1,
134+
context->rootDeviceIndices,
135+
context->deviceBitfields);
136136

137137
auto pDispatchTraits = driverHandle->svmAllocsManager->createHostUnifiedMemoryAllocation(2 * sizeof(ze_group_count_t), unifiedMemoryProperties);
138138

@@ -188,10 +188,10 @@ TEST_F(AUBAppendKernelIndirectL0, whenAppendMultipleKernelsIndirectThenGroupCoun
188188
}
189189

190190
TEST_F(AUBAppendKernelIndirectL0, whenAppendKernelIndirectThenWorkDimIsProperlyProgrammed) {
191-
NEO::SVMAllocsManager::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory,
192-
1,
193-
context->rootDeviceIndices,
194-
context->deviceBitfields);
191+
NEO::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory,
192+
1,
193+
context->rootDeviceIndices,
194+
context->deviceBitfields);
195195

196196
std::tuple<std::array<uint32_t, 3> /*groupSize*/, std::array<uint32_t, 3> /*groupCount*/, uint32_t /*expected workdim*/> testData[]{
197197
{{1, 1, 1}, {1, 1, 1}, 1},
@@ -369,10 +369,10 @@ HWTEST2_F(BcsSplitAubTests, whenAppendingCopyWithAggregatedEventThenEventIsSigna
369369
}
370370

371371
size_t bufferSize = whiteboxCmdList->minimalSizeForBcsSplit;
372-
NEO::SVMAllocsManager::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory,
373-
1,
374-
context->rootDeviceIndices,
375-
context->deviceBitfields);
372+
NEO::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory,
373+
1,
374+
context->rootDeviceIndices,
375+
context->deviceBitfields);
376376

377377
auto srcBuffer = driverHandle->svmAllocsManager->createHostUnifiedMemoryAllocation(bufferSize, unifiedMemoryProperties);
378378
auto dstBuffer1 = driverHandle->svmAllocsManager->createHostUnifiedMemoryAllocation(bufferSize, unifiedMemoryProperties);
@@ -438,10 +438,10 @@ HWTEST2_F(BcsSplitMultitileAubTests, whenAppendingCopyWithAggregatedEventThenEve
438438
EXPECT_TRUE(whiteboxCmdList->isBcsSplitNeeded);
439439

440440
size_t bufferSize = whiteboxCmdList->minimalSizeForBcsSplit;
441-
NEO::SVMAllocsManager::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory,
442-
1,
443-
context->rootDeviceIndices,
444-
context->deviceBitfields);
441+
NEO::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory,
442+
1,
443+
context->rootDeviceIndices,
444+
context->deviceBitfields);
445445

446446
auto srcBuffer = driverHandle->svmAllocsManager->createHostUnifiedMemoryAllocation(bufferSize, unifiedMemoryProperties);
447447
auto dstBuffer1 = driverHandle->svmAllocsManager->createHostUnifiedMemoryAllocation(bufferSize, unifiedMemoryProperties);

‎level_zero/core/test/aub_tests/cmdlist/multitile_aub_tests.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ HWTEST_F(SynchronizedDispatchMultiTileL0AubTests, givenFullSyncDispatchWhenExecu
8686

8787
constexpr uint8_t size = 3 * sizeof(uint32_t);
8888

89-
NEO::SVMAllocsManager::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory, 1, context->rootDeviceIndices, context->deviceBitfields);
89+
NEO::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory, 1, context->rootDeviceIndices, context->deviceBitfields);
9090

9191
auto outBuffer = driverHandle->svmAllocsManager->createHostUnifiedMemoryAllocation(size, unifiedMemoryProperties);
9292
memset(outBuffer, 0, size);
@@ -146,7 +146,7 @@ HWTEST2_F(CopyOffloadMultiTileL0AubTests, givenCopyOffloadCmdListWhenDispatching
146146
commandList->getCsr(true)->overrideDispatchPolicy(NEO::DispatchMode::immediateDispatch);
147147

148148
constexpr uint8_t size = 3 * sizeof(uint32_t);
149-
NEO::SVMAllocsManager::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory, 1, context->rootDeviceIndices, context->deviceBitfields);
149+
NEO::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory, 1, context->rootDeviceIndices, context->deviceBitfields);
150150
auto outBuffer = driverHandle->svmAllocsManager->createHostUnifiedMemoryAllocation(size, unifiedMemoryProperties);
151151
auto readBackBuffer = driverHandle->svmAllocsManager->createHostUnifiedMemoryAllocation(size, unifiedMemoryProperties);
152152

‎level_zero/core/test/aub_tests/debugger/debugger_aub_tests.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ HWTEST_F(DebuggerSingleAddressSpaceAub, GivenSingleAddressSpaceWhenCmdListIsExec
7878

7979
NEO::debugManager.flags.UpdateCrossThreadDataSize.set(true);
8080

81-
NEO::SVMAllocsManager::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory,
82-
1,
83-
context->rootDeviceIndices,
84-
context->deviceBitfields);
81+
NEO::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory,
82+
1,
83+
context->rootDeviceIndices,
84+
context->deviceBitfields);
8585

8686
auto bufferDst = driverHandle->svmAllocsManager->createHostUnifiedMemoryAllocation(bufferSize, unifiedMemoryProperties);
8787
memset(bufferDst, 0, bufferSize);
@@ -202,10 +202,10 @@ HWTEST2_F(DebuggerGlobalAllocatorAub, GivenKernelWithScratchWhenCmdListExecutedT
202202

203203
ASSERT_NE(nullptr, neoDevice->getBindlessHeapsHelper());
204204

205-
NEO::SVMAllocsManager::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory,
206-
1,
207-
context->rootDeviceIndices,
208-
context->deviceBitfields);
205+
NEO::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory,
206+
1,
207+
context->rootDeviceIndices,
208+
context->deviceBitfields);
209209

210210
auto bufferDst = driverHandle->svmAllocsManager->createHostUnifiedMemoryAllocation(bufferSize, unifiedMemoryProperties);
211211
memset(bufferDst, 0, bufferSize);

‎level_zero/core/test/unit_tests/mocks/mock_driver_handle.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h"
99

10+
#include "shared/source/memory_manager/unified_memory_properties.h"
1011
#include "shared/source/utilities/tag_allocator.h"
1112

1213
#include "level_zero/core/test/unit_tests/mocks/mock_device.h"
@@ -48,7 +49,7 @@ ze_result_t Mock<DriverHandle>::getDevice(uint32_t *pCount, ze_device_handle_t *
4849

4950
ze_result_t Mock<DriverHandle>::allocDeviceMem(ze_device_handle_t hDevice, const ze_device_mem_alloc_desc_t *deviceDesc,
5051
size_t size, size_t alignment, void **ptr) {
51-
NEO::SVMAllocsManager::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::deviceUnifiedMemory, alignment, rootDeviceIndices, deviceBitfields);
52+
NEO::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::deviceUnifiedMemory, alignment, rootDeviceIndices, deviceBitfields);
5253

5354
auto allocation = svmAllocsManager->createUnifiedMemoryAllocation(size, unifiedMemoryProperties);
5455

0 commit comments

Comments
 (0)