Sse optimized the Vector & Scalar fp-to-integer conversion instructions (unsigned); improved the related Tests. (#656)

* Update InstEmitSimdCvt.cs

* Update CpuTestSimdCvt.cs

* Update CpuTestSimd.cs

* Update CpuTestSimdShImm.cs

* Update InstEmitSimdCvt.cs

3 files changed, 181 insertions, 63 deletions

diff --git a/Ryujinx.Tests/Cpu/CpuTestSimd.cs b/Ryujinx.Tests/Cpu/CpuTestSimd.cs
index e409d8dd..fd395da8 100644
--- a/Ryujinx.Tests/Cpu/CpuTestSimd.cs
+++ b/Ryujinx.Tests/Cpu/CpuTestSimd.cs
@@ -2,6 +2,7 @@
 
 using NUnit.Framework;
 
+using System;
 using System.Collections.Generic;
 using System.Runtime.Intrinsics;
 
@@ -172,15 +173,20 @@ namespace Ryujinx.Tests.Cpu
             }
         }
 
-        private static IEnumerable<ulong> _1S_F_Cvt_()
+        private static IEnumerable<ulong> _1S_F_W_()
         {
             // int
-            yield return 0x00000000CF000001; // -2.1474839E9f  (-2147483904)
-            yield return 0x00000000CF000000; // -2.14748365E9f (-2147483648)
-            yield return 0x00000000CEFFFFFF; // -2.14748352E9f (-2147483520)
-            yield return 0x000000004F000001; //  2.1474839E9f  (2147483904)
-            yield return 0x000000004F000000; //  2.14748365E9f (2147483648)
-            yield return 0x000000004EFFFFFF; //  2.14748352E9f (2147483520)
+            yield return 0x00000000CF000001ul; // -2.1474839E9f  (-2147483904)
+            yield return 0x00000000CF000000ul; // -2.14748365E9f (-2147483648)
+            yield return 0x00000000CEFFFFFFul; // -2.14748352E9f (-2147483520)
+            yield return 0x000000004F000001ul; //  2.1474839E9f  (2147483904)
+            yield return 0x000000004F000000ul; //  2.14748365E9f (2147483648)
+            yield return 0x000000004EFFFFFFul; //  2.14748352E9f (2147483520)
+
+            // uint
+            yield return 0x000000004F800001ul; // 4.2949678E9f  (4294967808)
+            yield return 0x000000004F800000ul; // 4.2949673E9f  (4294967296)
+            yield return 0x000000004F7FFFFFul; // 4.29496704E9f (4294967040)
 
             yield return 0x00000000FF7FFFFFul; // -Max Normal    (float.MinValue)
             yield return 0x0000000080800000ul; // -Min Normal
@@ -214,11 +220,20 @@ namespace Ryujinx.Tests.Cpu
             for (int cnt = 1; cnt <= RndCnt; cnt++)
             {
                 ulong grbg = TestContext.CurrentContext.Random.NextUInt();
-                ulong rnd1 = GenNormalS();
-                ulong rnd2 = GenSubnormalS();
+
+                ulong rnd1 = (uint)BitConverter.SingleToInt32Bits(
+                    (float)((int)TestContext.CurrentContext.Random.NextUInt()));
+                ulong rnd2 = (uint)BitConverter.SingleToInt32Bits(
+                    (float)((uint)TestContext.CurrentContext.Random.NextUInt()));
+
+                ulong rnd3 = GenNormalS();
+                ulong rnd4 = GenSubnormalS();
 
                 yield return (grbg << 32) | rnd1;
                 yield return (grbg << 32) | rnd2;
+
+                yield return (grbg << 32) | rnd3;
+                yield return (grbg << 32) | rnd4;
             }
         }
 
@@ -263,15 +278,20 @@ namespace Ryujinx.Tests.Cpu
             }
         }
 
