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.

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

[Xtensa] Implement lowering SELECT_CC, SETCC. #97017

Merged
merged 7 commits into from
Jul 11, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
186 changes: 186 additions & 0 deletions llvm/lib/Target/Xtensa/XtensaISelLowering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,26 @@ XtensaTargetLowering::XtensaTargetLowering(const TargetMachine &TM,
setOperationAction(ISD::BR_CC, MVT::i64, Expand);
setOperationAction(ISD::BR_CC, MVT::f32, Expand);

// Used by legalize types to correctly generate the setcc result.
// AddPromotedToType(ISD::SETCC, MVT::i1, MVT::i32);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commented out coed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@arsenm, thank you very much for comments! Fixed

setOperationPromotedToType(ISD::SETCC, MVT::i1, MVT::i32);
setOperationPromotedToType(ISD::BR_CC, MVT::i1, MVT::i32);
s-barannikov marked this conversation as resolved.
Show resolved Hide resolved

setOperationAction(ISD::BR_CC, MVT::i32, Legal);
setOperationAction(ISD::BR_CC, MVT::i64, Expand);
s-barannikov marked this conversation as resolved.
Show resolved Hide resolved

setOperationAction(ISD::SELECT, MVT::i32, Expand);
setOperationAction(ISD::SELECT, MVT::i64, Expand);

setOperationAction(ISD::SELECT_CC, MVT::i32, Custom);
setOperationAction(ISD::SELECT_CC, MVT::i64, Expand);

setOperationAction(ISD::SETCC, MVT::i32, Custom);
setOperationAction(ISD::SETCC, MVT::i64, Expand);

// make BRCOND legal, its actually only legal for a subset of conds
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would be covered by setCondCodeAction, which isn't used here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed code related to BRCOND from this PR, seems it is redundant , I will add it in next patches.

setOperationAction(ISD::BRCOND, MVT::Other, Legal);

// Implement custom stack allocations
setOperationAction(ISD::DYNAMIC_STACKALLOC, PtrVT, Custom);
// Implement custom stack save and restore
Expand Down Expand Up @@ -514,6 +534,38 @@ XtensaTargetLowering::LowerReturn(SDValue Chain, CallingConv::ID CallConv,
return DAG.getNode(XtensaISD::RET, DL, MVT::Other, RetOps);
}

SDValue XtensaTargetLowering::LowerSELECT_CC(SDValue Op,
SelectionDAG &DAG) const {
SDLoc DL(Op);
EVT Ty = Op.getOperand(0).getValueType();
SDValue LHS = Op.getOperand(0);
SDValue RHS = Op.getOperand(1);
SDValue TrueValue = Op.getOperand(2);
SDValue FalseValue = Op.getOperand(3);
ISD::CondCode CC = cast<CondCodeSDNode>(Op->getOperand(4))->get();
SDValue TargetCC = DAG.getConstant(CC, DL, MVT::i32);
s-barannikov marked this conversation as resolved.
Show resolved Hide resolved

// Wrap select nodes
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't wrap anything

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

return DAG.getNode(XtensaISD::SELECT_CC, DL, Ty, LHS, RHS, TrueValue,
FalseValue, TargetCC);
}

SDValue XtensaTargetLowering::LowerSETCC(SDValue Op, SelectionDAG &DAG) const {
SDLoc DL(Op);
EVT Ty = Op.getOperand(0).getValueType();
SDValue LHS = Op.getOperand(0);
SDValue RHS = Op.getOperand(1);
ISD::CondCode CC = cast<CondCodeSDNode>(Op.getOperand(2))->get();
SDValue TargetCC = DAG.getConstant(CC, DL, MVT::i32);

// Expand to target SELECT_CC
s-barannikov marked this conversation as resolved.
Show resolved Hide resolved
SDValue TrueValue = DAG.getConstant(1, DL, Op.getValueType());
SDValue FalseValue = DAG.getConstant(0, DL, Op.getValueType());

return DAG.getNode(XtensaISD::SELECT_CC, DL, Ty, LHS, RHS, TrueValue,
FalseValue, TargetCC);
}

SDValue XtensaTargetLowering::LowerImmediate(SDValue Op,
SelectionDAG &DAG) const {
const ConstantSDNode *CN = cast<ConstantSDNode>(Op);
Expand Down Expand Up @@ -676,6 +728,10 @@ SDValue XtensaTargetLowering::LowerOperation(SDValue Op,
return LowerJumpTable(Op, DAG);
case ISD::ConstantPool:
return LowerConstantPool(cast<ConstantPoolSDNode>(Op), DAG);
case ISD::SETCC:
return LowerSETCC(Op, DAG);
case ISD::SELECT_CC:
return LowerSELECT_CC(Op, DAG);
case ISD::STACKSAVE:
return LowerSTACKSAVE(Op, DAG);
case ISD::STACKRESTORE:
Expand All @@ -697,6 +753,136 @@ const char *XtensaTargetLowering::getTargetNodeName(unsigned Opcode) const {
return "XtensaISD::PCREL_WRAPPER";
case XtensaISD::RET:
return "XtensaISD::RET";
case XtensaISD::SELECT:
return "XtensaISD::SELECT";
case XtensaISD::SELECT_CC:
return "XtensaISD::SELECT_CC";
}
return nullptr;
}

//===----------------------------------------------------------------------===//
// Custom insertion
//===----------------------------------------------------------------------===//

static int GetBranchKind(int Cond, bool &BrInv) {
s-barannikov marked this conversation as resolved.
Show resolved Hide resolved
switch (Cond) {
case ISD::SETEQ:
case ISD::SETOEQ:
case ISD::SETUEQ:
s-barannikov marked this conversation as resolved.
Show resolved Hide resolved
return Xtensa::BEQ;
case ISD::SETNE:
case ISD::SETONE:
case ISD::SETUNE:
return Xtensa::BNE;
case ISD::SETLT:
case ISD::SETOLT:
return Xtensa::BLT;
case ISD::SETLE:
case ISD::SETOLE:
BrInv = true;
return Xtensa::BGE;
case ISD::SETGT:
case ISD::SETOGT:
BrInv = true;
return Xtensa::BLT;
case ISD::SETGE:
case ISD::SETOGE:
return Xtensa::BGE;
case ISD::SETULT:
return Xtensa::BLTU;
case ISD::SETULE:
BrInv = true;
s-barannikov marked this conversation as resolved.
Show resolved Hide resolved
return Xtensa::BGEU;
case ISD::SETUGT:
BrInv = true;
return Xtensa::BLTU;
case ISD::SETUGE:
return Xtensa::BGEU;
default:
return -1;
s-barannikov marked this conversation as resolved.
Show resolved Hide resolved
}
}

MachineBasicBlock *
XtensaTargetLowering::emitSelectCC(MachineInstr &MI,
MachineBasicBlock *MBB) const {
const TargetInstrInfo &TII = *Subtarget.getInstrInfo();
DebugLoc DL = MI.getDebugLoc();

MachineOperand &LHS = MI.getOperand(1);
MachineOperand &RHS = MI.getOperand(2);
MachineOperand &TrueValue = MI.getOperand(3);
MachineOperand &FalseValue = MI.getOperand(4);
MachineOperand &Cond = MI.getOperand(5);

// To "insert" a SELECT_CC instruction, we actually have to insert
// CopyMBB and SinkMBB blocks and add branch to MBB. We build phi
// operation in SinkMBB like phi (TrueVakue,FalseValue), where TrueValue
// is passed from MMB and FalseValue is passed from CopyMBB.
// MBB
// | \
// | CopyMBB
// | /
// SinkMBB
// The incoming instruction knows the
// destination vreg to set, the condition code register to branch on, the
// true/false values to select between, and a branch opcode to use.
const BasicBlock *LLVM_BB = MBB->getBasicBlock();
MachineFunction::iterator It = ++MBB->getIterator();

MachineFunction *F = MBB->getParent();
MachineBasicBlock *CopyMBB = F->CreateMachineBasicBlock(LLVM_BB);
MachineBasicBlock *SinkMBB = F->CreateMachineBasicBlock(LLVM_BB);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You will need a code like this here (for a future patch that adds related tests), see 2dcf051:

  // Set the call frame size on entry to the new basic blocks.
  uint64_t CallFrameSize = TII.getCallFrameSizeAt(MI);
  CopyMBB->setCallFrameSize(CallFrameSize);
  SinkMBB->setCallFrameSize(CallFrameSize);

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, I will use this information in future.


F->insert(It, CopyMBB);
F->insert(It, SinkMBB);

// Transfer the remainder of MBB and its successor edges to SinkMBB.
SinkMBB->splice(SinkMBB->begin(), MBB,
std::next(MachineBasicBlock::iterator(MI)), MBB->end());
SinkMBB->transferSuccessorsAndUpdatePHIs(MBB);

MBB->addSuccessor(CopyMBB);
MBB->addSuccessor(SinkMBB);

bool BrInv = false;
s-barannikov marked this conversation as resolved.
Show resolved Hide resolved
int BrKind = GetBranchKind(Cond.getImm(), BrInv);
if (BrInv) {
BuildMI(MBB, DL, TII.get(BrKind))
.addReg(RHS.getReg())
.addReg(LHS.getReg())
.addMBB(SinkMBB);
} else {
BuildMI(MBB, DL, TII.get(BrKind))
.addReg(LHS.getReg())
.addReg(RHS.getReg())
.addMBB(SinkMBB);
}

CopyMBB->addSuccessor(SinkMBB);

// SinkMBB:
// %Result = phi [ %FalseValue, CopyMBB ], [ %TrueValue, MBB ]
// ...

BuildMI(*SinkMBB, SinkMBB->begin(), DL, TII.get(Xtensa::PHI),
MI.getOperand(0).getReg())
.addReg(FalseValue.getReg())
.addMBB(CopyMBB)
.addReg(TrueValue.getReg())
.addMBB(MBB);

MI.eraseFromParent(); // The pseudo instruction is gone now.
return SinkMBB;
}

MachineBasicBlock *XtensaTargetLowering::EmitInstrWithCustomInserter(
MachineInstr &MI, MachineBasicBlock *MBB) const {
switch (MI.getOpcode()) {
case Xtensa::SELECT:
return emitSelectCC(MI, MBB);
default:
report_fatal_error("Unexpected instr type to insert");
s-barannikov marked this conversation as resolved.
Show resolved Hide resolved
}
}
28 changes: 27 additions & 1 deletion llvm/lib/Target/Xtensa/XtensaISelLowering.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,14 @@ enum {
// Wraps a TargetGlobalAddress that should be loaded using PC-relative
// accesses. Operand 0 is the address.
PCREL_WRAPPER,
RET
RET,

// Selects between operand 0 and operand 1. Operand 2 is the
// mask of condition-code values for which operand 0 should be
// chosen over operand 1; it has the same form as BR_CCMASK.
// Operand 3 is the flag operand.
SELECT,
s-barannikov marked this conversation as resolved.
Show resolved Hide resolved
SELECT_CC
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
SELECT_CC
SELECT_CC,

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

};
}

Expand All @@ -44,6 +51,13 @@ class XtensaTargetLowering : public TargetLowering {
explicit XtensaTargetLowering(const TargetMachine &TM,
const XtensaSubtarget &STI);

EVT getSetCCResultType(const DataLayout &, LLVMContext &,
EVT VT) const override {
if (!VT.isVector())
return MVT::i32;
return VT.changeVectorElementTypeToInteger();
}

bool isOffsetFoldingLegal(const GlobalAddressSDNode *GA) const override;

const char *getTargetNodeName(unsigned Opcode) const override;
Expand Down Expand Up @@ -71,6 +85,10 @@ class XtensaTargetLowering : public TargetLowering {

const XtensaSubtarget &getSubtarget() const { return Subtarget; }

MachineBasicBlock *
EmitInstrWithCustomInserter(MachineInstr &MI,
MachineBasicBlock *BB) const override;

private:
const XtensaSubtarget &Subtarget;

Expand All @@ -86,6 +104,10 @@ class XtensaTargetLowering : public TargetLowering {

SDValue LowerConstantPool(ConstantPoolSDNode *CP, SelectionDAG &DAG) const;

SDValue LowerSETCC(SDValue Op, SelectionDAG &DAG) const;

SDValue LowerSELECT_CC(SDValue Op, SelectionDAG &DAG) const;

SDValue LowerDYNAMIC_STACKALLOC(SDValue Op, SelectionDAG &DAG) const;

SDValue LowerSTACKSAVE(SDValue Op, SelectionDAG &DAG) const;
Expand All @@ -95,6 +117,10 @@ class XtensaTargetLowering : public TargetLowering {
SDValue getAddrPCRel(SDValue Op, SelectionDAG &DAG) const;

CCAssignFn *CCAssignFnForCall(CallingConv::ID CC, bool IsVarArg) const;

// Implement EmitInstrWithCustomInserter for individual operation types.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment isn't helpful.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

MachineBasicBlock *emitSelectCC(MachineInstr &MI,
MachineBasicBlock *BB) const;
};

} // end namespace llvm
Expand Down
32 changes: 32 additions & 0 deletions llvm/lib/Target/Xtensa/XtensaInstrInfo.td
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,29 @@ def : Pat<(brcc SETLE, AR:$s, AR:$t, bb:$target),
def : Pat<(brcc SETULE, AR:$s, AR:$t, bb:$target),
(BGEU AR:$t, AR:$s, bb:$target)>;

def : Pat<(brcond (i32 (seteq AR:$s, AR:$t)), bb:$target),
(BEQ AR:$s, AR:$t, bb:$target)>;
def : Pat<(brcond (i32 (setne AR:$s, AR:$t)), bb:$target),
(BNE AR:$s, AR:$t, bb:$target)>;
def : Pat<(brcond (i32 (setge AR:$s, AR:$t)), bb:$target),
(BGE AR:$s, AR:$t, bb:$target)>;
def : Pat<(brcond (i32 (setle AR:$s, AR:$t)), bb:$target),
(BLT AR:$s, AR:$t, bb:$target)>;
def : Pat<(brcond (i32 (setuge AR:$s, AR:$t)), bb:$target),
(BGEU AR:$s, AR:$t, bb:$target)>;
def : Pat<(brcond (i32 (setult AR:$s, AR:$t)), bb:$target),
(BLTU AR:$s, AR:$t, bb:$target)>;
def : Pat<(brcond (i32 (setgt AR:$s, AR:$t)), bb:$target),
(BLT AR:$t, AR:$s, bb:$target)>;
def : Pat<(brcond (i32 (setugt AR:$s, AR:$t)), bb:$target),
(BLTU AR:$t, AR:$s, bb:$target)>;
def : Pat<(brcond (i32 (setle AR:$s, AR:$t)), bb:$target),
(BGE AR:$t, AR:$s, bb:$target)>;
def : Pat<(brcond (i32 (setule AR:$s, AR:$t)), bb:$target),
(BGEU AR:$t, AR:$s, bb:$target)>;

def : Pat<(brcond AR:$s, bb:$target), (BNEZ AR:$s, bb:$target)>;

//===----------------------------------------------------------------------===//
// Call and jump instructions
//===----------------------------------------------------------------------===//
Expand Down Expand Up @@ -574,3 +597,12 @@ let Defs = [SP], Uses = [SP] in {
"#ADJCALLSTACKUP",
[(Xtensa_callseq_end timm:$amt1, timm:$amt2)]>;
}

//===----------------------------------------------------------------------===//
// Generic select instruction
//===----------------------------------------------------------------------===//
let usesCustomInserter = 1 in {
def SELECT : Pseudo<(outs AR:$dst), (ins AR:$lhs, AR:$rhs, AR:$t, AR:$f, i32imm:$cond),
"!select $dst, $lhs, $rhs, $t, $f, $cond",
[(set AR:$dst, (Xtensa_select_cc AR:$lhs, AR:$rhs, AR:$t, AR:$f, imm:$cond))]>;
s-barannikov marked this conversation as resolved.
Show resolved Hide resolved
}
9 changes: 9 additions & 0 deletions llvm/lib/Target/Xtensa/XtensaOperators.td
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ def SDT_XtensaWrapPtr : SDTypeProfile<1, 1,

def SDT_XtensaBrJT : SDTypeProfile<0, 2,
[SDTCisPtrTy<0>, SDTCisVT<1, i32>]>;

def SDT_XtensaSelectCC : SDTypeProfile<1, 5,
[SDTCisSameAs<0, 1>,
SDTCisSameAs<2, 3>,
SDTCisVT<5, i32>]>;
//===----------------------------------------------------------------------===//
// Node definitions
//===----------------------------------------------------------------------===//
Expand All @@ -38,3 +43,7 @@ def Xtensa_callseq_end : SDNode<"ISD::CALLSEQ_END", SDT_XtensaCallSeqEnd,
SDNPOutGlue]>;

def Xtensa_brjt: SDNode<"XtensaISD::BR_JT", SDT_XtensaBrJT, [SDNPHasChain]>;

def Xtensa_select : SDNode<"XtensaISD::SELECT", SDTSelect>;
s-barannikov marked this conversation as resolved.
Show resolved Hide resolved
def Xtensa_select_cc: SDNode<"XtensaISD::SELECT_CC", SDT_XtensaSelectCC,
[SDNPInGlue]>;
Loading
Loading