Common: Add a memory pool implementation, remove use of boost::pool

This commit is contained in:
MerryMage 2016-08-06 20:41:00 +01:00
parent 411e804b0d
commit 4d127c19dd
6 changed files with 85 additions and 5 deletions

View file

@ -10,13 +10,11 @@ if (NOT MSVC)
add_compile_options(--std=c++14)
add_compile_options(-Wall -Werror -Wextra -pedantic -pedantic-errors -Wfatal-errors
-Wno-unused-parameter -Wno-missing-braces)
add_compile_options(-DBOOST_SYSTEM_NO_DEPRECATED -DBOOST_POOL_NO_MT)
if (ARCHITECTURE_x86_64)
add_compile_options(-msse4.1)
endif()
else()
add_compile_options(/W3 /MP /Zi /Zo /EHsc /WX)
add_compile_options(/DBOOST_SYSTEM_NO_DEPRECATED /DBOOST_POOL_NO_MT)
endif()
# This function should be passed a list of all files in a target. It will automatically generate

View file

@ -6,6 +6,7 @@ set(SRCS
backend_x64/jitstate.cpp
backend_x64/reg_alloc.cpp
backend_x64/routines.cpp
common/memory_pool.cpp
common/memory_util.cpp
common/string_util.cpp
common/x64/abi.cpp
@ -42,6 +43,7 @@ set(HEADERS
common/bit_util.h
common/code_block.h
common/common_types.h
common/memory_pool.h
common/memory_util.h
common/mp.h
common/scope_exit.h

View file

@ -0,0 +1,44 @@
/* This file is part of the dynarmic project.
* Copyright (c) 2016 MerryMage
* This software may be used and distributed according to the terms of the GNU
* General Public License version 2 or any later version.
*/
#include <cstdlib>
#include "common/memory_pool.h"
namespace Dynarmic {
namespace Common {
Pool::Pool(size_t object_size, size_t initial_pool_size) : object_size(object_size), slab_size(initial_pool_size) {
current_slab = (char*)std::malloc(object_size * slab_size);
current_ptr = current_slab;
remaining = slab_size;
}
Pool::~Pool() {
std::free(current_slab);
for (char* slab : slabs) {
std::free(slab);
}
}
void* Pool::Alloc() {
if (remaining == 0) {
slabs.emplace_back(current_slab);
current_slab = (char*)std::malloc(object_size * slab_size);
current_ptr = current_slab;
remaining = slab_size;
}
void* ret = (void*)current_ptr;
current_ptr += object_size;
remaining--;
return ret;
}
} // namespace Common
} // namespace Dynarmic

36
src/common/memory_pool.h Normal file
View file

@ -0,0 +1,36 @@
/* This file is part of the dynarmic project.
* Copyright (c) 2016 MerryMage
* This software may be used and distributed according to the terms of the GNU
* General Public License version 2 or any later version.
*/
#pragma once
#include <vector>
#include "common/common_types.h"
namespace Dynarmic {
namespace Common {
class Pool {
public:
Pool(size_t object_size, size_t initial_pool_size);
~Pool();
Pool(Pool&) = delete;
Pool(Pool&&) = delete;
void* Alloc();
private:
size_t object_size;
size_t slab_size;
char* current_slab;
char* current_ptr;
size_t remaining;
std::vector<char*> slabs;
};
} // namespace Common
} // namespace Dynarmic

View file

@ -10,13 +10,13 @@
#include <memory>
#include <vector>
#include <boost/pool/pool.hpp>
#include <boost/intrusive/list.hpp>
#include <boost/optional.hpp>
#include <boost/variant.hpp>
#include "common/assert.h"
#include "common/common_types.h"
#include "common/memory_pool.h"
#include "frontend/arm_types.h"
#include "frontend/ir/opcodes.h"
@ -244,7 +244,7 @@ public:
/// List of instructions in this block.
boost::intrusive::list<Inst, InstListLinkMode> instructions;
/// Memory pool for instruction list
std::unique_ptr<boost::pool<>> instruction_alloc_pool = std::make_unique<boost::pool<>>(sizeof(Inst));
std::unique_ptr<Common::Pool> instruction_alloc_pool = std::make_unique<Common::Pool>(sizeof(Inst), 4096);
/// Terminal instruction of this block.
Terminal terminal = Term::Invalid{};

View file

@ -352,7 +352,7 @@ void IREmitter::SetTerm(const IR::Terminal& terminal) {
}
IR::Value IREmitter::Inst(IR::Opcode op, std::initializer_list<IR::Value> args) {
IR::Inst* inst = new(block.instruction_alloc_pool->malloc()) IR::Inst(op);
IR::Inst* inst = new(block.instruction_alloc_pool->Alloc()) IR::Inst(op);
DEBUG_ASSERT(args.size() == inst->NumArgs());
std::for_each(args.begin(), args.end(), [&inst, op, index = size_t(0)](const auto& v) mutable {