1 files changed, 37 insertions, 40 deletions
diff --git a/Ryujinx.Tests/Cpu/CpuTestSimdImm.cs b/Ryujinx.Tests/Cpu/CpuTestSimdImm.cs
index 1ea74a11..d946b433 100644
--- a/Ryujinx.Tests/Cpu/CpuTestSimdImm.cs
+++ b/Ryujinx.Tests/Cpu/CpuTestSimdImm.cs
@@ -1,9 +1,7 @@
 #define SimdImm
 
 using ARMeilleure.State;
-
 using NUnit.Framework;
-
 using System.Collections.Generic;
 
 namespace Ryujinx.Tests.Cpu
@@ -50,14 +48,14 @@ namespace Ryujinx.Tests.Cpu
 #region "ValueSource (Types)"
         private static ulong[] _2S_()
         {
-            return new ulong[] { 0x0000000000000000ul, 0x7FFFFFFF7FFFFFFFul,
-                                 0x8000000080000000ul, 0xFFFFFFFFFFFFFFFFul };
+            return new[] { 0x0000000000000000ul, 0x7FFFFFFF7FFFFFFFul,
+                           0x8000000080000000ul, 0xFFFFFFFFFFFFFFFFul };
         }
 
         private static ulong[] _4H_()
         {
-            return new ulong[] { 0x0000000000000000ul, 0x7FFF7FFF7FFF7FFFul,
-                                 0x8000800080008000ul, 0xFFFFFFFFFFFFFFFFul };
+            return new[] { 0x0000000000000000ul, 0x7FFF7FFF7FFF7FFFul,
+                           0x8000800080008000ul, 0xFFFFFFFFFFFFFFFFul };
         }
 
         private static IEnumerable<byte> _8BIT_IMM_()