-        private static IEnumerable<ulong> _2S_F_Cvt_()
+        private static IEnumerable<ulong> _2S_F_W_()
         {
             // int
-            yield return 0xCF000001CF000001; // -2.1474839E9f  (-2147483904)
-            yield return 0xCF000000CF000000; // -2.14748365E9f (-2147483648)
-            yield return 0xCEFFFFFFCEFFFFFF; // -2.14748352E9f (-2147483520)
-            yield return 0x4F0000014F000001; //  2.1474839E9f  (2147483904)
-            yield return 0x4F0000004F000000; //  2.14748365E9f (2147483648)
-            yield return 0x4EFFFFFF4EFFFFFF; //  2.14748352E9f (2147483520)
+            yield return 0xCF000001CF000001ul; // -2.1474839E9f  (-2147483904)
+            yield return 0xCF000000CF000000ul; // -2.14748365E9f (-2147483648)
+            yield return 0xCEFFFFFFCEFFFFFFul; // -2.14748352E9f (-2147483520)
+            yield return 0x4F0000014F000001ul; //  2.1474839E9f  (2147483904)
+            yield return 0x4F0000004F000000ul; //  2.14748365E9f (2147483648)
+            yield return 0x4EFFFFFF4EFFFFFFul; //  2.14748352E9f (2147483520)
+
+            // uint
+            yield return 0x4F8000014F800001ul; // 4.2949678E9f  (4294967808)
+            yield return 0x4F8000004F800000ul; // 4.2949673E9f  (4294967296)
+            yield return 0x4F7FFFFF4F7FFFFFul; // 4.29496704E9f (4294967040)
 
             yield return 0xFF7FFFFFFF7FFFFFul; // -Max Normal    (float.MinValue)
             yield return 0x8080000080800000ul; // -Min Normal
@@ -304,11 +324,19 @@ namespace Ryujinx.Tests.Cpu
 
             for (int cnt = 1; cnt <= RndCnt; cnt++)
             {
-                ulong rnd1 = GenNormalS();
-                ulong rnd2 = GenSubnormalS();
+                ulong rnd1 = (uint)BitConverter.SingleToInt32Bits(
+                    (float)((int)TestContext.CurrentContext.Random.NextUInt()));
+                ulong rnd2 = (uint)BitConverter.SingleToInt32Bits(
+                    (float)((uint)TestContext.CurrentContext.Random.NextUInt()));
+
+                ulong rnd3 = GenNormalS();
+                ulong rnd4 = GenSubnormalS();
 
                 yield return (rnd1 << 32) | rnd1;
                 yield return (rnd2 << 32) | rnd2;
+
+                yield return (rnd3 << 32) | rnd3;
+                yield return (rnd4 << 32) | rnd4;
             }
         }
 
@@ -353,7 +381,7 @@ namespace Ryujinx.Tests.Cpu
             }
         }
 
-        private static IEnumerable<ulong> _1D_F_Cvt_()
+        private static IEnumerable<ulong> _1D_F_X_()
         {
             // long
             yield return 0xC3E0000000000001ul; // -9.2233720368547780E18d (-9223372036854778000)
@@ -363,6 +391,11 @@ namespace Ryujinx.Tests.Cpu
             yield return 0x43E0000000000000ul; //  9.2233720368547760E18d (9223372036854776000)
             yield return 0x43DFFFFFFFFFFFFFul; //  9.2233720368547750E18d (9223372036854775000)
 
+            // ulong
+            yield return 0x43F0000000000001ul; // 1.8446744073709556e19d (18446744073709556000)
+            yield return 0x43F0000000000000ul; // 1.8446744073709552E19d (18446744073709552000)
+            yield return 0x43EFFFFFFFFFFFFFul; // 1.8446744073709550e19d (18446744073709550000)
+
             yield return 0xFFEFFFFFFFFFFFFFul; // -Max Normal    (double.MinValue)
             yield return 0x8010000000000000ul; // -Min Normal
             yield return 0x800FFFFFFFFFFFFFul; // -Max Subnormal
@@ -394,11 +427,19 @@ namespace Ryujinx.Tests.Cpu
 
             for (int cnt = 1; cnt <= RndCnt; cnt++)
             {
-                ulong rnd1 = GenNormalD();
-                ulong rnd2 = GenSubnormalD();
+                ulong rnd1 = (ulong)BitConverter.DoubleToInt64Bits(
+                    (double)((long)TestContext.CurrentContext.Random.NextULong()));
+                ulong rnd2 = (ulong)BitConverter.DoubleToInt64Bits(
+                    (double)((ulong)TestContext.CurrentContext.Random.NextULong()));
+
+                ulong rnd3 = GenNormalD();
+                ulong rnd4 = GenSubnormalD();
 
                 yield return rnd1;
                 yield return rnd2;
+
+                yield return rnd3;
+                yield return rnd4;
             }
         }
 #endregion
