Skip to content

[RISCV] Implement EmitTargetCodeForStrcmp for unaligned case. #86645

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

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
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
1 change: 1 addition & 0 deletions llvm/lib/Target/RISCV/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ add_llvm_target(RISCVCodeGen
RISCVPushPopOptimizer.cpp
RISCVRegisterInfo.cpp
RISCVSubtarget.cpp
RISCVSelectionDAGTargetInfo.cpp
RISCVTargetMachine.cpp
RISCVTargetObjectFile.cpp
RISCVTargetTransformInfo.cpp
Expand Down
164 changes: 164 additions & 0 deletions llvm/lib/Target/RISCV/RISCVISelLowering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17655,6 +17655,167 @@ static MachineBasicBlock *emitFROUND(MachineInstr &MI, MachineBasicBlock *MBB,
return DoneMBB;
}

static MachineBasicBlock *emitSTRCMPI(MachineInstr &MI, MachineBasicBlock *MBB,
const RISCVSubtarget &Subtarget) {

const RISCVInstrInfo &TII = *Subtarget.getInstrInfo();
MachineRegisterInfo &MRI = MBB->getParent()->getRegInfo();
MachineFunction &MF = *MI.getParent()->getParent();
DebugLoc DL = MI.getDebugLoc();

const GlobalVariable *GV = cast<GlobalVariable>(MI.getOperand(2).getGlobal());
StringRef Str = cast<ConstantDataArray>(GV->getInitializer())->getAsCString();
int NumOfBytes = Str.str().length();
const BasicBlock *LLVM_BB = MBB->getBasicBlock();
MachineFunction::iterator MBBI = ++MBB->getIterator();

MachineBasicBlock *ExitMBB = MF.CreateMachineBasicBlock(LLVM_BB);
MF.insert(MBBI, ExitMBB);
ExitMBB->splice(ExitMBB->end(), MBB, std::next(MI.getIterator()), MBB->end());
ExitMBB->transferSuccessorsAndUpdatePHIs(MBB);
MBBI = ExitMBB->getIterator();

// In the code below we assume that the constant string is second argument
// and negate the result if needed.
bool NeedToNegateResult = MI.getOperand(3).getImm() == 0;
Register PHIReg = NeedToNegateResult
? MRI.createVirtualRegister(&RISCV::GPRRegClass)
: MI.getOperand(0).getReg();
MachineInstrBuilder PHI_MIB =
BuildMI(*ExitMBB, ExitMBB->begin(), DL, TII.get(RISCV::PHI), PHIReg);
if (NeedToNegateResult) {
BuildMI(*ExitMBB, ++ExitMBB->begin(), DL, TII.get(RISCV::SUB),
MI.getOperand(0).getReg())
.addReg(RISCV::X0)
.addReg(PHIReg);
}

MachineBasicBlock *ReturnEarlyNullByteMBB =
MF.CreateMachineBasicBlock(LLVM_BB);
MF.insert(MBBI, ReturnEarlyNullByteMBB);
Register NegReg = MRI.createVirtualRegister(&RISCV::GPRRegClass);
BuildMI(*ReturnEarlyNullByteMBB, ReturnEarlyNullByteMBB->end(), DL,
TII.get(RISCV::ADDI), NegReg)
.addReg(RISCV::X0)
.addImm(-1);
ReturnEarlyNullByteMBB->addSuccessor(ExitMBB);
PHI_MIB.addReg(NegReg).addMBB(ReturnEarlyNullByteMBB);
MBBI = ReturnEarlyNullByteMBB->getIterator();

Register BaseReg = MI.getOperand(1).getReg();
MachineMemOperand &MMO = *MI.memoperands()[0];

MachineBasicBlock *CheckNullByteMBB = MF.CreateMachineBasicBlock(LLVM_BB);
MF.insert(MBBI, CheckNullByteMBB);
Register LoadedLastByteReg = MRI.createVirtualRegister(&RISCV::GPRRegClass);
MachineInstr &LoadLastByteMI =
*BuildMI(*CheckNullByteMBB, CheckNullByteMBB->end(), DL,
TII.get(RISCV::LBU), LoadedLastByteReg)
.addReg(BaseReg)
.addImm(NumOfBytes)
.cloneMemRefs(MI)
.getInstr();
MachineMemOperand *NewMMO = MF.getMachineMemOperand(
MMO.getPointerInfo(), MachineMemOperand::MOLoad, LLT(MVT::i8), Align(1));
LoadLastByteMI.setMemRefs(MF, {NewMMO});
LoadLastByteMI.memoperands()[0]->setOffset(NumOfBytes);

Register NegLoadedLastByteReg =
MRI.createVirtualRegister(&RISCV::GPRRegClass);
BuildMI(*CheckNullByteMBB, CheckNullByteMBB->end(), DL, TII.get(RISCV::SUB),
NegLoadedLastByteReg)
.addReg(RISCV::X0)
.addReg(LoadedLastByteReg);
BuildMI(*CheckNullByteMBB, CheckNullByteMBB->end(), DL,
TII.get(RISCV::PseudoBR))
.addMBB(ExitMBB);
CheckNullByteMBB->addSuccessor(ExitMBB);
PHI_MIB.addReg(NegLoadedLastByteReg).addMBB(CheckNullByteMBB);
MBBI = CheckNullByteMBB->getIterator();

// First byte will be processed in the original MBB.
// Create NewMBBs for all other (non-null) bytes.
MachineFunction::iterator NewMBBI = MBBI;
SmallVector<MachineBasicBlock *> NewMBBs(NumOfBytes);
for (int i = NumOfBytes - 2; i >= 0; --i) {
MachineBasicBlock *NewMBB = MF.CreateMachineBasicBlock(LLVM_BB);
NewMBBs[i] = NewMBB;
MF.insert(NewMBBI, NewMBB);
NewMBBI = NewMBB->getIterator();
}
// The CheckNullByteMBB will be a fall-through successor
// of the block checking last non-null byte.
NewMBBs[NumOfBytes - 1] = CheckNullByteMBB;

int64_t Offset = 0;
char Byte = Str[0];
MachineBasicBlock::iterator MII = std::next(MI.getIterator());
MachineBasicBlock *CurrMBB = MBB;
MachineBasicBlock *NextMBB = NewMBBs[0];

auto emitCodeToCheckOneByteEquality = [&] {
Register LoadedByteReg = MRI.createVirtualRegister(&RISCV::GPRRegClass);
MachineInstr &LoadByteMI =
*BuildMI(*CurrMBB, MII, DL, TII.get(RISCV::LBU), LoadedByteReg)
.addReg(BaseReg)
.addImm(Offset)
.cloneMemRefs(MI)
.getInstr();
MachineMemOperand *NewMMO =
MF.getMachineMemOperand(MMO.getPointerInfo(), MachineMemOperand::MOLoad,
LLT(MVT::i8), Align(1));
LoadByteMI.setMemRefs(MF, {NewMMO});
LoadByteMI.memoperands()[0]->setOffset(Offset);

BuildMI(*CurrMBB, MII, DL, TII.get(RISCV::BEQ))
.addReg(LoadedByteReg)
.addReg(RISCV::X0)
.addMBB(ReturnEarlyNullByteMBB);

MBBI = NextMBB->getIterator();
MachineBasicBlock *CheckBytesEqualMBB = MF.CreateMachineBasicBlock(LLVM_BB);
MF.insert(MBBI, CheckBytesEqualMBB);
CurrMBB->addSuccessor(ReturnEarlyNullByteMBB);
CurrMBB->addSuccessor(CheckBytesEqualMBB);

MachineBasicBlock::iterator CheckBytesEqualMMBI =
CheckBytesEqualMBB->begin();
Register DiffReg = MRI.createVirtualRegister(&RISCV::GPRRegClass);
BuildMI(*CheckBytesEqualMBB, CheckBytesEqualMMBI, DL, TII.get(RISCV::ADDI),
DiffReg)
.addReg(LoadedByteReg)
.addImm(-Byte);

BuildMI(*CheckBytesEqualMBB, CheckBytesEqualMMBI, DL, TII.get(RISCV::BNE))
.addReg(DiffReg)
.addReg(RISCV::X0)
.addMBB(ExitMBB);

CheckBytesEqualMBB->addSuccessor(ExitMBB);
PHI_MIB.addReg(DiffReg).addMBB(CheckBytesEqualMBB);
CheckBytesEqualMBB->addSuccessor(NextMBB);
};

// Check the first byte.
emitCodeToCheckOneByteEquality();

for (int i = 0; i < NumOfBytes - 1; ++i) {
++Offset;
Byte = Str[i + 1];
CurrMBB = NewMBBs[i];
MII = CurrMBB->begin();
NextMBB = NewMBBs[i + 1];
// Check all other non-null bytes.
// On the last iteration of this loop,
// NextMBB is CheckNullByteMBB, so it will become
// a fall-through successor of basic block checking last non-null byte.
emitCodeToCheckOneByteEquality();
}

MI.eraseFromParent();
return ExitMBB;
}

MachineBasicBlock *
RISCVTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
MachineBasicBlock *BB) const {
Expand Down Expand Up @@ -17737,6 +17898,8 @@ RISCVTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
case RISCV::PseudoFROUND_D_INX:
case RISCV::PseudoFROUND_D_IN32X:
return emitFROUND(MI, BB, Subtarget);
case RISCV::PseudoSTRCMPI:
return emitSTRCMPI(MI, BB, Subtarget);
case TargetOpcode::STATEPOINT:
case TargetOpcode::STACKMAP:
case TargetOpcode::PATCHPOINT:
Expand Down Expand Up @@ -19512,6 +19675,7 @@ const char *RISCVTargetLowering::getTargetNodeName(unsigned Opcode) const {
NODE_NAME_CASE(SWAP_CSR)
NODE_NAME_CASE(CZERO_EQZ)
NODE_NAME_CASE(CZERO_NEZ)
NODE_NAME_CASE(STRCMP)
NODE_NAME_CASE(SF_VC_XV_SE)
NODE_NAME_CASE(SF_VC_IV_SE)
NODE_NAME_CASE(SF_VC_VV_SE)
Expand Down
1 change: 1 addition & 0 deletions llvm/lib/Target/RISCV/RISCVISelLowering.h
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,7 @@ enum NodeType : unsigned {
TH_LDD,
TH_SWD,
TH_SDD,
STRCMP
};
// clang-format on
} // namespace RISCVISD
Expand Down
23 changes: 23 additions & 0 deletions llvm/lib/Target/RISCV/RISCVInstrInfo.td
Original file line number Diff line number Diff line change
Expand Up @@ -1952,6 +1952,29 @@ def : Pat<(shl (zext GPR:$rs), uimm5:$shamt),
(SRLI (i64 (SLLI GPR:$rs, 32)), (ImmSubFrom32 uimm5:$shamt))>;
}

