CPU: Add low-power PPTC load mode.

Specifically, this setting causes the translation load core count to get reduced by two-thirds, for lower-power but still fast loading, and for unstable CPUs.
Ryubing · Oct 15, 2024 · 0faf3f5 · 0faf3f5
1 parent 4ee1dff
commit 0faf3f5
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 32 deletions.
diff --git a/src/ARMeilleure/Optimizations.cs b/src/ARMeilleure/Optimizations.cs
@@ -5,6 +5,9 @@ namespace ARMeilleure
 
     public static class Optimizations
     {
+        // low-core count PPTC
+        public static bool EcoFriendly { get; set; } = false;
+
         public static bool FastFP { get; set; } = true;
 
         public static bool AllowLcqInFunctionTable { get; set; } = true;

diff --git a/src/ARMeilleure/Translation/PTC/Ptc.cs b/src/ARMeilleure/Translation/PTC/Ptc.cs
@@ -795,10 +795,15 @@ public void MakeAndSaveTranslations(Translator translator)
                 return;
             }
 
+
+
             int degreeOfParallelism = Environment.ProcessorCount;
 
+            if (Optimizations.EcoFriendly)
+                degreeOfParallelism /= 3;
+
             // If there are enough cores lying around, we leave one alone for other tasks.
-            if (degreeOfParallelism > 4)
+            if (degreeOfParallelism > 4 && !Optimizations.EcoFriendly)
             {
                 degreeOfParallelism--;
             }

diff --git a/src/Ryujinx.Graphics.Vulkan/MemoryAllocator.cs b/src/Ryujinx.Graphics.Vulkan/MemoryAllocator.cs
@@ -76,9 +76,7 @@ private MemoryAllocation Allocate(int memoryTypeIndex, ulong size, ulong alignme
             }
         }
 
