cores rework (#505)

This PR changes the core count to be defined in the device instead of
being a const value.
This is mostly a change for future features I want to implement and
should not impact any functionality.
The console will now log the range of cores requested from the
application, and for now, if the requested range is not 0 to 2 (the 3
cores used for application emulation), it will give an error message
which tells the user to contact me on discord. I'm doing this because
I'm interested in finding applications/games that don't use 3 cores and
the error will be removed in the future once I've gotten enough data.

src/Ryujinx.HLE/HOS/Horizon.cs

@@ -284,7 +284,7 @@ namespace Ryujinx.HLE.HOS
                 ProcessCreationInfo creationInfo = new("Service", 1, 0, 0x8000000, 1, Flags, 0, 0);
 
                 uint[] defaultCapabilities = {
-                    0x030363F7,
+                    (((uint)KScheduler.CpuCoresCount - 1) << 24) + (((uint)KScheduler.CpuCoresCount - 1) << 16) + 0x63F7u,
                     0x1FFFFFCF,
                     0x207FFFEF,
                     0x47E0060F,

src/Ryujinx.HLE/HOS/Kernel/KernelContext.cs

@@ -63,6 +63,7 @@ namespace Ryujinx.HLE.HOS.Kernel
             TickSource = tickSource;
             Device = device;
             Memory = memory;
+            KScheduler.CpuCoresCount = device.CpuCoresCount;
 
             Running = true;
 

src/Ryujinx.HLE/HOS/Kernel/KernelStatic.cs

@@ -37,7 +37,7 @@ namespace Ryujinx.HLE.HOS.Kernel
                 return result;
             }
 
-            process.DefaultCpuCore = 3;
+            process.DefaultCpuCore = KScheduler.CpuCoresCount - 1;
 
             context.Processes.TryAdd(process.Pid, process);
 

src/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs

@@ -277,7 +277,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
                 return result;
             }
 
-            result = Capabilities.InitializeForUser(capabilities, MemoryManager);
+            result = Capabilities.InitializeForUser(capabilities, MemoryManager, IsApplication);
 
             if (result != Result.Success)
             {

src/Ryujinx.HLE/HOS/Kernel/Process/KProcessCapabilities.cs

@@ -35,15 +35,15 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
             DebuggingFlags &= ~3u;
             KernelReleaseVersion = KProcess.KernelVersionPacked;
 
-            return Parse(capabilities, memoryManager);
+            return Parse(capabilities, memoryManager, false);
         }
 
-        public Result InitializeForUser(ReadOnlySpan<uint> capabilities, KPageTableBase memoryManager)
+        public Result InitializeForUser(ReadOnlySpan<uint> capabilities, KPageTableBase memoryManager, bool isApplication)
         {
-            return Parse(capabilities, memoryManager);
+            return Parse(capabilities, memoryManager, isApplication);
         }
 
