eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 56 Projects 1 Releases Packages Wiki Activity Actions

[heap_tracker] Use ankerl map instead of rb tree

Browse source 
Signed-off-by: lizzie <lizzie@eden-emu.dev>
This commit is contained in:
lizzie 2025-08-12 23:40:17 +01:00 • committed by crueter
parent 380cfcaeed
commit efcf3b4c81
4 changed files with 90 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

11
externals/CMakeLists.txt vendored
View file

@ -151,6 +151,17 @@ if (ENABLE_WEB_SERVICE)
) )
endif() endif()
# unordered_dense
AddPackage(
NAME unordered_dense
REPO "Lizzie841/unordered_dense"
SHA e59d30b7b1
HASH 71eff7bd9ba4b9226967bacd56a8ff000946f8813167cb5664bb01e96fb79e4e220684d824fe9c59c4d1cc98c606f13aff05b7940a1ed8ab3c95d6974ee34fa0
FIND_PACKAGE_ARGUMENTS "CONFIG"
OPTIONS
"UNORDERED_DENSE_INSTALL OFF"
)
# FFMpeg # FFMpeg
if (YUZU_USE_BUNDLED_FFMPEG) if (YUZU_USE_BUNDLED_FFMPEG)
add_subdirectory(ffmpeg) add_subdirectory(ffmpeg)

11
src/common/CMakeLists.txt
View file

@ -262,13 +262,13 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
endif() endif()
if (BOOST_NO_HEADERS) if (BOOST_NO_HEADERS)
target_link_libraries(common PUBLIC Boost::algorithm Boost::icl Boost::pool) target_link_libraries(common PUBLIC Boost::algorithm Boost::icl Boost::pool)
else() else()
target_link_libraries(common PUBLIC Boost::headers) target_link_libraries(common PUBLIC Boost::headers)
endif() endif()
if (lz4_ADDED) if (lz4_ADDED)
target_include_directories(common PRIVATE ${lz4_SOURCE_DIR}/lib) target_include_directories(common PRIVATE ${lz4_SOURCE_DIR}/lib)
endif() endif()
target_link_libraries(common PUBLIC fmt::fmt stb::headers Threads::Threads) target_link_libraries(common PUBLIC fmt::fmt stb::headers Threads::Threads)
@ -280,6 +280,11 @@ else()
target_link_libraries(common PRIVATE zstd) target_link_libraries(common PRIVATE zstd)
endif() endif()
if (TARGET unordered_dense::unordered_dense)
# weird quirk of system installs
target_link_libraries(common PUBLIC unordered_dense::unordered_dense)
endif()
if(ANDROID) if(ANDROID)
# For ASharedMemory_create # For ASharedMemory_create
target_link_libraries(common PRIVATE android) target_link_libraries(common PRIVATE android)

157
src/common/heap_tracker.cpp
View file

