mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-30 21:32:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

zcull: Improve the delay algorithm to be more consistent

Browse Source 
- Use proper time checking; depending on what is being done one 'tick' can
  be almost a millisecond long or several nanoseconds
- Avoid spamming the system timer unless necessary
This commit is contained in:
kd-11 2018-07-27 21:33:10 +03:00 committed by kd-11
parent 38191c3013
commit 0f36e87010
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
rpcs3/Emu/RSX/RSXThread.cpp
View File

@ -2838,7 +2838,7 @@ namespace rsx
if (!It->sink) if (!It->sink)
{ {
It->counter_tag = m_statistics_tag_id; It->counter_tag = m_statistics_tag_id;
It->due_tsc = m_tsc + m_cycles_delay; It->due_tsc = get_system_time() + m_cycles_delay;
It->sink = sink; It->sink = sink;
It->type = type; It->type = type;
@ -2901,7 +2901,7 @@ namespace rsx
} }
//All slots are occupied, try to pop the earliest entry //All slots are occupied, try to pop the earliest entry
m_tsc += max_zcull_cycles_delay; m_tsc += max_zcull_delay_us;
update(ptimer); update(ptimer);
retries++; retries++;
@ -2940,7 +2940,7 @@ namespace rsx
if (m_current_task) if (m_current_task)
m_current_task->num_draws++; m_current_task->num_draws++;
m_cycles_delay = max_zcull_cycles_delay; m_cycles_delay = max_zcull_delay_us;
} }
void ZCULL_control::write(vm::addr_t sink, u32 timestamp, u32 type, u32 value) void ZCULL_control::write(vm::addr_t sink, u32 timestamp, u32 type, u32 value)
@ -3053,20 +3053,30 @@ namespace rsx
} }
//Critical, since its likely a WAIT_FOR_IDLE type has been processed, all results are considered available //Critical, since its likely a WAIT_FOR_IDLE type has been processed, all results are considered available
m_cycles_delay = min_zcull_cycles_delay; m_cycles_delay = min_zcull_delay_us;
m_tsc = std::max(m_tsc, get_system_time());
} }
void ZCULL_control::update(::rsx::thread* ptimer, u32 sync_address) void ZCULL_control::update(::rsx::thread* ptimer, u32 sync_address)
{ {
m_tsc++;
if (m_pending_writes.empty()) if (m_pending_writes.empty())
{
return; return;
}
const auto& front = m_pending_writes.front();
if (!front.sink)
{
// No writables in queue, abort
return;
}
// Update timestamp and proceed with processing only if there is work to be done
m_tsc = std::max(m_tsc, get_system_time());
if (!sync_address) if (!sync_address)
{ {
const auto& front = m_pending_writes.front(); if (m_tsc < front.due_tsc)
if (!front.sink || m_tsc < front.due_tsc)
{ {
// Avoid spamming backend with report status updates // Avoid spamming backend with report status updates
return; return;

8
rpcs3/Emu/RSX/RSXThread.h
View File

@ -258,9 +258,9 @@ namespace rsx
struct ZCULL_control struct ZCULL_control
{ {
// Delay in 'cycles' before a report update operation is forced to retire // Delay before a report update operation is forced to retire
const u32 max_zcull_cycles_delay = 128; const u32 max_zcull_delay_us = 500;
const u32 min_zcull_cycles_delay = 16; const u32 min_zcull_delay_us = 50;
// Number of occlusion query slots available. Real hardware actually has far fewer units before choking // Number of occlusion query slots available. Real hardware actually has far fewer units before choking
const u32 occlusion_query_count = 128; const u32 occlusion_query_count = 128;
@ -273,7 +273,7 @@ namespace rsx
occlusion_query_info* m_current_task = nullptr; occlusion_query_info* m_current_task = nullptr;
u32 m_statistics_tag_id = 0; u32 m_statistics_tag_id = 0;
u64 m_tsc = 0; u64 m_tsc = 0;
u32 m_cycles_delay = max_zcull_cycles_delay; u32 m_cycles_delay = max_zcull_delay_us;
std::vector<queued_report_write> m_pending_writes; std::vector<queued_report_write> m_pending_writes;
std::unordered_map<u32, u32> m_statistics_map; std::unordered_map<u32, u32> m_statistics_map;