mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-09-10 13:43:17 +02:00
CPU: A32: Fix Vabs_V & Vneg_V (S8, S16, S32 & F32); add Tests. (#1394)
* Fix Vabs_V & Vneg_V (S8, S16, S32 & F32); add Tests. * Update Ptc.cs
This commit is contained in:
parent
20774dab14
commit
56a61a5758
@ -798,8 +798,9 @@ namespace ARMeilleure.Decoders
|
|||||||
SetA32("111100111x110000xxx0001100x0xxx0", InstName.Aese_V, InstEmit32.Aese_V, typeof(OpCode32Simd));
|
SetA32("111100111x110000xxx0001100x0xxx0", InstName.Aese_V, InstEmit32.Aese_V, typeof(OpCode32Simd));
|
||||||
SetA32("111100111x110000xxx0001111x0xxx0", InstName.Aesimc_V, InstEmit32.Aesimc_V, typeof(OpCode32Simd));
|
SetA32("111100111x110000xxx0001111x0xxx0", InstName.Aesimc_V, InstEmit32.Aesimc_V, typeof(OpCode32Simd));
|
||||||
SetA32("111100111x110000xxx0001110x0xxx0", InstName.Aesmc_V, InstEmit32.Aesmc_V, typeof(OpCode32Simd));
|
SetA32("111100111x110000xxx0001110x0xxx0", InstName.Aesmc_V, InstEmit32.Aesmc_V, typeof(OpCode32Simd));
|
||||||
SetA32("<<<<11101x110000xxxx10xx11x0xxxx", InstName.Vabs, InstEmit32.Vabs_S, typeof(OpCode32SimdS));
|
SetA32("<<<<11101x110000xxxx101x11x0xxxx", InstName.Vabs, InstEmit32.Vabs_S, typeof(OpCode32SimdS));
|
||||||
SetA32("111100111x11xx01xxxx0x110xx0xxxx", InstName.Vabs, InstEmit32.Vabs_V, typeof(OpCode32Simd));
|
SetA32("111100111x11<<01xxxx00110xx0xxxx", InstName.Vabs, InstEmit32.Vabs_V, typeof(OpCode32SimdCmpZ));
|
||||||
|
SetA32("111100111x111001xxxx01110xx0xxxx", InstName.Vabs, InstEmit32.Vabs_V, typeof(OpCode32SimdCmpZ));
|
||||||
SetA32("111100100xxxxxxxxxxx1000xxx0xxxx", InstName.Vadd, InstEmit32.Vadd_I, typeof(OpCode32SimdReg));
|
SetA32("111100100xxxxxxxxxxx1000xxx0xxxx", InstName.Vadd, InstEmit32.Vadd_I, typeof(OpCode32SimdReg));
|
||||||
SetA32("<<<<11100x11xxxxxxxx101xx0x0xxxx", InstName.Vadd, InstEmit32.Vadd_S, typeof(OpCode32SimdRegS));
|
SetA32("<<<<11100x11xxxxxxxx101xx0x0xxxx", InstName.Vadd, InstEmit32.Vadd_S, typeof(OpCode32SimdRegS));
|
||||||
SetA32("111100100x00xxxxxxxx1101xxx0xxxx", InstName.Vadd, InstEmit32.Vadd_V, typeof(OpCode32SimdReg));
|
SetA32("111100100x00xxxxxxxx1101xxx0xxxx", InstName.Vadd, InstEmit32.Vadd_V, typeof(OpCode32SimdReg));
|
||||||
@ -897,7 +898,8 @@ namespace ARMeilleure.Decoders
|
|||||||
SetA32("1111001x1x000xxxxxxx10x00x11xxxx", InstName.Vmvn, InstEmit32.Vmvn_II, typeof(OpCode32SimdImm));
|
SetA32("1111001x1x000xxxxxxx10x00x11xxxx", InstName.Vmvn, InstEmit32.Vmvn_II, typeof(OpCode32SimdImm));
|
||||||
SetA32("1111001x1x000xxxxxxx110x0x11xxxx", InstName.Vmvn, InstEmit32.Vmvn_II, typeof(OpCode32SimdImm));
|
SetA32("1111001x1x000xxxxxxx110x0x11xxxx", InstName.Vmvn, InstEmit32.Vmvn_II, typeof(OpCode32SimdImm));
|
||||||
SetA32("<<<<11101x110001xxxx101x01x0xxxx", InstName.Vneg, InstEmit32.Vneg_S, typeof(OpCode32SimdS));
|
SetA32("<<<<11101x110001xxxx101x01x0xxxx", InstName.Vneg, InstEmit32.Vneg_S, typeof(OpCode32SimdS));
|
||||||
SetA32("111100111x11xx01xxxx0x111xx0xxxx", InstName.Vneg, InstEmit32.Vneg_V, typeof(OpCode32Simd));
|
SetA32("111100111x11<<01xxxx00111xx0xxxx", InstName.Vneg, InstEmit32.Vneg_V, typeof(OpCode32SimdCmpZ));
|
||||||
|
SetA32("111100111x111001xxxx01111xx0xxxx", InstName.Vneg, InstEmit32.Vneg_V, typeof(OpCode32SimdCmpZ));
|
||||||
SetA32("<<<<11100x01xxxxxxxx101xx1x0xxxx", InstName.Vnmla, InstEmit32.Vnmla_S, typeof(OpCode32SimdRegS));
|
SetA32("<<<<11100x01xxxxxxxx101xx1x0xxxx", InstName.Vnmla, InstEmit32.Vnmla_S, typeof(OpCode32SimdRegS));
|
||||||
SetA32("<<<<11100x01xxxxxxxx101xx0x0xxxx", InstName.Vnmls, InstEmit32.Vnmls_S, typeof(OpCode32SimdRegS));
|
SetA32("<<<<11100x01xxxxxxxx101xx0x0xxxx", InstName.Vnmls, InstEmit32.Vnmls_S, typeof(OpCode32SimdRegS));
|
||||||
SetA32("<<<<11100x10xxxxxxxx101xx1x0xxxx", InstName.Vnmul, InstEmit32.Vnmul_S, typeof(OpCode32SimdRegS));
|
SetA32("<<<<11100x10xxxxxxxx101xx1x0xxxx", InstName.Vnmul, InstEmit32.Vnmul_S, typeof(OpCode32SimdRegS));
|
||||||
|
@ -33,7 +33,7 @@ namespace ARMeilleure.Instructions
|
|||||||
|
|
||||||
public static void Vabs_V(ArmEmitterContext context)
|
public static void Vabs_V(ArmEmitterContext context)
|
||||||
{
|
{
|
||||||
OpCode32Simd op = (OpCode32Simd)context.CurrOp;
|
OpCode32SimdCmpZ op = (OpCode32SimdCmpZ)context.CurrOp;
|
||||||
|
|
||||||
if (op.F)
|
if (op.F)
|
||||||
{
|
{
|
||||||
@ -385,22 +385,22 @@ namespace ARMeilleure.Instructions
|
|||||||
|
|
||||||
public static void Vneg_V(ArmEmitterContext context)
|
public static void Vneg_V(ArmEmitterContext context)
|
||||||
{
|
{
|
||||||
OpCode32Simd op = (OpCode32Simd)context.CurrOp;
|
OpCode32SimdCmpZ op = (OpCode32SimdCmpZ)context.CurrOp;
|
||||||
|
|
||||||
if (op.F)
|
if (op.F)
|
||||||
{
|
{
|
||||||
if (Optimizations.UseSse2)
|
if (Optimizations.FastFP && Optimizations.UseSse2)
|
||||||
{
|
{
|
||||||
EmitVectorUnaryOpSimd32(context, (m) =>
|
EmitVectorUnaryOpSimd32(context, (m) =>
|
||||||
{
|
{
|
||||||
if ((op.Size & 1) == 0)
|
if ((op.Size & 1) == 0)
|
||||||
{
|
{
|
||||||
Operand mask = X86GetScalar(context, -0f);
|
Operand mask = X86GetAllElements(context, -0f);
|
||||||
return context.AddIntrinsic(Intrinsic.X86Xorps, mask, m);
|
return context.AddIntrinsic(Intrinsic.X86Xorps, mask, m);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Operand mask = X86GetScalar(context, -0d);
|
Operand mask = X86GetAllElements(context, -0d);
|
||||||
return context.AddIntrinsic(Intrinsic.X86Xorpd, mask, m);
|
return context.AddIntrinsic(Intrinsic.X86Xorpd, mask, m);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -19,8 +19,8 @@ namespace ARMeilleure.Translation.PTC
|
|||||||
public static class Ptc
|
public static class Ptc
|
||||||
{
|
{
|
||||||
private const string HeaderMagic = "PTChd";
|
private const string HeaderMagic = "PTChd";
|
||||||
|
|
||||||
private const int InternalVersion = 11; //! To be incremented manually for each change to the ARMeilleure project.
|
private const int InternalVersion = 12; //! To be incremented manually for each change to the ARMeilleure project.
|
||||||
|
|
||||||
private const string BaseDir = "Ryujinx";
|
private const string BaseDir = "Ryujinx";
|
||||||
|
|
||||||
|
222
Ryujinx.Tests/Cpu/CpuTestSimd32.cs
Normal file
222
Ryujinx.Tests/Cpu/CpuTestSimd32.cs
Normal file
@ -0,0 +1,222 @@
|
|||||||
|
#define Simd32
|
||||||
|
|
||||||
|
using ARMeilleure.State;
|
||||||
|
using NUnit.Framework;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
namespace Ryujinx.Tests.Cpu
|
||||||
|
{
|
||||||
|
[Category("Simd32")]
|
||||||
|
public sealed class CpuTestSimd32 : CpuTest32
|
||||||
|
{
|
||||||
|
#if Simd32
|
||||||
|
|
||||||
|
#region "ValueSource (Opcodes)"
|
||||||
|
private static uint[] _Vabs_Vneg_V_()
|
||||||
|
{
|
||||||
|
return new uint[]
|
||||||
|
{
|
||||||
|
0xf3b10300u, // VABS.S8 D0, D0
|
||||||
|
0xf3b10380u // VNEG.S8 D0, D0
|
||||||
|
};
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region "ValueSource (Types)"
|
||||||
|
private static ulong[] _8B4H2S_()
|
||||||
|
{
|
||||||
|
return new ulong[] { 0x0000000000000000ul, 0x7F7F7F7F7F7F7F7Ful,
|
||||||
|
0x8080808080808080ul, 0x7FFF7FFF7FFF7FFFul,
|
||||||
|
0x8000800080008000ul, 0x7FFFFFFF7FFFFFFFul,
|
||||||
|
0x8000000080000000ul, 0xFFFFFFFFFFFFFFFFul };
|
||||||
|
}
|
||||||
|
|
||||||
|
private static IEnumerable<ulong> _1S_F_()
|
||||||
|
{
|
||||||
|
yield return 0x00000000FF7FFFFFul; // -Max Normal (float.MinValue)
|
||||||
|
yield return 0x0000000080800000ul; // -Min Normal
|
||||||
|
yield return 0x00000000807FFFFFul; // -Max Subnormal
|
||||||
|
yield return 0x0000000080000001ul; // -Min Subnormal (-float.Epsilon)
|
||||||
|
yield return 0x000000007F7FFFFFul; // +Max Normal (float.MaxValue)
|
||||||
|
yield return 0x0000000000800000ul; // +Min Normal
|
||||||
|
yield return 0x00000000007FFFFFul; // +Max Subnormal
|
||||||
|
yield return 0x0000000000000001ul; // +Min Subnormal (float.Epsilon)
|
||||||
|
|
||||||
|
if (!NoZeros)
|
||||||
|
{
|
||||||
|
yield return 0x0000000080000000ul; // -Zero
|
||||||
|
yield return 0x0000000000000000ul; // +Zero
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!NoInfs)
|
||||||
|
{
|
||||||
|
yield return 0x00000000FF800000ul; // -Infinity
|
||||||
|
yield return 0x000000007F800000ul; // +Infinity
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!NoNaNs)
|
||||||
|
{
|
||||||
|
yield return 0x00000000FFC00000ul; // -QNaN (all zeros payload) (float.NaN)
|
||||||
|
yield return 0x00000000FFBFFFFFul; // -SNaN (all ones payload)
|
||||||
|
yield return 0x000000007FC00000ul; // +QNaN (all zeros payload) (-float.NaN) (DefaultNaN)
|
||||||
|
yield return 0x000000007FBFFFFFul; // +SNaN (all ones payload)
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int cnt = 1; cnt <= RndCnt; cnt++)
|
||||||
|
{
|
||||||
|
ulong grbg = TestContext.CurrentContext.Random.NextUInt();
|
||||||
|
ulong rnd1 = GenNormalS();
|
||||||
|
ulong rnd2 = GenSubnormalS();
|
||||||
|
|
||||||
|
yield return (grbg << 32) | rnd1;
|
||||||
|
yield return (grbg << 32) | rnd2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static IEnumerable<ulong> _2S_F_()
|
||||||
|
{
|
||||||
|
yield return 0xFF7FFFFFFF7FFFFFul; // -Max Normal (float.MinValue)
|
||||||
|
yield return 0x8080000080800000ul; // -Min Normal
|
||||||
|
yield return 0x807FFFFF807FFFFFul; // -Max Subnormal
|
||||||
|
yield return 0x8000000180000001ul; // -Min Subnormal (-float.Epsilon)
|
||||||
|
yield return 0x7F7FFFFF7F7FFFFFul; // +Max Normal (float.MaxValue)
|
||||||
|
yield return 0x0080000000800000ul; // +Min Normal
|
||||||
|
yield return 0x007FFFFF007FFFFFul; // +Max Subnormal
|
||||||
|
yield return 0x0000000100000001ul; // +Min Subnormal (float.Epsilon)
|
||||||
|
|
||||||
|
if (!NoZeros)
|
||||||
|
{
|
||||||
|
yield return 0x8000000080000000ul; // -Zero
|
||||||
|
yield return 0x0000000000000000ul; // +Zero
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!NoInfs)
|
||||||
|
{
|
||||||
|
yield return 0xFF800000FF800000ul; // -Infinity
|
||||||
|
yield return 0x7F8000007F800000ul; // +Infinity
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!NoNaNs)
|
||||||
|
{
|
||||||
|
yield return 0xFFC00000FFC00000ul; // -QNaN (all zeros payload) (float.NaN)
|
||||||
|
yield return 0xFFBFFFFFFFBFFFFFul; // -SNaN (all ones payload)
|
||||||
|
yield return 0x7FC000007FC00000ul; // +QNaN (all zeros payload) (-float.NaN) (DefaultNaN)
|
||||||
|
yield return 0x7FBFFFFF7FBFFFFFul; // +SNaN (all ones payload)
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int cnt = 1; cnt <= RndCnt; cnt++)
|
||||||
|
{
|
||||||
|
ulong rnd1 = GenNormalS();
|
||||||
|
ulong rnd2 = GenSubnormalS();
|
||||||
|
|
||||||
|
yield return (rnd1 << 32) | rnd1;
|
||||||
|
yield return (rnd2 << 32) | rnd2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static IEnumerable<ulong> _1D_F_()
|
||||||
|
{
|
||||||
|
yield return 0xFFEFFFFFFFFFFFFFul; // -Max Normal (double.MinValue)
|
||||||
|
yield return 0x8010000000000000ul; // -Min Normal
|
||||||
|
yield return 0x800FFFFFFFFFFFFFul; // -Max Subnormal
|
||||||
|
yield return 0x8000000000000001ul; // -Min Subnormal (-double.Epsilon)
|
||||||
|
yield return 0x7FEFFFFFFFFFFFFFul; // +Max Normal (double.MaxValue)
|
||||||
|
yield return 0x0010000000000000ul; // +Min Normal
|
||||||
|
yield return 0x000FFFFFFFFFFFFFul; // +Max Subnormal
|
||||||
|
yield return 0x0000000000000001ul; // +Min Subnormal (double.Epsilon)
|
||||||
|
|
||||||
|
if (!NoZeros)
|
||||||
|
{
|
||||||
|
yield return 0x8000000000000000ul; // -Zero
|
||||||
|
yield return 0x0000000000000000ul; // +Zero
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!NoInfs)
|
||||||
|
{
|
||||||
|
yield return 0xFFF0000000000000ul; // -Infinity
|
||||||
|
yield return 0x7FF0000000000000ul; // +Infinity
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!NoNaNs)
|
||||||
|
{
|
||||||
|
yield return 0xFFF8000000000000ul; // -QNaN (all zeros payload) (double.NaN)
|
||||||
|
yield return 0xFFF7FFFFFFFFFFFFul; // -SNaN (all ones payload)
|
||||||
|
yield return 0x7FF8000000000000ul; // +QNaN (all zeros payload) (-double.NaN) (DefaultNaN)
|
||||||
|
yield return 0x7FF7FFFFFFFFFFFFul; // +SNaN (all ones payload)
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int cnt = 1; cnt <= RndCnt; cnt++)
|
||||||
|
{
|
||||||
|
ulong rnd1 = GenNormalD();
|
||||||
|
ulong rnd2 = GenSubnormalD();
|
||||||
|
|
||||||
|
yield return rnd1;
|
||||||
|
yield return rnd2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
private const int RndCnt = 2;
|
||||||
|
|
||||||
|
private static readonly bool NoZeros = false;
|
||||||
|
private static readonly bool NoInfs = false;
|
||||||
|
private static readonly bool NoNaNs = false;
|
||||||
|
|
||||||
|
[Test, Pairwise]
|
||||||
|
public void Vabs_Vneg_V_S8_S16_S32([ValueSource("_Vabs_Vneg_V_")] uint opcode,
|
||||||
|
[Range(0u, 3u)] uint rd,
|
||||||
|
[Range(0u, 3u)] uint rm,
|
||||||
|
[ValueSource("_8B4H2S_")] [Random(RndCnt)] ulong z,
|
||||||
|
[ValueSource("_8B4H2S_")] [Random(RndCnt)] ulong b,
|
||||||
|
[Values(0u, 1u, 2u)] uint size, // <S8, S16, S32>
|
||||||
|
[Values] bool q)
|
||||||
|
{
|
||||||
|
const bool f = false;
|
||||||
|
|
||||||
|
Vabs_Vneg_V(opcode, rd, rm, z, b, size, f, q);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test, Pairwise]
|
||||||
|
public void Vabs_Vneg_V_F32([ValueSource("_Vabs_Vneg_V_")] uint opcode,
|
||||||
|
[Range(0u, 3u)] uint rd,
|
||||||
|
[Range(0u, 3u)] uint rm,
|
||||||
|
[ValueSource("_2S_F_")] ulong z,
|
||||||
|
[ValueSource("_2S_F_")] ulong b,
|
||||||
|
[Values] bool q)
|
||||||
|
{
|
||||||
|
const uint size = 0b10; // <F32>
|
||||||
|
const bool f = true;
|
||||||
|
|
||||||
|
Vabs_Vneg_V(opcode, rd, rm, z, b, size, f, q);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Vabs_Vneg_V(uint opcode, uint rd, uint rm, ulong z, ulong b, uint size, bool f, bool q)
|
||||||
|
{
|
||||||
|
if (f)
|
||||||
|
{
|
||||||
|
opcode |= 1 << 10;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (q)
|
||||||
|
{
|
||||||
|
opcode |= 1 << 6;
|
||||||
|
|
||||||
|
rd >>= 1; rd <<= 1;
|
||||||
|
rm >>= 1; rm <<= 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
opcode |= ((rd & 0xf) << 12) | ((rd & 0x10) << 18);
|
||||||
|
opcode |= ((rm & 0xf) << 0) | ((rm & 0x10) << 1);
|
||||||
|
|
||||||
|
opcode |= (size & 0x3) << 18;
|
||||||
|
|
||||||
|
V128 v0 = MakeVectorE0E1(z, ~z);
|
||||||
|
V128 v1 = MakeVectorE0E1(b, ~b);
|
||||||
|
|
||||||
|
SingleOpcode(opcode, v0: v0, v1: v1);
|
||||||
|
|
||||||
|
CompareAgainstUnicorn();
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user