def riscv_strcmp : SDNode<
"RISCVISD::STRCMP",
SDTypeProfile<1, 2, [SDTCisPtrTy<0>, SDTCisPtrTy<1>]>,
[SDNPHasChain, SDNPMayLoad, SDNPMemOperand]
>;

let usesCustomInserter = 1, mayLoad = 1, mayStore = 0, hasSideEffects = 0 in
def PseudoSTRCMPI : Pseudo<
(outs GPR:$rd),
(ins GPR:$str1, i64imm:$str2, i64imm:$constant_str_idx),
[]
>;

def : Pat<
(XLenVT (riscv_strcmp tglobaladdr:$str1, iPTR:$str2)),
(PseudoSTRCMPI GPR:$str2, tglobaladdr:$str1, 0)
>;

def : Pat<
(XLenVT (riscv_strcmp iPTR:$str1, tglobaladdr:$str2)),
(PseudoSTRCMPI GPR:$str1, tglobaladdr:$str2, 1)
>;

//===----------------------------------------------------------------------===//
// Standard extensions
//===----------------------------------------------------------------------===//
Expand Down
127 changes: 127 additions & 0 deletions llvm/lib/Target/RISCV/RISCVSelectionDAGTargetInfo.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
//===-- RISCVSelectionDAGTargetInfo.cpp - RISCV SelectionDAG Info
//-----------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
//
// This file implements the RISCVSelectionDAGTargetInfo class.
//
//===----------------------------------------------------------------------===//

