VERY experimental Nintendo Switch 2 emulator
C++
Memory: Fix invalidation handling from the CPU/Services
Fernando Sahmkowce3c3c003844
diff --git a/src/core/memory.cpp b/src/core/memory.cppindex fa52734025..9f4883afcf 100644--- a/src/core/memory.cpp+++ b/src/core/memory.cpp@@ -1,8 +1,10 @@// SPDX-FileCopyrightText: 2015 Citra Emulator Project+// SPDX-FileCopyrightText: 2018 yuzu Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later#include <algorithm>#include <cstring>+#include <mutex>#include <span>#include "common/assert.h"@@ -10,6 +12,7 @@#include "common/common_types.h"#include "common/logging/log.h"#include "common/page_table.h"+#include "common/scope_exit.h"#include "common/settings.h"#include "common/swap.h"#include "core/core.h"@@ -318,7 +321,7 @@ struct Memory::Impl {[&](const Common::ProcessAddress current_vaddr, const std::size_t copy_amount,u8* const host_ptr) {if constexpr (!UNSAFE) {- system.GPU().InvalidateRegion(GetInteger(current_vaddr), copy_amount);+ HandleRasterizerWrite(GetInteger(current_vaddr), copy_amount);}std::memcpy(host_ptr, src_buffer, copy_amount);},@@ -351,7 +354,7 @@ struct Memory::Impl {},[&](const Common::ProcessAddress current_vaddr, const std::size_t copy_amount,u8* const host_ptr) {- system.GPU().InvalidateRegion(GetInteger(current_vaddr), copy_amount);+ HandleRasterizerWrite(GetInteger(current_vaddr), copy_amount);std::memset(host_ptr, 0, copy_amount);},[](const std::size_t copy_amount) {});@@ -420,7 +423,7 @@ struct Memory::Impl {const std::size_t block_size) {// dc cvac: Store to point of coherency// CPU flush -> GPU invalidate- system.GPU().InvalidateRegion(GetInteger(current_vaddr), block_size);+ HandleRasterizerWrite(GetInteger(current_vaddr), block_size);};return PerformCacheOperation(dest_addr, size, on_rasterizer);}@@ -430,7 +433,7 @@ struct Memory::Impl {const std::size_t block_size) {// dc civac: Store to point of coherency, and invalidate from cache// CPU flush -> GPU invalidate- system.GPU().InvalidateRegion(GetInteger(current_vaddr), block_size);+ HandleRasterizerWrite(GetInteger(current_vaddr), block_size);};return PerformCacheOperation(dest_addr, size, on_rasterizer);}@@ -767,7 +770,18 @@ struct Memory::Impl {}void HandleRasterizerWrite(VAddr address, size_t size) {- const size_t core = system.GetCurrentHostThreadID();+ constexpr size_t sys_core = Core::Hardware::NUM_CPU_CORES - 1;+ const size_t core = std::min(system.GetCurrentHostThreadID(),+ sys_core); // any other calls threads go to syscore.+ // Guard on sys_core;+ if (core == sys_core) [[unlikely]] {+ sys_core_guard.lock();+ }+ SCOPE_EXIT({+ if (core == sys_core) [[unlikely]] {+ sys_core_guard.unlock();+ }+ });auto& current_area = rasterizer_write_areas[core];VAddr subaddress = address >> YUZU_PAGEBITS;bool do_collection = current_area.last_address == subaddress;@@ -799,6 +813,7 @@ struct Memory::Impl {rasterizer_read_areas{};std::array<GPUDirtyState, Core::Hardware::NUM_CPU_CORES> rasterizer_write_areas{};std::span<Core::GPUDirtyMemoryManager> gpu_dirty_managers;+ std::mutex sys_core_guard;};Memory::Memory(Core::System& system_) : system{system_} {diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cppindex 27e2de1bf0..9995b6dd4f 100644--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp@@ -555,7 +555,7 @@ void RasterizerOpenGL::OnCacheInvalidation(VAddr addr, u64 size) {}{std::scoped_lock lock{buffer_cache.mutex};- buffer_cache.CachedWriteMemory(addr, size);+ buffer_cache.WriteMemory(addr, size);}shader_cache.InvalidateRegion(addr, size);}diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cppindex 3bfaabc498..e0ab1eaacd 100644--- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp+++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp@@ -621,7 +621,7 @@ void RasterizerVulkan::OnCacheInvalidation(VAddr addr, u64 size) {}{std::scoped_lock lock{buffer_cache.mutex};- buffer_cache.CachedWriteMemory(addr, size);+ buffer_cache.WriteMemory(addr, size);}pipeline_cache.InvalidateRegion(addr, size);}