-        private Result Parse(ReadOnlySpan<uint> capabilities, KPageTableBase memoryManager)
+        private Result Parse(ReadOnlySpan<uint> capabilities, KPageTableBase memoryManager, bool isApplication)
         {
             int mask0 = 0;
             int mask1 = 0;
@@ -54,7 +54,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
 
                 if (cap.GetCapabilityType() != CapabilityType.MapRange)
                 {
-                    Result result = ParseCapability(cap, ref mask0, ref mask1, memoryManager);
+                    Result result = ParseCapability(cap, ref mask0, ref mask1, memoryManager, isApplication);
 
                     if (result != Result.Success)
                     {
@@ -120,7 +120,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
             return Result.Success;
         }
 
-        private Result ParseCapability(uint cap, ref int mask0, ref int mask1, KPageTableBase memoryManager)
+        private Result ParseCapability(uint cap, ref int mask0, ref int mask1, KPageTableBase memoryManager, bool isApplication)
         {
             CapabilityType code = cap.GetCapabilityType();
 
@@ -176,6 +176,11 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
                         AllowedCpuCoresMask = GetMaskFromMinMax(lowestCpuCore, highestCpuCore);
                         AllowedThreadPriosMask = GetMaskFromMinMax(lowestThreadPrio, highestThreadPrio);
 
+                        if (isApplication && lowestCpuCore == 0 && highestCpuCore != 2)
+                            Ryujinx.Common.Logging.Logger.Error?.Print(Ryujinx.Common.Logging.LogClass.Application, $"Application requested cores with index range {lowestCpuCore} to {highestCpuCore}! Report this to @LotP on the Ryujinx/Ryubing discord server (discord.gg/ryujinx)!");
+                        else if (isApplication)
+                            Ryujinx.Common.Logging.Logger.Info?.Print(Ryujinx.Common.Logging.LogClass.Application, $"Application requested cores with index range {lowestCpuCore} to {highestCpuCore}");
+
                         break;
                     }
 

src/Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs

@@ -2683,7 +2683,7 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall
                     return KernelResult.InvalidCombination;
                 }
 
-                if ((uint)preferredCore > 3)
+                if ((uint)preferredCore > KScheduler.CpuCoresCount - 1)
                 {
                     if ((preferredCore | 2) != -1)
                     {

src/Ryujinx.HLE/HOS/Kernel/Threading/KScheduler.cs

@@ -9,13 +9,11 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
     partial class KScheduler : IDisposable
     {
         public const int PrioritiesCount = 64;
-        public const int CpuCoresCount = 4;
+        public static int CpuCoresCount;
 
         private const int RoundRobinTimeQuantumMs = 10;
 
-        private static readonly int[] _preemptionPriorities = { 59, 59, 59, 63 };
+        private static int[] _srcCoresHighestPrioThreads;
-
-        private static readonly int[] _srcCoresHighestPrioThreads = new int[CpuCoresCount];
 
         private readonly KernelContext _context;
         private readonly int _coreId;
@@ -47,6 +45,16 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
             _coreId = coreId;
 
             _currentThread = null;
+
+            if (_srcCoresHighestPrioThreads == null)
+            {
+                _srcCoresHighestPrioThreads = new int[CpuCoresCount];
+            }
+        }
+
+        private static int PreemptionPriorities(int index)
+        {
+            return index == CpuCoresCount - 1 ? 63 : 59;
         }
 
         public static ulong SelectThreads(KernelContext context)
@@ -437,7 +445,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
 
                 for (int core = 0; core < CpuCoresCount; core++)
                 {
-                    RotateScheduledQueue(context, core, _preemptionPriorities[core]);
+                    RotateScheduledQueue(context, core, PreemptionPriorities(core));
                 }
 
                 context.CriticalSection.Leave();

src/Ryujinx.HLE/HOS/Services/ServerBase.cs

@@ -24,14 +24,14 @@ namespace Ryujinx.HLE.HOS.Services
         // not large enough.
         private const int PointerBufferSize = 0x8000;
 
-        private readonly static uint[] _defaultCapabilities = {
+        private static uint[] _defaultCapabilities => [
-            0x030363F7,
+            (((uint)KScheduler.CpuCoresCount - 1) << 24) + (((uint)KScheduler.CpuCoresCount - 1) << 16) + 0x63F7u,
             0x1FFFFFCF,
             0x207FFFEF,
             0x47E0060F,
             0x0048BFFF,
             0x01007FFF,
-        };
+        ];
 
         // The amount of time Dispose() will wait to Join() the thread executing the ServerLoop()
         private static readonly TimeSpan _threadJoinTimeout = TimeSpan.FromSeconds(3);

src/Ryujinx.HLE/Switch.cs

@@ -32,6 +32,8 @@ namespace Ryujinx.HLE
         public TamperMachine TamperMachine { get; }
         public IHostUIHandler UIHandler { get; }
 
+        public int CpuCoresCount = 4; //Switch 1 has 4 cores
+
         public VSyncMode VSyncMode { get; set; } = VSyncMode.Switch;
         public bool CustomVSyncIntervalEnabled { get; set; } = false;
         public int CustomVSyncInterval { get; set; }

src/Ryujinx/Headless/HeadlessRyujinx.Init.cs

@@ -1,4 +1,4 @@
-using DiscordRPC;
+using DiscordRPC;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.SDL2;
 using Ryujinx.Ava;

src/Ryujinx/UI/Helpers/PlayabilityStatusConverter.cs

@@ -12,8 +12,8 @@ namespace Ryujinx.Ava.UI.Helpers
         private static readonly Lazy<PlayabilityStatusConverter> _shared = new(() => new());
         public static PlayabilityStatusConverter Shared => _shared.Value;
 
-        public object Convert(object? value, Type _, object? __, CultureInfo ___) =>
+        public object Convert(object value, Type _, object __, CultureInfo ___)
-            value.Cast<LocaleKeys>() switch
+            => value.Cast<LocaleKeys>() switch
             {
                 LocaleKeys.CompatibilityListNothing or 
                     LocaleKeys.CompatibilityListBoots or 
@@ -22,7 +22,7 @@ namespace Ryujinx.Ava.UI.Helpers
                 _ => Brushes.ForestGreen
             };
 
-        public object ConvertBack(object? value, Type _, object? __, CultureInfo ___) 
+        public object ConvertBack(object value, Type _, object __, CultureInfo ___)
             => throw new NotSupportedException();
     }
 }

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -741,7 +741,10 @@ namespace Ryujinx.Ava.UI.ViewModels
             Applications.ToObservableChangeSet()
                 .Filter(Filter)
                 .Sort(GetComparer())
-                .Bind(out _appsObservableList).AsObservableList();
+#pragma warning disable MVVMTK0034
+                .Bind(out _appsObservableList)
+#pragma warning enable MVVMTK0034
+                .AsObservableList();
 
             OnPropertyChanged(nameof(AppsObservableList));
         }