-        internal int FindSuitableMemoryTypeIndex(
-            uint memoryTypeBits,
-            MemoryPropertyFlags flags)
+        internal int FindSuitableMemoryTypeIndex(uint memoryTypeBits, MemoryPropertyFlags flags)
         {
             for (int i = 0; i < _physicalDevice.PhysicalDeviceMemoryProperties.MemoryTypeCount; i++)
             {

diff --git a/src/Ryujinx.Headless.SDL2/StatusUpdatedEventArgs.cs b/src/Ryujinx.Headless.SDL2/StatusUpdatedEventArgs.cs
@@ -2,23 +2,20 @@
 
 namespace Ryujinx.Headless.SDL2
 {
-    class StatusUpdatedEventArgs : EventArgs
+    class StatusUpdatedEventArgs(
+        bool vSyncEnabled,
+        string dockedMode,
+        string aspectRatio,
+        string gameStatus,
+        string fifoStatus,
+        string gpuName)
+        : EventArgs
     {
-        public bool VSyncEnabled;
-        public string DockedMode;
-        public string AspectRatio;
-        public string GameStatus;
-        public string FifoStatus;
-        public string GpuName;
-
-        public StatusUpdatedEventArgs(bool vSyncEnabled, string dockedMode, string aspectRatio, string gameStatus, string fifoStatus, string gpuName)
-        {
-            VSyncEnabled = vSyncEnabled;
-            DockedMode = dockedMode;
-            AspectRatio = aspectRatio;
-            GameStatus = gameStatus;
-            FifoStatus = fifoStatus;
-            GpuName = gpuName;
-        }
+        public bool VSyncEnabled = vSyncEnabled;
+        public string DockedMode = dockedMode;
+        public string AspectRatio = aspectRatio;
+        public string GameStatus = gameStatus;
+        public string FifoStatus = fifoStatus;
+        public string GpuName = gpuName;
     }
 }
diff --git a/src/Ryujinx.Input.SDL2/SDL2Keyboard.cs b/src/Ryujinx.Input.SDL2/SDL2Keyboard.cs
@@ -12,16 +12,9 @@ namespace Ryujinx.Input.SDL2
 {
     class SDL2Keyboard : IKeyboard
     {
-        private class ButtonMappingEntry
+        private readonly record struct ButtonMappingEntry(GamepadButtonInputId To, Key From)
         {
-            public readonly GamepadButtonInputId To;
-            public readonly Key From;
-
-            public ButtonMappingEntry(GamepadButtonInputId to, Key from)
-            {
-                To = to;
-                From = from;
-            }
+            public bool IsValid => To is not GamepadButtonInputId.Unbound && From is not Key.Unbound;
         }
 
         private readonly object _userMappingLock = new();

diff --git a/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs b/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs
@@ -15,7 +15,7 @@ public class ConfigurationFileFormat
         /// <summary>
         /// The current version of the file format
         /// </summary>
-        public const int CurrentVersion = 52;
+        public const int CurrentVersion = 53;
 
         /// <summary>
         /// Version of the configuration file format
@@ -207,6 +207,11 @@ public class ConfigurationFileFormat
         /// </summary>
         public bool EnablePtc { get; set; }
 
+        /// <summary>
+        /// Enables or disables low-power profiled translation cache persistency loading
+        /// </summary>
+        public bool EnableLowPowerPtc { get; set; }
+
         /// <summary>
         /// Enables or disables guest Internet access
         /// </summary>

diff --git a/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs b/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs
@@ -327,6 +327,11 @@ public class SystemSection
             /// </summary>
             public ReactiveObject<bool> EnablePtc { get; private set; }
 
+            /// <summary>
+            /// Enables or disables low-power profiled translation cache persistency loading
+            /// </summary>
+            public ReactiveObject<bool> EnableLowPowerPtc { get; private set; }
+
             /// <summary>
             /// Enables or disables guest Internet access
             /// </summary>
@@ -382,6 +387,8 @@ public SystemSection()
                 EnableDockedMode.Event += static (sender, e) => LogValueChange(e, nameof(EnableDockedMode));
                 EnablePtc = new ReactiveObject<bool>();
                 EnablePtc.Event += static (sender, e) => LogValueChange(e, nameof(EnablePtc));
+                EnableLowPowerPtc = new ReactiveObject<bool>();
+                EnableLowPowerPtc.Event += static (sender, e) => LogValueChange(e, nameof(EnableLowPowerPtc));
                 EnableInternetAccess = new ReactiveObject<bool>();
                 EnableInternetAccess.Event += static (sender, e) => LogValueChange(e, nameof(EnableInternetAccess));
                 EnableFsIntegrityChecks = new ReactiveObject<bool>();
@@ -706,6 +713,7 @@ public ConfigurationFileFormat ToFileFormat()
                 EnableMacroHLE = Graphics.EnableMacroHLE,
                 EnableColorSpacePassthrough = Graphics.EnableColorSpacePassthrough,
                 EnablePtc = System.EnablePtc,
+                EnableLowPowerPtc = System.EnableLowPowerPtc,
                 EnableInternetAccess = System.EnableInternetAccess,
                 EnableFsIntegrityChecks = System.EnableFsIntegrityChecks,
                 FsGlobalAccessLogMode = System.FsGlobalAccessLogMode,
@@ -1495,6 +1503,15 @@ public void Load(ConfigurationFileFormat configurationFileFormat, string configu
                 configurationFileUpdated = true;
             }
 
+            if (configurationFileFormat.Version < 53)
+            {
+                Ryujinx.Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 53.");
+
+                configurationFileFormat.EnableLowPowerPtc = false;
+
+                configurationFileUpdated = true;
+            }
+
             Logger.EnableFileLog.Value = configurationFileFormat.EnableFileLog;
             Graphics.ResScale.Value = configurationFileFormat.ResScale;
             Graphics.ResScaleCustom.Value = configurationFileFormat.ResScaleCustom;
@@ -1534,6 +1551,7 @@ public void Load(ConfigurationFileFormat configurationFileFormat, string configu
             Graphics.EnableMacroHLE.Value = configurationFileFormat.EnableMacroHLE;
             Graphics.EnableColorSpacePassthrough.Value = configurationFileFormat.EnableColorSpacePassthrough;
             System.EnablePtc.Value = configurationFileFormat.EnablePtc;
+            System.EnableLowPowerPtc.Value = configurationFileFormat.EnableLowPowerPtc;
             System.EnableInternetAccess.Value = configurationFileFormat.EnableInternetAccess;
             System.EnableFsIntegrityChecks.Value = configurationFileFormat.EnableFsIntegrityChecks;
             System.FsGlobalAccessLogMode.Value = configurationFileFormat.FsGlobalAccessLogMode;

diff --git a/src/Ryujinx/AppHost.cs b/src/Ryujinx/AppHost.cs
@@ -406,6 +406,8 @@ private void SaveBitmapAsPng(SKBitmap bitmap, string path)
 
         public void Start()
         {
+            ARMeilleure.Optimizations.EcoFriendly = ConfigurationState.Instance.System.EnableLowPowerPtc;
+
             if (OperatingSystem.IsWindows())
             {
                 _windowsMultimediaTimerResolution = new WindowsMultimediaTimerResolution(1);

diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -150,6 +150,7 @@ public bool AutoloadDirectoryChanged
         public bool EnableMouse { get; set; }
         public bool EnableVsync { get; set; }
         public bool EnablePptc { get; set; }
+        public bool EnableLowPowerPptc { get; set; }
         public bool EnableInternetAccess { get; set; }
         public bool EnableFsIntegrityChecks { get; set; }
         public bool IgnoreMissingServices { get; set; }
@@ -448,6 +449,7 @@ public void LoadCurrentConfiguration()
 
             // CPU
             EnablePptc = config.System.EnablePtc;
+            EnableLowPowerPptc = config.System.EnableLowPowerPtc;
             MemoryMode = (int)config.System.MemoryManagerMode.Value;
             UseHypervisor = config.System.UseHypervisor;
 
@@ -548,6 +550,7 @@ public void SaveSettings()
 
             // CPU
             config.System.EnablePtc.Value = EnablePptc;
+            config.System.EnableLowPowerPtc.Value = EnableLowPowerPptc;
             config.System.MemoryManagerMode.Value = (MemoryManagerMode)MemoryMode;
             config.System.UseHypervisor.Value = UseHypervisor;
 

diff --git a/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml
@@ -1,4 +1,4 @@
-<UserControl
+<UserControl
     x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsCPUView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -32,6 +32,10 @@
                         <TextBlock Text="{locale:Locale SettingsTabSystemEnablePptc}"
                                    ToolTip.Tip="{locale:Locale PptcToggleTooltip}" />
                     </CheckBox>
+                    <CheckBox IsChecked="{Binding EnableLowPowerPptc}">
+                        <TextBlock Text="Low-power PPTC cache"
+                                   ToolTip.Tip="Load the PPTC cache using a third of the amount of cores." />
+                    </CheckBox>
                 </StackPanel>
                 <Separator Height="1" />
                 <TextBlock Classes="h1" Text="{locale:Locale SettingsTabCpuMemory}" />