Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow debug allocs to use copyMemoryToAllocation

Browse Source 
Signed-off-by: Szymon Morek <szymon.morek@intel.com>
This commit is contained in:
Szymon Morek
2022-11-14 12:06:54 +00:00
committed by Compute-Runtime-Automation
parent 1e0a2b897f
commit 3281dea1fe
7 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
shared/source/memory_manager/graphics_allocation.h
View File

@ -212,6 +212,11 @@ class GraphicsAllocation : public IDNode<GraphicsAllocation> {
type == AllocationType::DEBUG_MODULE_AREA; type == AllocationType::DEBUG_MODULE_AREA;
} }
static bool isDebugSurfaceAllocationType(AllocationType type) {
return type == AllocationType::DEBUG_CONTEXT_SAVE_AREA ||
type == AllocationType::DEBUG_SBA_TRACKING_BUFFER;
}
void *getReservedAddressPtr() const { void *getReservedAddressPtr() const {
return this->reservedAddressRangeInfo.addressPtr; return this->reservedAddressRangeInfo.addressPtr;
} }

7
shared/source/memory_manager/memory_manager.cpp
View File

@ -426,8 +426,7 @@ bool MemoryManager::getAllocationData(AllocationData &allocationData, const Allo
allocationData.flags.multiOsContextCapable = properties.flags.multiOsContextCapable; allocationData.flags.multiOsContextCapable = properties.flags.multiOsContextCapable;
allocationData.usmInitialPlacement = properties.usmInitialPlacement; allocationData.usmInitialPlacement = properties.usmInitialPlacement;
if (properties.allocationType == AllocationType::DEBUG_CONTEXT_SAVE_AREA || if (GraphicsAllocation::isDebugSurfaceAllocationType(properties.allocationType)) {
properties.allocationType == AllocationType::DEBUG_SBA_TRACKING_BUFFER) {
allocationData.flags.zeroMemory = 1; allocationData.flags.zeroMemory = 1;
} }
@ -696,11 +695,11 @@ bool MemoryManager::copyMemoryToAllocation(GraphicsAllocation *graphicsAllocatio
if (!graphicsAllocation->getUnderlyingBuffer()) { if (!graphicsAllocation->getUnderlyingBuffer()) {
return false; return false;
} }
for (auto i = 0u; i < graphicsAllocation->storageInfo.getNumBanks(); ++i) { for (auto i = 0u; i < graphicsAllocation->storageInfo.getNumBanks(); ++i) {
memcpy_s(ptrOffset(static_cast<uint8_t *>(graphicsAllocation->getUnderlyingBuffer()) + i * graphicsAllocation->getUnderlyingBufferSize(), destinationOffset), memcpy_s(ptrOffset(static_cast<uint8_t *>(graphicsAllocation->getUnderlyingBuffer()) + i * graphicsAllocation->getUnderlyingBufferSize(), destinationOffset),
(graphicsAllocation->getUnderlyingBufferSize() - destinationOffset), memoryToCopy, sizeToCopy); (graphicsAllocation->getUnderlyingBufferSize() - destinationOffset), memoryToCopy, sizeToCopy);
if (graphicsAllocation->getAllocationType() != AllocationType::DEBUG_CONTEXT_SAVE_AREA && if (!GraphicsAllocation::isDebugSurfaceAllocationType(graphicsAllocation->getAllocationType())) {
graphicsAllocation->getAllocationType() != AllocationType::DEBUG_SBA_TRACKING_BUFFER) {
break; break;
} }
} }

6
shared/source/memory_manager/os_agnostic_memory_manager.cpp
View File

@ -77,8 +77,7 @@ GraphicsAllocation *OsAgnosticMemoryManager::allocateGraphicsMemoryWithAlignment
sizeAligned = alignUp(allocationData.size, MemoryConstants::pageSize2Mb); sizeAligned = alignUp(allocationData.size, MemoryConstants::pageSize2Mb);
} }
if (allocationData.type == AllocationType::DEBUG_CONTEXT_SAVE_AREA || if (GraphicsAllocation::isDebugSurfaceAllocationType(allocationData.type)) {
allocationData.type == AllocationType::DEBUG_SBA_TRACKING_BUFFER) {
sizeAligned *= allocationData.storageInfo.getNumBanks(); sizeAligned *= allocationData.storageInfo.getNumBanks();
} }
@ -104,8 +103,7 @@ GraphicsAllocation *OsAgnosticMemoryManager::allocateGraphicsMemoryWithAlignment
memoryAllocation->setCpuPtrAndGpuAddress(ptr, canonizedGpuAddress); memoryAllocation->setCpuPtrAndGpuAddress(ptr, canonizedGpuAddress);
} }
if (allocationData.type == AllocationType::DEBUG_CONTEXT_SAVE_AREA || if (GraphicsAllocation::isDebugSurfaceAllocationType(allocationData.type)) {
allocationData.type == AllocationType::DEBUG_SBA_TRACKING_BUFFER) {
memoryAllocation->storageInfo = allocationData.storageInfo; memoryAllocation->storageInfo = allocationData.storageInfo;
} }

