intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-03 06:49:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix indexing of allocated bos in populateOsHandles

Browse Source 
- when fragment is already allocated, allcoating is
skipped and index is incremented,
separate index must be used for allocated bos array

Change-Id: I856a99ba4ebdad5375829a43d721c7e1490b18d3
This commit is contained in:
Hoppe, Mateusz
2018-03-15 11:58:31 +01:00
parent 894060de50
commit 756aafe3dd
3 changed files with 71 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,6 +106,13 @@ class TestedDrmMemoryManager : public DrmMemoryManager {
DrmMemoryManager::unreference(bo);
}
void injectPinBB(BufferObject *newPinBB) {
BufferObject *currentPinBB = pinBB;
pinBB = nullptr;
DrmMemoryManager::unreference(currentPinBB);
pinBB = newPinBB;
}
DrmGemCloseWorker *getgemCloseWorker() { return this->gemCloseWorker.get(); }
Allocator32bit *getDrmInternal32BitAllocator() { return internal32bitAllocator.get(); }
@@ -2394,6 +2401,68 @@ TEST_F(DrmMemoryManagerWithExplicitExpectationsTest, givenDisabledForcePinAndEna
testedMemoryManager->cleanOsHandles(handleStorage);
}
TEST_F(DrmMemoryManagerWithExplicitExpectationsTest, givenDisabledForcePinAndEnabledValidateHostMemoryWhenPopulateOsHandlesIsCalledWithFirstFragmentAlreadyAllocatedThenNewBosAreValidated) {
class PinBufferObject : public BufferObject {
public:
PinBufferObject(Drm *drm) : BufferObject(drm, 1, true) {
}
int pin(BufferObject *boToPin[], size_t numberOfBos) override {
for (size_t i = 0; i < numberOfBos; i++) {
pinnedBoArray[i] = boToPin[i];
}
numberOfBosPinned = numberOfBos;
return 0;
}
BufferObject *pinnedBoArray[5];
size_t numberOfBosPinned;
};
std::unique_ptr<TestedDrmMemoryManager> testedMemoryManager(new TestedDrmMemoryManager(this->mock, false, true));
ASSERT_NE(nullptr, testedMemoryManager.get());
ASSERT_NE(nullptr, testedMemoryManager->getPinBB());
PinBufferObject *pinBB = new PinBufferObject(this->mock);
testedMemoryManager->injectPinBB(pinBB);
mock->reset();
mock->ioctl_expected.gemUserptr = 2;
mock->ioctl_expected.execbuffer2 = 0; // pinning for host memory validation is mocked
OsHandleStorage handleStorage;
OsHandle handle1;
handleStorage.fragmentStorageData[0].osHandleStorage = &handle1;
handleStorage.fragmentStorageData[0].cpuPtr = (void *)0x1000;
handleStorage.fragmentStorageData[0].fragmentSize = 4096;
handleStorage.fragmentStorageData[1].osHandleStorage = nullptr;
handleStorage.fragmentStorageData[1].cpuPtr = (void *)0x2000;
handleStorage.fragmentStorageData[1].fragmentSize = 8192;
handleStorage.fragmentStorageData[2].osHandleStorage = nullptr;
handleStorage.fragmentStorageData[2].cpuPtr = (void *)0x4000;
handleStorage.fragmentStorageData[2].fragmentSize = 4096;
auto result = testedMemoryManager->populateOsHandles(handleStorage);
EXPECT_EQ(MemoryManager::AllocationStatus::Success, result);
mock->testIoctls();
EXPECT_NE(nullptr, handleStorage.fragmentStorageData[0].osHandleStorage);
EXPECT_NE(nullptr, handleStorage.fragmentStorageData[1].osHandleStorage);
EXPECT_NE(nullptr, handleStorage.fragmentStorageData[2].osHandleStorage);
EXPECT_EQ(handleStorage.fragmentStorageData[1].osHandleStorage->bo, pinBB->pinnedBoArray[0]);
EXPECT_EQ(handleStorage.fragmentStorageData[2].osHandleStorage->bo, pinBB->pinnedBoArray[1]);
handleStorage.fragmentStorageData[0].freeTheFragment = false;
handleStorage.fragmentStorageData[1].freeTheFragment = true;
handleStorage.fragmentStorageData[2].freeTheFragment = true;
testedMemoryManager->cleanOsHandles(handleStorage);
}
TEST_F(DrmMemoryManagerWithExplicitExpectationsTest, givenValidateHostPtrMemoryEnabledWhenHostPtrAllocationIsCreatedWithoutForcingPinThenBufferObjectIsPinned) {
mock->ioctl_expected.gemUserptr = 2;
mock->ioctl_expected.gemWait = 1;