VideoCommon: rewrite sync on idle skipping hack

Now it's done without a busy loop
dolphin-emu · Mar 7, 2015 · e8ba439 · e8ba439
1 parent ec767fa
commit e8ba439
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 29 deletions.
diff --git a/Source/Core/Core/CoreTiming.cpp b/Source/Core/Core/CoreTiming.cpp
@@ -480,11 +480,7 @@ void Idle()
 		//When the FIFO is processing data we must not advance because in this way
 		//the VI will be desynchronized. So, We are waiting until the FIFO finish and
 		//while we process only the events required by the FIFO.
-		while (g_video_backend->Video_IsPossibleWaitingSetDrawDone())
-		{
-			ProcessFifoWaitEvents();
-			Common::YieldCPU();
-		}
+		g_video_backend->Video_Sync();
 	}
 
 	idledCycles += DowncountToCycles(PowerPC::ppcState.downcount);

diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp
@@ -360,11 +360,6 @@ void VideoSoftware::Video_GatherPipeBursted()
 	SWCommandProcessor::GatherPipeBursted();
 }
 
-bool VideoSoftware::Video_IsPossibleWaitingSetDrawDone()
-{
-	return false;
-}
-
 void VideoSoftware::RegisterCPMMIO(MMIO::Mapping* mmio, u32 base)
 {
 	SWCommandProcessor::RegisterMMIO(mmio, base);

diff --git a/Source/Core/VideoBackends/Software/VideoBackend.h b/Source/Core/VideoBackends/Software/VideoBackend.h
@@ -45,7 +45,7 @@ class VideoSoftware : public VideoBackend
 	void Video_SetRendering(bool bEnabled) override;
 
 	void Video_GatherPipeBursted() override;
-	bool Video_IsPossibleWaitingSetDrawDone() override;
+	void Video_Sync() override {}
 
 	void RegisterCPMMIO(MMIO::Mapping* mmio, u32 base) override;
 

diff --git a/Source/Core/VideoCommon/CommandProcessor.cpp b/Source/Core/VideoCommon/CommandProcessor.cpp
@@ -40,7 +40,6 @@ static u16 m_bboxright;
 static u16 m_bboxbottom;
 static u16 m_tokenReg;
 
-volatile bool isPossibleWaitingSetDrawDone = false;
 volatile bool interruptSet= false;
 volatile bool interruptWaiting= false;
 volatile bool interruptTokenWaiting = false;
@@ -70,7 +69,6 @@ void DoState(PointerWrap &p)
 	p.Do(m_tokenReg);
 	p.Do(fifo);
 
-	p.Do(isPossibleWaitingSetDrawDone);
 	p.Do(interruptSet);
 	p.Do(interruptWaiting);
 	p.Do(interruptTokenWaiting);
@@ -123,8 +121,6 @@ void Init()
 	interruptFinishWaiting = false;
 	interruptTokenWaiting = false;
 
-	isPossibleWaitingSetDrawDone = false;
-
 	et_UpdateInterrupts = CoreTiming::RegisterEvent("CPInterrupt", UpdateInterrupts_Wrapper);
 }
 