6
shared/source/os_interface/linux/drm_memory_manager.cpp
View File

@ -296,8 +296,7 @@ GraphicsAllocation *DrmMemoryManager::createGraphicsAllocation(OsHandleStorage &
} }
GraphicsAllocation *DrmMemoryManager::allocateGraphicsMemoryWithAlignment(const AllocationData &allocationData) { GraphicsAllocation *DrmMemoryManager::allocateGraphicsMemoryWithAlignment(const AllocationData &allocationData) {
if ((allocationData.type == NEO::AllocationType::DEBUG_CONTEXT_SAVE_AREA || if (GraphicsAllocation::isDebugSurfaceAllocationType(allocationData.type) &&
allocationData.type == NEO::AllocationType::DEBUG_SBA_TRACKING_BUFFER) &&
allocationData.storageInfo.subDeviceBitfield.count() > 1) { allocationData.storageInfo.subDeviceBitfield.count() > 1) {
return createMultiHostAllocation(allocationData); return createMultiHostAllocation(allocationData);
} }
@ -1249,11 +1248,12 @@ uint64_t DrmMemoryManager::getLocalMemorySize(uint32_t rootDeviceIndex, uint32_t
} }
bool DrmMemoryManager::copyMemoryToAllocation(GraphicsAllocation *graphicsAllocation, size_t destinationOffset, const void *memoryToCopy, size_t sizeToCopy) { bool DrmMemoryManager::copyMemoryToAllocation(GraphicsAllocation *graphicsAllocation, size_t destinationOffset, const void *memoryToCopy, size_t sizeToCopy) {
if (graphicsAllocation->getUnderlyingBuffer() && graphicsAllocation->storageInfo.getNumBanks() == 1) { if (graphicsAllocation->getUnderlyingBuffer() && (graphicsAllocation->storageInfo.getNumBanks() == 1 || GraphicsAllocation::isDebugSurfaceAllocationType(graphicsAllocation->getAllocationType()))) {
return MemoryManager::copyMemoryToAllocation(graphicsAllocation, destinationOffset, memoryToCopy, sizeToCopy); return MemoryManager::copyMemoryToAllocation(graphicsAllocation, destinationOffset, memoryToCopy, sizeToCopy);
} }
return copyMemoryToAllocationBanks(graphicsAllocation, destinationOffset, memoryToCopy, sizeToCopy, maxNBitValue(graphicsAllocation->storageInfo.getNumBanks())); return copyMemoryToAllocationBanks(graphicsAllocation, destinationOffset, memoryToCopy, sizeToCopy, maxNBitValue(graphicsAllocation->storageInfo.getNumBanks()));
} }
bool DrmMemoryManager::copyMemoryToAllocationBanks(GraphicsAllocation *graphicsAllocation, size_t destinationOffset, const void *memoryToCopy, size_t sizeToCopy, DeviceBitfield handleMask) { bool DrmMemoryManager::copyMemoryToAllocationBanks(GraphicsAllocation *graphicsAllocation, size_t destinationOffset, const void *memoryToCopy, size_t sizeToCopy, DeviceBitfield handleMask) {
if (MemoryPoolHelper::isSystemMemoryPool(graphicsAllocation->getMemoryPool())) { if (MemoryPoolHelper::isSystemMemoryPool(graphicsAllocation->getMemoryPool())) {
return false; return false;

2
shared/source/os_interface/windows/wddm_memory_manager.cpp
View File

@ -927,7 +927,7 @@ bool WddmMemoryManager::isCpuCopyRequired(const void *ptr) {
} }
bool WddmMemoryManager::copyMemoryToAllocation(GraphicsAllocation *graphicsAllocation, size_t destinationOffset, const void *memoryToCopy, size_t sizeToCopy) { bool WddmMemoryManager::copyMemoryToAllocation(GraphicsAllocation *graphicsAllocation, size_t destinationOffset, const void *memoryToCopy, size_t sizeToCopy) {
if (graphicsAllocation->getUnderlyingBuffer()) { if (graphicsAllocation->getUnderlyingBuffer() && (graphicsAllocation->storageInfo.getNumBanks() == 1 || GraphicsAllocation::isDebugSurfaceAllocationType(graphicsAllocation->getAllocationType()))) {
return MemoryManager::copyMemoryToAllocation(graphicsAllocation, destinationOffset, memoryToCopy, sizeToCopy); return MemoryManager::copyMemoryToAllocation(graphicsAllocation, destinationOffset, memoryToCopy, sizeToCopy);
} }
return copyMemoryToAllocationBanks(graphicsAllocation, destinationOffset, memoryToCopy, sizeToCopy, maxNBitValue(graphicsAllocation->storageInfo.getNumBanks())); return copyMemoryToAllocationBanks(graphicsAllocation, destinationOffset, memoryToCopy, sizeToCopy, maxNBitValue(graphicsAllocation->storageInfo.getNumBanks()));

7
shared/test/common/os_interface/windows/mock_wddm_memory_manager.h
View File

@ -73,6 +73,11 @@ class MockWddmMemoryManager : public MemoryManagerCreate<WddmMemoryManager> {
BaseClass::freeGraphicsMemoryImpl(gfxAllocation); BaseClass::freeGraphicsMemoryImpl(gfxAllocation);
} }
bool copyMemoryToAllocationBanks(GraphicsAllocation *graphicsAllocation, size_t destinationOffset, const void *memoryToCopy, size_t sizeToCopy, DeviceBitfield handleMask) {
copyMemoryToAllocationBanksCalled++;
return BaseClass::copyMemoryToAllocationBanks(graphicsAllocation, destinationOffset, memoryToCopy, sizeToCopy, handleMask);
}
void freeGraphicsMemoryImpl(GraphicsAllocation *gfxAllocation, bool isImportedAllocation) override { void freeGraphicsMemoryImpl(GraphicsAllocation *gfxAllocation, bool isImportedAllocation) override {
BaseClass::freeGraphicsMemoryImpl(gfxAllocation, isImportedAllocation); BaseClass::freeGraphicsMemoryImpl(gfxAllocation, isImportedAllocation);
} }
@ -86,7 +91,7 @@ class MockWddmMemoryManager : public MemoryManagerCreate<WddmMemoryManager> {
registerAllocationInOsCalled++; registerAllocationInOsCalled++;
BaseClass::registerAllocationInOs(gfxAllocation); BaseClass::registerAllocationInOs(gfxAllocation);
} }
uint32_t copyMemoryToAllocationBanksCalled = 0u;
uint32_t freeGraphicsMemoryImplCalled = 0u; uint32_t freeGraphicsMemoryImplCalled = 0u;
uint32_t registerAllocationInOsCalled = 0; uint32_t registerAllocationInOsCalled = 0;
bool allocationGraphicsMemory64kbCreated = false; bool allocationGraphicsMemory64kbCreated = false;

21
shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_prelim_tests.cpp
View File

@ -1641,6 +1641,27 @@ TEST_F(DrmMemoryManagerCopyMemoryToAllocationPrelimTest, givenDrmMemoryManagerWh
drmMemoryManager.freeGraphicsMemory(allocation); drmMemoryManager.freeGraphicsMemory(allocation);
} }
TEST_F(DrmMemoryManagerCopyMemoryToAllocationPrelimTest, givenDrmMemoryManagerWhenCopyDebugSurfaceToMultiTileAllocationThenCallCopyMemoryToAllocation) {
size_t sourceAllocationSize = MemoryConstants::pageSize;
size_t destinationAllocationSize = sourceAllocationSize;
DrmMemoryManagerToTestCopyMemoryToAllocation drmMemoryManager(*executionEnvironment, true, destinationAllocationSize);
std::vector<uint8_t> dataToCopy(sourceAllocationSize, 1u);
AllocationType debugSurfaces[] = {AllocationType::DEBUG_CONTEXT_SAVE_AREA, AllocationType::DEBUG_SBA_TRACKING_BUFFER};
for (auto type : debugSurfaces) {
AllocationProperties debugSurfaceProperties{0, true, sourceAllocationSize, type, false, false, 0b11};
auto allocation = memoryManager->allocateGraphicsMemoryWithProperties(debugSurfaceProperties);
ASSERT_NE(nullptr, allocation);
auto ret = drmMemoryManager.copyMemoryToAllocation(allocation, 0, dataToCopy.data(), dataToCopy.size());
EXPECT_TRUE(ret);
EXPECT_EQ(0u, drmMemoryManager.copyMemoryToAllocationBanksCalled);
drmMemoryManager.freeGraphicsMemory(allocation);
}
}
TEST_F(DrmMemoryManagerCopyMemoryToAllocationPrelimTest, givenDrmMemoryManagerWhenCopyMemoryToAllocationFailsToLockResourceThenItReturnsFalse) { TEST_F(DrmMemoryManagerCopyMemoryToAllocationPrelimTest, givenDrmMemoryManagerWhenCopyMemoryToAllocationFailsToLockResourceThenItReturnsFalse) {
DrmMemoryManagerToTestCopyMemoryToAllocation drmMemoryManager(*executionEnvironment, true, 0); DrmMemoryManagerToTestCopyMemoryToAllocation drmMemoryManager(*executionEnvironment, true, 0);
std::vector<uint8_t> dataToCopy(MemoryConstants::pageSize, 1u); std::vector<uint8_t> dataToCopy(MemoryConstants::pageSize, 1u);