mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-12 11:09:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rsx: Simplify FIFO concurrent access.

Browse source
This commit is contained in:
kd-11 2022-09-09 22:04:32 +03:00 • committed by kd-11
commit d686b48f65
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rpcs3/Emu/RSX/RSXFIFO.cpp
View file

@ -119,14 +119,17 @@ namespace rsx
m_cache_size = put - m_cache_addr; m_cache_size = put - m_cache_addr;
} }
rsx::reservation_lock<true, 1> rsx_lock(addr1, m_cache_size, true); // Atomic FIFO debug options
const bool force_cache_fill = g_cfg.core.rsx_fifo_accuracy == rsx_fifo_mode::atomic_ordered;
const bool strict_fetch_ordering = g_cfg.core.rsx_fifo_accuracy >= rsx_fifo_mode::atomic_ordered;
rsx::reservation_lock<true, 1> rsx_lock(addr1, m_cache_size, true);
const auto src = vm::_ptr<spu_rdata_t>(addr1); const auto src = vm::_ptr<spu_rdata_t>(addr1);
// Find the next set bit after every iteration
u64 start_time = 0; u64 start_time = 0;
u32 bytes_read = 0; u32 bytes_read = 0;
// Find the next set bit after every iteration
for (int i = 0;; i = (std::countr_zero<u32>(utils::rol8(to_fetch, 0 - i - 1)) + i + 1) % 8) for (int i = 0;; i = (std::countr_zero<u32>(utils::rol8(to_fetch, 0 - i - 1)) + i + 1) % 8)
{ {
// If a reservation is being updated, try to load another // If a reservation is being updated, try to load another
@ -154,9 +157,10 @@ namespace rsx
if (!start_time) if (!start_time)
{ {
if ((bytes_read << 1) >= m_cache_size) if (bytes_read >= 256 && !force_cache_fill)
{ {
// Cut our losses, we have enough to work with. // Cut our losses if we have something to work with.
// This is the first time falling out of the reservation loop above, so we have clean data with no holes.
m_cache_size = bytes_read; m_cache_size = bytes_read;
break; break;
} }
@ -183,7 +187,7 @@ namespace rsx
busy_wait(200); busy_wait(200);
} }
if (g_cfg.core.rsx_fifo_accuracy >= rsx_fifo_mode::atomic_ordered) if (strict_fetch_ordering)
{ {
i = (i - 1) % 8; i = (i - 1) % 8;
} }