mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix HighCq, enable FastFP paths for some floating point instructions

Browse source 
(not entirely sure why these were disabled, so important to note this
commit exists)

Branching has been removed in A32 shifts until I figure out if it's
worth it
This commit is contained in:
riperiperi 2020-01-16 19:09:57 +00:00
commit 0f65c7f6ef
3 changed files with 6 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

34
ARMeilleure/Instructions/InstEmitAluHelper.cs
View file

@ -222,30 +222,8 @@ namespace ARMeilleure.Instructions
Operand zeroResult = m; Operand zeroResult = m;
Operand shiftResult = m; Operand shiftResult = m;
Operand shiftSkip = Label();
//Operand shiftZeroSkip = Label();
setCarry &= op.SetFlags; setCarry &= op.SetFlags;
context.BranchIfTrue(shiftSkip, shiftIsZero);
/*
// if zero, fudge the shift number a little
switch (op.ShiftType)
{
case ShiftType.Lsr: zeroResult = GetLsrC(context, m, setCarry, 32); break;
case ShiftType.Asr: zeroResult = GetAsrC(context, m, setCarry, 32); break;
case ShiftType.Ror:
// ror 0 is rrx
zeroResult = GetRrxC(context, m, setCarry);
break;
}
context.Branch(shiftSkip);
context.MarkLabel(shiftZeroSkip);
*/
switch (op.ShiftType) switch (op.ShiftType)
{ {
case ShiftType.Lsl: shiftResult = EmitLslC(context, m, setCarry, s); break; case ShiftType.Lsl: shiftResult = EmitLslC(context, m, setCarry, s); break;
@ -254,8 +232,6 @@ namespace ARMeilleure.Instructions
case ShiftType.Ror: shiftResult = EmitRorC(context, m, setCarry, s); break; case ShiftType.Ror: shiftResult = EmitRorC(context, m, setCarry, s); break;
} }
context.MarkLabel(shiftSkip);
return context.ConditionalSelect(shiftIsZero, zeroResult, shiftResult); return context.ConditionalSelect(shiftIsZero, zeroResult, shiftResult);
} }
@ -361,16 +337,11 @@ namespace ARMeilleure.Instructions
public static Operand EmitAsrC(ArmEmitterContext context, Operand m, bool setCarry, Operand shift) public static Operand EmitAsrC(ArmEmitterContext context, Operand m, bool setCarry, Operand shift)
{ {
Operand normalShift = Label();
Operand end = Label();
Operand l32Result; Operand l32Result;
Operand ge32Result; Operand ge32Result;
Operand less32 = context.ICompareLess(shift, Const(32)); Operand less32 = context.ICompareLess(shift, Const(32));
context.BranchIfTrue(normalShift, less32);
ge32Result = context.ShiftRightSI(m, Const(31)); ge32Result = context.ShiftRightSI(m, Const(31));
if (setCarry) if (setCarry)
@ -378,9 +349,6 @@ namespace ARMeilleure.Instructions
SetCarryMLsb(context, ge32Result); SetCarryMLsb(context, ge32Result);
} }
context.Branch(end);
context.MarkLabel(normalShift);
l32Result = context.ShiftRightSI(m, shift); l32Result = context.ShiftRightSI(m, shift);
if (setCarry) if (setCarry)
{ {
@ -391,8 +359,6 @@ namespace ARMeilleure.Instructions
SetFlag(context, PState.CFlag, cOut); SetFlag(context, PState.CFlag, cOut);
} }
context.MarkLabel(end);
return context.ConditionalSelect(less32, l32Result, ge32Result); return context.ConditionalSelect(less32, l32Result, ge32Result);
} }

10
ARMeilleure/Instructions/InstEmitSimdArithmetic32.cs
View file

@ -240,7 +240,7 @@ namespace ARMeilleure.Instructions
public static void Vnmla_S(ArmEmitterContext context) public static void Vnmla_S(ArmEmitterContext context)
{ {
if (false) //Optimizations.FastFP) if (Optimizations.FastFP)
{ {
EmitScalarTernaryOpF32(context, (op1, op2, op3) => EmitScalarTernaryOpF32(context, (op1, op2, op3) =>
{ {
@ -258,11 +258,11 @@ namespace ARMeilleure.Instructions
public static void Vnmls_S(ArmEmitterContext context) public static void Vnmls_S(ArmEmitterContext context)
{ {
if (false)//Optimizations.FastFP) if (Optimizations.FastFP)
{ {
EmitScalarTernaryOpF32(context, (op1, op2, op3) => EmitScalarTernaryOpF32(context, (op1, op2, op3) =>
{ {
return context.Subtract(op1, context.Multiply(op2, op3)); return context.Add(context.Negate(op1), context.Multiply(op2, op3));
}); });
} }
else else
@ -452,7 +452,7 @@ namespace ARMeilleure.Instructions
public static void Vmla_V(ArmEmitterContext context) public static void Vmla_V(ArmEmitterContext context)
{ {
if (false)//Optimizations.FastFP) if (Optimizations.FastFP)
{ {
EmitVectorTernaryOpF32(context, (op1, op2, op3) => context.Add(op1, context.Multiply(op2, op3))); EmitVectorTernaryOpF32(context, (op1, op2, op3) => context.Add(op1, context.Multiply(op2, op3)));
} }
@ -510,7 +510,7 @@ namespace ARMeilleure.Instructions
public static void Vmls_V(ArmEmitterContext context) public static void Vmls_V(ArmEmitterContext context)
{ {
if (false)//Optimizations.FastFP) if (Optimizations.FastFP)
{ {
EmitVectorTernaryOpF32(context, (op1, op2, op3) => context.Subtract(op1, context.Multiply(op2, op3))); EmitVectorTernaryOpF32(context, (op1, op2, op3) => context.Subtract(op1, context.Multiply(op2, op3)));
} }

2
ARMeilleure/Translation/CompilerOptions.cs
View file

@ -11,6 +11,6 @@ namespace ARMeilleure.Translation
Lsra = 1 << 2, Lsra = 1 << 2,
MediumCq = SsaForm | Optimize, MediumCq = SsaForm | Optimize,
HighCq = SsaForm | Optimize HighCq = SsaForm | Optimize | Lsra
} }
} }