6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-07 14:33:15 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Migrate the AArch64 TargetRegisterInfo to its TargetMachine"

Browse Source 
as we don't necessarily need to do this yet - though we could move
the base class to the TargetMachine as it isn't subtarget dependent.

This reverts commit r232103.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@232665 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Christopher 2015-03-18 20:37:30 +00:00
parent 01a1af4fe4
commit d587f213ad
8 changed files with 48 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/Target/AArch64/AArch64InstrInfo.cpp
View File

@ -31,7 +31,7 @@ using namespace llvm;
AArch64InstrInfo::AArch64InstrInfo(const AArch64Subtarget &STI) AArch64InstrInfo::AArch64InstrInfo(const AArch64Subtarget &STI)
: AArch64GenInstrInfo(AArch64::ADJCALLSTACKDOWN, AArch64::ADJCALLSTACKUP), : AArch64GenInstrInfo(AArch64::ADJCALLSTACKDOWN, AArch64::ADJCALLSTACKUP),
Subtarget(STI) {} RI(STI.getTargetTriple()), Subtarget(STI) {}
/// GetInstSize - Return the number of bytes of code the specified /// GetInstSize - Return the number of bytes of code the specified
/// instruction may be. This returns the maximum number of bytes. /// instruction may be. This returns the maximum number of bytes.
@ -375,8 +375,7 @@ bool AArch64InstrInfo::canInsertSelect(
// Check register classes. // Check register classes.
const MachineRegisterInfo &MRI = MBB.getParent()->getRegInfo(); const MachineRegisterInfo &MRI = MBB.getParent()->getRegInfo();
const TargetRegisterClass *RC = const TargetRegisterClass *RC =
Subtarget.getRegisterInfo()->getCommonSubClass(MRI.getRegClass(TrueReg), RI.getCommonSubClass(MRI.getRegClass(TrueReg), MRI.getRegClass(FalseReg));
MRI.getRegClass(FalseReg));
if (!RC) if (!RC)
return false; return false;
@ -613,7 +612,7 @@ bool
AArch64InstrInfo::areMemAccessesTriviallyDisjoint(MachineInstr *MIa, AArch64InstrInfo::areMemAccessesTriviallyDisjoint(MachineInstr *MIa,
MachineInstr *MIb, MachineInstr *MIb,
AliasAnalysis *AA) const { AliasAnalysis *AA) const {
const TargetRegisterInfo *TRI = Subtarget.getRegisterInfo(); const TargetRegisterInfo *TRI = &getRegisterInfo();
unsigned BaseRegA = 0, BaseRegB = 0; unsigned BaseRegA = 0, BaseRegB = 0;
int OffsetA = 0, OffsetB = 0; int OffsetA = 0, OffsetB = 0;
int WidthA = 0, WidthB = 0; int WidthA = 0, WidthB = 0;
@ -866,7 +865,7 @@ bool AArch64InstrInfo::optimizeCompareInstr(
return false; return false;
bool CheckOnlyCCWrites = false; bool CheckOnlyCCWrites = false;
const TargetRegisterInfo *TRI = Subtarget.getRegisterInfo(); const TargetRegisterInfo *TRI = &getRegisterInfo();
if (modifiesConditionCode(MI, CmpInstr, CheckOnlyCCWrites, TRI)) if (modifiesConditionCode(MI, CmpInstr, CheckOnlyCCWrites, TRI))
return false; return false;
@ -1514,7 +1513,7 @@ void AArch64InstrInfo::copyPhysRegTuple(
llvm::ArrayRef<unsigned> Indices) const { llvm::ArrayRef<unsigned> Indices) const {
assert(Subtarget.hasNEON() && assert(Subtarget.hasNEON() &&
"Unexpected register copy without NEON"); "Unexpected register copy without NEON");
const TargetRegisterInfo *TRI = Subtarget.getRegisterInfo(); const TargetRegisterInfo *TRI = &getRegisterInfo();
uint16_t DestEncoding = TRI->getEncodingValue(DestReg); uint16_t DestEncoding = TRI->getEncodingValue(DestReg);
uint16_t SrcEncoding = TRI->getEncodingValue(SrcReg); uint16_t SrcEncoding = TRI->getEncodingValue(SrcReg);
unsigned NumRegs = Indices.size(); unsigned NumRegs = Indices.size();
@ -1538,9 +1537,10 @@ void AArch64InstrInfo::copyPhysReg(MachineBasicBlock &MBB,
MachineBasicBlock::iterator I, DebugLoc DL, MachineBasicBlock::iterator I, DebugLoc DL,
unsigned DestReg, unsigned SrcReg, unsigned DestReg, unsigned SrcReg,
bool KillSrc) const { bool KillSrc) const {
const TargetRegisterInfo *TRI = Subtarget.getRegisterInfo();
if (AArch64::GPR32spRegClass.contains(DestReg) && if (AArch64::GPR32spRegClass.contains(DestReg) &&
(AArch64::GPR32spRegClass.contains(SrcReg) || SrcReg == AArch64::WZR)) { (AArch64::GPR32spRegClass.contains(SrcReg) || SrcReg == AArch64::WZR)) {
const TargetRegisterInfo *TRI = &getRegisterInfo();
if (DestReg == AArch64::WSP || SrcReg == AArch64::WSP) { if (DestReg == AArch64::WSP || SrcReg == AArch64::WSP) {
// If either operand is WSP, expand to ADD #0. // If either operand is WSP, expand to ADD #0.
if (Subtarget.hasZeroCycleRegMove()) { if (Subtarget.hasZeroCycleRegMove()) {
@ -1694,9 +1694,9 @@ void AArch64InstrInfo::copyPhysReg(MachineBasicBlock &MBB,
if (AArch64::FPR64RegClass.contains(DestReg) && if (AArch64::FPR64RegClass.contains(DestReg) &&
AArch64::FPR64RegClass.contains(SrcReg)) { AArch64::FPR64RegClass.contains(SrcReg)) {
if(Subtarget.hasNEON()) { if(Subtarget.hasNEON()) {
DestReg = TRI->getMatchingSuperReg(DestReg, AArch64::dsub, DestReg = RI.getMatchingSuperReg(DestReg, AArch64::dsub,
&AArch64::FPR128RegClass); &AArch64::FPR128RegClass);
SrcReg = TRI->getMatchingSuperReg(SrcReg, AArch64::dsub, SrcReg = RI.getMatchingSuperReg(SrcReg, AArch64::dsub,
&AArch64::FPR128RegClass); &AArch64::FPR128RegClass);
BuildMI(MBB, I, DL, get(AArch64::ORRv16i8), DestReg) BuildMI(MBB, I, DL, get(AArch64::ORRv16i8), DestReg)
.addReg(SrcReg) .addReg(SrcReg)
@ -1711,9 +1711,9 @@ void AArch64InstrInfo::copyPhysReg(MachineBasicBlock &MBB,
if (AArch64::FPR32RegClass.contains(DestReg) && if (AArch64::FPR32RegClass.contains(DestReg) &&
AArch64::FPR32RegClass.contains(SrcReg)) { AArch64::FPR32RegClass.contains(SrcReg)) {
if(Subtarget.hasNEON()) { if(Subtarget.hasNEON()) {
DestReg = TRI->getMatchingSuperReg(DestReg, AArch64::ssub, DestReg = RI.getMatchingSuperReg(DestReg, AArch64::ssub,
&AArch64::FPR128RegClass); &AArch64::FPR128RegClass);
SrcReg = TRI->getMatchingSuperReg(SrcReg, AArch64::ssub, SrcReg = RI.getMatchingSuperReg(SrcReg, AArch64::ssub,
&AArch64::FPR128RegClass); &AArch64::FPR128RegClass);
BuildMI(MBB, I, DL, get(AArch64::ORRv16i8), DestReg) BuildMI(MBB, I, DL, get(AArch64::ORRv16i8), DestReg)
.addReg(SrcReg) .addReg(SrcReg)
@ -1728,17 +1728,17 @@ void AArch64InstrInfo::copyPhysReg(MachineBasicBlock &MBB,
if (AArch64::FPR16RegClass.contains(DestReg) && if (AArch64::FPR16RegClass.contains(DestReg) &&
AArch64::FPR16RegClass.contains(SrcReg)) { AArch64::FPR16RegClass.contains(SrcReg)) {
if(Subtarget.hasNEON()) { if(Subtarget.hasNEON()) {
DestReg = TRI->getMatchingSuperReg(DestReg, AArch64::hsub, DestReg = RI.getMatchingSuperReg(DestReg, AArch64::hsub,
&AArch64::FPR128RegClass); &AArch64::FPR128RegClass);
SrcReg = TRI->getMatchingSuperReg(SrcReg, AArch64::hsub, SrcReg = RI.getMatchingSuperReg(SrcReg, AArch64::hsub,
&AArch64::FPR128RegClass); &AArch64::FPR128RegClass);
BuildMI(MBB, I, DL, get(AArch64::ORRv16i8), DestReg) BuildMI(MBB, I, DL, get(AArch64::ORRv16i8), DestReg)
.addReg(SrcReg) .addReg(SrcReg)
.addReg(SrcReg, getKillRegState(KillSrc)); .addReg(SrcReg, getKillRegState(KillSrc));
} else { } else {
DestReg = TRI->getMatchingSuperReg(DestReg, AArch64::hsub, DestReg = RI.getMatchingSuperReg(DestReg, AArch64::hsub,
&AArch64::FPR32RegClass); &AArch64::FPR32RegClass);
SrcReg = TRI->getMatchingSuperReg(SrcReg, AArch64::hsub, SrcReg = RI.getMatchingSuperReg(SrcReg, AArch64::hsub,
&AArch64::FPR32RegClass); &AArch64::FPR32RegClass);
BuildMI(MBB, I, DL, get(AArch64::FMOVSr), DestReg) BuildMI(MBB, I, DL, get(AArch64::FMOVSr), DestReg)
.addReg(SrcReg, getKillRegState(KillSrc)); .addReg(SrcReg, getKillRegState(KillSrc));
@ -1749,17 +1749,17 @@ void AArch64InstrInfo::copyPhysReg(MachineBasicBlock &MBB,
if (AArch64::FPR8RegClass.contains(DestReg) && if (AArch64::FPR8RegClass.contains(DestReg) &&
AArch64::FPR8RegClass.contains(SrcReg)) { AArch64::FPR8RegClass.contains(SrcReg)) {
if(Subtarget.hasNEON()) { if(Subtarget.hasNEON()) {
DestReg = TRI->getMatchingSuperReg(DestReg, AArch64::bsub, DestReg = RI.getMatchingSuperReg(DestReg, AArch64::bsub,
&AArch64::FPR128RegClass); &AArch64::FPR128RegClass);
SrcReg = TRI->getMatchingSuperReg(SrcReg, AArch64::bsub, SrcReg = RI.getMatchingSuperReg(SrcReg, AArch64::bsub,
&AArch64::FPR128RegClass); &AArch64::FPR128RegClass);
BuildMI(MBB, I, DL, get(AArch64::ORRv16i8), DestReg) BuildMI(MBB, I, DL, get(AArch64::ORRv16i8), DestReg)
.addReg(SrcReg) .addReg(SrcReg)
.addReg(SrcReg, getKillRegState(KillSrc)); .addReg(SrcReg, getKillRegState(KillSrc));
} else { } else {
DestReg = TRI->getMatchingSuperReg(DestReg, AArch64::bsub, DestReg = RI.getMatchingSuperReg(DestReg, AArch64::bsub,
&AArch64::FPR32RegClass); &AArch64::FPR32RegClass);
SrcReg = TRI->getMatchingSuperReg(SrcReg, AArch64::bsub, SrcReg = RI.getMatchingSuperReg(SrcReg, AArch64::bsub,
&AArch64::FPR32RegClass); &AArch64::FPR32RegClass);
BuildMI(MBB, I, DL, get(AArch64::FMOVSr), DestReg) BuildMI(MBB, I, DL, get(AArch64::FMOVSr), DestReg)
.addReg(SrcReg, getKillRegState(KillSrc)); .addReg(SrcReg, getKillRegState(KillSrc));
@ -2946,8 +2946,7 @@ bool AArch64InstrInfo::optimizeCondBranch(MachineInstr *MI) const {
// Convert only when the condition code is not modified between // Convert only when the condition code is not modified between
// the CSINC and the branch. The CC may be used by other // the CSINC and the branch. The CC may be used by other
// instructions in between. // instructions in between.
if (modifiesConditionCode(DefMI, MI, CheckOnlyCCWrites, if (modifiesConditionCode(DefMI, MI, CheckOnlyCCWrites, &getRegisterInfo()))
Subtarget.getRegisterInfo()))
return false; return false;
MachineBasicBlock &RefToMBB = *MBB; MachineBasicBlock &RefToMBB = *MBB;
MachineBasicBlock *TBB = MI->getOperand(TargetBBInMI).getMBB(); MachineBasicBlock *TBB = MI->getOperand(TargetBBInMI).getMBB();

6
lib/Target/AArch64/AArch64InstrInfo.h
View File

@ -34,11 +34,17 @@ class AArch64InstrInfo : public AArch64GenInstrInfo {
MOSuppressPair = 1 MOSuppressPair = 1
}; };
const AArch64RegisterInfo RI;
const AArch64Subtarget &Subtarget; const AArch64Subtarget &Subtarget;
public: public:
explicit AArch64InstrInfo(const AArch64Subtarget &STI); explicit AArch64InstrInfo(const AArch64Subtarget &STI);
/// getRegisterInfo - TargetInstrInfo is a superset of MRegister info. As
/// such, whenever a client has an instance of instruction info, it should
/// always be able to get register info as well (through this method).
const AArch64RegisterInfo &getRegisterInfo() const { return RI; }
unsigned GetInstSizeInBytes(const MachineInstr *MI) const; unsigned GetInstSizeInBytes(const MachineInstr *MI) const;
bool isAsCheapAsAMove(const MachineInstr *MI) const override; bool isAsCheapAsAMove(const MachineInstr *MI) const override;

4
lib/Target/AArch64/AArch64RegisterInfo.cpp
View File

@ -38,8 +38,8 @@ static cl::opt<bool>
ReserveX18("aarch64-reserve-x18", cl::Hidden, ReserveX18("aarch64-reserve-x18", cl::Hidden,
cl::desc("Reserve X18, making it unavailable as GPR")); cl::desc("Reserve X18, making it unavailable as GPR"));
AArch64RegisterInfo::AArch64RegisterInfo(StringRef TargetTriple) AArch64RegisterInfo::AArch64RegisterInfo(const Triple &TT)
: AArch64GenRegisterInfo(AArch64::LR), TT(TargetTriple) {} : AArch64GenRegisterInfo(AArch64::LR), TT(TT) {}
const MCPhysReg * const MCPhysReg *
AArch64RegisterInfo::getCalleeSavedRegs(const MachineFunction *MF) const { AArch64RegisterInfo::getCalleeSavedRegs(const MachineFunction *MF) const {

4
lib/Target/AArch64/AArch64RegisterInfo.h
View File

@ -26,10 +26,10 @@ class Triple;
struct AArch64RegisterInfo : public AArch64GenRegisterInfo { struct AArch64RegisterInfo : public AArch64GenRegisterInfo {
private: private:
const Triple TT; const Triple &TT;
public: public:
AArch64RegisterInfo(StringRef TargetTriple); AArch64RegisterInfo(const Triple &TT);
bool isReservedReg(const MachineFunction &MF, unsigned Reg) const; bool isReservedReg(const MachineFunction &MF, unsigned Reg) const;

12
lib/Target/AArch64/AArch64Subtarget.cpp
View File

@ -14,7 +14,6 @@
#include "AArch64InstrInfo.h" #include "AArch64InstrInfo.h"
#include "AArch64PBQPRegAlloc.h" #include "AArch64PBQPRegAlloc.h"
#include "AArch64Subtarget.h" #include "AArch64Subtarget.h"
#include "AArch64TargetMachine.h"
#include "llvm/ADT/SmallVector.h" #include "llvm/ADT/SmallVector.h"
#include "llvm/CodeGen/MachineScheduler.h" #include "llvm/CodeGen/MachineScheduler.h"
#include "llvm/IR/GlobalValue.h" #include "llvm/IR/GlobalValue.h"
@ -46,13 +45,12 @@ AArch64Subtarget::initializeSubtargetDependencies(StringRef FS) {
AArch64Subtarget::AArch64Subtarget(const std::string &TT, AArch64Subtarget::AArch64Subtarget(const std::string &TT,
const std::string &CPU, const std::string &CPU,
const std::string &FS, const std::string &FS,
const AArch64TargetMachine &TM, const TargetMachine &TM, bool LittleEndian)
bool LittleEndian)
: AArch64GenSubtargetInfo(TT, CPU, FS), ARMProcFamily(Others), : AArch64GenSubtargetInfo(TT, CPU, FS), ARMProcFamily(Others),
HasFPARMv8(false), HasNEON(false), HasCrypto(false), HasCRC(false), HasFPARMv8(false), HasNEON(false), HasCrypto(false), HasCRC(false),
HasZeroCycleRegMove(false), HasZeroCycleZeroing(false), HasZeroCycleRegMove(false), HasZeroCycleZeroing(false),
IsLittle(LittleEndian), CPUString(CPU), TargetTriple(TT), TM(TM), IsLittle(LittleEndian), CPUString(CPU), TargetTriple(TT), FrameLowering(),
FrameLowering(), InstrInfo(initializeSubtargetDependencies(FS)), InstrInfo(initializeSubtargetDependencies(FS)),
TSInfo(TM.getDataLayout()), TLInfo(TM, *this) {} TSInfo(TM.getDataLayout()), TLInfo(TM, *this) {}
/// ClassifyGlobalReference - Find the target operand flags that describe /// ClassifyGlobalReference - Find the target operand flags that describe
@ -131,7 +129,3 @@ AArch64Subtarget::getCustomPBQPConstraints() const {
return llvm::make_unique<A57ChainingConstraint>(); return llvm::make_unique<A57ChainingConstraint>();
} }
const AArch64RegisterInfo *AArch64Subtarget::getRegisterInfo() const {
return getTargetMachine().getRegisterInfo();
}

8
lib/Target/AArch64/AArch64Subtarget.h
View File

@ -56,7 +56,6 @@ protected:
/// TargetTriple - What processor and OS we're targeting. /// TargetTriple - What processor and OS we're targeting.
Triple TargetTriple; Triple TargetTriple;
const AArch64TargetMachine &TM;
AArch64FrameLowering FrameLowering; AArch64FrameLowering FrameLowering;
AArch64InstrInfo InstrInfo; AArch64InstrInfo InstrInfo;
AArch64SelectionDAGInfo TSInfo; AArch64SelectionDAGInfo TSInfo;
@ -71,7 +70,7 @@ public:
/// This constructor initializes the data members to match that /// This constructor initializes the data members to match that
/// of the specified triple. /// of the specified triple.
AArch64Subtarget(const std::string &TT, const std::string &CPU, AArch64Subtarget(const std::string &TT, const std::string &CPU,
const std::string &FS, const AArch64TargetMachine &TM, const std::string &FS, const TargetMachine &TM,
bool LittleEndian); bool LittleEndian);
const AArch64SelectionDAGInfo *getSelectionDAGInfo() const override { const AArch64SelectionDAGInfo *getSelectionDAGInfo() const override {
@ -84,8 +83,9 @@ public:
return &TLInfo; return &TLInfo;
} }
const AArch64InstrInfo *getInstrInfo() const override { return &InstrInfo; } const AArch64InstrInfo *getInstrInfo() const override { return &InstrInfo; }
const AArch64TargetMachine &getTargetMachine() const { return TM; } const AArch64RegisterInfo *getRegisterInfo() const override {
const AArch64RegisterInfo *getRegisterInfo() const override; return &getInstrInfo()->getRegisterInfo();
}
const Triple &getTargetTriple() const { return TargetTriple; } const Triple &getTargetTriple() const { return TargetTriple; }
bool enableMachineScheduler() const override { return true; } bool enableMachineScheduler() const override { return true; }
bool enablePostMachineScheduler() const override { bool enablePostMachineScheduler() const override {

1
lib/Target/AArch64/AArch64TargetMachine.cpp
View File

@ -127,7 +127,6 @@ AArch64TargetMachine::AArch64TargetMachine(const Target &T, StringRef TT,
: LLVMTargetMachine(T, computeDataLayout(TT, LittleEndian), TT, CPU, FS, : LLVMTargetMachine(T, computeDataLayout(TT, LittleEndian), TT, CPU, FS,
Options, RM, CM, OL), Options, RM, CM, OL),
TLOF(createTLOF(Triple(getTargetTriple()))), TLOF(createTLOF(Triple(getTargetTriple()))),
RI(TT),
Subtarget(TT, CPU, FS, *this, LittleEndian), Subtarget(TT, CPU, FS, *this, LittleEndian),
isLittle(LittleEndian) { isLittle(LittleEndian) {
initAsmInfo(); initAsmInfo();

2
lib/Target/AArch64/AArch64TargetMachine.h
View File

@ -24,7 +24,6 @@ namespace llvm {
class AArch64TargetMachine : public LLVMTargetMachine { class AArch64TargetMachine : public LLVMTargetMachine {
protected: protected:
std::unique_ptr<TargetLoweringObjectFile> TLOF; std::unique_ptr<TargetLoweringObjectFile> TLOF;
AArch64RegisterInfo RI;
AArch64Subtarget Subtarget; AArch64Subtarget Subtarget;
mutable StringMap<std::unique_ptr<AArch64Subtarget>> SubtargetMap; mutable StringMap<std::unique_ptr<AArch64Subtarget>> SubtargetMap;
@ -40,7 +39,6 @@ public:
return &Subtarget; return &Subtarget;
} }
const AArch64Subtarget *getSubtargetImpl(const Function &F) const override; const AArch64Subtarget *getSubtargetImpl(const Function &F) const override;
const AArch64RegisterInfo *getRegisterInfo() const { return &RI; }
// Pass Pipeline Configuration // Pass Pipeline Configuration
TargetPassConfig *createPassConfig(PassManagerBase &PM) override; TargetPassConfig *createPassConfig(PassManagerBase &PM) override;