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

Enhance PageTable testing

Browse Source 
- and mock PageTables with entries access
- new test checking correct entries filling

Change-Id: I4ad70aac2915f0ff2611c65a8480dadcf87c0b8d
This commit is contained in:
Hoppe, Mateusz
2018-09-11 11:35:04 +02:00
committed by sys_ocldev
parent be4c2cca60
commit 58c34fd72c
5 changed files with 169 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runtime/memory_manager/CMakeLists.txt
View File

@@ -39,6 +39,7 @@ set(RUNTIME_SRCS_MEMORY_MANAGER
${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/os_agnostic_memory_manager_allocate_in_device_pool.cpp
${CMAKE_CURRENT_SOURCE_DIR}/page_table.cpp
${CMAKE_CURRENT_SOURCE_DIR}/page_table.h
${CMAKE_CURRENT_SOURCE_DIR}/page_table.inl
${CMAKE_CURRENT_SOURCE_DIR}/residency.h
${CMAKE_CURRENT_SOURCE_DIR}/residency.cpp
${CMAKE_CURRENT_SOURCE_DIR}/residency_container.h

76
runtime/memory_manager/page_table.cpp
View File

@@ -21,25 +21,13 @@
*/
#include "runtime/memory_manager/page_table.h"
#include <inttypes.h>
#include <iostream>
#include "runtime/memory_manager/page_table.inl"
namespace OCLRT {
const uint32_t PTE::initialPage = 1;
std::atomic<uint32_t> PTE::nextPage(PTE::initialPage);
template <>
uintptr_t PageTable<void, 0, 9>::map(uintptr_t vm, size_t size) {
return 0;
}
template <>
size_t PageTable<void, 0, 9>::getBits() {
return 9;
}
uintptr_t PTE::map(uintptr_t vm, size_t size) {
const size_t shift = 12;
const uint32_t mask = (1 << bits) - 1;
@@ -57,30 +45,6 @@ uintptr_t PTE::map(uintptr_t vm, size_t size) {
return (res & ~0x1) + (vm & (pageSize - 1));
}
template <class T, uint32_t level, uint32_t bits>
uintptr_t PageTable<T, level, bits>::map(uintptr_t vm, size_t size) {
const size_t shift = T::getBits() + 12;
const uintptr_t mask = (1 << bits) - 1;
size_t indexStart = (vm >> shift) & mask;
size_t indexEnd = ((vm + size - 1) >> shift) & mask;
uintptr_t res = -1;
uintptr_t vmMask = (uintptr_t(-1) >> (sizeof(void *) * 8 - shift - bits));
auto maskedVm = vm & vmMask;
for (size_t index = indexStart; index <= indexEnd; index++) {
uintptr_t vmStart = (uintptr_t(1) << shift) * index;
vmStart = std::max(vmStart, maskedVm);
uintptr_t vmEnd = (uintptr_t(1) << shift) * (index + 1) - 1;
vmEnd = std::min(vmEnd, maskedVm + size - 1);
if (entries[index] == nullptr) {
entries[index] = new T;
}
res = std::min((entries[index])->map(vmStart, vmEnd - vmStart + 1), res);
}
return res;
}
void PTE::pageWalk(uintptr_t vm, size_t size, size_t offset, PageWalker &pageWalker) {
static const uint32_t bits = 9;
const size_t shift = 12;
@@ -106,44 +70,6 @@ void PTE::pageWalk(uintptr_t vm, size_t size, size_t offset, PageWalker &pageWal
}
}
template <>
void PageTable<void, 0, 9>::pageWalk(uintptr_t vm, size_t size, size_t offset, PageWalker &pageWalker) {
}
template <class T, uint32_t level, uint32_t bits>
void PageTable<T, level, bits>::pageWalk(uintptr_t vm, size_t size, size_t offset, PageWalker &pageWalker) {
const size_t shift = T::getBits() + 12;
const uintptr_t mask = (1 << bits) - 1;
size_t indexStart = (vm >> shift) & mask;
size_t indexEnd = ((vm + size - 1) >> shift) & mask;
uintptr_t vmMask = (uintptr_t(-1) >> (sizeof(void *) * 8 - shift - bits));
auto maskedVm = vm & vmMask;
for (size_t index = indexStart; index <= indexEnd; index++) {
uintptr_t vmStart = (uintptr_t(1) << shift) * index;
vmStart = std::max(vmStart, maskedVm);
uintptr_t vmEnd = (uintptr_t(1) << shift) * (index + 1) - 1;
vmEnd = std::min(vmEnd, maskedVm + size - 1);
if (entries[index] == nullptr) {
entries[index] = new T;
}
entries[index]->pageWalk(vmStart, vmEnd - vmStart + 1, offset, pageWalker);
offset += (vmEnd - vmStart + 1);
}
}
template <>
PageTable<void, 0, 9>::~PageTable() {
}
template <class T, uint32_t level, uint32_t bits>
PageTable<T, level, bits>::~PageTable() {
for (auto &e : entries)
delete e;
}
template class PageTable<class PDP, 3, 9>;
template class PageTable<class PDE, 2, 2>;
} // namespace OCLRT

5
runtime/memory_manager/page_table.h
View File

@@ -23,9 +23,10 @@
#pragma once
#include "runtime/helpers/basic_math.h"
#include <functional>
#include <atomic>
#include <array>
#include <atomic>
#include <cinttypes>
#include <functional>
#include <memory>
#include <vector>

97
runtime/memory_manager/page_table.inl Normal file
View File

@@ -0,0 +1,97 @@
/*
* Copyright (c) 2018, Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
namespace OCLRT {
template <>
inline uintptr_t PageTable<void, 0, 9>::map(uintptr_t vm, size_t size) {
return 0;
}
template <>
inline size_t PageTable<void, 0, 9>::getBits() {
return 9;
}
template <>
inline void PageTable<void, 0, 9>::pageWalk(uintptr_t vm, size_t size, size_t offset, PageWalker &pageWalker) {
}
template <>
inline PageTable<void, 0, 9>::~PageTable() {
}
template <class T, uint32_t level, uint32_t bits>
inline uintptr_t PageTable<T, level, bits>::map(uintptr_t vm, size_t size) {
const size_t shift = T::getBits() + 12;
const uintptr_t mask = (1 << bits) - 1;
size_t indexStart = (vm >> shift) & mask;
size_t indexEnd = ((vm + size - 1) >> shift) & mask;
uintptr_t res = -1;
uintptr_t vmMask = (uintptr_t(-1) >> (sizeof(void *) * 8 - shift - bits));
auto maskedVm = vm & vmMask;
for (size_t index = indexStart; index <= indexEnd; index++) {
uintptr_t vmStart = (uintptr_t(1) << shift) * index;
vmStart = std::max(vmStart, maskedVm);
uintptr_t vmEnd = (uintptr_t(1) << shift) * (index + 1) - 1;
vmEnd = std::min(vmEnd, maskedVm + size - 1);
if (entries[index] == nullptr) {
entries[index] = new T;
}
res = std::min((entries[index])->map(vmStart, vmEnd - vmStart + 1), res);
}
return res;
}
template <class T, uint32_t level, uint32_t bits>
inline void PageTable<T, level, bits>::pageWalk(uintptr_t vm, size_t size, size_t offset, PageWalker &pageWalker) {
const size_t shift = T::getBits() + 12;
const uintptr_t mask = (1 << bits) - 1;
size_t indexStart = (vm >> shift) & mask;
size_t indexEnd = ((vm + size - 1) >> shift) & mask;
uintptr_t vmMask = (uintptr_t(-1) >> (sizeof(void *) * 8 - shift - bits));
auto maskedVm = vm & vmMask;
for (size_t index = indexStart; index <= indexEnd; index++) {
uintptr_t vmStart = (uintptr_t(1) << shift) * index;
vmStart = std::max(vmStart, maskedVm);
uintptr_t vmEnd = (uintptr_t(1) << shift) * (index + 1) - 1;
vmEnd = std::min(vmEnd, maskedVm + size - 1);
if (entries[index] == nullptr) {
entries[index] = new T;
}
entries[index]->pageWalk(vmStart, vmEnd - vmStart + 1, offset, pageWalker);
offset += (vmEnd - vmStart + 1);
}
}
template <class T, uint32_t level, uint32_t bits>
inline PageTable<T, level, bits>::~PageTable() {
for (auto &e : entries)
delete e;
}
} // namespace OCLRT