[AArch64] Utilize XAR for certain vector rotates
#137629
Conversation
|
@llvm/pr-subscribers-backend-aarch64 Author: Rajveer Singh Bharadwaj (Rajveer100) ChangesResolves #137162 For cases when there isn't any Full diff: https://github.com/llvm/llvm-project/pull/137629.diff 1 Files Affected:
diff --git a/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp b/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp
index 40944e3d43d6b..b0559692331d8 100644
--- a/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp
+++ b/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp
@@ -13,6 +13,7 @@
#include "AArch64MachineFunctionInfo.h"
#include "AArch64TargetMachine.h"
#include "MCTargetDesc/AArch64AddressingModes.h"
+#include "MCTargetDesc/AArch64MCTargetDesc.h"
#include "llvm/ADT/APSInt.h"
#include "llvm/CodeGen/ISDOpcodes.h"
#include "llvm/CodeGen/SelectionDAGISel.h"
@@ -4558,9 +4559,15 @@ bool AArch64DAGToDAGISel::trySelectXAR(SDNode *N) {
!TLI->isAllActivePredicate(*CurDAG, N1.getOperand(0)))
return false;
- SDValue XOR = N0.getOperand(1);
- if (XOR.getOpcode() != ISD::XOR || XOR != N1.getOperand(1))
- return false;
+ SDValue R1, R2;
+ if (N0.getOperand(1).getOpcode() != ISD::XOR) {
+ if (N0.getOperand(1) != N1.getOperand(1))
+ return false;
+ SDLoc DL(N1->getOperand(0));
+ SDValue Zero = CurDAG->getRegister(AArch64::XZR, N1->getOperand(0).getValueType());
+ R1 = N1->getOperand(0);
+ R2 = Zero;
+ }
APInt ShlAmt, ShrAmt;
if (!ISD::isConstantSplatVector(N0.getOperand(2).getNode(), ShlAmt) ||
@@ -4574,7 +4581,7 @@ bool AArch64DAGToDAGISel::trySelectXAR(SDNode *N) {
SDValue Imm =
CurDAG->getTargetConstant(ShrAmt.getZExtValue(), DL, MVT::i32);
- SDValue Ops[] = {XOR.getOperand(0), XOR.getOperand(1), Imm};
+ SDValue Ops[] = {R1, R2, Imm};
if (auto Opc = SelectOpcodeFromVT<SelectTypeKind::Int>(
VT, {AArch64::XAR_ZZZI_B, AArch64::XAR_ZZZI_H, AArch64::XAR_ZZZI_S,
AArch64::XAR_ZZZI_D})) {
@@ -4591,13 +4598,21 @@ bool AArch64DAGToDAGISel::trySelectXAR(SDNode *N) {
N1->getOpcode() != AArch64ISD::VLSHR)
return false;
- if (N0->getOperand(0) != N1->getOperand(0) ||
- N1->getOperand(0)->getOpcode() != ISD::XOR)
+
+ if (N0->getOperand(0) != N1->getOperand(0))
return false;
- SDValue XOR = N0.getOperand(0);
- SDValue R1 = XOR.getOperand(0);
- SDValue R2 = XOR.getOperand(1);
+ SDValue R1, R2;
+ if (N1->getOperand(0)->getOpcode() != ISD::XOR) {
+ SDLoc DL(N1->getOperand(0));
+ SDValue Zero = CurDAG->getRegister(AArch64::XZR, N1->getOperand(0).getValueType());
+ R1 = N1->getOperand(0);
+ R2 = Zero;
+ } else {
+ SDValue XOR = N0.getOperand(0);
+ R1 = XOR.getOperand(0);
+ R2 = XOR.getOperand(1);
+ }
unsigned HsAmt = N0.getConstantOperandVal(1);
unsigned ShAmt = N1.getConstantOperandVal(1);
|
|
I currently face this assertion locally (Apple Silicon) when reproducing the original snippet after the change: Assertion failed: (*(AsmStrsvreg+RegAsmOffsetvreg[RegNo-1]) && "Invalid alt name index for register!"), function getRegisterName, file AArch64GenAsmWriter.inc, line 24199. |
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
ae842ad to
c8e32e0
Compare
|
This could to with some extra tests for fixed and scalable vectors, and to make sure the existing tests work. You might need to be careful about how the zero gets generated, I think it might need to generate a |
|
For scalable vectors, which instruction do we want to use among |
c8e32e0 to
57329e9
Compare
|
MOVIv2d_ns will actually set all the upper bits too, so it can use MOVIv2d_ns and an SUBREG_TO_REG. Something like |
57329e9 to
c14ca26
Compare
I am probably not doing it the right way, pushed changes for review. |
c14ca26 to
9c2648d
Compare
|
Updated the failing tests, will add new tests. |
27b1cd0 to
97bd765
Compare
There was a problem hiding this comment.
Thanks - this looks good. Can you add tests like xar_instead_of_or but with types <4 x i32>, <8 x i16> and <16 x i8> to llvm/test/CodeGen/AArch64/xar.ll, and tests like xar_nxv2i64_l_neg2 but with types <vscale x 4 x i32>, <vscale x 8 x i16> and <vscale x 16 x i8> to llvm/test/CodeGen/AArch64/sve2-xar.ll. Not all of them are expected to transform, but we should make sure we test all the combos.
Resolves llvm#137162 For cases when there isn't any `XOR` in the transformation, replace with a zero register.
97bd765 to
a37b2b7
Compare
|
I have added the additional tests. |
|
Test failure (lldb) seems unrelated to the changes. |
|
Could you land this for me, don't have commit access?! |
|
Are you happy for this to be submitted, with the icloud.com email address? |
|
All my previous PRs have been submitted with this, so cool :) |
Resolves #137162
For cases when there isn't any
XORin the transformation, replace with a zero register.