src/Ryujinx/Utilities/AppletMetadata.cs

@@ -32,29 +32,27 @@ namespace Ryujinx.Ava.Utilities
 
         public string GetContentPath(ContentManager contentManager)
             => (contentManager ?? _contentManager)
-                .GetInstalledContentPath(ProgramId, StorageId.BuiltInSystem, NcaContentType.Program);
+                ?.GetInstalledContentPath(ProgramId, StorageId.BuiltInSystem, NcaContentType.Program);
 
         public bool CanStart(ContentManager contentManager, out ApplicationData appData,
             out BlitStruct<ApplicationControlProperty> appControl)
         {
             contentManager ??= _contentManager;
-            if (contentManager == null)
+            if (contentManager == null) 
-            {
+                goto BadData;
-                appData = null;
+
-                appControl = new BlitStruct<ApplicationControlProperty>(0);
+            string contentPath = GetContentPath(contentManager);
-                return false;
+            if (string.IsNullOrEmpty(contentPath)) 
-            }
+                goto BadData;
 
             appData = new() { Name = Name, Id = ProgramId, Path = GetContentPath(contentManager) };
-
-            if (string.IsNullOrEmpty(appData.Path))
-            {
-                appControl = new BlitStruct<ApplicationControlProperty>(0);
-                return false;
-            }
-
             appControl = StructHelpers.CreateCustomNacpData(Name, Version);
             return true;
+            
+        BadData:
+            appData = null;
+            appControl = new BlitStruct<ApplicationControlProperty>(0);
+            return false;
         }
     }
 }

src/Ryujinx/Utilities/Compat/CompatibilityCsv.cs

