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

MTVU: port vuCycles to std::atomic 

V2: use relaxed order as the variable doesn't carry load/store dependency
It is only used as a counter for the speed hack
This commit is contained in:
Gregory Hainaut 2016-07-03 11:12:35 +02:00
parent 3f0655c821
commit 567976e822
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pcsx2/MTVU.cpp
View File

@ -52,7 +52,10 @@ void SaveStateBase::mtvuFreeze()
FreezeTag("MTVU"); FreezeTag("MTVU");
pxAssert(vu1Thread.IsDone()); pxAssert(vu1Thread.IsDone());
if (!IsSaving()) vu1Thread.Reset(); if (!IsSaving()) vu1Thread.Reset();
Freeze(vu1Thread.vuCycles); for (size_t i = 0; i < 4; ++i) {
unsigned int v = vu1Thread.vuCycles[i].load();
Freeze(v);
}
Freeze(vu1Thread.vuCycleIdx); Freeze(vu1Thread.vuCycleIdx);
} }
@ -82,7 +85,8 @@ void VU_Thread::Reset()
write_pos = 0; write_pos = 0;
memzero(vif); memzero(vif);
memzero(vifRegs); memzero(vifRegs);
memzero(vuCycles); for (size_t i = 0; i < 4; ++i)
vu1Thread.vuCycles[i] = 0;
} }
void VU_Thread::ExecuteTaskInThread() void VU_Thread::ExecuteTaskInThread()
@ -109,7 +113,7 @@ void VU_Thread::ExecuteRingBuffer()
vuCPU->Execute(vu1RunCycles); vuCPU->Execute(vu1RunCycles);
gifUnit.gifPath[GIF_PATH_1].FinishGSPacketMTVU(); gifUnit.gifPath[GIF_PATH_1].FinishGSPacketMTVU();
semaXGkick.Post(); // Tell MTGS a path1 packet is complete semaXGkick.Post(); // Tell MTGS a path1 packet is complete
AtomicExchange(vuCycles[vuCycleIdx], vuRegs.cycle); vuCycles[vuCycleIdx].store(vuRegs.cycle, std::memory_order_relaxed);
vuCycleIdx = (vuCycleIdx + 1) & 3; vuCycleIdx = (vuCycleIdx + 1) & 3;
break; break;
} }
@ -265,8 +269,10 @@ __fi void VU_Thread::WriteRegs(VIFregisters* src)
// Used for vu cycle stealing hack // Used for vu cycle stealing hack
u32 VU_Thread::Get_vuCycles() u32 VU_Thread::Get_vuCycles()
{ {
return (AtomicRead(vuCycles[0]) + AtomicRead(vuCycles[1]) return (vuCycles[0].load(std::memory_order_relaxed) +
+ AtomicRead(vuCycles[2]) + AtomicRead(vuCycles[3])) >> 2; vuCycles[1].load(std::memory_order_relaxed) +
vuCycles[2].load(std::memory_order_relaxed) +
vuCycles[3].load(std::memory_order_relaxed)) >> 2;
} }
void VU_Thread::KickStart(bool forceKick) void VU_Thread::KickStart(bool forceKick)

2
pcsx2/MTVU.h
View File

@ -43,7 +43,7 @@ public:
__aligned16 vifStruct vif; __aligned16 vifStruct vif;
__aligned16 VIFregisters vifRegs; __aligned16 VIFregisters vifRegs;
__aligned(4) Semaphore semaXGkick; __aligned(4) Semaphore semaXGkick;
__aligned(4) u32 vuCycles[4]; // Used for VU cycle stealing hack __aligned(4) std::atomic<unsigned int> vuCycles[4]; // Used for VU cycle stealing hack
__aligned(4) u32 vuCycleIdx; // Used for VU cycle stealing hack __aligned(4) u32 vuCycleIdx; // Used for VU cycle stealing hack
VU_Thread(BaseVUmicroCPU*& _vuCPU, VURegs& _vuRegs); VU_Thread(BaseVUmicroCPU*& _vuCPU, VURegs& _vuRegs);