Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unlock resource to check for local memory 

Releted-To: NEO-4495

Change-Id: I55ec577154ed937d566acd53894ed77360c63df8
Signed-off-by: Slawomir Milczarek <slawomir.milczarek@intel.com>
This commit is contained in:
Slawomir Milczarek 2020-03-23 10:51:30 +01:00 committed by sys_ocldev
parent bbdeec80ff
commit 6f09eef35f
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp
View File

@ -2192,6 +2192,38 @@ TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenLockUnlockIsCalledButFails
mock->ioctl_res_ext = &mock->NONE;
}
TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenUnlockResourceIsCalledOnAllocationInLocalMemoryThenRedirectToUnlockResourceInLocalMemory) {
struct DrmMemoryManagerToTestUnlockResource : public DrmMemoryManager {
using DrmMemoryManager::unlockResourceImpl;
DrmMemoryManagerToTestUnlockResource(ExecutionEnvironment &executionEnvironment, bool localMemoryEnabled, size_t lockableLocalMemorySize)
: DrmMemoryManager(gemCloseWorkerMode::gemCloseWorkerInactive, false, false, executionEnvironment) {
}
void unlockResourceInLocalMemoryImpl(BufferObject *bo) override {
unlockResourceInLocalMemoryImplParam.bo = bo;
unlockResourceInLocalMemoryImplParam.called = true;
}
struct unlockResourceInLocalMemoryImplParamType {
BufferObject *bo = nullptr;
bool called = false;
} unlockResourceInLocalMemoryImplParam;
};
DrmMemoryManagerToTestUnlockResource drmMemoryManager(*executionEnvironment, true, MemoryConstants::pageSize);
DrmMockCustom drmMock;
struct BufferObjectMock : public BufferObject {
BufferObjectMock(Drm *drm) : BufferObject(drm, 1, 0) {}
};
auto bo = new BufferObjectMock(&drmMock);
auto drmAllocation = new DrmAllocation(0, GraphicsAllocation::AllocationType::UNKNOWN, bo, nullptr, 0u, (osHandle)0u, MemoryPool::LocalMemory);
drmMemoryManager.unlockResourceImpl(*drmAllocation);
EXPECT_TRUE(drmMemoryManager.unlockResourceInLocalMemoryImplParam.called);
EXPECT_EQ(bo, drmMemoryManager.unlockResourceInLocalMemoryImplParam.bo);
drmMemoryManager.freeGraphicsMemory(drmAllocation);
}
TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenSetDomainCpuIsCalledOnAllocationWithoutBufferObjectThenReturnFalse) {
DrmAllocation drmAllocation(0, GraphicsAllocation::AllocationType::UNKNOWN, nullptr, nullptr, 0, (osHandle)0u, MemoryPool::MemoryNull);
EXPECT_EQ(nullptr, drmAllocation.getBO());

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

@ -702,6 +702,10 @@ void *DrmMemoryManager::lockResourceImpl(GraphicsAllocation &graphicsAllocation)
}
void DrmMemoryManager::unlockResourceImpl(GraphicsAllocation &graphicsAllocation) {
if (MemoryPool::LocalMemory == graphicsAllocation.getMemoryPool()) {
return unlockResourceInLocalMemoryImpl(static_cast<DrmAllocation &>(graphicsAllocation).getBO());
}
auto cpuPtr = graphicsAllocation.getUnderlyingBuffer();
if (cpuPtr != nullptr) {
return;