From 58f5966d5bc197a052f638545cc5fecc2f3277de Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Fri, 14 Aug 2020 15:50:52 -0700 Subject: [PATCH] Fix TargetSubtargetInfo derivatives after D85165 --- llvm/lib/Target/ARC/ARCSubtarget.cpp | 2 +- llvm/lib/Target/ARC/ARCSubtarget.h | 2 +- llvm/lib/Target/ARC/MCTargetDesc/ARCMCTargetDesc.cpp | 2 +- llvm/lib/Target/VE/MCTargetDesc/VEMCTargetDesc.cpp | 2 +- llvm/lib/Target/VE/VESubtarget.cpp | 4 ++-- llvm/lib/Target/VE/VESubtarget.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/llvm/lib/Target/ARC/ARCSubtarget.cpp b/llvm/lib/Target/ARC/ARCSubtarget.cpp index bce2dbd..409dd2a 100644 --- a/llvm/lib/Target/ARC/ARCSubtarget.cpp +++ b/llvm/lib/Target/ARC/ARCSubtarget.cpp @@ -26,5 +26,5 @@ void ARCSubtarget::anchor() {} ARCSubtarget::ARCSubtarget(const Triple &TT, const std::string &CPU, const std::string &FS, const TargetMachine &TM) - : ARCGenSubtargetInfo(TT, CPU, FS), FrameLowering(*this), + : ARCGenSubtargetInfo(TT, CPU, /*TuneCPU=*/CPU, FS), FrameLowering(*this), TLInfo(TM, *this) {} diff --git a/llvm/lib/Target/ARC/ARCSubtarget.h b/llvm/lib/Target/ARC/ARCSubtarget.h index 0be797f..1f1b27f 100644 --- a/llvm/lib/Target/ARC/ARCSubtarget.h +++ b/llvm/lib/Target/ARC/ARCSubtarget.h @@ -43,7 +43,7 @@ public: /// Parses features string setting specified subtarget options. /// Definition of function is auto generated by tblgen. - void ParseSubtargetFeatures(StringRef CPU, StringRef FS); + void ParseSubtargetFeatures(StringRef CPU, StringRef TuneCPU, StringRef FS); const ARCInstrInfo *getInstrInfo() const override { return &InstrInfo; } const ARCFrameLowering *getFrameLowering() const override { diff --git a/llvm/lib/Target/ARC/MCTargetDesc/ARCMCTargetDesc.cpp b/llvm/lib/Target/ARC/MCTargetDesc/ARCMCTargetDesc.cpp index 3e3613c..358ee60 100644 --- a/llvm/lib/Target/ARC/MCTargetDesc/ARCMCTargetDesc.cpp +++ b/llvm/lib/Target/ARC/MCTargetDesc/ARCMCTargetDesc.cpp @@ -48,7 +48,7 @@ static MCRegisterInfo *createARCMCRegisterInfo(const Triple &TT) { static MCSubtargetInfo *createARCMCSubtargetInfo(const Triple &TT, StringRef CPU, StringRef FS) { - return createARCMCSubtargetInfoImpl(TT, CPU, FS); + return createARCMCSubtargetInfoImpl(TT, CPU, /*TuneCPU=*/CPU, FS); } static MCAsmInfo *createARCMCAsmInfo(const MCRegisterInfo &MRI, diff --git a/llvm/lib/Target/VE/MCTargetDesc/VEMCTargetDesc.cpp b/llvm/lib/Target/VE/MCTargetDesc/VEMCTargetDesc.cpp index a39cffc..6a9ed48 100644 --- a/llvm/lib/Target/VE/MCTargetDesc/VEMCTargetDesc.cpp +++ b/llvm/lib/Target/VE/MCTargetDesc/VEMCTargetDesc.cpp @@ -57,7 +57,7 @@ static MCSubtargetInfo *createVEMCSubtargetInfo(const Triple &TT, StringRef CPU, StringRef FS) { if (CPU.empty()) CPU = "ve"; - return createVEMCSubtargetInfoImpl(TT, CPU, FS); + return createVEMCSubtargetInfoImpl(TT, CPU, /*TuneCPU=*/CPU, FS); } static MCTargetStreamer * diff --git a/llvm/lib/Target/VE/VESubtarget.cpp b/llvm/lib/Target/VE/VESubtarget.cpp index a0b78d9..6fb699d 100644 --- a/llvm/lib/Target/VE/VESubtarget.cpp +++ b/llvm/lib/Target/VE/VESubtarget.cpp @@ -33,14 +33,14 @@ VESubtarget &VESubtarget::initializeSubtargetDependencies(StringRef CPU, CPUName = "ve"; // Parse features string. - ParseSubtargetFeatures(CPUName, FS); + ParseSubtargetFeatures(CPUName, /*TuneCPU=*/CPU, FS); return *this; } VESubtarget::VESubtarget(const Triple &TT, const std::string &CPU, const std::string &FS, const TargetMachine &TM) - : VEGenSubtargetInfo(TT, CPU, FS), TargetTriple(TT), + : VEGenSubtargetInfo(TT, CPU, /*TuneCPU=*/CPU, FS), TargetTriple(TT), InstrInfo(initializeSubtargetDependencies(CPU, FS)), TLInfo(TM, *this), FrameLowering(*this) {} diff --git a/llvm/lib/Target/VE/VESubtarget.h b/llvm/lib/Target/VE/VESubtarget.h index f3a2c20..f4034df 100644 --- a/llvm/lib/Target/VE/VESubtarget.h +++ b/llvm/lib/Target/VE/VESubtarget.h @@ -57,7 +57,7 @@ public: /// ParseSubtargetFeatures - Parses features string setting specified /// subtarget options. Definition of function is auto generated by tblgen. - void ParseSubtargetFeatures(StringRef CPU, StringRef FS); + void ParseSubtargetFeatures(StringRef CPU, StringRef TuneCPU, StringRef FS); VESubtarget &initializeSubtargetDependencies(StringRef CPU, StringRef FS); /// Given a actual stack size as determined by FrameInfo, this function -- 2.7.4