intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-21 09:14:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Set allocation's lock state only in lockResource and unlockResource methods

Browse Source 
Change-Id: I60f35801287166f5bdb0dfcd31ff0118c56ec22a
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2019-01-24 11:51:33 +01:00
committed by sys_ocldev
parent 09c62ca44c
commit f332bf369e
20 changed files with 161 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
unit_tests/memory_manager/memory_manager_tests.cpp
View File

@@ -122,26 +122,6 @@ TEST(GraphicsAllocationTest, setSize) {
EXPECT_EQ(size, gfxAllocation.getUnderlyingBufferSize());
}
TEST(GraphicsAllocationTest, GivenGraphicsAllocationWhenLockingThenIsLocked) {
void *cpuPtr = (void *)0x30000;
uint64_t gpuAddr = 0x30000;
uint64_t gpuBaseAddr = 0x10000;
size_t size = 0x1000;
GraphicsAllocation gfxAllocation(cpuPtr, gpuAddr, gpuBaseAddr, size, 1u, false);
gfxAllocation.setLocked(false);
EXPECT_FALSE(gfxAllocation.isLocked());
gfxAllocation.setLocked(true);
EXPECT_TRUE(gfxAllocation.isLocked());
gfxAllocation.setCpuPtrAndGpuAddress(cpuPtr, gpuAddr);
cpuPtr = gfxAllocation.getUnderlyingBuffer();
EXPECT_NE(nullptr, cpuPtr);
gpuAddr = gfxAllocation.getGpuAddress();
EXPECT_NE(0ULL, gpuAddr);
}
TEST_F(MemoryAllocatorTest, allocateSystem) {
auto ptr = memoryManager->allocateSystemMemory(sizeof(char), 0);
EXPECT_NE(nullptr, ptr);
@@ -810,9 +790,12 @@ TEST(OsAgnosticMemoryManager, givenMemoryManagerWhenLockUnlockCalledThenReturnCp
auto allocation = memoryManager.allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize});
ASSERT_NE(nullptr, allocation);
EXPECT_FALSE(allocation->isLocked());
auto ptr = memoryManager.lockResource(allocation);
EXPECT_EQ(ptrOffset(allocation->getUnderlyingBuffer(), static_cast<size_t>(allocation->allocationOffset)), ptr);
EXPECT_TRUE(allocation->isLocked());
memoryManager.unlockResource(allocation);
EXPECT_FALSE(allocation->isLocked());
memoryManager.freeGraphicsMemory(allocation);
}