@@ -518,7 +514,7 @@ void SetCpControlRegister()
 	if (fifo.bFF_GPReadEnable && !m_CPCtrlReg.GPReadEnable)
 	{
 		fifo.bFF_GPReadEnable = m_CPCtrlReg.GPReadEnable;
-		while (fifo.isGpuReadingData) Common::YieldCPU();
+		FlushGpu();
 	}
 	else
 	{

diff --git a/Source/Core/VideoCommon/CommandProcessor.h b/Source/Core/VideoCommon/CommandProcessor.h
@@ -17,7 +17,6 @@ namespace CommandProcessor
 
 extern SCPFifoStruct fifo; //This one is shared between gfx thread and emulator thread.
 
-extern volatile bool isPossibleWaitingSetDrawDone; //This one is used for sync gfx thread and emulator thread.
 extern volatile bool interruptSet;
 extern volatile bool interruptWaiting;
 extern volatile bool interruptTokenWaiting;

diff --git a/Source/Core/VideoCommon/Fifo.cpp b/Source/Core/VideoCommon/Fifo.cpp
@@ -65,6 +65,10 @@ static std::atomic<bool> s_gpu_is_running;
 static std::mutex s_fifo_mutex;
 static std::condition_variable s_fifo_cond_var;
 
+// events for flush gpu
+static std::mutex s_gpu_flush_mutex;
+static std::condition_variable s_gpu_flush_cond_var;
+
 void Fifo_DoState(PointerWrap &p)
 {
 	p.DoArray(s_video_buffer, FIFO_SIZE);
@@ -134,9 +138,8 @@ void ExitGpuLoop()
 {
 	// This should break the wait loop in CPU thread
 	CommandProcessor::fifo.bFF_GPReadEnable = false;
-	SCPFifoStruct &fifo = CommandProcessor::fifo;
-	while (fifo.isGpuReadingData)
-		Common::YieldCPU();
+	FlushGpu();
+
 	// Terminate GPU thread loop
 	GpuRunningState = false;
 	EmuRunningState = true;
@@ -315,7 +318,6 @@ void RunGpuLoop()
 			while (GpuRunningState && EmuRunningState && !CommandProcessor::interruptWaiting && fifo.bFF_GPReadEnable && fifo.CPReadWriteDistance && !AtBreakpoint())
 			{
 				fifo.isGpuReadingData = true;
-				CommandProcessor::isPossibleWaitingSetDrawDone = fifo.bFF_GPLinkEnable ? true : false;
 
 				if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bSyncGPU || Common::AtomicLoad(CommandProcessor::VITicks) > CommandProcessor::m_cpClockOrigin)
 				{
@@ -350,10 +352,12 @@ void RunGpuLoop()
 				// If we don't, s_swapRequested or s_efbAccessRequested won't be set to false
 				// leading the CPU thread to wait in Video_BeginField or Video_AccessEFB thus slowing things down.
 				AsyncRequests::GetInstance()->PullEvents();
-				CommandProcessor::isPossibleWaitingSetDrawDone = false;
 			}
-
-			fifo.isGpuReadingData = false;
+			{
+				std::unique_lock<std::mutex> lock(s_gpu_flush_mutex);
+				fifo.isGpuReadingData = false;
+				s_gpu_flush_cond_var.notify_all();
+			}
 		}
 
 		if (EmuRunningState)
@@ -390,6 +394,17 @@ void RunGpuLoop()
 	AsyncRequests::GetInstance()->SetPassthrough(true);
 }
 
+void FlushGpu()
+{
+	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread || g_use_deterministic_gpu_thread || !CommandProcessor::fifo.isGpuReadingData)
+		return;
+
+	std::unique_lock<std::mutex> lock(s_gpu_flush_mutex);
+	while (CommandProcessor::fifo.isGpuReadingData)
+	{
+		s_gpu_flush_cond_var.wait(lock);
+	}
+}
 
 bool AtBreakpoint()
 {

diff --git a/Source/Core/VideoCommon/Fifo.h b/Source/Core/VideoCommon/Fifo.h
@@ -41,6 +41,7 @@ void SyncGPU(SyncGPUReason reason, bool may_move_read_ptr = true);
 void PushFifoAuxBuffer(void* ptr, size_t size);
 void* PopFifoAuxBuffer(size_t size);
 
+void FlushGpu();
 void RunGpu();
 void RunGpuLoop();
 void ExitGpuLoop();

diff --git a/Source/Core/VideoCommon/MainBase.cpp b/Source/Core/VideoCommon/MainBase.cpp
@@ -233,9 +233,9 @@ void VideoBackendHardware::Video_GatherPipeBursted()
 	CommandProcessor::GatherPipeBursted();
 }
 
-bool VideoBackendHardware::Video_IsPossibleWaitingSetDrawDone()
+void VideoBackendHardware::Video_Sync()
 {
-	return CommandProcessor::isPossibleWaitingSetDrawDone;
+	FlushGpu();
 }
 
 void VideoBackendHardware::RegisterCPMMIO(MMIO::Mapping* mmio, u32 base)

diff --git a/Source/Core/VideoCommon/PixelEngine.cpp b/Source/Core/VideoCommon/PixelEngine.cpp
@@ -287,7 +287,6 @@ void SetFinish_OnMainThread(u64 userdata, int cyclesLate)
 	Common::AtomicStore(*(volatile u32*)&g_bSignalFinishInterrupt, 1);
 	UpdateInterrupts();
 	CommandProcessor::interruptFinishWaiting = false;
-	CommandProcessor::isPossibleWaitingSetDrawDone = false;
 }
 
 // SetToken

diff --git a/Source/Core/VideoCommon/VideoBackendBase.h b/Source/Core/VideoCommon/VideoBackendBase.h
@@ -99,7 +99,7 @@ class VideoBackend
 
 	virtual void Video_GatherPipeBursted() = 0;
 
-	virtual bool Video_IsPossibleWaitingSetDrawDone() = 0;
+	virtual void Video_Sync() = 0;
 
 	// Registers MMIO handlers for the CommandProcessor registers.
 	virtual void RegisterCPMMIO(MMIO::Mapping* mmio, u32 base) = 0;
@@ -148,7 +148,7 @@ class VideoBackendHardware : public VideoBackend
 
 	void Video_GatherPipeBursted() override;
 
-	bool Video_IsPossibleWaitingSetDrawDone() override;
+	void Video_Sync() override;
 
 	void RegisterCPMMIO(MMIO::Mapping* mmio, u32 base) override;