@@ -94,7 +92,7 @@ namespace Ryujinx.Tests.Cpu
 #region "ValueSource (Opcodes)"
         private static uint[] _Bic_Orr_Vi_16bit_()
         {
-            return new uint[]
+            return new[]
             {
                 0x2F009400u, // BIC V0.4H, #0
                 0x0F009400u  // ORR V0.4H, #0
@@ -103,7 +101,7 @@ namespace Ryujinx.Tests.Cpu
 
         private static uint[] _Bic_Orr_Vi_32bit_()
         {
-            return new uint[]
+            return new[]
             {
                 0x2F001400u, // BIC V0.2S, #0
                 0x0F001400u  // ORR V0.2S, #0
@@ -112,7 +110,7 @@ namespace Ryujinx.Tests.Cpu
 
         private static uint[] _F_Mov_Vi_2S_()
         {
-            return new uint[]
+            return new[]
             {
                 0x0F00F400u // FMOV V0.2S, #2.0
             };
@@ -120,7 +118,7 @@ namespace Ryujinx.Tests.Cpu
 
         private static uint[] _F_Mov_Vi_4S_()
         {
-            return new uint[]
+            return new[]
             {
                 0x4F00F400u // FMOV V0.4S, #2.0
             };
@@ -128,7 +126,7 @@ namespace Ryujinx.Tests.Cpu
 
         private static uint[] _F_Mov_Vi_2D_()
         {
-            return new uint[]
+            return new[]
             {
                 0x6F00F400u // FMOV V0.2D, #2.0
             };
@@ -136,7 +134,7 @@ namespace Ryujinx.Tests.Cpu
 
         private static uint[] _Movi_V_8bit_()
         {
-            return new uint[]
+            return new[]
             {
                 0x0F00E400u // MOVI V0.8B, #0
             };
@@ -144,7 +142,7 @@ namespace Ryujinx.Tests.Cpu
 
         private static uint[] _Movi_Mvni_V_16bit_shifted_imm_()
         {
-            return new uint[]
+            return new[]
             {
                 0x0F008400u, // MOVI V0.4H, #0
                 0x2F008400u  // MVNI V0.4H, #0
@@ -153,7 +151,7 @@ namespace Ryujinx.Tests.Cpu
 
         private static uint[] _Movi_Mvni_V_32bit_shifted_imm_()
         {
-            return new uint[]
+            return new[]
             {
                 0x0F000400u, // MOVI V0.2S, #0
                 0x2F000400u  // MVNI V0.2S, #0
@@ -162,7 +160,7 @@ namespace Ryujinx.Tests.Cpu
 
         private static uint[] _Movi_Mvni_V_32bit_shifting_ones_()
         {
-            return new uint[]
+            return new[]
             {
                 0x0F00C400u, // MOVI V0.2S, #0, MSL #8
                 0x2F00C400u  // MVNI V0.2S, #0, MSL #8
@@ -171,7 +169,7 @@ namespace Ryujinx.Tests.Cpu
 
         private static uint[] _Movi_V_64bit_scalar_()
         {
-            return new uint[]
+            return new[]
             {
                 0x2F00E400u // MOVI D0, #0
             };
@@ -179,21 +177,20 @@ namespace Ryujinx.Tests.Cpu
 
         private static uint[] _Movi_V_64bit_vector_()
         {
-            return new uint[]
+            return new[]
             {
                 0x6F00E400u // MOVI V0.2D, #0
             };
         }
 #endregion
 
-        private const int RndCnt      = 2;
         private const int RndCntImm8  = 2;
         private const int RndCntImm64 = 2;
 
         [Test, Pairwise]
-        public void Bic_Orr_Vi_16bit([ValueSource("_Bic_Orr_Vi_16bit_")] uint opcodes,
-                                     [ValueSource("_4H_")] [Random(RndCnt)] ulong z,
-                                     [ValueSource("_8BIT_IMM_")] byte imm8,
+        public void Bic_Orr_Vi_16bit([ValueSource(nameof(_Bic_Orr_Vi_16bit_))] uint opcodes,
+                                     [ValueSource(nameof(_4H_))] ulong z,
+                                     [ValueSource(nameof(_8BIT_IMM_))] byte imm8,
                                      [Values(0b0u, 0b1u)] uint amount, // <0, 8>
                                      [Values(0b0u, 0b1u)] uint q)      // <4H, 8H>
         {
@@ -212,9 +209,9 @@ namespace Ryujinx.Tests.Cpu
         }
 
         [Test, Pairwise]
-        public void Bic_Orr_Vi_32bit([ValueSource("_Bic_Orr_Vi_32bit_")] uint opcodes,
-                                     [ValueSource("_2S_")] [Random(RndCnt)] ulong z,
-                                     [ValueSource("_8BIT_IMM_")] byte imm8,
+        public void Bic_Orr_Vi_32bit([ValueSource(nameof(_Bic_Orr_Vi_32bit_))] uint opcodes,
+                                     [ValueSource(nameof(_2S_))] ulong z,
+                                     [ValueSource(nameof(_8BIT_IMM_))] byte imm8,
                                      [Values(0b00u, 0b01u, 0b10u, 0b11u)] uint amount, // <0, 8, 16, 24>
                                      [Values(0b0u, 0b1u)] uint q)                      // <2S, 4S>
         {
@@ -233,7 +230,7 @@ namespace Ryujinx.Tests.Cpu
         }
 
         [Test, Pairwise] [Explicit]
-        public void F_Mov_Vi_2S([ValueSource("_F_Mov_Vi_2S_")] uint opcodes,
+        public void F_Mov_Vi_2S([ValueSource(nameof(_F_Mov_Vi_2S_))] uint opcodes,
                                 [Range(0u, 255u, 1u)] uint abcdefgh)
         {
             uint abc   = (abcdefgh & 0xE0u) >> 5;
@@ -250,7 +247,7 @@ namespace Ryujinx.Tests.Cpu
         }
 
         [Test, Pairwise] [Explicit]
-        public void F_Mov_Vi_4S([ValueSource("_F_Mov_Vi_4S_")] uint opcodes,
+        public void F_Mov_Vi_4S([ValueSource(nameof(_F_Mov_Vi_4S_))] uint opcodes,
                                 [Range(0u, 255u, 1u)] uint abcdefgh)
         {
             uint abc   = (abcdefgh & 0xE0u) >> 5;
@@ -264,7 +261,7 @@ namespace Ryujinx.Tests.Cpu
         }
 
         [Test, Pairwise] [Explicit]
-        public void F_Mov_Vi_2D([ValueSource("_F_Mov_Vi_2D_")] uint opcodes,
+        public void F_Mov_Vi_2D([ValueSource(nameof(_F_Mov_Vi_2D_))] uint opcodes,
                                 [Range(0u, 255u, 1u)] uint abcdefgh)
         {
             uint abc   = (abcdefgh & 0xE0u) >> 5;
@@ -278,8 +275,8 @@ namespace Ryujinx.Tests.Cpu
         }
 
         [Test, Pairwise]
-        public void Movi_V_8bit([ValueSource("_Movi_V_8bit_")] uint opcodes,
-                                [ValueSource("_8BIT_IMM_")] byte imm8,
+        public void Movi_V_8bit([ValueSource(nameof(_Movi_V_8bit_))] uint opcodes,
+                                [ValueSource(nameof(_8BIT_IMM_))] byte imm8,
                                 [Values(0b0u, 0b1u)] uint q) // <8B, 16B>
         {
             uint abc   = (imm8 & 0xE0u) >> 5;
@@ -297,8 +294,8 @@ namespace Ryujinx.Tests.Cpu
         }
 
         [Test, Pairwise]
-        public void Movi_Mvni_V_16bit_shifted_imm([ValueSource("_Movi_Mvni_V_16bit_shifted_imm_")] uint opcodes,
-                                                  [ValueSource("_8BIT_IMM_")] byte imm8,
+        public void Movi_Mvni_V_16bit_shifted_imm([ValueSource(nameof(_Movi_Mvni_V_16bit_shifted_imm_))] uint opcodes,
+                                                  [ValueSource(nameof(_8BIT_IMM_))] byte imm8,
                                                   [Values(0b0u, 0b1u)] uint amount, // <0, 8>
                                                   [Values(0b0u, 0b1u)] uint q)      // <4H, 8H>
         {
@@ -318,8 +315,8 @@ namespace Ryujinx.Tests.Cpu
         }
 
         [Test, Pairwise]
-        public void Movi_Mvni_V_32bit_shifted_imm([ValueSource("_Movi_Mvni_V_32bit_shifted_imm_")] uint opcodes,
-                                                  [ValueSource("_8BIT_IMM_")] byte imm8,
+        public void Movi_Mvni_V_32bit_shifted_imm([ValueSource(nameof(_Movi_Mvni_V_32bit_shifted_imm_))] uint opcodes,
+                                                  [ValueSource(nameof(_8BIT_IMM_))] byte imm8,
                                                   [Values(0b00u, 0b01u, 0b10u, 0b11u)] uint amount, // <0, 8, 16, 24>
                                                   [Values(0b0u, 0b1u)] uint q)                      // <2S, 4S>
         {
@@ -339,8 +336,8 @@ namespace Ryujinx.Tests.Cpu
         }
 
         [Test, Pairwise]
-        public void Movi_Mvni_V_32bit_shifting_ones([ValueSource("_Movi_Mvni_V_32bit_shifting_ones_")] uint opcodes,
-                                                    [ValueSource("_8BIT_IMM_")] byte imm8,
+        public void Movi_Mvni_V_32bit_shifting_ones([ValueSource(nameof(_Movi_Mvni_V_32bit_shifting_ones_))] uint opcodes,
+                                                    [ValueSource(nameof(_8BIT_IMM_))] byte imm8,
                                                     [Values(0b0u, 0b1u)] uint amount, // <8, 16>
                                                     [Values(0b0u, 0b1u)] uint q)      // <2S, 4S>
         {
@@ -360,8 +357,8 @@ namespace Ryujinx.Tests.Cpu
         }
 
         [Test, Pairwise]
-        public void Movi_V_64bit_scalar([ValueSource("_Movi_V_64bit_scalar_")] uint opcodes,
-                                        [ValueSource("_64BIT_IMM_")] ulong imm)
+        public void Movi_V_64bit_scalar([ValueSource(nameof(_Movi_V_64bit_scalar_))] uint opcodes,
+                                        [ValueSource(nameof(_64BIT_IMM_))] ulong imm)
         {
             byte imm8 = ShrinkImm64(imm);
 
@@ -379,8 +376,8 @@ namespace Ryujinx.Tests.Cpu
         }
 
         [Test, Pairwise]
-        public void Movi_V_64bit_vector([ValueSource("_Movi_V_64bit_vector_")] uint opcodes,
-                                        [ValueSource("_64BIT_IMM_")] ulong imm)
+        public void Movi_V_64bit_vector([ValueSource(nameof(_Movi_V_64bit_vector_))] uint opcodes,
+                                        [ValueSource(nameof(_64BIT_IMM_))] ulong imm)
         {
             byte imm8 = ShrinkImm64(imm);
 
@@ -395,4 +392,4 @@ namespace Ryujinx.Tests.Cpu
         }
 #endif
     }
-}
+}
+\ No newline at end of file