From 4dbf0b8e904ad3a338809ff1df4ba87836fffebe Mon Sep 17 00:00:00 2001 From: JosJuice Date: Wed, 19 Oct 2022 19:35:10 +0200 Subject: JitArm64: Reimplement Force25BitPrecision The previous implementation of Force25BitPrecision was essentially a translation of the x86-64 implementation. It worked, but we can make a more efficient implementation by using an AArch64 instruction I don't believe x86-64 has an equivalent of: URSHR. The latency is the same as before, but the instruction count and register count are both reduced. --- Source/Core/Common/Arm64Emitter.cpp | 37 +++++++++++++++++++++++++++++++++++-- Source/Core/Common/Arm64Emitter.h | 8 +++++++- 2 files changed, 42 insertions(+), 3 deletions(-) (limited to 'Source/Core/Common') diff --git a/Source/Core/Common/Arm64Emitter.cpp b/Source/Core/Common/Arm64Emitter.cpp index 2d6531503b..30dbaacd46 100644 --- a/Source/Core/Common/Arm64Emitter.cpp +++ b/Source/Core/Common/Arm64Emitter.cpp @@ -2354,7 +2354,7 @@ void ARM64FloatEmitter::EmitShiftImm(bool Q, bool U, u32 imm, u32 opcode, ARM64R void ARM64FloatEmitter::EmitScalarShiftImm(bool U, u32 imm, u32 opcode, ARM64Reg Rd, ARM64Reg Rn) { - Write32((2 << 30) | (U << 29) | (0x3E << 23) | (imm << 16) | (opcode << 11) | (1 << 10) | + Write32((1 << 30) | (U << 29) | (0x3E << 23) | (imm << 16) | (opcode << 11) | (1 << 10) | (DecodeReg(Rn) << 5) | DecodeReg(Rd)); } @@ -3540,7 +3540,26 @@ void ARM64FloatEmitter::ZIP2(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm) EmitPermute(size, 0b111, Rd, Rn, Rm); } -// Shift by immediate +// Scalar shift by immediate +void ARM64FloatEmitter::SHL(ARM64Reg Rd, ARM64Reg Rn, u32 shift) +{ + constexpr size_t src_size = 64; + ASSERT_MSG(DYNA_REC, IsDouble(Rd), "Only double registers are supported!"); + ASSERT_MSG(DYNA_REC, shift < src_size, "Shift amount must less than the element size! {} {}", + shift, src_size); + EmitScalarShiftImm(0, src_size | shift, 0b01010, Rd, Rn); +} + +void ARM64FloatEmitter::URSHR(ARM64Reg Rd, ARM64Reg Rn, u32 shift) +{ + constexpr size_t src_size = 64; + ASSERT_MSG(DYNA_REC, IsDouble(Rd), "Only double registers are supported!"); + ASSERT_MSG(DYNA_REC, shift < src_size, "Shift amount must less than the element size! {} {}", + shift, src_size); + EmitScalarShiftImm(1, src_size * 2 - shift, 0b00100, Rd, Rn); +} + +// Vector shift by immediate void ARM64FloatEmitter::SSHLL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift) { SSHLL(src_size, Rd, Rn, shift, false); @@ -3582,6 +3601,13 @@ void ARM64FloatEmitter::UXTL2(u8 src_size, ARM64Reg Rd, ARM64Reg Rn) UXTL(src_size, Rd, Rn, true); } +void ARM64FloatEmitter::SHL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift) +{ + ASSERT_MSG(DYNA_REC, shift < src_size, "Shift amount must less than the element size! {} {}", + shift, src_size); + EmitShiftImm(1, 0, src_size | shift, 0b01010, Rd, Rn); +} + void ARM64FloatEmitter::SSHLL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift, bool upper) { ASSERT_MSG(DYNA_REC, shift < src_size, "Shift amount must be less than the element size! {} {}", @@ -3589,6 +3615,13 @@ void ARM64FloatEmitter::SSHLL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift, EmitShiftImm(upper, 0, src_size | shift, 0b10100, Rd, Rn); } +void ARM64FloatEmitter::URSHR(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift) +{ + ASSERT_MSG(DYNA_REC, shift < src_size, "Shift amount must less than the element size! {} {}", + shift, src_size); + EmitShiftImm(1, 1, src_size * 2 - shift, 0b00100, Rd, Rn); +} + void ARM64FloatEmitter::USHLL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift, bool upper) { ASSERT_MSG(DYNA_REC, shift < src_size, "Shift amount must be less than the element size! {} {}", diff --git a/Source/Core/Common/Arm64Emitter.h b/Source/Core/Common/Arm64Emitter.h index a180b5282c..caf997a29d 100644 --- a/Source/Core/Common/Arm64Emitter.h +++ b/Source/Core/Common/Arm64Emitter.h @@ -1229,9 +1229,15 @@ public: void TRN2(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm); void ZIP2(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm); - // Shift by immediate + // Scalar shift by immediate + void SHL(ARM64Reg Rd, ARM64Reg Rn, u32 shift); + void URSHR(ARM64Reg Rd, ARM64Reg Rn, u32 shift); + + // Vector shift by immediate + void SHL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift); void SSHLL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift); void SSHLL2(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift); + void URSHR(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift); void USHLL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift); void USHLL2(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift); void SHRN(u8 dest_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift); -- cgit v1.2.3