dahjah/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-12-16 04:09:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Jit: Move rlwimix to ConstantPropagation

Browse Source
This commit is contained in:
JosJuice 2024-09-01 11:44:34 +02:00
parent bac911aac4
commit 502317a485
4 changed files with 163 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp
View File

@ -1997,22 +1997,6 @@ void Jit64::rlwimix(UGeckoInstruction inst)
int s = inst.RS; int s = inst.RS;
const u32 mask = MakeRotationMask(inst.MB, inst.ME); const u32 mask = MakeRotationMask(inst.MB, inst.ME);
if (gpr.IsImm(a, s))
{
gpr.SetImmediate32(a, (gpr.Imm32(a) & ~mask) | (std::rotl(gpr.Imm32(s), inst.SH) & mask));
if (inst.Rc)
ComputeRC(a);
}
else if (gpr.IsImm(s) && mask == 0xFFFFFFFF)
{
gpr.SetImmediate32(a, std::rotl(gpr.Imm32(s), inst.SH));
if (inst.Rc)
ComputeRC(a);
}
else
{
const bool left_shift = mask == 0U - (1U << inst.SH); const bool left_shift = mask == 0U - (1U << inst.SH);
const bool right_shift = mask == (1U << inst.SH) - 1; const bool right_shift = mask == (1U << inst.SH) - 1;
bool needs_test = false; bool needs_test = false;
@ -2125,7 +2109,6 @@ void Jit64::rlwimix(UGeckoInstruction inst)
} }
if (inst.Rc) if (inst.Rc)
ComputeRC(a, needs_test); ComputeRC(a, needs_test);
}
} }
void Jit64::rlwnmx(UGeckoInstruction inst) void Jit64::rlwnmx(UGeckoInstruction inst)

10
Source/Core/Core/PowerPC/JitArm64/JitArm64_Integer.cpp
View File

@ -1975,15 +1975,6 @@ void JitArm64::rlwimix(UGeckoInstruction inst)
const u32 width = inst.ME - inst.MB + 1; const u32 width = inst.ME - inst.MB + 1;
const u32 rot_dist = inst.SH ? 32 - inst.SH : 0; const u32 rot_dist = inst.SH ? 32 - inst.SH : 0;
if (gpr.IsImm(a) && gpr.IsImm(s))
{
u32 res = (gpr.GetImm(a) & ~mask) | (std::rotl(gpr.GetImm(s), inst.SH) & mask);
gpr.SetImmediate(a, res);
if (inst.Rc)
ComputeRC0(res);
}
else
{
if (mask == 0 || (a == s && inst.SH == 0)) if (mask == 0 || (a == s && inst.SH == 0))
{ {
// Do Nothing // Do Nothing
@ -2044,5 +2035,4 @@ void JitArm64::rlwimix(UGeckoInstruction inst)
if (inst.Rc) if (inst.Rc)
ComputeRC0(gpr.R(a)); ComputeRC0(gpr.R(a));
}
} }

18
Source/Core/Core/PowerPC/JitCommon/ConstantPropagation.cpp
View File

@ -41,6 +41,8 @@ ConstantPropagationResult ConstantPropagation::EvaluateInstruction(UGeckoInstruc
case 14: // addi case 14: // addi
case 15: // addis case 15: // addis
return EvaluateAddImm(inst); return EvaluateAddImm(inst);
case 20: // rlwimix
return EvaluateRlwimix(inst);
case 21: // rlwinmx case 21: // rlwinmx
return EvaluateRlwinmxRlwnmx(inst, inst.SH); return EvaluateRlwinmxRlwnmx(inst, inst.SH);
case 23: // rlwnmx case 23: // rlwnmx
@ -114,6 +116,22 @@ ConstantPropagationResult ConstantPropagation::EvaluateAddImmCarry(UGeckoInstruc
return result; return result;
} }
ConstantPropagationResult ConstantPropagation::EvaluateRlwimix(UGeckoInstruction inst) const
{
if (!HasGPR(inst.RS))
return {};
const u32 mask = MakeRotationMask(inst.MB, inst.ME);
if (mask == 0xFFFFFFFF)
return ConstantPropagationResult(inst.RA, std::rotl(GetGPR(inst.RS), inst.SH), inst.Rc);
if (!HasGPR(inst.RA))
return {};
return ConstantPropagationResult(
inst.RA, (GetGPR(inst.RA) & ~mask) | (std::rotl(GetGPR(inst.RS), inst.SH) & mask), inst.Rc);
}
ConstantPropagationResult ConstantPropagation::EvaluateRlwinmxRlwnmx(UGeckoInstruction inst, ConstantPropagationResult ConstantPropagation::EvaluateRlwinmxRlwnmx(UGeckoInstruction inst,
u32 shift) const u32 shift) const
{ {

1
Source/Core/Core/PowerPC/JitCommon/ConstantPropagation.h
View File

@ -81,6 +81,7 @@ private:
ConstantPropagationResult EvaluateSubImmCarry(UGeckoInstruction inst) const; ConstantPropagationResult EvaluateSubImmCarry(UGeckoInstruction inst) const;
ConstantPropagationResult EvaluateAddImm(UGeckoInstruction inst) const; ConstantPropagationResult EvaluateAddImm(UGeckoInstruction inst) const;
ConstantPropagationResult EvaluateAddImmCarry(UGeckoInstruction inst) const; ConstantPropagationResult EvaluateAddImmCarry(UGeckoInstruction inst) const;
ConstantPropagationResult EvaluateRlwimix(UGeckoInstruction inst) const;
ConstantPropagationResult EvaluateRlwinmxRlwnmx(UGeckoInstruction inst, u32 shift) const; ConstantPropagationResult EvaluateRlwinmxRlwnmx(UGeckoInstruction inst, u32 shift) const;
ConstantPropagationResult EvaluateBitwiseImm(UGeckoInstruction inst, ConstantPropagationResult EvaluateBitwiseImm(UGeckoInstruction inst,
u32 (*do_op)(u32, u32)) const; u32 (*do_op)(u32, u32)) const;