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

Use wrapper instead of manual restore. 

Change-Id: If394797132d67c7b36a29d42cf6f6d9809baf2c2
This commit is contained in:
Mrozek, Michal 2018-12-14 14:02:10 +01:00 committed by sys_ocldev
parent 1fccbe3c04
commit d1a80db2f2
1 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
unit_tests/os_interface/linux/drm_memory_manager_tests.cpp
View File

@ -2078,7 +2078,7 @@ TEST_F(DrmMemoryManagerWithExplicitExpectationsTest, givenDefaultDrmMemoryManage
} }
TEST(Allocator32BitUsingHeapAllocator, given32BitAllocatorWhenMMapFailsThenNullptrIsReturned) { TEST(Allocator32BitUsingHeapAllocator, given32BitAllocatorWhenMMapFailsThenNullptrIsReturned) {
bool flagToRestore = DebugManager.flags.UseNewHeapAllocator.get(); DebugManagerStateRestore restore;
DebugManager.flags.UseNewHeapAllocator.set(true); DebugManager.flags.UseNewHeapAllocator.set(true);
mockAllocator32Bit::resetState(); mockAllocator32Bit::resetState();
@ -2092,11 +2092,10 @@ TEST(Allocator32BitUsingHeapAllocator, given32BitAllocatorWhenMMapFailsThenNullp
EXPECT_EQ(0llu, ptr); EXPECT_EQ(0llu, ptr);
EXPECT_EQ(2u, mmapCallCount); EXPECT_EQ(2u, mmapCallCount);
delete mock32BitAllocator; delete mock32BitAllocator;
DebugManager.flags.UseNewHeapAllocator.set(flagToRestore);
} }
TEST(Allocator32BitUsingHeapAllocator, given32BitAllocatorWhenFirstMMapFailsThenSecondIsCalledWithSmallerSize) { TEST(Allocator32BitUsingHeapAllocator, given32BitAllocatorWhenFirstMMapFailsThenSecondIsCalledWithSmallerSize) {
bool flagToRestore = DebugManager.flags.UseNewHeapAllocator.get(); DebugManagerStateRestore restore;
DebugManager.flags.UseNewHeapAllocator.set(true); DebugManager.flags.UseNewHeapAllocator.set(true);
mockAllocator32Bit::resetState(); mockAllocator32Bit::resetState();
@ -2114,11 +2113,10 @@ TEST(Allocator32BitUsingHeapAllocator, given32BitAllocatorWhenFirstMMapFailsThen
EXPECT_NE(0u, osInternals->heapSize); EXPECT_NE(0u, osInternals->heapSize);
delete mock32BitAllocator; delete mock32BitAllocator;
DebugManager.flags.UseNewHeapAllocator.set(flagToRestore);
} }
TEST(DrmAllocator32Bit, allocateReturnsPointer) { TEST(DrmAllocator32Bit, allocateReturnsPointer) {
bool flagToRestore = DebugManager.flags.UseNewHeapAllocator.get(); DebugManagerStateRestore restore;
DebugManager.flags.UseNewHeapAllocator.set(false); DebugManager.flags.UseNewHeapAllocator.set(false);
mockAllocator32Bit mock32BitAllocator; mockAllocator32Bit mock32BitAllocator;
@ -2127,35 +2125,30 @@ TEST(DrmAllocator32Bit, allocateReturnsPointer) {
EXPECT_NE(0u, (uintptr_t)ptr); EXPECT_NE(0u, (uintptr_t)ptr);
EXPECT_EQ(1u, mmapCallCount); EXPECT_EQ(1u, mmapCallCount);
mock32BitAllocator.free(ptr, size); mock32BitAllocator.free(ptr, size);
DebugManager.flags.UseNewHeapAllocator.set(flagToRestore);
} }
TEST(DrmAllocator32Bit, freeMapFailedPointer) { TEST(DrmAllocator32Bit, freeMapFailedPointer) {
bool flagToRestore = DebugManager.flags.UseNewHeapAllocator.get(); DebugManagerStateRestore restore;
DebugManager.flags.UseNewHeapAllocator.set(false); DebugManager.flags.UseNewHeapAllocator.set(false);
mockAllocator32Bit mock32BitAllocator; mockAllocator32Bit mock32BitAllocator;
size_t size = 100u; size_t size = 100u;
int result = mock32BitAllocator.free(reinterpret_cast<uint64_t>(MAP_FAILED), size); int result = mock32BitAllocator.free(reinterpret_cast<uint64_t>(MAP_FAILED), size);
EXPECT_EQ(0, result); EXPECT_EQ(0, result);
DebugManager.flags.UseNewHeapAllocator.set(flagToRestore);
} }
TEST(DrmAllocator32Bit, freeNullPtrPointer) { TEST(DrmAllocator32Bit, freeNullPtrPointer) {
bool flagToRestore = DebugManager.flags.UseNewHeapAllocator.get(); DebugManagerStateRestore restore;
DebugManager.flags.UseNewHeapAllocator.set(false); DebugManager.flags.UseNewHeapAllocator.set(false);
mockAllocator32Bit mock32BitAllocator; mockAllocator32Bit mock32BitAllocator;
uint32_t size = 100u; uint32_t size = 100u;
int result = mock32BitAllocator.free(0llu, size); int result = mock32BitAllocator.free(0llu, size);
EXPECT_EQ(0, result); EXPECT_EQ(0, result);
DebugManager.flags.UseNewHeapAllocator.set(flagToRestore);
} }
TEST(DrmAllocator32Bit, freeLowerRangeAfterTwoMmapFails) { TEST(DrmAllocator32Bit, freeLowerRangeAfterTwoMmapFails) {
bool flagToRestore = DebugManager.flags.UseNewHeapAllocator.get(); DebugManagerStateRestore restore;
DebugManager.flags.UseNewHeapAllocator.set(false); DebugManager.flags.UseNewHeapAllocator.set(false);
mockAllocator32Bit mock32BitAllocator; mockAllocator32Bit mock32BitAllocator;
@ -2165,11 +2158,10 @@ TEST(DrmAllocator32Bit, freeLowerRangeAfterTwoMmapFails) {
EXPECT_EQ(3u, mmapCallCount); EXPECT_EQ(3u, mmapCallCount);
int result = mock32BitAllocator.free(ptr, size); int result = mock32BitAllocator.free(ptr, size);
EXPECT_EQ(0, result); EXPECT_EQ(0, result);
DebugManager.flags.UseNewHeapAllocator.set(flagToRestore);
} }
TEST(DrmAllocator32Bit, given32BitAllocatorWhenMMapFailsThenUpperHeapIsBrowsedForAllocations) { TEST(DrmAllocator32Bit, given32BitAllocatorWhenMMapFailsThenUpperHeapIsBrowsedForAllocations) {
bool flagToRestore = DebugManager.flags.UseNewHeapAllocator.get(); DebugManagerStateRestore restore;
DebugManager.flags.UseNewHeapAllocator.set(false); DebugManager.flags.UseNewHeapAllocator.set(false);
mockAllocator32Bit mock32BitAllocator; mockAllocator32Bit mock32BitAllocator;
@ -2178,11 +2170,10 @@ TEST(DrmAllocator32Bit, given32BitAllocatorWhenMMapFailsThenUpperHeapIsBrowsedFo
auto ptr = mock32BitAllocator.allocate(size); auto ptr = mock32BitAllocator.allocate(size);
EXPECT_EQ(maxMmap32BitAddress, (uintptr_t)ptr); EXPECT_EQ(maxMmap32BitAddress, (uintptr_t)ptr);
EXPECT_EQ(2u, mmapCallCount); EXPECT_EQ(2u, mmapCallCount);
DebugManager.flags.UseNewHeapAllocator.set(flagToRestore);
} }
TEST(DrmAllocator32Bit, given32BitAllocatorWith32AndUpperHeapsExhaustedThenPointerFromLowerHeapIsReturned) { TEST(DrmAllocator32Bit, given32BitAllocatorWith32AndUpperHeapsExhaustedThenPointerFromLowerHeapIsReturned) {
bool flagToRestore = DebugManager.flags.UseNewHeapAllocator.get(); DebugManagerStateRestore restore;
DebugManager.flags.UseNewHeapAllocator.set(false); DebugManager.flags.UseNewHeapAllocator.set(false);
mockAllocator32Bit mock32BitAllocator; mockAllocator32Bit mock32BitAllocator;
@ -2192,11 +2183,10 @@ TEST(DrmAllocator32Bit, given32BitAllocatorWith32AndUpperHeapsExhaustedThenPoint
auto ptr = mock32BitAllocator.allocate(size); auto ptr = mock32BitAllocator.allocate(size);
EXPECT_EQ(lowerRangeStart, (uintptr_t)ptr); EXPECT_EQ(lowerRangeStart, (uintptr_t)ptr);
EXPECT_EQ(3u, mmapCallCount); EXPECT_EQ(3u, mmapCallCount);
DebugManager.flags.UseNewHeapAllocator.set(flagToRestore);
} }
TEST(DrmAllocator32Bit, given32bitRegionExhaustedWhenTwoAllocationsAreCreatedThenSecondIsAfterFirst) { TEST(DrmAllocator32Bit, given32bitRegionExhaustedWhenTwoAllocationsAreCreatedThenSecondIsAfterFirst) {
bool flagToRestore = DebugManager.flags.UseNewHeapAllocator.get(); DebugManagerStateRestore restore;
DebugManager.flags.UseNewHeapAllocator.set(false); DebugManager.flags.UseNewHeapAllocator.set(false);
mockAllocator32Bit mock32BitAllocator; mockAllocator32Bit mock32BitAllocator;
@ -2219,11 +2209,10 @@ TEST(DrmAllocator32Bit, given32bitRegionExhaustedWhenTwoAllocationsAreCreatedThe
EXPECT_EQ(ptr, getInternals->upperRangeAddress); EXPECT_EQ(ptr, getInternals->upperRangeAddress);
EXPECT_EQ(2u, unmapCallCount); EXPECT_EQ(2u, unmapCallCount);
DebugManager.flags.UseNewHeapAllocator.set(flagToRestore);
} }
TEST(DrmAllocator32Bit, given32bitRegionAndUpperRegionExhaustedWhenTwoAllocationsAreCreatedThenSecondIsAfterFirst) { TEST(DrmAllocator32Bit, given32bitRegionAndUpperRegionExhaustedWhenTwoAllocationsAreCreatedThenSecondIsAfterFirst) {
bool flagToRestore = DebugManager.flags.UseNewHeapAllocator.get(); DebugManagerStateRestore restore;
DebugManager.flags.UseNewHeapAllocator.set(false); DebugManager.flags.UseNewHeapAllocator.set(false);
mockAllocator32Bit mock32BitAllocator; mockAllocator32Bit mock32BitAllocator;
@ -2247,11 +2236,10 @@ TEST(DrmAllocator32Bit, given32bitRegionAndUpperRegionExhaustedWhenTwoAllocation
EXPECT_EQ(ptr, getInternals->lowerRangeAddress); EXPECT_EQ(ptr, getInternals->lowerRangeAddress);
EXPECT_EQ(4u, unmapCallCount); EXPECT_EQ(4u, unmapCallCount);
DebugManager.flags.UseNewHeapAllocator.set(flagToRestore);
} }
TEST(DrmAllocator32Bit, given32bitAllocatorWithAllHeapsExhaustedWhenAskedForAllocationThenNullptrIsReturned) { TEST(DrmAllocator32Bit, given32bitAllocatorWithAllHeapsExhaustedWhenAskedForAllocationThenNullptrIsReturned) {
bool flagToRestore = DebugManager.flags.UseNewHeapAllocator.get(); DebugManagerStateRestore restore;
DebugManager.flags.UseNewHeapAllocator.set(false); DebugManager.flags.UseNewHeapAllocator.set(false);
mockAllocator32Bit mock32BitAllocator; mockAllocator32Bit mock32BitAllocator;
@ -2266,11 +2254,10 @@ TEST(DrmAllocator32Bit, given32bitAllocatorWithAllHeapsExhaustedWhenAskedForAllo
EXPECT_EQ(3u, mmapCallCount); EXPECT_EQ(3u, mmapCallCount);
EXPECT_EQ(2u, unmapCallCount); EXPECT_EQ(2u, unmapCallCount);
DebugManager.flags.UseNewHeapAllocator.set(flagToRestore);
} }
TEST(DrmAllocator32Bit, given32bitAllocatorWithUpperHeapCloseToFullWhenAskedForAllocationThenAllocationFromLowerHeapIsReturned) { TEST(DrmAllocator32Bit, given32bitAllocatorWithUpperHeapCloseToFullWhenAskedForAllocationThenAllocationFromLowerHeapIsReturned) {
bool flagToRestore = DebugManager.flags.UseNewHeapAllocator.get(); DebugManagerStateRestore restore;
DebugManager.flags.UseNewHeapAllocator.set(false); DebugManager.flags.UseNewHeapAllocator.set(false);
mockAllocator32Bit mock32BitAllocator; mockAllocator32Bit mock32BitAllocator;
@ -2282,27 +2269,24 @@ TEST(DrmAllocator32Bit, given32bitAllocatorWithUpperHeapCloseToFullWhenAskedForA
EXPECT_EQ(lowerRangeHeapStart, (uintptr_t)ptr); EXPECT_EQ(lowerRangeHeapStart, (uintptr_t)ptr);
EXPECT_EQ(3u, mmapCallCount); EXPECT_EQ(3u, mmapCallCount);
EXPECT_EQ(1u, unmapCallCount); EXPECT_EQ(1u, unmapCallCount);
DebugManager.flags.UseNewHeapAllocator.set(flagToRestore);
} }
TEST(DrmAllocator32Bit, givenMapFailedAsInputToFreeFunctionWhenItIsCalledThenUnmapIsNotCalled) { TEST(DrmAllocator32Bit, givenMapFailedAsInputToFreeFunctionWhenItIsCalledThenUnmapIsNotCalled) {
bool flagToRestore = DebugManager.flags.UseNewHeapAllocator.get(); DebugManagerStateRestore restore;
DebugManager.flags.UseNewHeapAllocator.set(false); DebugManager.flags.UseNewHeapAllocator.set(false);
mockAllocator32Bit mock32BitAllocator; mockAllocator32Bit mock32BitAllocator;
mock32BitAllocator.free(reinterpret_cast<uint64_t>(MAP_FAILED), 100u); mock32BitAllocator.free(reinterpret_cast<uint64_t>(MAP_FAILED), 100u);
EXPECT_EQ(0u, unmapCallCount); EXPECT_EQ(0u, unmapCallCount);
DebugManager.flags.UseNewHeapAllocator.set(flagToRestore);
} }
TEST(DrmAllocator32Bit, givenNullptrAsInputToFreeFunctionWhenItIsCalledThenUnmapIsNotCalled) { TEST(DrmAllocator32Bit, givenNullptrAsInputToFreeFunctionWhenItIsCalledThenUnmapIsNotCalled) {
bool flagToRestore = DebugManager.flags.UseNewHeapAllocator.get(); DebugManagerStateRestore restore;
DebugManager.flags.UseNewHeapAllocator.set(false); DebugManager.flags.UseNewHeapAllocator.set(false);
mockAllocator32Bit mock32BitAllocator; mockAllocator32Bit mock32BitAllocator;
mock32BitAllocator.free(0llu, 100u); mock32BitAllocator.free(0llu, 100u);
EXPECT_EQ(0u, unmapCallCount); EXPECT_EQ(0u, unmapCallCount);
DebugManager.flags.UseNewHeapAllocator.set(flagToRestore);
} }
#include <chrono> #include <chrono>