From 7a1fdb58f1d68aa8823c990ea7199005553b8e44 Mon Sep 17 00:00:00 2001 From: TSR Berry <20988865+TSRBerry@users.noreply.github.com> Date: Thu, 21 Mar 2024 21:44:56 +0100 Subject: [PATCH] Convert new CPU tests --- src/Ryujinx.Tests/Cpu/CpuTestSimdCvt32.cs | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/Ryujinx.Tests/Cpu/CpuTestSimdCvt32.cs b/src/Ryujinx.Tests/Cpu/CpuTestSimdCvt32.cs index 20b4fc37a..0555059e0 100644 --- a/src/Ryujinx.Tests/Cpu/CpuTestSimdCvt32.cs +++ b/src/Ryujinx.Tests/Cpu/CpuTestSimdCvt32.cs @@ -525,16 +525,18 @@ namespace Ryujinx.Tests.Cpu CompareAgainstUnicorn(); } - [Test, Pairwise, Description("VRINTR.F , ")] - [Platform(Exclude = "Linux,MacOsX")] // Instruction isn't testable due to Unicorn. - public void Vrintr([Values(0u, 1u)] uint rd, - [Values(0u, 1u)] uint rm, - [Values(2u, 3u)] uint size, - [ValueSource(nameof(_1D_F_))] ulong s0, - [ValueSource(nameof(_1D_F_))] ulong s1, - [ValueSource(nameof(_1D_F_))] ulong s2, - [Values(RMode.Rn, RMode.Rm, RMode.Rp)] RMode rMode) + [Theory(DisplayName = "VRINTR.F , ")] + [PairwiseData] + public void Vrintr([CombinatorialValues(0u, 1u)] uint rd, + [CombinatorialValues(0u, 1u)] uint rm, + [CombinatorialValues(2u, 3u)] uint size, + [CombinatorialMemberData(nameof(_1D_F_))] ulong s0, + [CombinatorialMemberData(nameof(_1D_F_))] ulong s1, + [CombinatorialMemberData(nameof(_1D_F_))] ulong s2, + [CombinatorialValues(RMode.Rn, RMode.Rm, RMode.Rp)] RMode rMode) { + Skip.If(OperatingSystem.IsLinux() || OperatingSystem.IsMacOS(), "Instruction not testable with Unicorn"); + uint opcode = 0xEEB60A40; V128 v0, v1, v2;