ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MTGS: use acquire/release semantics for atomic operation 

* Avoid the generation of memory barrier (mfence)
* Based on the fact that it used to work on previous code without any
  barrier

v2:
* keep "slow" and safe atomic on reset path
* use relaxed atomic for m_RingBufferIsBusy
The signal doesn't carry dependency with others load/store. Instead it is used
as an hint to awake the semaphore
As a side, there is a potential thread bug

T1 do
* wait sema
* busy = true;
* while (!queue.empty) do work...
* busy = false;
* go back to wait sema

T2 do
* post sema even if busy is false

If T1 stop after the while queue but before the busy, T2 won't post the
event. When T1 will wake up, it will block on the semaphore
This commit is contained in:
Gregory Hainaut 2016-07-02 18:31:27 +02:00
parent d855bc5ca8
commit 6fb7beb58a
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pcsx2/MTGS.cpp
View File

@ -74,7 +74,7 @@ void SysMtgsThread::OnStart()
m_ReadPos = 0; m_ReadPos = 0;
m_WritePos = 0; m_WritePos = 0;
m_RingBufferIsBusy = false; m_RingBufferIsBusy = false;
m_packet_size = 0; m_packet_size = 0;
m_packet_writepos = 0; m_packet_writepos = 0;
@ -110,9 +110,9 @@ void SysMtgsThread::ResetGS()
// * Signal a reset. // * Signal a reset.
// * clear the path and byRegs structs (used by GIFtagDummy) // * clear the path and byRegs structs (used by GIFtagDummy)
m_ReadPos = m_WritePos; m_ReadPos = m_WritePos;
m_QueuedFrameCount = 0; m_QueuedFrameCount = 0;
m_VsyncSignalListener = false; m_VsyncSignalListener = 0;
MTGS_LOG( "MTGS: Sending Reset..." ); MTGS_LOG( "MTGS: Sending Reset..." );
SendSimplePacket( GS_RINGTYPE_RESET, 0, 0, 0 ); SendSimplePacket( GS_RINGTYPE_RESET, 0, 0, 0 );
@ -163,7 +163,7 @@ void SysMtgsThread::PostVsyncStart()
if ((m_QueuedFrameCount.fetch_add(1) < EmuConfig.GS.VsyncQueueSize) /*|| (!EmuConfig.GS.VsyncEnable && !EmuConfig.GS.FrameLimitEnable)*/) return; if ((m_QueuedFrameCount.fetch_add(1) < EmuConfig.GS.VsyncQueueSize) /*|| (!EmuConfig.GS.VsyncEnable && !EmuConfig.GS.FrameLimitEnable)*/) return;
m_VsyncSignalListener = true; m_VsyncSignalListener.store(true, std::memory_order_release);
//Console.WriteLn( Color_Blue, "(EEcore Sleep) Vsync\t\tringpos=0x%06x, writepos=0x%06x", volatize(m_ReadPos), m_WritePos ); //Console.WriteLn( Color_Blue, "(EEcore Sleep) Vsync\t\tringpos=0x%06x, writepos=0x%06x", volatize(m_ReadPos), m_WritePos );
m_sem_Vsync.WaitNoCancel(); m_sem_Vsync.WaitNoCancel();
} }
@ -247,18 +247,18 @@ struct RingBufferLock {
: m_lock1(mtgs.m_mtx_RingBufferBusy), : m_lock1(mtgs.m_mtx_RingBufferBusy),
m_lock2(mtgs.m_mtx_RingBufferBusy2), m_lock2(mtgs.m_mtx_RingBufferBusy2),
m_mtgs(mtgs) { m_mtgs(mtgs) {
m_mtgs.m_RingBufferIsBusy = true; m_mtgs.m_RingBufferIsBusy.store(true, std::memory_order_relaxed);
} }
virtual ~RingBufferLock() throw() { virtual ~RingBufferLock() throw() {
m_mtgs.m_RingBufferIsBusy = false; m_mtgs.m_RingBufferIsBusy.store(false, std::memory_order_relaxed);
} }
void Acquire() { void Acquire() {
m_lock1.Acquire(); m_lock1.Acquire();
m_lock2.Acquire(); m_lock2.Acquire();
m_mtgs.m_RingBufferIsBusy = true; m_mtgs.m_RingBufferIsBusy.store(true, std::memory_order_relaxed);
} }
void Release() { void Release() {
m_mtgs.m_RingBufferIsBusy = false; m_mtgs.m_RingBufferIsBusy.store(false, std::memory_order_relaxed);
m_lock2.Release(); m_lock2.Release();
m_lock1.Release(); m_lock1.Release();
} }
@ -525,13 +525,13 @@ void SysMtgsThread::ExecuteTaskInThread()
m_ReadPos = newringpos; m_ReadPos = newringpos;
if( m_SignalRingEnable ) if(m_SignalRingEnable.load(std::memory_order_acquire))
{ {
// The EEcore has requested a signal after some amount of processed data. // The EEcore has requested a signal after some amount of processed data.
if( m_SignalRingPosition.fetch_sub( ringposinc ) <= 0 ) if( m_SignalRingPosition.fetch_sub( ringposinc ) <= 0 )
{ {
// Make sure to post the signal after the m_ReadPos has been updated... // Make sure to post the signal after the m_ReadPos has been updated...
m_SignalRingEnable = false; m_SignalRingEnable.store(false, std::memory_order_release);
m_sem_OnRingReset.Post(); m_sem_OnRingReset.Post();
continue; continue;
} }
@ -547,7 +547,7 @@ void SysMtgsThread::ExecuteTaskInThread()
if( m_SignalRingEnable.exchange(false) ) if( m_SignalRingEnable.exchange(false) )
{ {
//Console.Warning( "(MTGS Thread) Dangling RingSignal on empty buffer! signalpos=0x%06x", m_SignalRingPosition.exchange(0) ) ); //Console.Warning( "(MTGS Thread) Dangling RingSignal on empty buffer! signalpos=0x%06x", m_SignalRingPosition.exchange(0) ) );
m_SignalRingPosition = 0; m_SignalRingPosition.store(0, std::memory_order_release);
m_sem_OnRingReset.Post(); m_sem_OnRingReset.Post();
} }
@ -629,7 +629,7 @@ void SysMtgsThread::WaitGS(bool syncRegs, bool weakWait, bool isMTVU)
// For use in loops that wait on the GS thread to do certain things. // For use in loops that wait on the GS thread to do certain things.
void SysMtgsThread::SetEvent() void SysMtgsThread::SetEvent()
{ {
if(!m_RingBufferIsBusy) if(!m_RingBufferIsBusy.load(std::memory_order_relaxed))
m_sem_event.Post(); m_sem_event.Post();
m_CopyDataTally = 0; m_CopyDataTally = 0;
@ -655,11 +655,11 @@ void SysMtgsThread::SendDataPacket()
m_WritePos = m_packet_writepos; m_WritePos = m_packet_writepos;
if( EmuConfig.GS.SynchronousMTGS ) if(EmuConfig.GS.SynchronousMTGS)
{ {
WaitGS(); WaitGS();
} }
else if( !m_RingBufferIsBusy ) else if(!m_RingBufferIsBusy.load(std::memory_order_relaxed))
{ {
m_CopyDataTally += m_packet_size; m_CopyDataTally += m_packet_size;
if( m_CopyDataTally > 0x2000 ) SetEvent(); if( m_CopyDataTally > 0x2000 ) SetEvent();
@ -714,12 +714,12 @@ void SysMtgsThread::GenericStall( uint size )
if( somedone > 0x80 ) if( somedone > 0x80 )
{ {
pxAssertDev( m_SignalRingEnable == 0, "MTGS Thread Synchronization Error" ); pxAssertDev( m_SignalRingEnable == 0, "MTGS Thread Synchronization Error" );
m_SignalRingPosition = somedone; m_SignalRingPosition.store(somedone, std::memory_order_release);
//Console.WriteLn( Color_Blue, "(EEcore Sleep) PrepDataPacker \tringpos=0x%06x, writepos=0x%06x, signalpos=0x%06x", readpos, writepos, m_SignalRingPosition ); //Console.WriteLn( Color_Blue, "(EEcore Sleep) PrepDataPacker \tringpos=0x%06x, writepos=0x%06x, signalpos=0x%06x", readpos, writepos, m_SignalRingPosition );
while(true) { while(true) {
m_SignalRingEnable = true; m_SignalRingEnable.store(true, std::memory_order_release);
SetEvent(); SetEvent();
m_sem_OnRingReset.WaitWithoutYield(); m_sem_OnRingReset.WaitWithoutYield();
readpos = volatize(m_ReadPos); readpos = volatize(m_ReadPos);
@ -814,7 +814,7 @@ void SysMtgsThread::SendSimpleGSPacket(MTGS_RingCommand type, u32 offset, u32 si
SendSimplePacket(type, (int)offset, (int)size, (int)path); SendSimplePacket(type, (int)offset, (int)size, (int)path);
if(!EmuConfig.GS.SynchronousMTGS) { if(!EmuConfig.GS.SynchronousMTGS) {
if(!m_RingBufferIsBusy) { if(!m_RingBufferIsBusy.load(std::memory_order_relaxed)) {
m_CopyDataTally += size / 16; m_CopyDataTally += size / 16;
if (m_CopyDataTally > 0x2000) SetEvent(); if (m_CopyDataTally > 0x2000) SetEvent();
} }