Remove old Tester, update Tests (some reworks). (#400)
* Delete Bits.cs * Delete Integer.cs * Delete Instructions.cs * Delete Pseudocode.cs * Add files via upload * Add mnemonic. * Literals all uppercase. * Nit. * Allow FPSR control. * Allow FPSR control. * Allow FPSR control.
This commit is contained in:
parent
76a3172f17
commit
ca1e37a295
22 changed files with 1354 additions and 15384 deletions
|
@ -1,4 +1,4 @@
|
|||
//#define Csel
|
||||
#define Csel
|
||||
|
||||
using ChocolArm64.State;
|
||||
|
||||
|
@ -6,27 +6,20 @@ using NUnit.Framework;
|
|||
|
||||
namespace Ryujinx.Tests.Cpu
|
||||
{
|
||||
using Tester;
|
||||
using Tester.Types;
|
||||
|
||||
[Category("Csel"), Ignore("Tested: second half of 2018.")]
|
||||
[Category("Csel")] // Tested: second half of 2018.
|
||||
public sealed class CpuTestCsel : CpuTest
|
||||
{
|
||||
#if Csel
|
||||
[SetUp]
|
||||
public void SetupTester()
|
||||
{
|
||||
AArch64.TakeReset(false);
|
||||
}
|
||||
private const int RndCnt = 2;
|
||||
|
||||
[Test, Description("CSEL <Xd>, <Xn>, <Xm>, <cond>")]
|
||||
[Test, Pairwise, Description("CSEL <Xd>, <Xn>, <Xm>, <cond>")]
|
||||
public void Csel_64bit([Values(0u, 31u)] uint Rd,
|
||||
[Values(1u, 31u)] uint Rn,
|
||||
[Values(2u, 31u)] uint Rm,
|
||||
[Values(0x0000000000000000ul, 0x7FFFFFFFFFFFFFFFul,
|
||||
0x8000000000000000ul, 0xFFFFFFFFFFFFFFFFul)] [Random(1)] ulong Xn,
|
||||
0x8000000000000000ul, 0xFFFFFFFFFFFFFFFFul)] [Random(RndCnt)] ulong Xn,
|
||||
[Values(0x0000000000000000ul, 0x7FFFFFFFFFFFFFFFul,
|
||||
0x8000000000000000ul, 0xFFFFFFFFFFFFFFFFul)] [Random(1)] ulong Xm,
|
||||
0x8000000000000000ul, 0xFFFFFFFFFFFFFFFFul)] [Random(RndCnt)] ulong Xm,
|
||||
[Values(0b0000u, 0b0001u, 0b0010u, 0b0011u, // <EQ, NE, CS/HS, CC/LO,
|
||||
0b0100u, 0b0101u, 0b0110u, 0b0111u, // MI, PL, VS, VC,
|
||||
0b1000u, 0b1001u, 0b1010u, 0b1011u, // HI, LS, GE, LT,
|
||||
|
@ -37,34 +30,20 @@ namespace Ryujinx.Tests.Cpu
|
|||
Opcode |= ((cond & 15) << 12);
|
||||
|
||||
ulong _X31 = TestContext.CurrentContext.Random.NextULong();
|
||||
|
||||
AThreadState ThreadState = SingleOpcode(Opcode, X1: Xn, X2: Xm, X31: _X31);
|
||||
|
||||
if (Rd != 31)
|
||||
{
|
||||
Bits Op = new Bits(Opcode);
|
||||
|
||||
AArch64.X((int)Rn, new Bits(Xn));
|
||||
AArch64.X((int)Rm, new Bits(Xm));
|
||||
Base.Csel(Op[31], Op[20, 16], Op[15, 12], Op[9, 5], Op[4, 0]);
|
||||
ulong Xd = AArch64.X(64, (int)Rd).ToUInt64();
|
||||
|
||||
Assert.That((ulong)ThreadState.X0, Is.EqualTo(Xd));
|
||||
}
|
||||
else
|
||||
{
|
||||
Assert.That((ulong)ThreadState.X31, Is.EqualTo(_X31));
|
||||
}
|
||||
CompareAgainstUnicorn();
|
||||
}
|
||||
|
||||
[Test, Description("CSEL <Wd>, <Wn>, <Wm>, <cond>")]
|
||||
[Test, Pairwise, Description("CSEL <Wd>, <Wn>, <Wm>, <cond>")]
|
||||
public void Csel_32bit([Values(0u, 31u)] uint Rd,
|
||||
[Values(1u, 31u)] uint Rn,
|
||||
[Values(2u, 31u)] uint Rm,
|
||||
[Values(0x00000000u, 0x7FFFFFFFu,
|
||||
0x80000000u, 0xFFFFFFFFu)] [Random(1)] uint Wn,
|
||||
0x80000000u, 0xFFFFFFFFu)] [Random(RndCnt)] uint Wn,
|
||||
[Values(0x00000000u, 0x7FFFFFFFu,
|
||||
0x80000000u, 0xFFFFFFFFu)] [Random(1)] uint Wm,
|
||||
0x80000000u, 0xFFFFFFFFu)] [Random(RndCnt)] uint Wm,
|
||||
[Values(0b0000u, 0b0001u, 0b0010u, 0b0011u, // <EQ, NE, CS/HS, CC/LO,
|
||||
0b0100u, 0b0101u, 0b0110u, 0b0111u, // MI, PL, VS, VC,
|
||||
0b1000u, 0b1001u, 0b1010u, 0b1011u, // HI, LS, GE, LT,
|
||||
|
@ -75,34 +54,20 @@ namespace Ryujinx.Tests.Cpu
|
|||
Opcode |= ((cond & 15) << 12);
|
||||
|
||||
uint _W31 = TestContext.CurrentContext.Random.NextUInt();
|
||||
|
||||
AThreadState ThreadState = SingleOpcode(Opcode, X1: Wn, X2: Wm, X31: _W31);
|
||||
|
||||
if (Rd != 31)
|
||||
{
|
||||
Bits Op = new Bits(Opcode);
|
||||
|
||||
AArch64.X((int)Rn, new Bits(Wn));
|
||||
AArch64.X((int)Rm, new Bits(Wm));
|
||||
Base.Csel(Op[31], Op[20, 16], Op[15, 12], Op[9, 5], Op[4, 0]);
|
||||
uint Wd = AArch64.X(32, (int)Rd).ToUInt32();
|
||||
|
||||
Assert.That((uint)ThreadState.X0, Is.EqualTo(Wd));
|
||||
}
|
||||
else
|
||||
{
|
||||
Assert.That((uint)ThreadState.X31, Is.EqualTo(_W31));
|
||||
}
|
||||
CompareAgainstUnicorn();
|
||||
}
|
||||
|
||||
[Test, Description("CSINC <Xd>, <Xn>, <Xm>, <cond>")]
|
||||
[Test, Pairwise, Description("CSINC <Xd>, <Xn>, <Xm>, <cond>")]
|
||||
public void Csinc_64bit([Values(0u, 31u)] uint Rd,
|
||||
[Values(1u, 31u)] uint Rn,
|
||||
[Values(2u, 31u)] uint Rm,
|
||||
[Values(0x0000000000000000ul, 0x7FFFFFFFFFFFFFFFul,
|
||||
0x8000000000000000ul, 0xFFFFFFFFFFFFFFFFul)] [Random(1)] ulong Xn,
|
||||
0x8000000000000000ul, 0xFFFFFFFFFFFFFFFFul)] [Random(RndCnt)] ulong Xn,
|
||||
[Values(0x0000000000000000ul, 0x7FFFFFFFFFFFFFFFul,
|
||||
0x8000000000000000ul, 0xFFFFFFFFFFFFFFFFul)] [Random(1)] ulong Xm,
|
||||
0x8000000000000000ul, 0xFFFFFFFFFFFFFFFFul)] [Random(RndCnt)] ulong Xm,
|
||||
[Values(0b0000u, 0b0001u, 0b0010u, 0b0011u, // <EQ, NE, CS/HS, CC/LO,
|
||||
0b0100u, 0b0101u, 0b0110u, 0b0111u, // MI, PL, VS, VC,
|
||||
0b1000u, 0b1001u, 0b1010u, 0b1011u, // HI, LS, GE, LT,
|
||||
|
@ -113,34 +78,20 @@ namespace Ryujinx.Tests.Cpu
|
|||
Opcode |= ((cond & 15) << 12);
|
||||
|
||||
ulong _X31 = TestContext.CurrentContext.Random.NextULong();
|
||||
|
||||
AThreadState ThreadState = SingleOpcode(Opcode, X1: Xn, X2: Xm, X31: _X31);
|
||||
|
||||
if (Rd != 31)
|
||||
{
|
||||
Bits Op = new Bits(Opcode);
|
||||
|
||||
AArch64.X((int)Rn, new Bits(Xn));
|
||||
AArch64.X((int)Rm, new Bits(Xm));
|
||||
Base.Csinc(Op[31], Op[20, 16], Op[15, 12], Op[9, 5], Op[4, 0]);
|
||||
ulong Xd = AArch64.X(64, (int)Rd).ToUInt64();
|
||||
|
||||
Assert.That((ulong)ThreadState.X0, Is.EqualTo(Xd));
|
||||
}
|
||||
else
|
||||
{
|
||||
Assert.That((ulong)ThreadState.X31, Is.EqualTo(_X31));
|
||||
}
|
||||
CompareAgainstUnicorn();
|
||||
}
|
||||
|
||||
[Test, Description("CSINC <Wd>, <Wn>, <Wm>, <cond>")]
|
||||
[Test, Pairwise, Description("CSINC <Wd>, <Wn>, <Wm>, <cond>")]
|
||||
public void Csinc_32bit([Values(0u, 31u)] uint Rd,
|
||||
[Values(1u, 31u)] uint Rn,
|
||||
[Values(2u, 31u)] uint Rm,
|
||||
[Values(0x00000000u, 0x7FFFFFFFu,
|
||||
0x80000000u, 0xFFFFFFFFu)] [Random(1)] uint Wn,
|
||||
0x80000000u, 0xFFFFFFFFu)] [Random(RndCnt)] uint Wn,
|
||||
[Values(0x00000000u, 0x7FFFFFFFu,
|
||||
0x80000000u, 0xFFFFFFFFu)] [Random(1)] uint Wm,
|
||||
0x80000000u, 0xFFFFFFFFu)] [Random(RndCnt)] uint Wm,
|
||||
[Values(0b0000u, 0b0001u, 0b0010u, 0b0011u, // <EQ, NE, CS/HS, CC/LO,
|
||||
0b0100u, 0b0101u, 0b0110u, 0b0111u, // MI, PL, VS, VC,
|
||||
0b1000u, 0b1001u, 0b1010u, 0b1011u, // HI, LS, GE, LT,
|
||||
|
@ -151,34 +102,20 @@ namespace Ryujinx.Tests.Cpu
|
|||
Opcode |= ((cond & 15) << 12);
|
||||
|
||||
uint _W31 = TestContext.CurrentContext.Random.NextUInt();
|
||||
|
||||
AThreadState ThreadState = SingleOpcode(Opcode, X1: Wn, X2: Wm, X31: _W31);
|
||||
|
||||
if (Rd != 31)
|
||||
{
|
||||
Bits Op = new Bits(Opcode);
|
||||
|
||||
AArch64.X((int)Rn, new Bits(Wn));
|
||||
AArch64.X((int)Rm, new Bits(Wm));
|
||||
Base.Csinc(Op[31], Op[20, 16], Op[15, 12], Op[9, 5], Op[4, 0]);
|
||||
uint Wd = AArch64.X(32, (int)Rd).ToUInt32();
|
||||
|
||||
Assert.That((uint)ThreadState.X0, Is.EqualTo(Wd));
|
||||
}
|
||||
else
|
||||
{
|
||||
Assert.That((uint)ThreadState.X31, Is.EqualTo(_W31));
|
||||
}
|
||||
CompareAgainstUnicorn();
|
||||
}
|
||||
|
||||
[Test, Description("CSINV <Xd>, <Xn>, <Xm>, <cond>")]
|
||||
[Test, Pairwise, Description("CSINV <Xd>, <Xn>, <Xm>, <cond>")]
|
||||
public void Csinv_64bit([Values(0u, 31u)] uint Rd,
|
||||
[Values(1u, 31u)] uint Rn,
|
||||
[Values(2u, 31u)] uint Rm,
|
||||
[Values(0x0000000000000000ul, 0x7FFFFFFFFFFFFFFFul,
|
||||
0x8000000000000000ul, 0xFFFFFFFFFFFFFFFFul)] [Random(1)] ulong Xn,
|
||||
0x8000000000000000ul, 0xFFFFFFFFFFFFFFFFul)] [Random(RndCnt)] ulong Xn,
|
||||
[Values(0x0000000000000000ul, 0x7FFFFFFFFFFFFFFFul,
|
||||
0x8000000000000000ul, 0xFFFFFFFFFFFFFFFFul)] [Random(1)] ulong Xm,
|
||||
0x8000000000000000ul, 0xFFFFFFFFFFFFFFFFul)] [Random(RndCnt)] ulong Xm,
|
||||
[Values(0b0000u, 0b0001u, 0b0010u, 0b0011u, // <EQ, NE, CS/HS, CC/LO,
|
||||
0b0100u, 0b0101u, 0b0110u, 0b0111u, // MI, PL, VS, VC,
|
||||
0b1000u, 0b1001u, 0b1010u, 0b1011u, // HI, LS, GE, LT,
|
||||
|
@ -189,34 +126,20 @@ namespace Ryujinx.Tests.Cpu
|
|||
Opcode |= ((cond & 15) << 12);
|
||||
|
||||
ulong _X31 = TestContext.CurrentContext.Random.NextULong();
|
||||
|
||||
AThreadState ThreadState = SingleOpcode(Opcode, X1: Xn, X2: Xm, X31: _X31);
|
||||
|
||||
if (Rd != 31)
|
||||
{
|
||||
Bits Op = new Bits(Opcode);
|
||||
|
||||
AArch64.X((int)Rn, new Bits(Xn));
|
||||
AArch64.X((int)Rm, new Bits(Xm));
|
||||
Base.Csinv(Op[31], Op[20, 16], Op[15, 12], Op[9, 5], Op[4, 0]);
|
||||
ulong Xd = AArch64.X(64, (int)Rd).ToUInt64();
|
||||
|
||||
Assert.That((ulong)ThreadState.X0, Is.EqualTo(Xd));
|
||||
}
|
||||
else
|
||||
{
|
||||
Assert.That((ulong)ThreadState.X31, Is.EqualTo(_X31));
|
||||
}
|
||||
CompareAgainstUnicorn();
|
||||
}
|
||||
|
||||
[Test, Description("CSINV <Wd>, <Wn>, <Wm>, <cond>")]
|
||||
[Test, Pairwise, Description("CSINV <Wd>, <Wn>, <Wm>, <cond>")]
|
||||
public void Csinv_32bit([Values(0u, 31u)] uint Rd,
|
||||
[Values(1u, 31u)] uint Rn,
|
||||
[Values(2u, 31u)] uint Rm,
|
||||
[Values(0x00000000u, 0x7FFFFFFFu,
|
||||
0x80000000u, 0xFFFFFFFFu)] [Random(1)] uint Wn,
|
||||
0x80000000u, 0xFFFFFFFFu)] [Random(RndCnt)] uint Wn,
|
||||
[Values(0x00000000u, 0x7FFFFFFFu,
|
||||
0x80000000u, 0xFFFFFFFFu)] [Random(1)] uint Wm,
|
||||
0x80000000u, 0xFFFFFFFFu)] [Random(RndCnt)] uint Wm,
|
||||
[Values(0b0000u, 0b0001u, 0b0010u, 0b0011u, // <EQ, NE, CS/HS, CC/LO,
|
||||
0b0100u, 0b0101u, 0b0110u, 0b0111u, // MI, PL, VS, VC,
|
||||
0b1000u, 0b1001u, 0b1010u, 0b1011u, // HI, LS, GE, LT,
|
||||
|
@ -227,34 +150,20 @@ namespace Ryujinx.Tests.Cpu
|
|||
Opcode |= ((cond & 15) << 12);
|
||||
|
||||
uint _W31 = TestContext.CurrentContext.Random.NextUInt();
|
||||
|
||||
AThreadState ThreadState = SingleOpcode(Opcode, X1: Wn, X2: Wm, X31: _W31);
|
||||
|
||||
if (Rd != 31)
|
||||
{
|
||||
Bits Op = new Bits(Opcode);
|
||||
|
||||
AArch64.X((int)Rn, new Bits(Wn));
|
||||
AArch64.X((int)Rm, new Bits(Wm));
|
||||
Base.Csinv(Op[31], Op[20, 16], Op[15, 12], Op[9, 5], Op[4, 0]);
|
||||
uint Wd = AArch64.X(32, (int)Rd).ToUInt32();
|
||||
|
||||
Assert.That((uint)ThreadState.X0, Is.EqualTo(Wd));
|
||||
}
|
||||
else
|
||||
{
|
||||
Assert.That((uint)ThreadState.X31, Is.EqualTo(_W31));
|
||||
}
|
||||
CompareAgainstUnicorn();
|
||||
}
|
||||
|
||||
[Test, Description("CSNEG <Xd>, <Xn>, <Xm>, <cond>")]
|
||||
[Test, Pairwise, Description("CSNEG <Xd>, <Xn>, <Xm>, <cond>")]
|
||||
public void Csneg_64bit([Values(0u, 31u)] uint Rd,
|
||||
[Values(1u, 31u)] uint Rn,
|
||||
[Values(2u, 31u)] uint Rm,
|
||||
[Values(0x0000000000000000ul, 0x7FFFFFFFFFFFFFFFul,
|
||||
0x8000000000000000ul, 0xFFFFFFFFFFFFFFFFul)] [Random(1)] ulong Xn,
|
||||
0x8000000000000000ul, 0xFFFFFFFFFFFFFFFFul)] [Random(RndCnt)] ulong Xn,
|
||||
[Values(0x0000000000000000ul, 0x7FFFFFFFFFFFFFFFul,
|
||||
0x8000000000000000ul, 0xFFFFFFFFFFFFFFFFul)] [Random(1)] ulong Xm,
|
||||
0x8000000000000000ul, 0xFFFFFFFFFFFFFFFFul)] [Random(RndCnt)] ulong Xm,
|
||||
[Values(0b0000u, 0b0001u, 0b0010u, 0b0011u, // <EQ, NE, CS/HS, CC/LO,
|
||||
0b0100u, 0b0101u, 0b0110u, 0b0111u, // MI, PL, VS, VC,
|
||||
0b1000u, 0b1001u, 0b1010u, 0b1011u, // HI, LS, GE, LT,
|
||||
|
@ -265,34 +174,20 @@ namespace Ryujinx.Tests.Cpu
|
|||
Opcode |= ((cond & 15) << 12);
|
||||
|
||||
ulong _X31 = TestContext.CurrentContext.Random.NextULong();
|
||||
|
||||
AThreadState ThreadState = SingleOpcode(Opcode, X1: Xn, X2: Xm, X31: _X31);
|
||||
|
||||
if (Rd != 31)
|
||||
{
|
||||
Bits Op = new Bits(Opcode);
|
||||
|
||||
AArch64.X((int)Rn, new Bits(Xn));
|
||||
AArch64.X((int)Rm, new Bits(Xm));
|
||||
Base.Csneg(Op[31], Op[20, 16], Op[15, 12], Op[9, 5], Op[4, 0]);
|
||||
ulong Xd = AArch64.X(64, (int)Rd).ToUInt64();
|
||||
|
||||
Assert.That((ulong)ThreadState.X0, Is.EqualTo(Xd));
|
||||
}
|
||||
else
|
||||
{
|
||||
Assert.That((ulong)ThreadState.X31, Is.EqualTo(_X31));
|
||||
}
|
||||
CompareAgainstUnicorn();
|
||||
}
|
||||
|
||||
[Test, Description("CSNEG <Wd>, <Wn>, <Wm>, <cond>")]
|
||||
[Test, Pairwise, Description("CSNEG <Wd>, <Wn>, <Wm>, <cond>")]
|
||||
public void Csneg_32bit([Values(0u, 31u)] uint Rd,
|
||||
[Values(1u, 31u)] uint Rn,
|
||||
[Values(2u, 31u)] uint Rm,
|
||||
[Values(0x00000000u, 0x7FFFFFFFu,
|
||||
0x80000000u, 0xFFFFFFFFu)] [Random(1)] uint Wn,
|
||||
0x80000000u, 0xFFFFFFFFu)] [Random(RndCnt)] uint Wn,
|
||||
[Values(0x00000000u, 0x7FFFFFFFu,
|
||||
0x80000000u, 0xFFFFFFFFu)] [Random(1)] uint Wm,
|
||||
0x80000000u, 0xFFFFFFFFu)] [Random(RndCnt)] uint Wm,
|
||||
[Values(0b0000u, 0b0001u, 0b0010u, 0b0011u, // <EQ, NE, CS/HS, CC/LO,
|
||||
0b0100u, 0b0101u, 0b0110u, 0b0111u, // MI, PL, VS, VC,
|
||||
0b1000u, 0b1001u, 0b1010u, 0b1011u, // HI, LS, GE, LT,
|
||||
|
@ -303,23 +198,9 @@ namespace Ryujinx.Tests.Cpu
|
|||
Opcode |= ((cond & 15) << 12);
|
||||
|
||||
uint _W31 = TestContext.CurrentContext.Random.NextUInt();
|
||||
|
||||
AThreadState ThreadState = SingleOpcode(Opcode, X1: Wn, X2: Wm, X31: _W31);
|
||||
|
||||
if (Rd != 31)
|
||||
{
|
||||
Bits Op = new Bits(Opcode);
|
||||
|
||||
AArch64.X((int)Rn, new Bits(Wn));
|
||||
AArch64.X((int)Rm, new Bits(Wm));
|
||||
Base.Csneg(Op[31], Op[20, 16], Op[15, 12], Op[9, 5], Op[4, 0]);
|
||||
uint Wd = AArch64.X(32, (int)Rd).ToUInt32();
|
||||
|
||||
Assert.That((uint)ThreadState.X0, Is.EqualTo(Wd));
|
||||
}
|
||||
else
|
||||
{
|
||||
Assert.That((uint)ThreadState.X31, Is.EqualTo(_W31));
|
||||
}
|
||||
CompareAgainstUnicorn();
|
||||
}
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue