Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

JitArm64: Move psq_stXX GetCallerSavedUsed calls later #10087

Merged
merged 2 commits into from Sep 8, 2021
Merged

JitArm64: Move psq_stXX GetCallerSavedUsed calls later #10087

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
743de44
JitArm64: Move psq_stXX GetCallerSavedUsed calls later
JosJuice Sep 5, 2021
23f6fde
Revert "JitArm64: Indexed paired loadstores workaround, attempt 2"
JosJuice Aug 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 15 additions & 17 deletions Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStorePaired.cpp
View file
Open in desktop
Expand Up @@ -39,7 +39,6 @@ void JitArm64::psq_lXX(UGeckoInstruction inst)
gpr.Lock(ARM64Reg::W0, ARM64Reg::W1, ARM64Reg::W2, ARM64Reg::W30);
fpr.Lock(ARM64Reg::Q0, ARM64Reg::Q1);

const ARM64Reg arm_addr = gpr.R(inst.RA);
constexpr ARM64Reg scale_reg = ARM64Reg::W0;
constexpr ARM64Reg addr_reg = ARM64Reg::W1;
constexpr ARM64Reg type_reg = ARM64Reg::W2;
Expand All @@ -48,11 +47,11 @@ void JitArm64::psq_lXX(UGeckoInstruction inst)
if (inst.RA || update) // Always uses the register on update
{
if (indexed)
ADD(addr_reg, arm_addr, gpr.R(inst.RB));
ADD(addr_reg, gpr.R(inst.RA), gpr.R(inst.RB));
else if (offset >= 0)
ADD(addr_reg, arm_addr, offset);
ADD(addr_reg, gpr.R(inst.RA), offset);
else
SUB(addr_reg, arm_addr, std::abs(offset));
SUB(addr_reg, gpr.R(inst.RA), std::abs(offset));
}
else
{
Expand All @@ -65,7 +64,7 @@ void JitArm64::psq_lXX(UGeckoInstruction inst)
if (update)
{
gpr.BindToRegister(inst.RA, false);
MOV(arm_addr, addr_reg);
MOV(gpr.R(inst.RA), addr_reg);
}

if (js.assumeNoPairedQuantize)
Expand Down Expand Up @@ -163,26 +162,18 @@ void JitArm64::psq_stXX(UGeckoInstruction inst)

gpr.Lock(ARM64Reg::W0, ARM64Reg::W1, ARM64Reg::W2, ARM64Reg::W30);

const ARM64Reg arm_addr = gpr.R(inst.RA);
constexpr ARM64Reg scale_reg = ARM64Reg::W0;
constexpr ARM64Reg addr_reg = ARM64Reg::W1;
constexpr ARM64Reg type_reg = ARM64Reg::W2;

BitSet32 gprs_in_use = gpr.GetCallerSavedUsed();
BitSet32 fprs_in_use = fpr.GetCallerSavedUsed();

// Wipe the registers we are using as temporaries
gprs_in_use &= BitSet32(~7);
fprs_in_use &= BitSet32(~3);

if (inst.RA || update) // Always uses the register on update
{
if (indexed)
ADD(addr_reg, arm_addr, gpr.R(inst.RB));
ADD(addr_reg, gpr.R(inst.RA), gpr.R(inst.RB));
else if (offset >= 0)
ADD(addr_reg, arm_addr, offset);
ADD(addr_reg, gpr.R(inst.RA), offset);
else
SUB(addr_reg, arm_addr, std::abs(offset));
SUB(addr_reg, gpr.R(inst.RA), std::abs(offset));
}
else
{
Expand All @@ -195,9 +186,16 @@ void JitArm64::psq_stXX(UGeckoInstruction inst)
if (update)
{
gpr.BindToRegister(inst.RA, false);
MOV(arm_addr, addr_reg);
MOV(gpr.R(inst.RA), addr_reg);
}

BitSet32 gprs_in_use = gpr.GetCallerSavedUsed();
BitSet32 fprs_in_use = fpr.GetCallerSavedUsed();

// Wipe the registers we are using as temporaries
gprs_in_use &= BitSet32(~7);
fprs_in_use &= BitSet32(~3);

if (js.assumeNoPairedQuantize)
{
u32 flags = BackPatchInfo::FLAG_STORE;
Expand Down