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

[2/n] Optimize indirect calls.

Browse Source 
Migrate shared allocation when command list sets indirect flags.

Signed-off-by: Michal Mrozek <michal.mrozek@intel.com>
This commit is contained in:
Michal Mrozek
2022-01-25 10:26:22 +00:00
committed by Compute-Runtime-Automation
parent 3d9e1ea3a5
commit a12f9cb377
3 changed files with 59 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
level_zero/core/source/cmdlist/cmdlist.cpp
View File

@@ -160,6 +160,10 @@ void CommandList::migrateSharedAllocations() {
for (auto alloc : driverHandleImp->sharedMakeResidentAllocations) {
pageFaultManager->moveAllocationToGpuDomain(reinterpret_cast<void *>(alloc.second->getGpuAddress()));
}
if (this->unifiedMemoryControls.indirectSharedAllocationsAllowed) {
auto pageFaultManager = device->getDriverHandle()->getMemoryManager()->getPageFaultManager();
pageFaultManager->moveAllocationsWithinUMAllocsManagerToGpuDomain(this->device->getDriverHandle()->getSvmAllocsManager());
}
}
} // namespace L0

53
level_zero/core/test/unit_tests/sources/context/test_context.cpp
View File

@@ -18,6 +18,7 @@
#include "level_zero/core/source/image/image.h"
#include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
#include "level_zero/core/test/unit_tests/fixtures/host_pointer_manager_fixture.h"
#include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"
#include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h"
#include "gtest/gtest.h"
@@ -460,7 +461,11 @@ struct ContextMakeMemoryResidentAndMigrationTests : public ContextMakeMemoryResi
moveAllocationToGpuDomainCalledTimes++;
migratedAddress = ptr;
}
void moveAllocationsWithinUMAllocsManagerToGpuDomain(SVMAllocsManager *unifiedMemoryManager) override {
moveAllocationsWithinUMAllocsManagerToGpuDomainCalled++;
}
uint32_t moveAllocationToGpuDomainCalledTimes = 0;
uint32_t moveAllocationsWithinUMAllocsManagerToGpuDomainCalled = 0;
void *migratedAddress = nullptr;
};
@@ -548,7 +553,55 @@ HWTEST_F(ContextMakeMemoryResidentAndMigrationTests,
commandQueue->destroy();
context->freeMem(ptr);
}
HWTEST2_F(ContextMakeMemoryResidentAndMigrationTests,
whenExecutingKernelWithIndirectAccessThenSharedAllocationsAreMigrated, IsAtLeastSkl) {
DriverHandleImp *driverHandleImp = static_cast<DriverHandleImp *>(hostDriverHandle.get());
size_t previousSize = driverHandleImp->sharedMakeResidentAllocations.size();
mockMemoryInterface->makeResidentResult = NEO::MemoryOperationsStatus::SUCCESS;
ze_result_t res = context->makeMemoryResident(device, ptr, size);
EXPECT_EQ(ZE_RESULT_SUCCESS, res);
size_t currentSize = driverHandleImp->sharedMakeResidentAllocations.size();
EXPECT_EQ(previousSize + 1, currentSize);
const ze_command_queue_desc_t desc = {};
MockCsrHw2<FamilyType> csr(*neoDevice->getExecutionEnvironment(), 0, neoDevice->getDeviceBitfield());
csr.initializeTagAllocation();
csr.setupContext(*neoDevice->getDefaultEngine().osContext);
ze_result_t returnValue;
L0::CommandQueue *commandQueue = CommandQueue::create(productFamily,
device,
&csr,
&desc,
true,
false,
returnValue);
EXPECT_NE(nullptr, commandQueue);
EXPECT_EQ(mockPageFaultManager->moveAllocationToGpuDomainCalledTimes, 0u);
auto commandList = std::make_unique<WhiteBox<::L0::CommandListCoreFamily<gfxCoreFamily>>>();
commandList->initialize(device, NEO::EngineGroupType::Copy, 0u);
commandList->unifiedMemoryControls.indirectSharedAllocationsAllowed = true;
commandList->indirectAllocationsAllowed = true;
commandList->close();
auto commandListHandle = commandList->toHandle();
res = commandQueue->executeCommandLists(1, &commandListHandle, nullptr, true);
EXPECT_EQ(mockPageFaultManager->moveAllocationsWithinUMAllocsManagerToGpuDomainCalled, 1u);
mockMemoryInterface->evictResult = NEO::MemoryOperationsStatus::SUCCESS;
res = context->evictMemory(device, ptr, size);
EXPECT_EQ(ZE_RESULT_SUCCESS, res);
commandQueue->destroy();
context->freeMem(ptr);
}
HWTEST_F(ContextMakeMemoryResidentAndMigrationTests,
whenExecutingCommandListsWithNoMigrationThenMemoryFromMakeResidentIsNotMovedToGpu) {
DriverHandleImp *driverHandleImp = static_cast<DriverHandleImp *>(hostDriverHandle.get());