mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-22 02:23:23 +02:00
rasterizer_cache: Use boost::interval_map for a more accurate cache.
This commit is contained in:
parent
d647d9550c
commit
9bc71fcc5f
@ -4,7 +4,9 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <unordered_map>
|
#include <set>
|
||||||
|
|
||||||
|
#include <boost/icl/interval_map.hpp>
|
||||||
|
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
#include "core/core.h"
|
#include "core/core.h"
|
||||||
@ -17,62 +19,72 @@ template <class T>
|
|||||||
class RasterizerCache : NonCopyable {
|
class RasterizerCache : NonCopyable {
|
||||||
public:
|
public:
|
||||||
/// Mark the specified region as being invalidated
|
/// Mark the specified region as being invalidated
|
||||||
void InvalidateRegion(VAddr region_addr, size_t region_size) {
|
void InvalidateRegion(VAddr addr, u64 size) {
|
||||||
for (auto iter = cached_objects.cbegin(); iter != cached_objects.cend();) {
|
if (size == 0)
|
||||||
const auto& object{iter->second};
|
return;
|
||||||
|
|
||||||
++iter;
|
const ObjectInterval interval{addr, addr + size};
|
||||||
|
for (auto& pair : boost::make_iterator_range(object_cache.equal_range(interval))) {
|
||||||
|
for (auto& cached_object : pair.second) {
|
||||||
|
if (!cached_object)
|
||||||
|
continue;
|
||||||
|
|
||||||
if (object->GetAddr() <= (region_addr + region_size) &&
|
remove_objects.emplace(cached_object);
|
||||||
region_addr <= (object->GetAddr() + object->GetSizeInBytes())) {
|
|
||||||
// Regions overlap, so invalidate
|
|
||||||
Unregister(object);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (auto& remove_object : remove_objects) {
|
||||||
|
Unregister(remove_object);
|
||||||
|
}
|
||||||
|
|
||||||
|
remove_objects.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Invalidates everything in the cache
|
||||||
|
void InvalidateAll() {
|
||||||
|
while (object_cache.begin() != object_cache.end()) {
|
||||||
|
Unregister(*object_cache.begin()->second.begin());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/// Tries to get an object from the cache with the specified address
|
/// Tries to get an object from the cache with the specified address
|
||||||
T TryGet(VAddr addr) const {
|
T TryGet(VAddr addr) const {
|
||||||
const auto& search{cached_objects.find(addr)};
|
const ObjectInterval interval{addr};
|
||||||
if (search != cached_objects.end()) {
|
for (auto& pair : boost::make_iterator_range(object_cache.equal_range(interval))) {
|
||||||
return search->second;
|
for (auto& cached_object : pair.second) {
|
||||||
|
if (cached_object->GetAddr() == addr) {
|
||||||
|
return cached_object;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Gets a reference to the cache
|
|
||||||
const std::unordered_map<VAddr, T>& GetCache() const {
|
|
||||||
return cached_objects;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Register an object into the cache
|
/// Register an object into the cache
|
||||||
void Register(const T& object) {
|
void Register(const T& object) {
|
||||||
const auto& search{cached_objects.find(object->GetAddr())};
|
object_cache.add({GetInterval(object), ObjectSet{object}});
|
||||||
if (search != cached_objects.end()) {
|
|
||||||
// Registered already
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto& rasterizer = Core::System::GetInstance().Renderer().Rasterizer();
|
auto& rasterizer = Core::System::GetInstance().Renderer().Rasterizer();
|
||||||
rasterizer.UpdatePagesCachedCount(object->GetAddr(), object->GetSizeInBytes(), 1);
|
rasterizer.UpdatePagesCachedCount(object->GetAddr(), object->GetSizeInBytes(), 1);
|
||||||
cached_objects[object->GetAddr()] = std::move(object);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Unregisters an object from the cache
|
/// Unregisters an object from the cache
|
||||||
void Unregister(const T& object) {
|
void Unregister(const T& object) {
|
||||||
const auto& search{cached_objects.find(object->GetAddr())};
|
|
||||||
if (search == cached_objects.end()) {
|
|
||||||
// Unregistered already
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto& rasterizer = Core::System::GetInstance().Renderer().Rasterizer();
|
auto& rasterizer = Core::System::GetInstance().Renderer().Rasterizer();
|
||||||
rasterizer.UpdatePagesCachedCount(object->GetAddr(), object->GetSizeInBytes(), -1);
|
rasterizer.UpdatePagesCachedCount(object->GetAddr(), object->GetSizeInBytes(), -1);
|
||||||
cached_objects.erase(search);
|
object_cache.subtract({GetInterval(object), ObjectSet{object}});
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::unordered_map<VAddr, T> cached_objects;
|
using ObjectSet = std::set<T>;
|
||||||
|
using ObjectCache = boost::icl::interval_map<VAddr, ObjectSet>;
|
||||||
|
using ObjectInterval = typename ObjectCache::interval_type;
|
||||||
|
|
||||||
|
static auto GetInterval(const T& object) {
|
||||||
|
return ObjectInterval::right_open(object->GetAddr(),
|
||||||
|
object->GetAddr() + object->GetSizeInBytes());
|
||||||
|
}
|
||||||
|
|
||||||
|
ObjectCache object_cache;
|
||||||
|
ObjectSet remove_objects;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user