#include "RISCVSelectionDAGTargetInfo.h"
#include "RISCVSubtarget.h"
#include "llvm/CodeGen/SelectionDAG.h"
#include "llvm/IR/GlobalValue.h"
#include "llvm/IR/GlobalVariable.h"
#include "llvm/IR/Type.h"

using namespace llvm;

#define DEBUG_TYPE "riscv-selectiondag-target-info"

static cl::opt<unsigned> MaxStrcmpSpecializeLength(
"riscv-max-strcmp-specialize-length", cl::Hidden,
cl::desc("Do not specialize strcmp if the length of constant string is "
"greater or equal to this parameter"),
cl::init(0));

static bool canSpecializeStrcmp(const GlobalAddressSDNode *GA) {
const GlobalVariable *GV = dyn_cast<GlobalVariable>(GA->getGlobal());
if (!GV || !GV->isConstant() || !GV->hasInitializer())
return false;
// NOTE: this doesn't work for empty strings
const ConstantDataArray *CDA =
dyn_cast<ConstantDataArray>(GV->getInitializer());
if (!CDA || !CDA->isCString())
return false;

StringRef CString = CDA->getAsCString();
if (CString.str().length() >= MaxStrcmpSpecializeLength)
return false;

return true;
}

std::pair<SDValue, SDValue>
RISCVSelectionDAGTargetInfo::EmitTargetCodeForStrcmp(
SelectionDAG &DAG, const SDLoc &DL, SDValue Chain, SDValue Src1,
SDValue Src2, MachinePointerInfo Op1PtrInfo,
MachinePointerInfo Op2PtrInfo) const {
// This is the default setting, so exit early if the optimization is turned
// off.
if (MaxStrcmpSpecializeLength == 0)
return std::make_pair(SDValue(), Chain);

const RISCVSubtarget &Subtarget =
DAG.getMachineFunction().getSubtarget<RISCVSubtarget>();
const TargetLowering &TLI = DAG.getTargetLoweringInfo();
MVT XLenVT = Subtarget.getXLenVT();
const DataLayout &DLayout = DAG.getDataLayout();

Align NeededAlignment = Align(XLenVT.getSizeInBits() / 8);
Align Src1Align;
Align Src2Align;
if (const Value *Src1V = dyn_cast_if_present<const Value *>(Op1PtrInfo.V)) {
Src1Align = Src1V->getPointerAlignment(DLayout);
}
if (const Value *Src2V = dyn_cast_if_present<const Value *>(Op2PtrInfo.V)) {
Src2Align = Src2V->getPointerAlignment(DLayout);
}
if (!(Src1Align < NeededAlignment || Src2Align < NeededAlignment))
return std::make_pair(SDValue(), Chain);

const GlobalAddressSDNode *CStringGA = nullptr;
SDValue Other;
MachinePointerInfo MPI;
bool ConstantStringIsSecond = false;

const GlobalAddressSDNode *GA = dyn_cast<GlobalAddressSDNode>(Src1);
if (GA && canSpecializeStrcmp(GA)) {
CStringGA = GA;
Other = Src2;
MPI = Op2PtrInfo;
}
if (!CStringGA) {
GA = dyn_cast<GlobalAddressSDNode>(Src2);
if (GA && canSpecializeStrcmp(GA)) {
ConstantStringIsSecond = true;
CStringGA = GA;
Other = Src1;
MPI = Op1PtrInfo;
}
}

if (!CStringGA)
return std::make_pair(SDValue(), Chain);

// It could be that the non-constant string is actually aligned, but
// we can't prove it, so getPointerAlignment will return Align(1).
// In this case, if the constant string is sufficiently aligned, It is better
// to call to libc's strcmp?
Align ConstantStrAlignment = ConstantStringIsSecond ? Src2Align : Src1Align;
if (ConstantStrAlignment >= NeededAlignment)
return std::make_pair(SDValue(), Chain);

SDValue TGA = DAG.getTargetGlobalAddress(CStringGA->getGlobal(), DL,
TLI.getPointerTy(DLayout), 0,
CStringGA->getTargetFlags());

SDValue Str1 = TGA;
SDValue Str2 = Other;
if (ConstantStringIsSecond)
std::swap(Str1, Str2);

MachineFunction &MF = DAG.getMachineFunction();
MachineMemOperand *MMO = MF.getMachineMemOperand(
MPI, MachineMemOperand::MOLoad, LLT(MVT::i8), Align(1));
// TODO: what should be the MemVT?
Copy link
Contributor Author

Choose a reason for hiding this comment

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

What is the proper way to indicate that this will read a known number of bytes from its argument?

SDValue STRCMPNode = DAG.getMemIntrinsicNode(
RISCVISD::STRCMP, DL, DAG.getVTList(XLenVT, MVT::Other),
{Chain, Str1, Str2}, MVT::i8, MMO);

SDValue ChainOut = STRCMPNode.getValue(1);
return std::make_pair(STRCMPNode, ChainOut);
}
33 changes: 33 additions & 0 deletions llvm/lib/Target/RISCV/RISCVSelectionDAGTargetInfo.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
//===-- RISCVSelectionDAGTargetInfo.h - RISCV SelectionDAG Info ---*- C++
//-*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
//
// This file defines the RISCV subclass for SelectionDAGTargetInfo.
//
//===----------------------------------------------------------------------===//

#ifndef LLVM_LIB_TARGET_RISCV_RISCVSELECTIONDAGINFO_H
#define LLVM_LIB_TARGET_RISCV_RISCVSELECTIONDAGINFO_H

#include "llvm/CodeGen/SelectionDAGTargetInfo.h"

namespace llvm {

class RISCVSelectionDAGTargetInfo : public SelectionDAGTargetInfo {
public:
explicit RISCVSelectionDAGTargetInfo() = default;
std::pair<SDValue, SDValue>
EmitTargetCodeForStrcmp(SelectionDAG &DAG, const SDLoc &DL, SDValue Chain,
SDValue Src1, SDValue Src2,
MachinePointerInfo Op1PtrInfo,
MachinePointerInfo Op2PtrInfo) const override;
};

} // end namespace llvm

#endif
Loading