Review of cpu tests and creation of a class for mixed cpu tests. (#35)

* Update CpuTest.cs

* Update CpuTestAlu.cs

* Update CpuTestScalar.cs

* Update CpuTestSimdMove.cs

* Create CpuTestMisc.cs

* Update CpuTest.cs

* Update CpuTestScalar.cs

* Update CpuTest.cs

* Update CpuTestAlu.cs

* Update CpuTestMisc.cs

* Update CpuTestScalar.cs

Ryujinx.Tests/Cpu/CpuTest.cs

@@ -1,4 +1,4 @@
-using ChocolArm64;
+using ChocolArm64;
 using ChocolArm64.Memory;
 using ChocolArm64.State;
 using NUnit.Framework;
@@ -9,65 +9,93 @@ using System.Threading;
 namespace Ryujinx.Tests.Cpu
 {
     [TestFixture]
-    public partial class CpuTest
+    public class CpuTest
     {
-        IntPtr Ram;
+        protected long Position { get; private set; }
-        AMemoryAlloc Allocator;
+        private long Size;
-        AMemory Memory;
+
+        private long EntryPoint;
+
+        private IntPtr Ram;
+        private AMemoryAlloc Allocator;
+        private AMemory Memory;
+        private AThread Thread;
 
         [SetUp]
         public void Setup()
         {
+            Position = 0x0;
+            Size = 0x1000;
+
+            EntryPoint = Position;
+
             Ram = Marshal.AllocHGlobal((IntPtr)AMemoryMgr.RamSize);
             Allocator = new AMemoryAlloc();
             Memory = new AMemory(Ram, Allocator);
-            Memory.Manager.MapPhys(0x1000, 0x1000, 2, AMemoryPerm.Read | AMemoryPerm.Write | AMemoryPerm.Execute);
+            Memory.Manager.MapPhys(Position, Size, 2, AMemoryPerm.Read | AMemoryPerm.Write | AMemoryPerm.Execute);
+            Thread = new AThread(Memory, ThreadPriority.Normal, EntryPoint);
         }
 
         [TearDown]
         public void Teardown()
         {
+            Thread = null;
+            Memory = null;
+            Allocator = null;
             Marshal.FreeHGlobal(Ram);
         }
 
-        private void Execute(AThread Thread)
+        protected void Reset()
         {
-            AutoResetEvent Wait = new AutoResetEvent(false);
+            Teardown();
-            Thread.ThreadState.Break += (sender, e) => Thread.StopExecution();
+            Setup();
-            Thread.WorkFinished += (sender, e) => Wait.Set();
-
-            Wait.Reset();
-            Thread.Execute();
-            Wait.WaitOne();
         }
 
-        private AThreadState SingleOpcode(uint Opcode, 
+        protected void Opcode(uint Opcode)
-                                          ulong X0 = 0, ulong X1 = 0, ulong X2 = 0, 
-                                          AVec V0 = new AVec(), AVec V1 = new AVec(), AVec V2 = new AVec())
         {
-            Memory.WriteUInt32(0x1000, Opcode);
+            Thread.Memory.WriteUInt32(Position, Opcode);
-            Memory.WriteUInt32(0x1004, 0xD4200000); // BRK #0
+            Position += 4;
-            Memory.WriteUInt32(0x1008, 0xD65F03C0); // RET
+        }
 
-            AThread Thread = new AThread(Memory, ThreadPriority.Normal, 0x1000);
+        protected void SetThreadState(ulong X0 = 0, ulong X1 = 0, ulong X2 = 0,
+                                      AVec V0 = default(AVec), AVec V1 = default(AVec), AVec V2 = default(AVec))
+        {
             Thread.ThreadState.X0 = X0;
             Thread.ThreadState.X1 = X1;
             Thread.ThreadState.X2 = X2;
             Thread.ThreadState.V0 = V0;
             Thread.ThreadState.V1 = V1;
             Thread.ThreadState.V2 = V2;
-            Execute(Thread);
+        }
+
+        protected void ExecuteOpcodes()
+        {
+            using (ManualResetEvent Wait = new ManualResetEvent(false))
+            {
+                Thread.ThreadState.Break += (sender, e) => Thread.StopExecution();
+                Thread.WorkFinished += (sender, e) => Wait.Set();
+
+                Thread.Execute();
+                Wait.WaitOne();
+            }
+        }
+
+        protected AThreadState GetThreadState()
+        {
             return Thread.ThreadState;
         }
 
-        [Test]
+        protected AThreadState SingleOpcode(uint Opcode,
-        public void SanityCheck()
+                                            ulong X0 = 0, ulong X1 = 0, ulong X2 = 0,
+                                            AVec V0 = default(AVec), AVec V1 = default(AVec), AVec V2 = default(AVec))
         {
-            uint Opcode = 0xD503201F; // NOP
+            this.Opcode(Opcode);
-            Assert.AreEqual(SingleOpcode(Opcode, X0: 0).X0, 0);
+            this.Opcode(0xD4200000); // BRK #0
-            Assert.AreEqual(SingleOpcode(Opcode, X0: 1).X0, 1);
+            this.Opcode(0xD65F03C0); // RET
-            Assert.AreEqual(SingleOpcode(Opcode, X0: 2).X0, 2);
+            SetThreadState(X0, X1, X2, V0, V1, V2);
-            Assert.AreEqual(SingleOpcode(Opcode, X0: 42).X0, 42);
+            ExecuteOpcodes();
+
+            return GetThreadState();
         }
     }
 }

Ryujinx.Tests/Cpu/CpuTestAlu.cs

@@ -1,10 +1,9 @@
-using ChocolArm64.State;
+using ChocolArm64.State;
 using NUnit.Framework;
 
 namespace Ryujinx.Tests.Cpu
 {
-    [TestFixture]
+    public class CpuTestAlu : CpuTest
-    public partial class CpuTest
     {
         [Test]
         public void Add()
@@ -14,25 +13,17 @@ namespace Ryujinx.Tests.Cpu
             Assert.AreEqual(3, ThreadState.X0);
         }
 
-        [Test]
+        [TestCase(0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFul, true, false)]
-        public void Ands()
+        [TestCase(0xFFFFFFFFu, 0x00000000u, 0x00000000ul, false, true)]
+        [TestCase(0x12345678u, 0x7324A993u, 0x12240010ul, false, false)]
+        public void Ands(uint A, uint B, ulong Result, bool Negative, bool Zero)
         {
             // ANDS W0, W1, W2
             uint Opcode = 0x6A020020;
-            var tests = new[]
+            AThreadState ThreadState = SingleOpcode(Opcode, X1: A, X2: B);
-            {
+            Assert.AreEqual(Result,   ThreadState.X0);
-                new { W1 = 0xFFFFFFFFul, W2 = 0xFFFFFFFFul, Result = 0xFFFFFFFFul, Negative = true,  Zero = false },
+            Assert.AreEqual(Negative, ThreadState.Negative);
-                new { W1 = 0xFFFFFFFFul, W2 = 0x00000000ul, Result = 0x00000000ul, Negative = false, Zero = true  },
+            Assert.AreEqual(Zero,     ThreadState.Zero);
-                new { W1 = 0x12345678ul, W2 = 0x7324A993ul, Result = 0x12240010ul, Negative = false, Zero = false },
-            };
-
-            foreach (var test in tests)
-            {
-                AThreadState ThreadState = SingleOpcode(Opcode, X1: test.W1, X2: test.W2);
-                Assert.AreEqual(test.Result,   ThreadState.X0);
-                Assert.AreEqual(test.Negative, ThreadState.Negative);
-                Assert.AreEqual(test.Zero,     ThreadState.Zero);
-            }
         }
 
         [Test]
@@ -40,8 +31,14 @@ namespace Ryujinx.Tests.Cpu
         {
             // ORR W0, WZR, #0x01010101
             Assert.AreEqual(0x01010101, SingleOpcode(0x3200C3E0).X0);
+
+            Reset();
+
             // ORR W1, WZR, #0x00F000F0
             Assert.AreEqual(0x00F000F0, SingleOpcode(0x320C8FE1).X1);
+
+            Reset();
+
             // ORR W2, WZR, #1
             Assert.AreEqual(0x00000001, SingleOpcode(0x320003E2).X2);
         }

Ryujinx.Tests/Cpu/CpuTestMisc.cs

@@ -0,0 +1,276 @@
+using ChocolArm64.State;
+using NUnit.Framework;
+
+namespace Ryujinx.Tests.Cpu
+{
+    public class CpuTestMisc : CpuTest
+    {
+        [TestCase(0ul)]
+        [TestCase(1ul)]
+        [TestCase(2ul)]
+        [TestCase(42ul)]
+        public void SanityCheck(ulong A)
+        {
+            // NOP
+            uint Opcode = 0xD503201F;
+            AThreadState ThreadState = SingleOpcode(Opcode, X0: A);
+            Assert.AreEqual(A, ThreadState.X0);
+        }
+
+        [TestCase(0xFFFFFFFDu)] // Roots.
+        [TestCase(0x00000005u)]
+        public void Misc1(uint A)
+        {
+            // ((A + 3) * (A - 5)) / ((A + 5) * (A - 3)) = 0
+
+            /*
+            ADD W2, W0, 3
+            SUB W1, W0, #5
+            MUL W2, W2, W1
+            ADD W1, W0, 5
+            SUB W0, W0, #3
+            MUL W0, W1, W0
+            SDIV W0, W2, W0
+            BRK #0
+            RET
+            */
+
+            SetThreadState(X0: A);
+            Opcode(0x11000C02);
+            Opcode(0x51001401);
+            Opcode(0x1B017C42);
+            Opcode(0x11001401);
+            Opcode(0x51000C00);
+            Opcode(0x1B007C20);
+            Opcode(0x1AC00C40);
+            Opcode(0xD4200000);
+            Opcode(0xD65F03C0);
+            ExecuteOpcodes();
+            Assert.AreEqual(0, GetThreadState().X0);
+        }
+
+        [TestCase(-20f, -5f)] // 18 integer solutions.
+        [TestCase(-12f, -6f)]
+        [TestCase(-12f, 3f)]
+        [TestCase(-8f, -8f)]
+        [TestCase(-6f, -12f)]
+        [TestCase(-5f, -20f)]
+        [TestCase(-4f, 2f)]
+        [TestCase(-3f, 12f)]
+        [TestCase(-2f, 4f)]
+        [TestCase(2f, -4f)]
+        [TestCase(3f, -12f)]
+        [TestCase(4f, -2f)]
+        [TestCase(5f, 20f)]
+        [TestCase(6f, 12f)]
+        [TestCase(8f, 8f)]
+        [TestCase(12f, -3f)]
+        [TestCase(12f, 6f)]
+        [TestCase(20f, 5f)]
+        public void Misc2(float A, float B)
+        {
+            // 1 / ((1 / A + 1 / B) ^ 2) = 16
+
+            /*
+            FMOV S2, 1.0e+0
+            FDIV S0, S2, S0
+            FDIV S1, S2, S1
+            FADD S0, S0, S1
+            FDIV S0, S2, S0
+            FMUL S0, S0, S0
+            BRK #0
+            RET
+            */
+
+            SetThreadState(V0: new AVec { S0 = A }, V1: new AVec { S0 = B });
+            Opcode(0x1E2E1002);
+            Opcode(0x1E201840);
+            Opcode(0x1E211841);
+            Opcode(0x1E212800);
+            Opcode(0x1E201840);
+            Opcode(0x1E200800);
+            Opcode(0xD4200000);
+            Opcode(0xD65F03C0);
+            ExecuteOpcodes();
+            Assert.AreEqual(16f, GetThreadState().V0.S0);
+        }
+
+        [TestCase(-20d, -5d)] // 18 integer solutions.
+        [TestCase(-12d, -6d)]
+        [TestCase(-12d, 3d)]
+        [TestCase(-8d, -8d)]
+        [TestCase(-6d, -12d)]
+        [TestCase(-5d, -20d)]
+        [TestCase(-4d, 2d)]
+        [TestCase(-3d, 12d)]
+        [TestCase(-2d, 4d)]
+        [TestCase(2d, -4d)]
+        [TestCase(3d, -12d)]
+        [TestCase(4d, -2d)]
+        [TestCase(5d, 20d)]
+        [TestCase(6d, 12d)]
+        [TestCase(8d, 8d)]
+        [TestCase(12d, -3d)]
+        [TestCase(12d, 6d)]
+        [TestCase(20d, 5d)]
+        public void Misc3(double A, double B)
+        {
+            // 1 / ((1 / A + 1 / B) ^ 2) = 16
+
+            /*
+            FMOV D2, 1.0e+0
+            FDIV D0, D2, D0
+            FDIV D1, D2, D1
+            FADD D0, D0, D1
+            FDIV D0, D2, D0
+            FMUL D0, D0, D0
+            BRK #0
+            RET
+            */
+
+            SetThreadState(V0: new AVec { D0 = A }, V1: new AVec { D0 = B });
+            Opcode(0x1E6E1002);
+            Opcode(0x1E601840);
+            Opcode(0x1E611841);
+            Opcode(0x1E612800);
+            Opcode(0x1E601840);
+            Opcode(0x1E600800);
+            Opcode(0xD4200000);
+            Opcode(0xD65F03C0);
+            ExecuteOpcodes();
+            Assert.AreEqual(16d, GetThreadState().V0.D0);
+        }
+
+        [Test]
+        public void MiscR()
+        {
+            ulong Result = 5;
+
+            /*
+            0x0000000000000000: MOV X0, #2
+            0x0000000000000004: MOV X1, #3
+            0x0000000000000008: ADD X0, X0, X1
+            0x000000000000000C: BRK #0
+            0x0000000000000010: RET
+            */
+
+            Opcode(0xD2800040);
+            Opcode(0xD2800061);
+            Opcode(0x8B010000);
+            Opcode(0xD4200000);
+            Opcode(0xD65F03C0);
+            ExecuteOpcodes();
+            Assert.AreEqual(Result, GetThreadState().X0);
+
+            Reset();
+
+            /*
+            0x0000000000000000: MOV X0, #3
+            0x0000000000000004: MOV X1, #2
+            0x0000000000000008: ADD X0, X0, X1
+            0x000000000000000C: BRK #0
+            0x0000000000000010: RET
+            */
+
+            Opcode(0xD2800060);
+            Opcode(0xD2800041);
+            Opcode(0x8B010000);
+            Opcode(0xD4200000);
+            Opcode(0xD65F03C0);
+            ExecuteOpcodes();
+            Assert.AreEqual(Result, GetThreadState().X0);
+        }
+
+        [Test, Explicit]
+        public void Misc5()
+        {
+            /*
+            0x0000000000000000: SUBS X0, X0, #1
+            0x0000000000000004: B.NE #0
+            0x0000000000000008: BRK #0
+            0x000000000000000C: RET
+            */
+
+            SetThreadState(X0: 0x100000000);
+            Opcode(0xF1000400);
+            Opcode(0x54FFFFE1);
+            Opcode(0xD4200000);
+            Opcode(0xD65F03C0);
+            ExecuteOpcodes();
+            Assert.AreEqual(0, GetThreadState().X0);
+            Assert.IsTrue(GetThreadState().Zero);
+        }
+
+        [Test]
+        public void MiscF([Range(0, 92, 1)] int A)
+        {
+            ulong F_n(uint n)
+            {
+                ulong a = 0, b = 1, c;
+
+                if (n == 0)
+                {
+                    return a;
+                }
+
+                for (uint i = 2; i <= n; i++)
+                {
+                    c = a + b;
+                    a = b;
+                    b = c;
+                }
+
+                return b;
+            }
+
+            /*
+            0x0000000000000000: MOV W4, W0
+            0x0000000000000004: CBZ W0, #0x3C
+            0x0000000000000008: CMP W0, #1
+            0x000000000000000C: B.LS #0x48
+            0x0000000000000010: MOVZ W2, #0x2
+            0x0000000000000014: MOVZ X1, #0x1
+            0x0000000000000018: MOVZ X3, #0
+            0x000000000000001C: ADD X0, X3, X1
+            0x0000000000000020: ADD W2, W2, #1
+            0x0000000000000024: MOV X3, X1
+            0x0000000000000028: MOV X1, X0
+            0x000000000000002C: CMP W4, W2
+            0x0000000000000030: B.HS #0x1C
+            0x0000000000000034: BRK #0
+            0x0000000000000038: RET
+            0x000000000000003C: MOVZ X0, #0
+            0x0000000000000040: BRK #0
+            0x0000000000000044: RET
+            0x0000000000000048: MOVZ X0, #0x1
+            0x000000000000004C: BRK #0
+            0x0000000000000050: RET
+            */
+
+            SetThreadState(X0: (uint)A);
+            Opcode(0x2A0003E4);
+            Opcode(0x340001C0);
+            Opcode(0x7100041F);
+            Opcode(0x540001E9);
+            Opcode(0x52800042);
+            Opcode(0xD2800021);
+            Opcode(0xD2800003);
+            Opcode(0x8B010060);
+            Opcode(0x11000442);
+            Opcode(0xAA0103E3);
+            Opcode(0xAA0003E1);
+            Opcode(0x6B02009F);
+            Opcode(0x54FFFF62);
+            Opcode(0xD4200000);
+            Opcode(0xD65F03C0);
+            Opcode(0xD2800000);
+            Opcode(0xD4200000);
+            Opcode(0xD65F03C0);
+            Opcode(0xD2800020);
+            Opcode(0xD4200000);
+            Opcode(0xD65F03C0);
+            ExecuteOpcodes();
+            Assert.AreEqual(F_n((uint)A), GetThreadState().X0);
+        }
+    }
+}

Ryujinx.Tests/Cpu/CpuTestScalar.cs

@@ -3,8 +3,7 @@ using NUnit.Framework;
 
 namespace Ryujinx.Tests.Cpu
 {
-    [TestFixture]
+    public class CpuTestScalar : CpuTest
-    public partial class CpuTest
     {
         [TestCase(0x00000000u, 0x80000000u, 0x00000000u)]
         [TestCase(0x80000000u, 0x00000000u, 0x00000000u)]
@@ -15,10 +14,9 @@ namespace Ryujinx.Tests.Cpu
         [TestCase(0x7F7FFFFFu, 0x807FFFFFu, 0x7F7FFFFFu)]
         [TestCase(0x7FC00000u, 0x3F800000u, 0x7FC00000u)]
         [TestCase(0x3F800000u, 0x7FC00000u, 0x7FC00000u)]
-        // NaN tests
+        [TestCase(0x7F800001u, 0x7FC00042u, 0x7FC00001u, Ignore = "NaN test.")]
-        //[TestCase(0x7F800001u, 0x7FC00042u, 0x7FC00001u)]
+        [TestCase(0x7FC00042u, 0x7F800001u, 0x7FC00001u, Ignore = "NaN test.")]
-        //[TestCase(0x7FC00042u, 0x7F800001u, 0x7FC00001u)]
+        [TestCase(0x7FC0000Au, 0x7FC0000Bu, 0x7FC0000Au, Ignore = "NaN test.")]
-        //[TestCase(0x7FC0000Au, 0x7FC0000Bu, 0x7FC0000Au)]
         public void Fmax_S(uint A, uint B, uint Result)
         {
             // FMAX S0, S1, S2

Ryujinx.Tests/Cpu/CpuTestSimdMove.cs

@@ -3,8 +3,7 @@ using NUnit.Framework;
 
 namespace Ryujinx.Tests.Cpu
 {
-    [TestFixture]
+    public class CpuTestSimdMove : CpuTest
-    public partial class CpuTest
     {
         [TestCase(0u, 0u, 0x2313221221112010ul, 0x0000000000000000ul)]
         [TestCase(1u, 0u, 0x2313221221112010ul, 0x2717261625152414ul)]