From fe185ba9821b9563314b34d518914f6b42cda078 Mon Sep 17 00:00:00 2001 From: Lucas Date: Mon, 2 Dec 2024 18:42:46 -0300 Subject: [PATCH] Fix naming issues --- llvm/lib/Target/SBF/SBFISelLowering.cpp | 5 +++-- llvm/lib/Target/SBF/SBFInstrInfo.cpp | 9 +++++---- llvm/lib/Target/SBF/SBFInstrInfo.h | 4 ++-- llvm/lib/Target/SBF/SBFInstrInfo.td | 4 ++-- llvm/lib/Target/SBF/SBFSubtarget.cpp | 2 +- llvm/lib/Target/SBF/SBFSubtarget.h | 4 ++-- llvm/lib/Target/SBF/SBFTargetFeatures.td | 2 +- 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp index 2b08c198b8263b..6eb5dd3640cf90 100644 --- a/llvm/lib/Target/SBF/SBFISelLowering.cpp +++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp @@ -939,7 +939,8 @@ SBFTargetLowering::EmitSubregExt(MachineInstr &MI, MachineBasicBlock *BB, MachineRegisterInfo &RegInfo = F->getRegInfo(); if (!isSigned) { - unsigned MovOp = Subtarget->getExplicitSignExt() + unsigned MovOp = + Subtarget->getHasExplicitSignExt() ? SBF::MOV_rr : SBF::MOV_32_64; Register PromotedReg0 = RegInfo.createVirtualRegister(RC); BuildMI(BB, DL, TII.get(MovOp), PromotedReg0).addReg(Reg); @@ -947,7 +948,7 @@ SBFTargetLowering::EmitSubregExt(MachineInstr &MI, MachineBasicBlock *BB, } Register PromotedReg0 = RegInfo.createVirtualRegister(RC); BuildMI(BB, DL, TII.get(SBF::MOV_32_64), PromotedReg0).addReg(Reg); - if (Subtarget->getExplicitSignExt()) + if (Subtarget->getHasExplicitSignExt()) return PromotedReg0; Register PromotedReg1 = RegInfo.createVirtualRegister(RC); diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.cpp b/llvm/lib/Target/SBF/SBFInstrInfo.cpp index fe64772f84cf05..9e7cc61e854727 100644 --- a/llvm/lib/Target/SBF/SBFInstrInfo.cpp +++ b/llvm/lib/Target/SBF/SBFInstrInfo.cpp @@ -28,8 +28,8 @@ using namespace llvm; SBFInstrInfo::SBFInstrInfo() : SBFGenInstrInfo(SBF::ADJCALLSTACKDOWN, SBF::ADJCALLSTACKUP) {} -void SBFInstrInfo::setHasExplicitSext(bool HasExplicitSext) { - this->HasExpliciSext = HasExplicitSext; +void SBFInstrInfo::setHasExplicitSignExt(bool HasExplicitSext) { + this->HasExplicitSignExt = HasExplicitSext; } void SBFInstrInfo::copyPhysReg(MachineBasicBlock &MBB, @@ -40,8 +40,9 @@ void SBFInstrInfo::copyPhysReg(MachineBasicBlock &MBB, BuildMI(MBB, I, DL, get(SBF::MOV_rr), DestReg) .addReg(SrcReg, getKillRegState(KillSrc)); else if (SBF::GPR32RegClass.contains(DestReg, SrcReg)) { - unsigned OpCode = HasExpliciSext - ? SBF::MOV_rr_32_no_sext_v2 : SBF::MOV_rr_32_no_sext_v1; + unsigned OpCode = + HasExplicitSignExt ? SBF::MOV_rr_32_no_sext_v2 + : SBF::MOV_rr_32_no_sext_v1; BuildMI(MBB, I, DL, get(OpCode), DestReg) .addReg(SrcReg, getKillRegState(KillSrc)); } diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.h b/llvm/lib/Target/SBF/SBFInstrInfo.h index c93294bc36234c..5c4afdb2a25789 100644 --- a/llvm/lib/Target/SBF/SBFInstrInfo.h +++ b/llvm/lib/Target/SBF/SBFInstrInfo.h @@ -58,11 +58,11 @@ class SBFInstrInfo : public SBFGenInstrInfo { MachineBasicBlock *FBB, ArrayRef Cond, const DebugLoc &DL, int *BytesAdded = nullptr) const override; - void setHasExplicitSext(bool HasExplicitSext); + void setHasExplicitSignExt(bool HasExplicitSext); private: void expandMEMCPY(MachineBasicBlock::iterator) const; - bool HasExpliciSext; + bool HasExplicitSignExt; }; } diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td index 8ed75a23384317..03136325cdca08 100644 --- a/llvm/lib/Target/SBF/SBFInstrInfo.td +++ b/llvm/lib/Target/SBF/SBFInstrInfo.td @@ -65,8 +65,8 @@ def SBFNoCallxSrc : Predicate<"!Subtarget->getCallXRegSrc()">; def SBFPqrInstr : Predicate<"Subtarget->getHasPqrClass()">; def SBFNoPqrInstr : Predicate<"!Subtarget->getHasPqrClass()">; def SBFHasStoreImm : Predicate<"Subtarget->getHasStoreImm()">; -def SBFExplicitSignExt : Predicate<"Subtarget->getExplicitSignExt()">; -def SBFNoExplicitSignExt : Predicate<"!Subtarget->getExplicitSignExt()">; +def SBFExplicitSignExt : Predicate<"Subtarget->getHasExplicitSignExt()">; +def SBFNoExplicitSignExt : Predicate<"!Subtarget->getHasExplicitSignExt()">; def brtarget : Operand { let PrintMethod = "printBrTargetOperand"; diff --git a/llvm/lib/Target/SBF/SBFSubtarget.cpp b/llvm/lib/Target/SBF/SBFSubtarget.cpp index bc0754a5948efa..313be03f9539e4 100644 --- a/llvm/lib/Target/SBF/SBFSubtarget.cpp +++ b/llvm/lib/Target/SBF/SBFSubtarget.cpp @@ -30,7 +30,7 @@ SBFSubtarget &SBFSubtarget::initializeSubtargetDependencies(const Triple &TT, StringRef FS) { initializeEnvironment(TT); initSubtargetFeatures(CPU, FS); - InstrInfo.setHasExplicitSext(ExplicitSignExt); + InstrInfo.setHasExplicitSignExt(HasExplicitSignExt); return *this; } diff --git a/llvm/lib/Target/SBF/SBFSubtarget.h b/llvm/lib/Target/SBF/SBFSubtarget.h index 598845bf0afc98..685bbef2fb7b4a 100644 --- a/llvm/lib/Target/SBF/SBFSubtarget.h +++ b/llvm/lib/Target/SBF/SBFSubtarget.h @@ -81,7 +81,7 @@ class SBFSubtarget : public SBFGenSubtargetInfo { bool HasStoreImm; // Whether we have the explicit sign extension instruction (mov32) - bool ExplicitSignExt; + bool HasExplicitSignExt; public: // This constructor initializes the data members to match that @@ -108,7 +108,7 @@ class SBFSubtarget : public SBFGenSubtargetInfo { return HasDynamicFrames && NewCallConvention; } bool getHasStoreImm() const { return HasStoreImm; } - bool getExplicitSignExt() const { return ExplicitSignExt; } + bool getHasExplicitSignExt() const { return HasExplicitSignExt; } const SBFInstrInfo *getInstrInfo() const override { return &InstrInfo; } const SBFFrameLowering *getFrameLowering() const override { return &FrameLowering; diff --git a/llvm/lib/Target/SBF/SBFTargetFeatures.td b/llvm/lib/Target/SBF/SBFTargetFeatures.td index 45175ba52429d9..351500e73da65c 100644 --- a/llvm/lib/Target/SBF/SBFTargetFeatures.td +++ b/llvm/lib/Target/SBF/SBFTargetFeatures.td @@ -46,7 +46,7 @@ def FeatureCallConv : SubtargetFeature<"new-call-conv", "NewCallConvention", "tr def FeatureStoreImm : SubtargetFeature<"store-imm", "HasStoreImm", "true", "Enable store imm instructions">; -def FeatureExplicitSext : SubtargetFeature<"explicit-sext", "ExplicitSignExt", +def FeatureExplicitSext : SubtargetFeature<"explicit-sext", "HasExplicitSignExt", "true", "Enable the explicit sign extension instruction mov32">; class Proc Features>