diff options
| author | JosJuice <josjuice@gmail.com> | 2021-05-13 19:30:30 +0200 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2021-05-15 09:52:04 +0200 |
| commit | 8a0f5ea04a276afcf3f76a038b0d3d88415ecad9 (patch) | |
| tree | 3a2a9ac84b155626d4e6a30c988d932ef592ed0d /Source/Core/VideoCommon | |
| parent | 41befc21cd1124fc8e1e47aeeb8c02d0e110be9b (diff) | |
Remove all remaining volatile qualifiers
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/CommandProcessor.cpp | 153 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/CommandProcessor.h | 18 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Fifo.cpp | 15 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/PerfQueryBase.h | 8 |
4 files changed, 108 insertions, 86 deletions
diff --git a/Source/Core/VideoCommon/CommandProcessor.cpp b/Source/Core/VideoCommon/CommandProcessor.cpp index 14b865386e..4cdb9bd9fc 100644 --- a/Source/Core/VideoCommon/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/CommandProcessor.cpp @@ -119,11 +119,11 @@ void Init() m_tokenReg = 0; memset(&fifo, 0, sizeof(fifo)); - fifo.bFF_Breakpoint = 0; - fifo.bFF_HiWatermark = 0; - fifo.bFF_HiWatermarkInt = 0; - fifo.bFF_LoWatermark = 0; - fifo.bFF_LoWatermarkInt = 0; + fifo.bFF_Breakpoint.store(0, std::memory_order_relaxed); + fifo.bFF_HiWatermark.store(0, std::memory_order_relaxed); + fifo.bFF_HiWatermarkInt.store(0, std::memory_order_relaxed); + fifo.bFF_LoWatermark.store(0, std::memory_order_relaxed); + fifo.bFF_LoWatermarkInt.store(0, std::memory_order_relaxed); s_interrupt_set.Clear(); s_interrupt_waiting.Clear(); @@ -368,7 +368,7 @@ void GatherPipeBursted() } // If the game is running close to overflowing, make the exception checking more frequent. - if (fifo.bFF_HiWatermark) + if (fifo.bFF_HiWatermark.load(std::memory_order_relaxed) != 0) CoreTiming::ForceExceptionCheck(0); fifo.CPReadWriteDistance.fetch_add(GATHER_PIPE_SIZE, std::memory_order_seq_cst); @@ -427,47 +427,53 @@ bool IsInterruptWaiting() void SetCPStatusFromGPU() { // breakpoint - if (fifo.bFF_BPEnable) + const bool breakpoint = fifo.bFF_Breakpoint.load(std::memory_order_relaxed); + if (fifo.bFF_BPEnable.load(std::memory_order_relaxed) != 0) { if (fifo.CPBreakpoint.load(std::memory_order_relaxed) == fifo.CPReadPointer.load(std::memory_order_relaxed)) { - if (!fifo.bFF_Breakpoint) + if (!breakpoint) { DEBUG_LOG_FMT(COMMANDPROCESSOR, "Hit breakpoint at {}", fifo.CPReadPointer.load(std::memory_order_relaxed)); - fifo.bFF_Breakpoint = true; + fifo.bFF_Breakpoint.store(1, std::memory_order_relaxed); } } else { - if (fifo.bFF_Breakpoint) + if (breakpoint) { DEBUG_LOG_FMT(COMMANDPROCESSOR, "Cleared breakpoint at {}", fifo.CPReadPointer.load(std::memory_order_relaxed)); + fifo.bFF_Breakpoint.store(0, std::memory_order_relaxed); } - fifo.bFF_Breakpoint = false; } } else { - if (fifo.bFF_Breakpoint) + if (breakpoint) { DEBUG_LOG_FMT(COMMANDPROCESSOR, "Cleared breakpoint at {}", fifo.CPReadPointer.load(std::memory_order_relaxed)); + fifo.bFF_Breakpoint = false; } - fifo.bFF_Breakpoint = false; } // overflow & underflow check - fifo.bFF_HiWatermark = - (fifo.CPReadWriteDistance.load(std::memory_order_relaxed) > fifo.CPHiWatermark); - fifo.bFF_LoWatermark = - (fifo.CPReadWriteDistance.load(std::memory_order_relaxed) < fifo.CPLoWatermark); - - bool bpInt = fifo.bFF_Breakpoint && fifo.bFF_BPInt; - bool ovfInt = fifo.bFF_HiWatermark && fifo.bFF_HiWatermarkInt; - bool undfInt = fifo.bFF_LoWatermark && fifo.bFF_LoWatermarkInt; + fifo.bFF_HiWatermark.store( + (fifo.CPReadWriteDistance.load(std::memory_order_relaxed) > fifo.CPHiWatermark), + std::memory_order_relaxed); + fifo.bFF_LoWatermark.store( + (fifo.CPReadWriteDistance.load(std::memory_order_relaxed) < fifo.CPLoWatermark), + std::memory_order_relaxed); + + bool bpInt = fifo.bFF_Breakpoint.load(std::memory_order_relaxed) && + fifo.bFF_BPInt.load(std::memory_order_relaxed); + bool ovfInt = fifo.bFF_HiWatermark.load(std::memory_order_relaxed) && + fifo.bFF_HiWatermarkInt.load(std::memory_order_relaxed); + bool undfInt = fifo.bFF_LoWatermark.load(std::memory_order_relaxed) && + fifo.bFF_LoWatermarkInt.load(std::memory_order_relaxed); bool interrupt = (bpInt || ovfInt || undfInt) && m_CPCtrlReg.GPReadEnable; @@ -493,14 +499,19 @@ void SetCPStatusFromGPU() void SetCPStatusFromCPU() { // overflow & underflow check - fifo.bFF_HiWatermark = - (fifo.CPReadWriteDistance.load(std::memory_order_relaxed) > fifo.CPHiWatermark); - fifo.bFF_LoWatermark = - (fifo.CPReadWriteDistance.load(std::memory_order_relaxed) < fifo.CPLoWatermark); - - bool bpInt = fifo.bFF_Breakpoint && fifo.bFF_BPInt; - bool ovfInt = fifo.bFF_HiWatermark && fifo.bFF_HiWatermarkInt; - bool undfInt = fifo.bFF_LoWatermark && fifo.bFF_LoWatermarkInt; + fifo.bFF_HiWatermark.store( + (fifo.CPReadWriteDistance.load(std::memory_order_relaxed) > fifo.CPHiWatermark), + std::memory_order_relaxed); + fifo.bFF_LoWatermark.store( + (fifo.CPReadWriteDistance.load(std::memory_order_relaxed) < fifo.CPLoWatermark), + std::memory_order_relaxed); + + bool bpInt = fifo.bFF_Breakpoint.load(std::memory_order_relaxed) && + fifo.bFF_BPInt.load(std::memory_order_relaxed); + bool ovfInt = fifo.bFF_HiWatermark.load(std::memory_order_relaxed) && + fifo.bFF_HiWatermarkInt.load(std::memory_order_relaxed); + bool undfInt = fifo.bFF_LoWatermark.load(std::memory_order_relaxed) && + fifo.bFF_LoWatermarkInt.load(std::memory_order_relaxed); bool interrupt = (bpInt || ovfInt || undfInt) && m_CPCtrlReg.GPReadEnable; @@ -526,14 +537,15 @@ void SetCPStatusFromCPU() void SetCpStatusRegister() { // Here always there is one fifo attached to the GPU - m_CPStatusReg.Breakpoint = fifo.bFF_Breakpoint; + m_CPStatusReg.Breakpoint = fifo.bFF_Breakpoint.load(std::memory_order_relaxed); m_CPStatusReg.ReadIdle = !fifo.CPReadWriteDistance.load(std::memory_order_relaxed) || (fifo.CPReadPointer.load(std::memory_order_relaxed) == fifo.CPWritePointer.load(std::memory_order_relaxed)); m_CPStatusReg.CommandIdle = !fifo.CPReadWriteDistance.load(std::memory_order_relaxed) || - Fifo::AtBreakpoint() || !fifo.bFF_GPReadEnable; - m_CPStatusReg.UnderflowLoWatermark = fifo.bFF_LoWatermark; - m_CPStatusReg.OverflowHiWatermark = fifo.bFF_HiWatermark; + Fifo::AtBreakpoint() || + !fifo.bFF_GPReadEnable.load(std::memory_order_relaxed); + m_CPStatusReg.UnderflowLoWatermark = fifo.bFF_LoWatermark.load(std::memory_order_relaxed); + m_CPStatusReg.OverflowHiWatermark = fifo.bFF_HiWatermark.load(std::memory_order_relaxed); DEBUG_LOG_FMT(COMMANDPROCESSOR, "\t Read from STATUS_REGISTER : {:04x}", m_CPStatusReg.Hex); DEBUG_LOG_FMT( @@ -545,15 +557,15 @@ void SetCpStatusRegister() void SetCpControlRegister() { - fifo.bFF_BPInt = m_CPCtrlReg.BPInt; - fifo.bFF_BPEnable = m_CPCtrlReg.BPEnable; - fifo.bFF_HiWatermarkInt = m_CPCtrlReg.FifoOverflowIntEnable; - fifo.bFF_LoWatermarkInt = m_CPCtrlReg.FifoUnderflowIntEnable; - fifo.bFF_GPLinkEnable = m_CPCtrlReg.GPLinkEnable; + fifo.bFF_BPInt.store(m_CPCtrlReg.BPInt, std::memory_order_relaxed); + fifo.bFF_BPEnable.store(m_CPCtrlReg.BPEnable, std::memory_order_relaxed); + fifo.bFF_HiWatermarkInt.store(m_CPCtrlReg.FifoOverflowIntEnable, std::memory_order_relaxed); + fifo.bFF_LoWatermarkInt.store(m_CPCtrlReg.FifoUnderflowIntEnable, std::memory_order_relaxed); + fifo.bFF_GPLinkEnable.store(m_CPCtrlReg.GPLinkEnable, std::memory_order_relaxed); - if (fifo.bFF_GPReadEnable && !m_CPCtrlReg.GPReadEnable) + if (fifo.bFF_GPReadEnable.load(std::memory_order_relaxed) && !m_CPCtrlReg.GPReadEnable) { - fifo.bFF_GPReadEnable = m_CPCtrlReg.GPReadEnable; + fifo.bFF_GPReadEnable.store(m_CPCtrlReg.GPReadEnable, std::memory_order_relaxed); Fifo::FlushGpu(); } else @@ -562,8 +574,10 @@ void SetCpControlRegister() } DEBUG_LOG_FMT(COMMANDPROCESSOR, "\t GPREAD {} | BP {} | Int {} | OvF {} | UndF {} | LINK {}", - fifo.bFF_GPReadEnable ? "ON" : "OFF", fifo.bFF_BPEnable ? "ON" : "OFF", - fifo.bFF_BPInt ? "ON" : "OFF", m_CPCtrlReg.FifoOverflowIntEnable ? "ON" : "OFF", + fifo.bFF_GPReadEnable.load(std::memory_order_relaxed) ? "ON" : "OFF", + fifo.bFF_BPEnable.load(std::memory_order_relaxed) ? "ON" : "OFF", + fifo.bFF_BPInt.load(std::memory_order_relaxed) ? "ON" : "OFF", + m_CPCtrlReg.FifoOverflowIntEnable ? "ON" : "OFF", m_CPCtrlReg.FifoUnderflowIntEnable ? "ON" : "OFF", m_CPCtrlReg.GPLinkEnable ? "ON" : "OFF"); } @@ -588,32 +602,35 @@ void HandleUnknownOpcode(u8 cmd_byte, void* buffer, bool preprocess) cmd_byte, buffer, preprocess ? "preprocess=true" : "preprocess=false"); { - PanicAlertFmt( - "Illegal command {:02x}\n" - "CPBase: {:#010x}\n" - "CPEnd: {:#010x}\n" - "CPHiWatermark: {:#010x}\n" - "CPLoWatermark: {:#010x}\n" - "CPReadWriteDistance: {:#010x}\n" - "CPWritePointer: {:#010x}\n" - "CPReadPointer: {:#010x}\n" - "CPBreakpoint: {:#010x}\n" - "bFF_GPReadEnable: {}\n" - "bFF_BPEnable: {}\n" - "bFF_BPInt: {}\n" - "bFF_Breakpoint: {}\n" - "bFF_GPLinkEnable: {}\n" - "bFF_HiWatermarkInt: {}\n" - "bFF_LoWatermarkInt: {}\n", - cmd_byte, fifo.CPBase.load(std::memory_order_relaxed), - fifo.CPEnd.load(std::memory_order_relaxed), fifo.CPHiWatermark, fifo.CPLoWatermark, - fifo.CPReadWriteDistance.load(std::memory_order_relaxed), - fifo.CPWritePointer.load(std::memory_order_relaxed), - fifo.CPReadPointer.load(std::memory_order_relaxed), - fifo.CPBreakpoint.load(std::memory_order_relaxed), fifo.bFF_GPReadEnable ? "true" : "false", - fifo.bFF_BPEnable ? "true" : "false", fifo.bFF_BPInt ? "true" : "false", - fifo.bFF_Breakpoint ? "true" : "false", fifo.bFF_GPLinkEnable ? "true" : "false", - fifo.bFF_HiWatermarkInt ? "true" : "false", fifo.bFF_LoWatermarkInt ? "true" : "false"); + PanicAlertFmt("Illegal command {:02x}\n" + "CPBase: {:#010x}\n" + "CPEnd: {:#010x}\n" + "CPHiWatermark: {:#010x}\n" + "CPLoWatermark: {:#010x}\n" + "CPReadWriteDistance: {:#010x}\n" + "CPWritePointer: {:#010x}\n" + "CPReadPointer: {:#010x}\n" + "CPBreakpoint: {:#010x}\n" + "bFF_GPReadEnable: {}\n" + "bFF_BPEnable: {}\n" + "bFF_BPInt: {}\n" + "bFF_Breakpoint: {}\n" + "bFF_GPLinkEnable: {}\n" + "bFF_HiWatermarkInt: {}\n" + "bFF_LoWatermarkInt: {}\n", + cmd_byte, fifo.CPBase.load(std::memory_order_relaxed), + fifo.CPEnd.load(std::memory_order_relaxed), fifo.CPHiWatermark, + fifo.CPLoWatermark, fifo.CPReadWriteDistance.load(std::memory_order_relaxed), + fifo.CPWritePointer.load(std::memory_order_relaxed), + fifo.CPReadPointer.load(std::memory_order_relaxed), + fifo.CPBreakpoint.load(std::memory_order_relaxed), + fifo.bFF_GPReadEnable.load(std::memory_order_relaxed) ? "true" : "false", + fifo.bFF_BPEnable.load(std::memory_order_relaxed) ? "true" : "false", + fifo.bFF_BPInt.load(std::memory_order_relaxed) ? "true" : "false", + fifo.bFF_Breakpoint.load(std::memory_order_relaxed) ? "true" : "false", + fifo.bFF_GPLinkEnable.load(std::memory_order_relaxed) ? "true" : "false", + fifo.bFF_HiWatermarkInt.load(std::memory_order_relaxed) ? "true" : "false", + fifo.bFF_LoWatermarkInt.load(std::memory_order_relaxed) ? "true" : "false"); } } diff --git a/Source/Core/VideoCommon/CommandProcessor.h b/Source/Core/VideoCommon/CommandProcessor.h index bc0a8ede49..20f2bc243c 100644 --- a/Source/Core/VideoCommon/CommandProcessor.h +++ b/Source/Core/VideoCommon/CommandProcessor.h @@ -29,17 +29,17 @@ struct SCPFifoStruct std::atomic<u32> CPBreakpoint; std::atomic<u32> SafeCPReadPointer; - volatile u32 bFF_GPLinkEnable; - volatile u32 bFF_GPReadEnable; - volatile u32 bFF_BPEnable; - volatile u32 bFF_BPInt; - volatile u32 bFF_Breakpoint; + std::atomic<u32> bFF_GPLinkEnable; + std::atomic<u32> bFF_GPReadEnable; + std::atomic<u32> bFF_BPEnable; + std::atomic<u32> bFF_BPInt; + std::atomic<u32> bFF_Breakpoint; - volatile u32 bFF_LoWatermarkInt; - volatile u32 bFF_HiWatermarkInt; + std::atomic<u32> bFF_LoWatermarkInt; + std::atomic<u32> bFF_HiWatermarkInt; - volatile u32 bFF_LoWatermark; - volatile u32 bFF_HiWatermark; + std::atomic<u32> bFF_LoWatermark; + std::atomic<u32> bFF_HiWatermark; void DoState(PointerWrap& p); }; diff --git a/Source/Core/VideoCommon/Fifo.cpp b/Source/Core/VideoCommon/Fifo.cpp index f12776449c..cfc126cfc1 100644 --- a/Source/Core/VideoCommon/Fifo.cpp +++ b/Source/Core/VideoCommon/Fifo.cpp @@ -139,7 +139,7 @@ void Shutdown() void ExitGpuLoop() { // This should break the wait loop in CPU thread - CommandProcessor::fifo.bFF_GPReadEnable = false; + CommandProcessor::fifo.bFF_GPReadEnable.store(0, std::memory_order_relaxed); FlushGpu(); // Terminate GPU thread loop @@ -327,7 +327,8 @@ void RunGpuLoop() CommandProcessor::SetCPStatusFromGPU(); // check if we are able to run this buffer - while (!CommandProcessor::IsInterruptWaiting() && fifo.bFF_GPReadEnable && + while (!CommandProcessor::IsInterruptWaiting() && + fifo.bFF_GPReadEnable.load(std::memory_order_relaxed) && fifo.CPReadWriteDistance.load(std::memory_order_relaxed) && !AtBreakpoint()) { if (param.bSyncGPU && s_sync_ticks.load() < param.iSyncGpuMinDistance) @@ -415,8 +416,9 @@ void GpuMaySleep() bool AtBreakpoint() { CommandProcessor::SCPFifoStruct& fifo = CommandProcessor::fifo; - return fifo.bFF_BPEnable && (fifo.CPReadPointer.load(std::memory_order_relaxed) == - fifo.CPBreakpoint.load(std::memory_order_relaxed)); + return fifo.bFF_BPEnable.load(std::memory_order_relaxed) && + (fifo.CPReadPointer.load(std::memory_order_relaxed) == + fifo.CPBreakpoint.load(std::memory_order_relaxed)); } void RunGpu() @@ -446,8 +448,9 @@ static int RunGpuOnCpu(int ticks) CommandProcessor::SCPFifoStruct& fifo = CommandProcessor::fifo; bool reset_simd_state = false; int available_ticks = int(ticks * SConfig::GetInstance().fSyncGpuOverclock) + s_sync_ticks.load(); - while (fifo.bFF_GPReadEnable && fifo.CPReadWriteDistance.load(std::memory_order_relaxed) && - !AtBreakpoint() && available_ticks >= 0) + while (fifo.bFF_GPReadEnable.load(std::memory_order_relaxed) && + fifo.CPReadWriteDistance.load(std::memory_order_relaxed) && !AtBreakpoint() && + available_ticks >= 0) { if (s_use_deterministic_gpu_thread) { diff --git a/Source/Core/VideoCommon/PerfQueryBase.h b/Source/Core/VideoCommon/PerfQueryBase.h index de99b215c9..9e29e238a6 100644 --- a/Source/Core/VideoCommon/PerfQueryBase.h +++ b/Source/Core/VideoCommon/PerfQueryBase.h @@ -4,7 +4,10 @@ #pragma once +#include <array> +#include <atomic> #include <memory> + #include "Common/CommonTypes.h" enum PerfQueryType @@ -61,9 +64,8 @@ public: virtual bool IsFlushed() const { return true; } protected: - // TODO: sloppy - volatile u32 m_query_count; - volatile u32 m_results[PQG_NUM_MEMBERS]; + std::atomic<u32> m_query_count; + std::array<std::atomic<u32>, PQG_NUM_MEMBERS> m_results; }; extern std::unique_ptr<PerfQueryBase> g_perf_query; |
