aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Tests
diff options
context:
space:
mode:
Diffstat (limited to 'Ryujinx.Tests')
-rw-r--r--Ryujinx.Tests/Cpu/CpuTest.cs8
-rw-r--r--Ryujinx.Tests/Cpu/CpuTest32.cs10
2 files changed, 15 insertions, 3 deletions
diff --git a/Ryujinx.Tests/Cpu/CpuTest.cs b/Ryujinx.Tests/Cpu/CpuTest.cs
index e823ea17..26f0d286 100644
--- a/Ryujinx.Tests/Cpu/CpuTest.cs
+++ b/Ryujinx.Tests/Cpu/CpuTest.cs
@@ -1,3 +1,4 @@
+using ARMeilleure;
using ARMeilleure.State;
using ARMeilleure.Translation;
using NUnit.Framework;
@@ -60,7 +61,12 @@ namespace Ryujinx.Tests.Cpu
_context = CpuContext.CreateExecutionContext();
Translator.IsReadyForTranslation.Set();
- _cpuContext = new CpuContext(_memory);
+ _cpuContext = new CpuContext(_memory, for64Bit: true);
+
+ // Prevent registering LCQ functions in the FunctionTable to avoid initializing and populating the table,
+ // which improves test durations.
+ Optimizations.AllowLcqInFunctionTable = false;
+ Optimizations.UseUnmanagedDispatchLoop = false;
if (_unicornAvailable)
{
diff --git a/Ryujinx.Tests/Cpu/CpuTest32.cs b/Ryujinx.Tests/Cpu/CpuTest32.cs
index 380c86e8..5d24af39 100644
--- a/Ryujinx.Tests/Cpu/CpuTest32.cs
+++ b/Ryujinx.Tests/Cpu/CpuTest32.cs
@@ -1,4 +1,5 @@
-using ARMeilleure.State;
+using ARMeilleure;
+using ARMeilleure.State;
using ARMeilleure.Translation;
using NUnit.Framework;
using Ryujinx.Cpu;
@@ -56,7 +57,12 @@ namespace Ryujinx.Tests.Cpu
_context.IsAarch32 = true;
Translator.IsReadyForTranslation.Set();
- _cpuContext = new CpuContext(_memory);
+ _cpuContext = new CpuContext(_memory, for64Bit: false);
+
+ // Prevent registering LCQ functions in the FunctionTable to avoid initializing and populating the table,
+ // which improves test durations.
+ Optimizations.AllowLcqInFunctionTable = false;
+ Optimizations.UseUnmanagedDispatchLoop = false;
if (_unicornAvailable)
{