@ -1,3 +1,5 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
@ -39,25 +41,18 @@ void HeapTracker::Map(size_t virtual_offset, size_t host_offset, size_t length,
m_buffer.Map(virtual_offset, host_offset, length, perm, false); m_buffer.Map(virtual_offset, host_offset, length, perm, false);
return; return;
} }
{ {
// We are mapping part of a separate heap. // We are mapping part of a separate heap and insert into mappings.
std::scoped_lock lk{m_lock}; std::scoped_lock lk{m_lock};
m_map_count++;
auto* const map = new SeparateHeapMap{ m_mappings.insert_or_assign(virtual_offset, SeparateHeapMap{
.vaddr = virtual_offset,
.paddr = host_offset, .paddr = host_offset,
.size = length, .size = length,
.tick = m_tick++, .tick = m_tick++,
.perm = perm, .perm = perm,
.is_resident = false, .is_resident = false,
}; });
// Insert into mappings.
m_map_count++;
m_mappings.insert(*map);
} }
// Finally, map. // Finally, map.
this->DeferredMapSeparateHeap(virtual_offset); this->DeferredMapSeparateHeap(virtual_offset);
} }
@ -66,36 +61,22 @@ void HeapTracker::Unmap(size_t virtual_offset, size_t size, bool is_separate_hea
// If this is a separate heap... // If this is a separate heap...
if (is_separate_heap) { if (is_separate_heap) {
std::scoped_lock lk{m_lock}; std::scoped_lock lk{m_lock};
const SeparateHeapMap key{
.vaddr = virtual_offset,
};
// Split at the boundaries of the region we are removing. // Split at the boundaries of the region we are removing.
this->SplitHeapMapLocked(virtual_offset); this->SplitHeapMapLocked(virtual_offset);
this->SplitHeapMapLocked(virtual_offset + size); this->SplitHeapMapLocked(virtual_offset + size);
// Erase all mappings in range. // Erase all mappings in range.
auto it = m_mappings.find(key); auto it = m_mappings.find(virtual_offset);
while (it != m_mappings.end() && it->vaddr < virtual_offset + size) { while (it != m_mappings.end() && it->first < virtual_offset + size) {
// Get underlying item.
auto* const item = std::addressof(*it);
// If resident, erase from resident map. // If resident, erase from resident map.
if (item->is_resident) { if (it->second.is_resident) {
ASSERT(--m_resident_map_count >= 0); ASSERT(--m_resident_map_count >= 0);
m_resident_mappings.erase(m_resident_mappings.iterator_to(*item)); m_resident_mappings.erase(m_resident_mappings.find(it->first));
} }
// Erase from map. // Erase from map.
ASSERT(--m_map_count >= 0); ASSERT(--m_map_count >= 0);
it = m_mappings.erase(it); it = m_mappings.erase(it);
// Free the item.
delete item;
} }
} }
// Unmap pages. // Unmap pages.
m_buffer.Unmap(virtual_offset, size, false); m_buffer.Unmap(virtual_offset, size, false);
} }
@ -117,68 +98,56 @@ void HeapTracker::Protect(size_t virtual_offset, size_t size, MemoryPermission p
{ {
std::scoped_lock lk2{m_lock}; std::scoped_lock lk2{m_lock};
const SeparateHeapMap key{
.vaddr = next,
};
// Try to get the next mapping corresponding to this address. // Try to get the next mapping corresponding to this address.
const auto it = m_mappings.nfind(key); const auto it = m_mappings.find(next);
if (it == m_mappings.end()) { if (it == m_mappings.end()) {
// There are no separate heap mappings remaining. // There are no separate heap mappings remaining.
next = end; next = end;
should_protect = true; should_protect = true;
} else if (it->vaddr == cur) { } else if (it->first == cur) {
// We are in range. // We are in range.
// Update permission bits. // Update permission bits.
it->perm = perm; it->second.perm = perm;
// Determine next address and whether we should protect. // Determine next address and whether we should protect.
next = cur + it->size; next = cur + it->second.size;
should_protect = it->is_resident; should_protect = it->second.is_resident;
} else /* if (it->vaddr > cur) */ { } else /* if (it->vaddr > cur) */ {
// We weren't in range, but there is a block coming up that will be. // We weren't in range, but there is a block coming up that will be.
next = it->vaddr; next = it->first;
should_protect = true; should_protect = true;
} }
} }
// Clamp to end. // Clamp to end.
next = std::min(next, end); next = std::min(next, end);
// Reprotect, if we need to. // Reprotect, if we need to.
if (should_protect) { if (should_protect)
m_buffer.Protect(cur, next - cur, perm); m_buffer.Protect(cur, next - cur, perm);
}
// Advance. // Advance.
cur = next; cur = next;
} }
} }
bool HeapTracker::DeferredMapSeparateHeap(u8* fault_address) { bool HeapTracker::DeferredMapSeparateHeap(u8* fault_address) {
if (m_buffer.IsInVirtualRange(fault_address)) { if (m_buffer.IsInVirtualRange(fault_address))
return this->DeferredMapSeparateHeap(fault_address - m_buffer.VirtualBasePointer()); return this->DeferredMapSeparateHeap(fault_address - m_buffer.VirtualBasePointer());
}
return false; return false;
} }
bool HeapTracker::DeferredMapSeparateHeap(size_t virtual_offset) { bool HeapTracker::DeferredMapSeparateHeap(size_t virtual_offset) {
bool rebuild_required = false; bool rebuild_required = false;
{ {
std::scoped_lock lk{m_lock}; std::scoped_lock lk{m_lock};
// Check to ensure this was a non-resident separate heap mapping. // Check to ensure this was a non-resident separate heap mapping.
const auto it = this->GetNearestHeapMapLocked(virtual_offset); const auto it = this->GetNearestHeapMapLocked(virtual_offset);
if (it == m_mappings.end() || it->is_resident) { if (it == m_mappings.end() || it->second.is_resident) {
return false; return false;
} }
// Update tick before possible rebuild. // Update tick before possible rebuild.
it->tick = m_tick++; it->second.tick = m_tick++;
// Check if we need to rebuild. // Check if we need to rebuild.
if (m_resident_map_count > m_max_resident_map_count) { if (m_resident_map_count > m_max_resident_map_count) {
@ -186,41 +155,34 @@ bool HeapTracker::DeferredMapSeparateHeap(size_t virtual_offset) {
} }
// Map the area. // Map the area.
m_buffer.Map(it->vaddr, it->paddr, it->size, it->perm, false); m_buffer.Map(it->first, it->second.paddr, it->second.size, it->second.perm, false);
// This map is now resident. // This map is now resident.
it->is_resident = true; it->second.is_resident = true;
m_resident_map_count++; m_resident_map_count++;
m_resident_mappings.insert(*it); m_resident_mappings.insert(*it);
} }
if (rebuild_required) { // A rebuild was required, so perform it now.
// A rebuild was required, so perform it now. if (rebuild_required)
this->RebuildSeparateHeapAddressSpace(); this->RebuildSeparateHeapAddressSpace();
}
return true; return true;
} }
void HeapTracker::RebuildSeparateHeapAddressSpace() { void HeapTracker::RebuildSeparateHeapAddressSpace() {
std::scoped_lock lk{m_rebuild_lock, m_lock}; std::scoped_lock lk{m_rebuild_lock, m_lock};
ASSERT(!m_resident_mappings.empty()); ASSERT(!m_resident_mappings.empty());
// Dump half of the mappings. // Dump half of the mappings.
//
// Despite being worse in theory, this has proven to be better in practice than more // Despite being worse in theory, this has proven to be better in practice than more
// regularly dumping a smaller amount, because it significantly reduces average case // regularly dumping a smaller amount, because it significantly reduces average case
// lock contention. // lock contention.
const size_t desired_count = std::min(m_resident_map_count, m_max_resident_map_count) / 2; std::size_t const desired_count = std::min(m_resident_map_count, m_max_resident_map_count) / 2;
const size_t evict_count = m_resident_map_count - desired_count; std::size_t const evict_count = m_resident_map_count - desired_count;
auto it = m_resident_mappings.begin(); auto it = m_resident_mappings.begin();
for (std::size_t i = 0; i < evict_count && it != m_resident_mappings.end(); i++) {
for (size_t i = 0; i < evict_count && it != m_resident_mappings.end(); i++) {
// Unmark and unmap. // Unmark and unmap.
it->is_resident = false; it->second.is_resident = false;
m_buffer.Unmap(it->vaddr, it->size, false); m_buffer.Unmap(it->first, it->second.size, false);
// Advance. // Advance.
ASSERT(--m_resident_map_count >= 0); ASSERT(--m_resident_map_count >= 0);
it = m_resident_mappings.erase(it); it = m_resident_mappings.erase(it);
@ -229,53 +191,32 @@ void HeapTracker::RebuildSeparateHeapAddressSpace() {
void HeapTracker::SplitHeapMap(VAddr offset, size_t size) { void HeapTracker::SplitHeapMap(VAddr offset, size_t size) {
std::scoped_lock lk{m_lock}; std::scoped_lock lk{m_lock};
this->SplitHeapMapLocked(offset); this->SplitHeapMapLocked(offset);
this->SplitHeapMapLocked(offset + size); this->SplitHeapMapLocked(offset + size);
} }
void HeapTracker::SplitHeapMapLocked(VAddr offset) { void HeapTracker::SplitHeapMapLocked(VAddr offset) {
const auto it = this->GetNearestHeapMapLocked(offset); auto it = this->GetNearestHeapMapLocked(offset);
if (it == m_mappings.end() || it->vaddr == offset) { if (it != m_mappings.end() && it->first != offset) {
// Not contained or no split required. // Adjust left iterator
return; auto const orig_size = it->second.size;
auto const left_size = offset - it->first;
it->second.size = left_size;
// Insert the new right map.
auto const right = SeparateHeapMap{
.paddr = it->second.paddr + left_size,
.size = orig_size - left_size,
.tick = it->second.tick,
.perm = it->second.perm,
.is_resident = it->second.is_resident,
};
m_map_count++;
auto rit = m_mappings.insert_or_assign(it->first + left_size, right);
if (rit.first->second.is_resident) {
m_resident_map_count++;
m_resident_mappings.insert(*rit.first);
}
} }
// Cache the original values.
auto* const left = std::addressof(*it);
const size_t orig_size = left->size;
// Adjust the left map.
const size_t left_size = offset - left->vaddr;
left->size = left_size;
// Create the new right map.
auto* const right = new SeparateHeapMap{
.vaddr = left->vaddr + left_size,
.paddr = left->paddr + left_size,
.size = orig_size - left_size,
.tick = left->tick,
.perm = left->perm,
.is_resident = left->is_resident,
};
// Insert the new right map.
m_map_count++;
m_mappings.insert(*right);
// If resident, also insert into resident map.
if (right->is_resident) {
m_resident_map_count++;
m_resident_mappings.insert(*right);
}
}
HeapTracker::AddrTree::iterator HeapTracker::GetNearestHeapMapLocked(VAddr offset) {
const SeparateHeapMap key{
.vaddr = offset,
};
return m_mappings.find(key);
} }
} // namespace Common } // namespace Common

80
src/common/heap_tracker.h
View file

@ -1,93 +1,57 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#pragma once #pragma once
#include <atomic>
#include <mutex> #include <mutex>
#include <set>
#include <shared_mutex> #include <shared_mutex>
#include <ankerl/unordered_dense.h>
#include "common/host_memory.h" #include "common/host_memory.h"
#include "common/intrusive_red_black_tree.h"
namespace Common { namespace Common {
struct SeparateHeapMap { struct SeparateHeapMap {
Common::IntrusiveRedBlackTreeNode addr_node{}; PAddr paddr{}; //8
Common::IntrusiveRedBlackTreeNode tick_node{}; std::size_t size{}; //8 (16)
VAddr vaddr{}; std::size_t tick{}; //8 (24)
PAddr paddr{}; // 4 bits needed, sync with host_memory.h if needed
size_t size{}; MemoryPermission perm : 4 = MemoryPermission::Read;
size_t tick{}; bool is_resident : 1 = false;
MemoryPermission perm{};
bool is_resident{};
};
struct SeparateHeapMapAddrComparator {
static constexpr int Compare(const SeparateHeapMap& lhs, const SeparateHeapMap& rhs) {
if (lhs.vaddr < rhs.vaddr) {
return -1;
} else if (lhs.vaddr <= (rhs.vaddr + rhs.size - 1)) {
return 0;
} else {
return 1;
}
}
};
struct SeparateHeapMapTickComparator {
static constexpr int Compare(const SeparateHeapMap& lhs, const SeparateHeapMap& rhs) {
if (lhs.tick < rhs.tick) {
return -1;
} else if (lhs.tick > rhs.tick) {
return 1;
} else {
return SeparateHeapMapAddrComparator::Compare(lhs, rhs);
}
}
}; };
static_assert(sizeof(SeparateHeapMap) == 32); //half a cache line! good for coherency
class HeapTracker { class HeapTracker {
public: public:
explicit HeapTracker(Common::HostMemory& buffer); explicit HeapTracker(Common::HostMemory& buffer);
~HeapTracker(); ~HeapTracker();
void Map(size_t virtual_offset, size_t host_offset, size_t length, MemoryPermission perm, bool is_separate_heap);
void Map(size_t virtual_offset, size_t host_offset, size_t length, MemoryPermission perm,
bool is_separate_heap);
void Unmap(size_t virtual_offset, size_t size, bool is_separate_heap); void Unmap(size_t virtual_offset, size_t size, bool is_separate_heap);
void Protect(size_t virtual_offset, size_t length, MemoryPermission perm); void Protect(size_t virtual_offset, size_t length, MemoryPermission perm);
u8* VirtualBasePointer() { inline u8* VirtualBasePointer() noexcept {
return m_buffer.VirtualBasePointer(); return m_buffer.VirtualBasePointer();
} }
bool DeferredMapSeparateHeap(u8* fault_address); bool DeferredMapSeparateHeap(u8* fault_address);
bool DeferredMapSeparateHeap(size_t virtual_offset); bool DeferredMapSeparateHeap(size_t virtual_offset);
private: private:
using AddrTreeTraits = // TODO: You may want to "fake-map" the first 2GB of 64-bit address space
Common::IntrusiveRedBlackTreeMemberTraitsDeferredAssert<&SeparateHeapMap::addr_node>; // and dedicate it entirely to a recursive PTE mapping :)
using AddrTree = AddrTreeTraits::TreeType<SeparateHeapMapAddrComparator>; // However Ankerl is way better than using an RB tree, in all senses
using AddrTree = ankerl::unordered_dense::map<VAddr, SeparateHeapMap>;
using TickTreeTraits = AddrTree m_mappings;
Common::IntrusiveRedBlackTreeMemberTraitsDeferredAssert<&SeparateHeapMap::tick_node>; using TicksTree = ankerl::unordered_dense::map<VAddr, SeparateHeapMap>;
using TickTree = TickTreeTraits::TreeType<SeparateHeapMapTickComparator>; TicksTree m_resident_mappings;
AddrTree m_mappings{};
TickTree m_resident_mappings{};
private: private:
void SplitHeapMap(VAddr offset, size_t size); void SplitHeapMap(VAddr offset, size_t size);
void SplitHeapMapLocked(VAddr offset); void SplitHeapMapLocked(VAddr offset);
AddrTree::iterator GetNearestHeapMapLocked(VAddr offset);
void RebuildSeparateHeapAddressSpace(); void RebuildSeparateHeapAddressSpace();
inline HeapTracker::AddrTree::iterator GetNearestHeapMapLocked(VAddr offset) noexcept {
return m_mappings.find(offset);
}
private: private:
Common::HostMemory& m_buffer; Common::HostMemory& m_buffer;
const s64 m_max_resident_map_count; const s64 m_max_resident_map_count;
std::shared_mutex m_rebuild_lock{}; std::shared_mutex m_rebuild_lock{};
std::mutex m_lock{}; std::mutex m_lock{};
s64 m_map_count{}; s64 m_map_count{};