@@ -1467,7 +1508,7 @@ namespace Ryujinx.Tests.Cpu
 
         [Test, Pairwise] [Explicit]
         public void F_Cvt_NZ_SU_S_S([ValueSource("_F_Cvt_NZ_SU_S_S_")] uint opcodes,
-                                    [ValueSource("_1S_F_Cvt_")] ulong a)
+                                    [ValueSource("_1S_F_W_")] ulong a)
         {
             ulong z = TestContext.CurrentContext.Random.NextULong();
             Vector128<float> v0 = MakeVectorE0E1(z, z);
@@ -1480,7 +1521,7 @@ namespace Ryujinx.Tests.Cpu
 
         [Test, Pairwise] [Explicit]
         public void F_Cvt_NZ_SU_S_D([ValueSource("_F_Cvt_NZ_SU_S_D_")] uint opcodes,
-                                    [ValueSource("_1D_F_Cvt_")] ulong a)
+                                    [ValueSource("_1D_F_X_")] ulong a)
         {
             ulong z = TestContext.CurrentContext.Random.NextULong();
             Vector128<float> v0 = MakeVectorE1(z);
@@ -1495,8 +1536,8 @@ namespace Ryujinx.Tests.Cpu
         public void F_Cvt_NZ_SU_V_2S_4S([ValueSource("_F_Cvt_NZ_SU_V_2S_4S_")] uint opcodes,
                                         [Values(0u)]     uint rd,
                                         [Values(1u, 0u)] uint rn,
-                                        [ValueSource("_2S_F_Cvt_")] ulong z,
-                                        [ValueSource("_2S_F_Cvt_")] ulong a,
+                                        [ValueSource("_2S_F_W_")] ulong z,
+                                        [ValueSource("_2S_F_W_")] ulong a,
                                         [Values(0b0u, 0b1u)] uint q) // <2S, 4S>
         {
             opcodes |= ((rn & 31) << 5) | ((rd & 31) << 0);
@@ -1514,8 +1555,8 @@ namespace Ryujinx.Tests.Cpu
         public void F_Cvt_NZ_SU_V_2D([ValueSource("_F_Cvt_NZ_SU_V_2D_")] uint opcodes,
                                      [Values(0u)]     uint rd,
                                      [Values(1u, 0u)] uint rn,
-                                     [ValueSource("_1D_F_Cvt_")] ulong z,
-                                     [ValueSource("_1D_F_Cvt_")] ulong a)
+                                     [ValueSource("_1D_F_X_")] ulong z,
+                                     [ValueSource("_1D_F_X_")] ulong a)
         {
             opcodes |= ((rn & 31) << 5) | ((rd & 31) << 0);
 
diff --git a/Ryujinx.Tests/Cpu/CpuTestSimdCvt.cs b/Ryujinx.Tests/Cpu/CpuTestSimdCvt.cs
index 775044a0..60935488 100644
--- a/Ryujinx.Tests/Cpu/CpuTestSimdCvt.cs
+++ b/Ryujinx.Tests/Cpu/CpuTestSimdCvt.cs
@@ -2,6 +2,7 @@
 
 using NUnit.Framework;
 
+using System;
 using System.Collections.Generic;
 using System.Runtime.Intrinsics;
 
@@ -13,15 +14,15 @@ namespace Ryujinx.Tests.Cpu
 #if SimdCvt
 
 #region "ValueSource (Types)"
-        private static IEnumerable<ulong> _1S_F_Cvt_()
+        private static IEnumerable<ulong> _1S_F_WX_()
         {
             // int
-            yield return 0x00000000CF000001; // -2.1474839E9f  (-2147483904)
-            yield return 0x00000000CF000000; // -2.14748365E9f (-2147483648)
-            yield return 0x00000000CEFFFFFF; // -2.14748352E9f (-2147483520)
-            yield return 0x000000004F000001; //  2.1474839E9f  (2147483904)
-            yield return 0x000000004F000000; //  2.14748365E9f (2147483648)
-            yield return 0x000000004EFFFFFF; //  2.14748352E9f (2147483520)
+            yield return 0x00000000CF000001ul; // -2.1474839E9f  (-2147483904)
+            yield return 0x00000000CF000000ul; // -2.14748365E9f (-2147483648)
+            yield return 0x00000000CEFFFFFFul; // -2.14748352E9f (-2147483520)
+            yield return 0x000000004F000001ul; //  2.1474839E9f  (2147483904)
+            yield return 0x000000004F000000ul; //  2.14748365E9f (2147483648)
+            yield return 0x000000004EFFFFFFul; //  2.14748352E9f (2147483520)
 
             // long
             yield return 0x00000000DF000001ul; // -9.223373E18f  (-9223373136366403584)
@@ -31,6 +32,16 @@ namespace Ryujinx.Tests.Cpu
             yield return 0x000000005F000000ul; //  9.223372E18f  (9223372036854775808)
             yield return 0x000000005EFFFFFFul; //  9.2233715E18f (9223371487098961920)
 
+            // uint
+            yield return 0x000000004F800001ul; // 4.2949678E9f  (4294967808)
+            yield return 0x000000004F800000ul; // 4.2949673E9f  (4294967296)
+            yield return 0x000000004F7FFFFFul; // 4.29496704E9f (4294967040)
+
+            // ulong
+            yield return 0x000000005F800001ul; // 1.8446746E19f (18446746272732807168)
+            yield return 0x000000005F800000ul; // 1.8446744E19f (18446744073709551616)
+            yield return 0x000000005F7FFFFFul; // 1.8446743E19f (18446742974197923840)
+
             yield return 0x00000000FF7FFFFFul; // -Max Normal    (float.MinValue)
             yield return 0x0000000080800000ul; // -Min Normal
             yield return 0x00000000807FFFFFul; // -Max Subnormal
@@ -63,15 +74,30 @@ namespace Ryujinx.Tests.Cpu
             for (int cnt = 1; cnt <= RndCnt; cnt++)
             {
                 ulong grbg = TestContext.CurrentContext.Random.NextUInt();
-                ulong rnd1 = GenNormalS();
-                ulong rnd2 = GenSubnormalS();
+
+                ulong rnd1 = (uint)BitConverter.SingleToInt32Bits(
+                    (float)((int)TestContext.CurrentContext.Random.NextUInt()));
+                ulong rnd2 = (uint)BitConverter.SingleToInt32Bits(
+                    (float)((long)TestContext.CurrentContext.Random.NextULong()));
+                ulong rnd3 = (uint)BitConverter.SingleToInt32Bits(
+                    (float)((uint)TestContext.CurrentContext.Random.NextUInt()));
+                ulong rnd4 = (uint)BitConverter.SingleToInt32Bits(
+                    (float)((ulong)TestContext.CurrentContext.Random.NextULong()));
+
+                ulong rnd5 = GenNormalS();
+                ulong rnd6 = GenSubnormalS();
 
                 yield return (grbg << 32) | rnd1;
                 yield return (grbg << 32) | rnd2;
+                yield return (grbg << 32) | rnd3;
+                yield return (grbg << 32) | rnd4;
+
+                yield return (grbg << 32) | rnd5;
+                yield return (grbg << 32) | rnd6;
             }
         }
 
-        private static IEnumerable<ulong> _1D_F_Cvt_()
+        private static IEnumerable<ulong> _1D_F_WX_()
         {
             // int
             yield return 0xC1E0000000200000ul; // -2147483649.0000000d (-2147483649)
@@ -89,6 +115,16 @@ namespace Ryujinx.Tests.Cpu
             yield return 0x43E0000000000000ul; //  9.2233720368547760E18d (9223372036854776000)
             yield return 0x43DFFFFFFFFFFFFFul; //  9.2233720368547750E18d (9223372036854775000)
 
+            // uint
+            yield return 0x41F0000000100000ul; // 4294967297.0000000d (4294967297)
+            yield return 0x41F0000000000000ul; // 4294967296.0000000d (4294967296)
+            yield return 0x41EFFFFFFFE00000ul; // 4294967295.0000000d (4294967295)
+
+            // ulong
+            yield return 0x43F0000000000001ul; // 1.8446744073709556e19d (18446744073709556000)
+            yield return 0x43F0000000000000ul; // 1.8446744073709552E19d (18446744073709552000)
+            yield return 0x43EFFFFFFFFFFFFFul; // 1.8446744073709550e19d (18446744073709550000)
+
             yield return 0xFFEFFFFFFFFFFFFFul; // -Max Normal    (double.MinValue)
             yield return 0x8010000000000000ul; // -Min Normal
             yield return 0x800FFFFFFFFFFFFFul; // -Max Subnormal
@@ -120,11 +156,25 @@ namespace Ryujinx.Tests.Cpu
 
             for (int cnt = 1; cnt <= RndCnt; cnt++)
             {
-                ulong rnd1 = GenNormalD();
-                ulong rnd2 = GenSubnormalD();
+                ulong rnd1 = (ulong)BitConverter.DoubleToInt64Bits(
+                    (double)((int)TestContext.CurrentContext.Random.NextUInt()));
+                ulong rnd2 = (ulong)BitConverter.DoubleToInt64Bits(
+                    (double)((long)TestContext.CurrentContext.Random.NextULong()));
+                ulong rnd3 = (ulong)BitConverter.DoubleToInt64Bits(
+                    (double)((uint)TestContext.CurrentContext.Random.NextUInt()));
+                ulong rnd4 = (ulong)BitConverter.DoubleToInt64Bits(
+                    (double)((ulong)TestContext.CurrentContext.Random.NextULong()));
+
+                ulong rnd5 = GenNormalD();
+                ulong rnd6 = GenSubnormalD();
 
                 yield return rnd1;
                 yield return rnd2;
+                yield return rnd3;
+                yield return rnd4;
+
+                yield return rnd5;
+                yield return rnd6;
             }
         }
 
@@ -286,7 +336,7 @@ namespace Ryujinx.Tests.Cpu
         public void F_Cvt_AMPZ_SU_Gp_SW([ValueSource("_F_Cvt_AMPZ_SU_Gp_SW_")] uint opcodes,
                                         [Values(0u, 31u)] uint rd,
                                         [Values(1u)]      uint rn,
-                                        [ValueSource("_1S_F_Cvt_")] ulong a)
+                                        [ValueSource("_1S_F_WX_")] ulong a)
         {
             opcodes |= ((rn & 31) << 5) | ((rd & 31) << 0);
 
@@ -303,7 +353,7 @@ namespace Ryujinx.Tests.Cpu
         public void F_Cvt_AMPZ_SU_Gp_SX([ValueSource("_F_Cvt_AMPZ_SU_Gp_SX_")] uint opcodes,
                                         [Values(0u, 31u)] uint rd,
                                         [Values(1u)]      uint rn,
-                                        [ValueSource("_1S_F_Cvt_")] ulong a)
+                                        [ValueSource("_1S_F_WX_")] ulong a)
         {
             opcodes |= ((rn & 31) << 5) | ((rd & 31) << 0);
 
@@ -319,7 +369,7 @@ namespace Ryujinx.Tests.Cpu
         public void F_Cvt_AMPZ_SU_Gp_DW([ValueSource("_F_Cvt_AMPZ_SU_Gp_DW_")] uint opcodes,
                                         [Values(0u, 31u)] uint rd,
                                         [Values(1u)]      uint rn,
-                                        [ValueSource("_1D_F_Cvt_")] ulong a)
+                                        [ValueSource("_1D_F_WX_")] ulong a)
         {
             opcodes |= ((rn & 31) << 5) | ((rd & 31) << 0);
 
@@ -336,7 +386,7 @@ namespace Ryujinx.Tests.Cpu
         public void F_Cvt_AMPZ_SU_Gp_DX([ValueSource("_F_Cvt_AMPZ_SU_Gp_DX_")] uint opcodes,
                                         [Values(0u, 31u)] uint rd,
                                         [Values(1u)]      uint rn,
-                                        [ValueSource("_1D_F_Cvt_")] ulong a)
+                                        [ValueSource("_1D_F_WX_")] ulong a)
         {
             opcodes |= ((rn & 31) << 5) | ((rd & 31) << 0);
 
@@ -352,7 +402,7 @@ namespace Ryujinx.Tests.Cpu
         public void F_Cvt_Z_SU_Gp_Fixed_SW([ValueSource("_F_Cvt_Z_SU_Gp_Fixed_SW_")] uint opcodes,
                                            [Values(0u, 31u)] uint rd,
                                            [Values(1u)]      uint rn,
-                                           [ValueSource("_1S_F_Cvt_")] ulong a,
+                                           [ValueSource("_1S_F_WX_")] ulong a,
                                            [Values(1u, 32u)] [Random(2u, 31u, RndCntFBits)] uint fBits)
         {
             uint scale = (64u - fBits) & 0x3Fu;
@@ -373,7 +423,7 @@ namespace Ryujinx.Tests.Cpu
         public void F_Cvt_Z_SU_Gp_Fixed_SX([ValueSource("_F_Cvt_Z_SU_Gp_Fixed_SX_")] uint opcodes,
                                            [Values(0u, 31u)] uint rd,
                                            [Values(1u)]      uint rn,
-                                           [ValueSource("_1S_F_Cvt_")] ulong a,
+                                           [ValueSource("_1S_F_WX_")] ulong a,
                                            [Values(1u, 64u)] [Random(2u, 63u, RndCntFBits)] uint fBits)
         {
             uint scale = (64u - fBits) & 0x3Fu;
@@ -393,7 +443,7 @@ namespace Ryujinx.Tests.Cpu
         public void F_Cvt_Z_SU_Gp_Fixed_DW([ValueSource("_F_Cvt_Z_SU_Gp_Fixed_DW_")] uint opcodes,
                                            [Values(0u, 31u)] uint rd,
                                            [Values(1u)]      uint rn,
-                                           [ValueSource("_1D_F_Cvt_")] ulong a,
+                                           [ValueSource("_1D_F_WX_")] ulong a,
                                            [Values(1u, 32u)] [Random(2u, 31u, RndCntFBits)] uint fBits)
         {
             uint scale = (64u - fBits) & 0x3Fu;
@@ -414,7 +464,7 @@ namespace Ryujinx.Tests.Cpu
         public void F_Cvt_Z_SU_Gp_Fixed_DX([ValueSource("_F_Cvt_Z_SU_Gp_Fixed_DX_")] uint opcodes,
                                            [Values(0u, 31u)] uint rd,
                                            [Values(1u)]      uint rn,
-                                           [ValueSource("_1D_F_Cvt_")] ulong a,
+                                           [ValueSource("_1D_F_WX_")] ulong a,
                                            [Values(1u, 64u)] [Random(2u, 63u, RndCntFBits)] uint fBits)
         {
             uint scale = (64u - fBits) & 0x3Fu;
diff --git a/Ryujinx.Tests/Cpu/CpuTestSimdShImm.cs b/Ryujinx.Tests/Cpu/CpuTestSimdShImm.cs
index c1a1ed42..cabaac02 100644
--- a/Ryujinx.Tests/Cpu/CpuTestSimdShImm.cs
+++ b/Ryujinx.Tests/Cpu/CpuTestSimdShImm.cs
@@ -2,6 +2,7 @@
 
 using NUnit.Framework;
 
+using System;
 using System.Collections.Generic;
 using System.Runtime.Intrinsics;
 
@@ -49,15 +50,20 @@ namespace Ryujinx.Tests.Cpu
                                  0x8080808080808080ul, 0xFFFFFFFFFFFFFFFFul };
         }
 
-        private static IEnumerable<ulong> _2S_F_Cvt_()
+        private static IEnumerable<ulong> _2S_F_W_()
         {
             // int
-            yield return 0xCF000001CF000001; // -2.1474839E9f  (-2147483904)
-            yield return 0xCF000000CF000000; // -2.14748365E9f (-2147483648)
-            yield return 0xCEFFFFFFCEFFFFFF; // -2.14748352E9f (-2147483520)
-            yield return 0x4F0000014F000001; //  2.1474839E9f  (2147483904)
-            yield return 0x4F0000004F000000; //  2.14748365E9f (2147483648)
-            yield return 0x4EFFFFFF4EFFFFFF; //  2.14748352E9f (2147483520)
+            yield return 0xCF000001CF000001ul; // -2.1474839E9f  (-2147483904)
+            yield return 0xCF000000CF000000ul; // -2.14748365E9f (-2147483648)
+            yield return 0xCEFFFFFFCEFFFFFFul; // -2.14748352E9f (-2147483520)
+            yield return 0x4F0000014F000001ul; //  2.1474839E9f  (2147483904)
+            yield return 0x4F0000004F000000ul; //  2.14748365E9f (2147483648)
+            yield return 0x4EFFFFFF4EFFFFFFul; //  2.14748352E9f (2147483520)
+
+            // uint
+            yield return 0x4F8000014F800001ul; // 4.2949678E9f  (4294967808)
+            yield return 0x4F8000004F800000ul; // 4.2949673E9f  (4294967296)
+            yield return 0x4F7FFFFF4F7FFFFFul; // 4.29496704E9f (4294967040)
 
             yield return 0xFF7FFFFFFF7FFFFFul; // -Max Normal    (float.MinValue)
             yield return 0x8080000080800000ul; // -Min Normal
@@ -90,15 +96,23 @@ namespace Ryujinx.Tests.Cpu
 
             for (int cnt = 1; cnt <= RndCnt; cnt++)
             {
-                ulong rnd1 = GenNormalS();
-                ulong rnd2 = GenSubnormalS();
+                ulong rnd1 = (uint)BitConverter.SingleToInt32Bits(
+                    (float)((int)TestContext.CurrentContext.Random.NextUInt()));
+                ulong rnd2 = (uint)BitConverter.SingleToInt32Bits(
+                    (float)((uint)TestContext.CurrentContext.Random.NextUInt()));
+
+                ulong rnd3 = GenNormalS();
+                ulong rnd4 = GenSubnormalS();
 
                 yield return (rnd1 << 32) | rnd1;
                 yield return (rnd2 << 32) | rnd2;
+
+                yield return (rnd3 << 32) | rnd3;
+                yield return (rnd4 << 32) | rnd4;
             }
         }
 
-        private static IEnumerable<ulong> _1D_F_Cvt_()
+        private static IEnumerable<ulong> _1D_F_X_()
         {
             // long
             yield return 0xC3E0000000000001ul; // -9.2233720368547780E18d (-9223372036854778000)
@@ -108,6 +122,11 @@ namespace Ryujinx.Tests.Cpu
             yield return 0x43E0000000000000ul; //  9.2233720368547760E18d (9223372036854776000)
             yield return 0x43DFFFFFFFFFFFFFul; //  9.2233720368547750E18d (9223372036854775000)
 
+            // ulong
+            yield return 0x43F0000000000001ul; // 1.8446744073709556e19d (18446744073709556000)
+            yield return 0x43F0000000000000ul; // 1.8446744073709552E19d (18446744073709552000)
+            yield return 0x43EFFFFFFFFFFFFFul; // 1.8446744073709550e19d (18446744073709550000)
+
             yield return 0xFFEFFFFFFFFFFFFFul; // -Max Normal    (double.MinValue)
             yield return 0x8010000000000000ul; // -Min Normal
             yield return 0x800FFFFFFFFFFFFFul; // -Max Subnormal
@@ -139,11 +158,19 @@ namespace Ryujinx.Tests.Cpu
 
             for (int cnt = 1; cnt <= RndCnt; cnt++)
             {
-                ulong rnd1 = GenNormalD();
-                ulong rnd2 = GenSubnormalD();
+                ulong rnd1 = (ulong)BitConverter.DoubleToInt64Bits(
+                    (double)((long)TestContext.CurrentContext.Random.NextULong()));
+                ulong rnd2 = (ulong)BitConverter.DoubleToInt64Bits(
+                    (double)((ulong)TestContext.CurrentContext.Random.NextULong()));
+
+                ulong rnd3 = GenNormalD();
+                ulong rnd4 = GenSubnormalD();
 
                 yield return rnd1;
                 yield return rnd2;
+
+                yield return rnd3;
+                yield return rnd4;
             }
         }
 #endregion
@@ -387,8 +414,8 @@ namespace Ryujinx.Tests.Cpu
         public void F_Cvt_Z_SU_V_Fixed_2S_4S([ValueSource("_F_Cvt_Z_SU_V_Fixed_2S_4S_")] uint opcodes,
                                              [Values(0u)]     uint rd,
                                              [Values(1u, 0u)] uint rn,
-                                             [ValueSource("_2S_F_Cvt_")] ulong z,
-                                             [ValueSource("_2S_F_Cvt_")] ulong a,
+                                             [ValueSource("_2S_F_W_")] ulong z,
+                                             [ValueSource("_2S_F_W_")] ulong a,
                                              [Values(1u, 32u)] [Random(2u, 31u, RndCntFBits)] uint fBits,
                                              [Values(0b0u, 0b1u)] uint q) // <2S, 4S>
         {
@@ -410,8 +437,8 @@ namespace Ryujinx.Tests.Cpu
         public void F_Cvt_Z_SU_V_Fixed_2D([ValueSource("_F_Cvt_Z_SU_V_Fixed_2D_")] uint opcodes,
                                           [Values(0u)]     uint rd,
                                           [Values(1u, 0u)] uint rn,
-                                          [ValueSource("_1D_F_Cvt_")] ulong z,
-                                          [ValueSource("_1D_F_Cvt_")] ulong a,
+                                          [ValueSource("_1D_F_X_")] ulong z,
+                                          [ValueSource("_1D_F_X_")] ulong a,
                                           [Values(1u, 64u)] [Random(2u, 63u, RndCntFBits)] uint fBits)
         {
             uint immHb = (128 - fBits) & 0x7F;