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

Cleanup after #5310 (SPU thread groups)

Browse source 
Move lambda into a cpu_stop()
Use running thread counter to synchronize with sys_spu_thread_group_join()
Use SPU_STATUS_STOPPED_BY_STOP exclusively for sys_spu_thread_exit() as before
Remove unnecessary waiting in sys_spu_thread_group_exit()
Rollback some minor unnecessary changes
Use shared_mutex in SPU TG
This commit is contained in:
Nekotekina 2018-11-13 18:40:41 +03:00
parent 0e0a82e536
commit 0044eb44e2
4 changed files with 69 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

63
rpcs3/Emu/Cell/SPUThread.cpp
View file

@ -476,25 +476,28 @@ void spu_thread::cpu_init()
gpr[1]._u32[3] = 0x3FFF0; // initial stack frame pointer
}
void spu_thread::cpu_stop()
{
if (!group && offset >= RAW_SPU_BASE_ADDR)
{
// Save next PC and current SPU Interrupt Status
npc = pc | (interrupts_enabled);
}
else if (group && is_stopped())
{
if (verify(HERE, group->running--) == 1)
{
// Notify on last thread stopped
group->mutex.lock_unlock();
group->cond.notify_all();
}
}
}
extern thread_local std::string(*g_tls_log_prefix)();
void spu_thread::cpu_task()
{
auto end_cpu_task = [&]()
{
// save next PC and current SPU Interrupt status
if (!group && offset >= RAW_SPU_BASE_ADDR)
{
npc = pc | (interrupts_enabled);
}
if (state & cpu_flag::stop)
{
status |= SPU_STATUS_STOPPED_BY_STOP;
if (group) group->cv.notify_all();
}
};
// Get next PC and SPU Interrupt status
pc = npc.exchange(0);
@ -525,8 +528,7 @@ void spu_thread::cpu_task()
// Print some stats
LOG_NOTICE(SPU, "Stats: Block Weight: %u (Retreats: %u);", block_counter, block_failure);
end_cpu_task();
cpu_stop();
return;
}
@ -608,7 +610,7 @@ void spu_thread::cpu_task()
}
}
end_cpu_task();
cpu_stop();
}
void spu_thread::cpu_mem()
@ -2067,6 +2069,7 @@ bool spu_thread::stop_and_signal(u32 code)
status.atomic_op([code](u32& status)
{
status = (status & 0xffff) | (code << 16);
status |= SPU_STATUS_STOPPED_BY_STOP;
status &= ~SPU_STATUS_RUNNING;
});
@ -2358,26 +2361,6 @@ bool spu_thread::stop_and_signal(u32 code)
}
}
while (!Emu.IsStopped())
{
bool stopped = true;
for (auto& thread : group->threads)
{
if (thread && thread.get() != this)
{
if ((thread->status & SPU_STATUS_STOPPED_BY_STOP) == 0)
{
stopped = false;
break;
}
}
}
if (stopped) break;
group->cv.wait(group->mutex, 1000);
}
group->run_state = SPU_THREAD_GROUP_STATUS_INITIALIZED;
group->exit_status = value;
group->join_state |= SPU_TGJSF_GROUP_EXIT;
@ -2396,9 +2379,7 @@ bool spu_thread::stop_and_signal(u32 code)
}
LOG_TRACE(SPU, "sys_spu_thread_exit(status=0x%x)", ch_out_mbox.get_value());
std::lock_guard lock(group->mutex);
status |= SPU_STATUS_STOPPED_BY_STOP;
state += cpu_flag::stop;
return true;
}