archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 21:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

CPU preemption control: Improve analysis

Browse source
This commit is contained in:
Eladash 2022-09-14 15:03:51 +03:00 • committed by Ivan
parent cf4da5c4d1
commit 2e9ee81dcd
4 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rpcs3/Emu/RSX/GL/GLPresent.cpp
View file

@ -201,6 +201,11 @@ void GLGSRender::flip(const rsx::display_flip_info_t& info)
buffer_height = present_info.height; buffer_height = present_info.height;
} }
if (info.emu_flip)
{
evaluate_cpu_usage_reduction_limits();
}
// Get window state // Get window state
const int width = m_frame->client_width(); const int width = m_frame->client_width();
const int height = m_frame->client_height(); const int height = m_frame->client_height();

10
rpcs3/Emu/RSX/RSXThread.cpp
View file

@ -3493,8 +3493,6 @@ namespace rsx
intr_thread->cmd_notify.notify_one(); intr_thread->cmd_notify.notify_one();
} }
} }
evaluate_cpu_usage_reduction_limits();
} }
void thread::evaluate_cpu_usage_reduction_limits() void thread::evaluate_cpu_usage_reduction_limits()
@ -3574,9 +3572,9 @@ namespace rsx
const u64 cur_diff = (i == frame_times.size() ? current_time : frame_times[i].timestamp) - frame_times[i - 1].timestamp; const u64 cur_diff = (i == frame_times.size() ? current_time : frame_times[i].timestamp) - frame_times[i - 1].timestamp;
if (const u64 diff_of_diff = abs_dst(cur_diff, avg_frame_time); if (const u64 diff_of_diff = abs_dst(cur_diff, avg_frame_time);
diff_of_diff >= avg_frame_time / 4) diff_of_diff >= avg_frame_time / 7)
{ {
if (diff_of_diff >= avg_frame_time / 2) if (diff_of_diff >= avg_frame_time / 3)
{ {
highered_delay++; highered_delay++;
hard_fails++; hard_fails++;
@ -3608,7 +3606,7 @@ namespace rsx
preempt_count = 0; preempt_count = 0;
} }
if (hard_fails > 2 && is_last_frame_a_fail) if ((hard_fails > 2 || fails > 20) && is_last_frame_a_fail)
{ {
hard_measures_taken = preempt_count > 1; hard_measures_taken = preempt_count > 1;
preempt_count = preempt_count * 7 / 8; preempt_count = preempt_count * 7 / 8;
@ -3641,7 +3639,7 @@ namespace rsx
} }
} }
// Sudden FPS drop detection // Sudden FPS drop detection
else if ((fails > 10 || hard_fails > 2 || !(abs_dst(fps_10, 300) < 20 || abs_dst(fps_10, 600) < 30 || abs_dst(fps_10, g_cfg.video.vblank_rate * 10) < 20 || abs_dst(fps_10, g_cfg.video.vblank_rate * 10 / 2) < 30)) && lowered_delay < highered_delay && is_last_frame_a_fail) else if ((fails > 13 || hard_fails > 2 || !(abs_dst(fps_10, 300) < 20 || abs_dst(fps_10, 600) < 30 || abs_dst(fps_10, g_cfg.video.vblank_rate * 10) < 20 || abs_dst(fps_10, g_cfg.video.vblank_rate * 10 / 2) < 30)) && lowered_delay < highered_delay && is_last_frame_a_fail)
{ {
lower_preemption_count(); lower_preemption_count();
} }

3
rpcs3/Emu/RSX/RSXThread.h
View file

@ -800,11 +800,12 @@ namespace rsx
*/ */
void write_vertex_data_to_memory(const vertex_input_layout& layout, u32 first_vertex, u32 vertex_count, void *persistent_data, void *volatile_data); void write_vertex_data_to_memory(const vertex_input_layout& layout, u32 first_vertex, u32 vertex_count, void *persistent_data, void *volatile_data);
void evaluate_cpu_usage_reduction_limits();
private: private:
shared_mutex m_mtx_task; shared_mutex m_mtx_task;
void handle_emu_flip(u32 buffer); void handle_emu_flip(u32 buffer);
void evaluate_cpu_usage_reduction_limits();
void handle_invalidated_memory_range(); void handle_invalidated_memory_range();
public: public:

5
rpcs3/Emu/RSX/VK/VKPresent.cpp
View file

@ -503,6 +503,11 @@ void VKGSRender::flip(const rsx::display_flip_info_t& info)
buffer_height = present_info.height; buffer_height = present_info.height;
} }
if (info.emu_flip)
{
evaluate_cpu_usage_reduction_limits();
}
// Prepare surface for new frame. Set no timeout here so that we wait for the next image if need be // Prepare surface for new frame. Set no timeout here so that we wait for the next image if need be
ensure(m_current_frame->present_image == umax); ensure(m_current_frame->present_image == umax);
ensure(m_current_frame->swap_command_buffer == nullptr); ensure(m_current_frame->swap_command_buffer == nullptr);