The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-03-12 22:56:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Jit: Move addix to ConstantPropagation

Browse Source
This commit is contained in:
JosJuice 2023-08-22 19:50:38 +02:00
parent 90c89ce533
commit 0b81bd8412
4 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,25 +260,18 @@ void Jit64::regimmop(int d, int a, bool binary, u32 value, Operation doop,
if (a || binary || carry) if (a || binary || carry)
{ {
carry &= js.op->wantsCA; carry &= js.op->wantsCA;
if (gpr.IsImm(a) && !carry) RCOpArg Ra = gpr.Use(a, RCMode::Read);
RCX64Reg Rd = gpr.Bind(d, RCMode::Write);
RegCache::Realize(Ra, Rd);
if (doop == Add && Ra.IsSimpleReg() && !carry && d != a)
{ {
gpr.SetImmediate32(d, doop(gpr.Imm32(a), value)); LEA(32, Rd, MDisp(Ra.GetSimpleReg(), value));
} }
else else
{ {
RCOpArg Ra = gpr.Use(a, RCMode::Read); if (d != a)
RCX64Reg Rd = gpr.Bind(d, RCMode::Write); MOV(32, Rd, Ra);
RegCache::Realize(Ra, Rd); (this->*op)(32, Rd, Imm32(value)); // m_GPR[d] = m_GPR[_inst.RA] + _inst.SIMM_16;
if (doop == Add && Ra.IsSimpleReg() && !carry && d != a)
{
LEA(32, Rd, MDisp(Ra.GetSimpleReg(), value));
}
else
{
if (d != a)
MOV(32, Rd, Ra);
(this->*op)(32, Rd, Imm32(value)); // m_GPR[d] = m_GPR[_inst.RA] + _inst.SIMM_16;
}
} }
if (carry) if (carry)
FinalizeCarry(CC_C); FinalizeCarry(CC_C);
@ -304,12 +297,8 @@ void Jit64::reg_imm(UGeckoInstruction inst)
switch (inst.OPCD) switch (inst.OPCD)
{ {
case 14: // addi case 14: // addi
// occasionally used as MOV - emulate, with immediate propagation // occasionally used as MOV
if (a != 0 && d != a && gpr.IsImm(a)) if (a != 0 && d != a && inst.SIMM_16 == 0)
{
gpr.SetImmediate32(d, gpr.Imm32(a) + (u32)(s32)inst.SIMM_16);
}
else if (a != 0 && d != a && inst.SIMM_16 == 0)
{ {
RCOpArg Ra = gpr.Use(a, RCMode::Read); RCOpArg Ra = gpr.Use(a, RCMode::Read);
RCX64Reg Rd = gpr.Bind(d, RCMode::Write); RCX64Reg Rd = gpr.Bind(d, RCMode::Write);

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

@ -217,17 +217,10 @@ void JitArm64::addix(UGeckoInstruction inst)
if (a) if (a)
{ {
if (gpr.IsImm(a)) gpr.BindToRegister(d, d == a);
{
gpr.SetImmediate(d, gpr.GetImm(a) + imm);
}
else
{
gpr.BindToRegister(d, d == a);
auto WA = gpr.GetScopedReg(); auto WA = gpr.GetScopedReg();
ADDI2R(gpr.R(d), gpr.R(a), imm, WA); ADDI2R(gpr.R(d), gpr.R(a), imm, WA);
}
} }
else else
{ {

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

@ -24,6 +24,9 @@ ConstantPropagationResult ConstantPropagation::EvaluateInstruction(UGeckoInstruc
{ {
switch (inst.OPCD) switch (inst.OPCD)
{ {
case 14: // addi
case 15: // addis
return EvaluateAddImm(inst);
case 24: // ori case 24: // ori
case 25: // oris case 25: // oris
return EvaluateBitwiseImm(inst, BitOR); return EvaluateBitwiseImm(inst, BitOR);
@ -38,6 +41,19 @@ ConstantPropagationResult ConstantPropagation::EvaluateInstruction(UGeckoInstruc
} }
} }
ConstantPropagationResult ConstantPropagation::EvaluateAddImm(UGeckoInstruction inst) const
{
const s32 immediate = inst.OPCD & 1 ? inst.SIMM_16 << 16 : inst.SIMM_16;
if (inst.RA == 0)
return ConstantPropagationResult(inst.RD, immediate);
if (!HasGPR(inst.RA))
return {};
return ConstantPropagationResult(inst.RD, m_gpr_values[inst.RA] + immediate);
}
ConstantPropagationResult ConstantPropagation::EvaluateBitwiseImm(UGeckoInstruction inst, ConstantPropagationResult ConstantPropagation::EvaluateBitwiseImm(UGeckoInstruction inst,
u32 (*do_op)(u32, u32)) const u32 (*do_op)(u32, u32)) const
{ {

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

@ -77,6 +77,7 @@ public:
void Clear() { m_gpr_values_known = BitSet32{}; } void Clear() { m_gpr_values_known = BitSet32{}; }
private: private:
ConstantPropagationResult EvaluateAddImm(UGeckoInstruction inst) const;
ConstantPropagationResult EvaluateBitwiseImm(UGeckoInstruction inst, ConstantPropagationResult EvaluateBitwiseImm(UGeckoInstruction inst,
u32 (*do_op)(u32, u32)) const; u32 (*do_op)(u32, u32)) const;