@@ -3,7 +3,6 @@ using nietras.SeparatedValues;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Common.Logging;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -11,7 +10,7 @@ using System.Text;
 
 namespace Ryujinx.Ava.Utilities.Compat
 {
-    public struct ColumnIndices(SepReaderHeader header)
+    public struct ColumnIndices(Func<ReadOnlySpan<char>, int> getIndex)
     {
         public const string TitleIdCol = "\"title_id\"";
         public const string GameNameCol = "\"game_name\"";
@@ -19,11 +18,11 @@ namespace Ryujinx.Ava.Utilities.Compat
         public const string StatusCol = "\"status\"";
         public const string LastUpdatedCol = "\"last_updated\"";
         
-        public readonly int TitleId = header.IndexOf(TitleIdCol);
+        public readonly int TitleId = getIndex(TitleIdCol);
-        public readonly int GameName = header.IndexOf(GameNameCol);
+        public readonly int GameName = getIndex(GameNameCol);
-        public readonly int Labels = header.IndexOf(LabelsCol);
+        public readonly int Labels = getIndex(LabelsCol);
-        public readonly int Status = header.IndexOf(StatusCol);
+        public readonly int Status = getIndex(StatusCol);
-        public readonly int LastUpdated = header.IndexOf(LastUpdatedCol);
+        public readonly int LastUpdated = getIndex(LastUpdatedCol);
     }
     
     public class CompatibilityCsv
@@ -34,20 +33,15 @@ namespace Ryujinx.Ava.Utilities.Compat
                 .GetManifestResourceStream("RyujinxGameCompatibilityList")!;
             csvStream.Position = 0;
 
-            LoadFromStream(csvStream);
+            using SepReader reader = Sep.Reader().From(csvStream);
-        }
+            ColumnIndices columnIndices = new(reader.Header.IndexOf);
-        
-        public static void LoadFromStream(Stream stream)
-        {
-            var reader = Sep.Reader().From(stream);
-            var columnIndices = new ColumnIndices(reader.Header); 
 
             Entries = reader
                 .Enumerate(row => new CompatibilityEntry(ref columnIndices, row))
                 .OrderBy(it => it.GameName)
                 .ToArray();
             
-            Logger.Debug?.Print(LogClass.UI, "Compatibility CSV loaded.");
+            Logger.Debug?.Print(LogClass.UI, "Compatibility CSV loaded.", "LoadCompatCsv");
         }
 
         public static CompatibilityEntry[] Entries { get; private set; }
@@ -57,7 +51,7 @@ namespace Ryujinx.Ava.Utilities.Compat
     {
         public CompatibilityEntry(ref ColumnIndices indices, SepReader.Row row)
         {
-            var titleIdRow = ColStr(row[indices.TitleId]);
+            string titleIdRow = ColStr(row[indices.TitleId]);
             TitleId = !string.IsNullOrEmpty(titleIdRow) 
                 ? titleIdRow 
                 : default(Optional<string>);
@@ -100,7 +94,7 @@ namespace Ryujinx.Ava.Utilities.Compat
 
         public override string ToString()
         {
-            var sb = new StringBuilder("CompatibilityEntry: {");
+            StringBuilder sb = new("CompatibilityEntry: {");
             sb.Append($"{nameof(GameName)}=\"{GameName}\", ");
             sb.Append($"{nameof(TitleId)}={TitleId}, ");
             sb.Append($"{nameof(Labels)}=\"{Labels}\", ");
@@ -161,8 +155,8 @@ namespace Ryujinx.Ava.Utilities.Compat
             if (value == string.Empty)
                 return string.Empty;
         
-            var firstChar = value[0];
+            char firstChar = value[0];
-            var rest = value[1..];
+            string rest = value[1..];
 
             return $"{char.ToUpper(firstChar)}{rest}";
         }

src/Ryujinx/Utilities/Compat/CompatibilityList.axaml.cs

@@ -42,7 +42,7 @@ namespace Ryujinx.Ava.Utilities.Compat
             InitializeComponent();
         }
 
-        private void TextBox_OnTextChanged(object? sender, TextChangedEventArgs e)
+        private void TextBox_OnTextChanged(object sender, TextChangedEventArgs e)
         {
             if (DataContext is not CompatibilityViewModel cvm)
                 return;