Fix preformance regression on TSX path

RPCS3 · Apr 28, 2020 · 5fb53ef · 5fb53ef
1 parent 7da8ba5
commit 5fb53ef
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp
@@ -1035,6 +1035,11 @@ static T ppu_load_acquire_reservation(ppu_thread& ppu, u32 addr)
 
 	for (u64 count = 0; g_use_rtm; [&]()
 	{
+		if (ppu.is_paused())
+		{
+			ppu.check_state();
+		}
+
 		if (++count < 20) [[likely]]
 		{
 			busy_wait(300);
@@ -1049,21 +1054,14 @@ static T ppu_load_acquire_reservation(ppu_thread& ppu, u32 addr)
 
 		if (ppu.rtime & 127)
 		{
-			if (!(ppu.state & cpu_flag::wait))
-			{
-				ppu.state += cpu_flag::wait;
-			}
-
 			continue;
 		}
 
 		ppu.rdata = data;
 
 		if (vm::reservation_acquire(addr, sizeof(T)) == ppu.rtime) [[likely]]
 		{
-			ppu.test_stopped();
-
-			if (count >= 10) [[unlikely]]
+			if (count >= 15) [[unlikely]]
 			{
 				ppu_log.error("%s took too long: %u", sizeof(T) == 4 ? "LWARX" : "LDARX", count);
 			}

diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp
@@ -1737,9 +1737,9 @@ bool spu_thread::process_mfc_cmd()
 
 		for (u64 i = 0;; [&]()
 		{
-			if (ntime & 127 && g_use_rtm && !(state & cpu_flag::wait))
+			if (is_paused())
 			{
-				state += cpu_flag::wait;
+				check_state();
 			}
 
 			if (++i < 25) [[likely]]
@@ -1766,7 +1766,7 @@ bool spu_thread::process_mfc_cmd()
 				ntime != time0)
 			{
 				// Reservation data has been modified recently
-				if (time0 & 127) i += 12, ntime = time0;
+				if (time0 & 127) i += 12;
 				continue;
 			}