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

refactor graphics allocation structure elements for sub-allocation properties

Browse Source 
Resolves:  LOCI-3772

Signed-off-by: John Falkowski <john.falkowski@intel.com>
This commit is contained in:
John Falkowski
2023-04-06 22:35:11 +00:00
committed by Compute-Runtime-Automation
parent 66c19c7749
commit e056082710
8 changed files with 70 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
level_zero/core/source/context/context_imp.cpp
View File

@@ -679,7 +679,7 @@ ze_result_t ContextImp::handleAllocationExtensions(NEO::GraphicsAllocation *allo
}
exportStructure->handle = reinterpret_cast<void *>(handle);
} else if (extendedProperties->stype == ZE_STRUCTURE_TYPE_MEMORY_SUB_ALLOCATIONS_EXP_PROPERTIES) {
if (alloc->isSubAllocSet) {
if (alloc->getNumHandles()) {
ze_memory_sub_allocations_exp_properties_t *extendedSubAllocProperties =
reinterpret_cast<ze_memory_sub_allocations_exp_properties_t *>(extendedProperties);
if (extendedSubAllocProperties->pCount) {
@@ -690,8 +690,8 @@ ze_result_t ContextImp::handleAllocationExtensions(NEO::GraphicsAllocation *allo
}
if (extendedSubAllocProperties->pSubAllocations) {
for (uint32_t i = 0; i < *extendedSubAllocProperties->pCount; i++) {
extendedSubAllocProperties->pSubAllocations[i].base = reinterpret_cast<void *>(alloc->subAllocBase[i]);
extendedSubAllocProperties->pSubAllocations[i].size = alloc->subAllocSize[i];
extendedSubAllocProperties->pSubAllocations[i].base = reinterpret_cast<void *>(alloc->getHandleAddressBase(i));
extendedSubAllocProperties->pSubAllocations[i].size = alloc->getHandleSize(i);
}
// If pSubAllocations nullptr, then user getting Count first and calling second time
}

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

@@ -2606,7 +2606,16 @@ struct SingleSubAllocMockGraphicsAllocation : public NEO::MockGraphicsAllocation
uint32_t getNumHandles() override {
return 1;
}
uint64_t getHandleAddressBase(uint32_t handleIndex) override {
return 0lu;
}
size_t getHandleSize(uint32_t handleIndex) override {
return 1000lu;
}
};
TEST_F(MemoryExportImportTest,
givenCallToMemAllocPropertiesWithExtendedExportPropertiesAndGetSingleSubAllocation) {
@@ -2619,10 +2628,6 @@ TEST_F(MemoryExportImportTest,
subAllocationDesc.stype = ZE_STRUCTURE_TYPE_MEMORY_SUB_ALLOCATIONS_EXP_PROPERTIES;
subAllocationDesc.pCount = &numberOfSubAllocations;
memoryProperties.pNext = &subAllocationDesc;
alloc->subAllocSize[0] = MemoryConstants::pageSize64k;
alloc->subAllocBase[0] = 0;
alloc->isSubAllocSet = true;
ze_memory_type_t type = ZE_MEMORY_TYPE_DEVICE;
ze_result_t result = context->handleAllocationExtensions(alloc, type, &subAllocationDesc, driverHandle.get());
@@ -2633,8 +2638,8 @@ TEST_F(MemoryExportImportTest,
result = context->handleAllocationExtensions(alloc, type, &subAllocationDesc, driverHandle.get());
EXPECT_EQ(ZE_RESULT_SUCCESS, result);
EXPECT_EQ(1u, numberOfSubAllocations);
EXPECT_EQ(alloc->subAllocSize[0], subAllocationMemAllocProperties[0].size);
EXPECT_EQ(alloc->subAllocBase[0], reinterpret_cast<uint64_t>(subAllocationMemAllocProperties[0].base));
EXPECT_EQ(1000lu, subAllocationMemAllocProperties[0].size);
EXPECT_EQ(0lu, reinterpret_cast<uint64_t>(subAllocationMemAllocProperties[0].base));
delete alloc;
}
@@ -2644,7 +2649,16 @@ struct SubAllocMockGraphicsAllocation : public NEO::MockGraphicsAllocation {
uint32_t getNumHandles() override {
return 4;
}
uint64_t getHandleAddressBase(uint32_t handleIndex) override {
return (handleIndex * MemoryConstants::pageSize64k);
}
size_t getHandleSize(uint32_t handleIndex) override {
return MemoryConstants::pageSize64k;
}
};
TEST_F(MemoryExportImportTest,
givenCallToMemAllocPropertiesWithExtendedExportPropertiesAndGetSubAllocations) {
@@ -2658,15 +2672,6 @@ TEST_F(MemoryExportImportTest,
subAllocationDesc.pCount = &numberOfSubAllocations;
memoryProperties.pNext = &subAllocationDesc;
uint64_t baseAddress = 0;
size_t size = MemoryConstants::pageSize64k;
for (uint32_t i = 0; i < alloc->getNumHandles(); i++) {
alloc->subAllocSize[i] = size;
alloc->subAllocBase[i] = baseAddress;
baseAddress += size;
}
alloc->isSubAllocSet = true;
ze_memory_type_t type = ZE_MEMORY_TYPE_DEVICE;
ze_result_t result = context->handleAllocationExtensions(alloc, type, &subAllocationDesc, driverHandle.get());
@@ -2679,17 +2684,33 @@ TEST_F(MemoryExportImportTest,
EXPECT_EQ(4u, numberOfSubAllocations);
for (uint32_t i = 0; i < numberOfSubAllocations; i++) {
EXPECT_EQ(alloc->subAllocSize[i], subAllocationMemAllocProperties[i].size);
EXPECT_EQ(alloc->subAllocBase[i], reinterpret_cast<uint64_t>(subAllocationMemAllocProperties[i].base));
EXPECT_EQ(MemoryConstants::pageSize64k, subAllocationMemAllocProperties[i].size);
EXPECT_EQ(i * MemoryConstants::pageSize64k, reinterpret_cast<uint64_t>(subAllocationMemAllocProperties[i].base));
}
delete alloc;
}
struct NoSubAllocMockGraphicsAllocation : public NEO::MockGraphicsAllocation {
using NEO::MockGraphicsAllocation::MockGraphicsAllocation;
uint32_t getNumHandles() override {
return 0;
}
uint64_t getHandleAddressBase(uint32_t handleIndex) override {
return 0lu;
}
size_t getHandleSize(uint32_t handleIndex) override {
return 0lu;
}
};
TEST_F(MemoryExportImportTest,
givenCallToMemAllocPropertiesWithExtendedExportPropertiesAndUnsetFlagAndGetReturnError) {
char buffer[256];
auto alloc = new SubAllocMockGraphicsAllocation(&buffer, sizeof(buffer));
auto alloc = new NoSubAllocMockGraphicsAllocation(&buffer, sizeof(buffer));
ze_memory_allocation_properties_t memoryProperties = {};
ze_memory_sub_allocations_exp_properties_t subAllocationDesc{};
@@ -2698,15 +2719,6 @@ TEST_F(MemoryExportImportTest,
subAllocationDesc.pCount = &numberOfSubAllocations;
memoryProperties.pNext = &subAllocationDesc;
uint64_t baseAddress = 0;
size_t size = MemoryConstants::pageSize64k;
for (uint32_t i = 0; i < alloc->getNumHandles(); i++) {
alloc->subAllocSize[i] = size;
alloc->subAllocBase[i] = baseAddress;
baseAddress += size;
}
alloc->isSubAllocSet = false;
ze_memory_type_t type = ZE_MEMORY_TYPE_DEVICE;
ze_result_t result = context->handleAllocationExtensions(alloc, type, &subAllocationDesc, driverHandle.get());
@@ -2725,15 +2737,6 @@ TEST_F(MemoryExportImportTest,
subAllocationDesc.stype = ZE_STRUCTURE_TYPE_MEMORY_SUB_ALLOCATIONS_EXP_PROPERTIES;
memoryProperties.pNext = &subAllocationDesc;
uint64_t baseAddress = 0;
size_t size = MemoryConstants::pageSize64k;
for (uint32_t i = 0; i < alloc->getNumHandles(); i++) {
alloc->subAllocSize[i] = size;
alloc->subAllocBase[i] = baseAddress;
baseAddress += size;
}
alloc->isSubAllocSet = true;
ze_memory_type_t type = ZE_MEMORY_TYPE_DEVICE;
ze_result_t result = context->handleAllocationExtensions(alloc, type, &subAllocationDesc, driverHandle.get());