[llvm] 58f5966 - Fix TargetSubtargetInfo derivatives after D85165

[Craig Topper via llvm-commits]

Thanks. I forgot about the non default build targets.

~Craig


On Fri, Aug 14, 2020 at 3:52 PM Fangrui Song via llvm-commits <
llvm-commits at lists.llvm.org> wrote:

>
> Author: Fangrui Song
> Date: 2020-08-14T15:50:53-07:00
> New Revision: 58f5966d5bc197a052f638545cc5fecc2f3277de
>
> URL:
> https://github.com/llvm/llvm-project/commit/58f5966d5bc197a052f638545cc5fecc2f3277de
> DIFF:
> https://github.com/llvm/llvm-project/commit/58f5966d5bc197a052f638545cc5fecc2f3277de.diff
>
> LOG: Fix TargetSubtargetInfo derivatives after D85165
>
> Added:
>
>
> Modified:
>     llvm/lib/Target/ARC/ARCSubtarget.cpp
>     llvm/lib/Target/ARC/ARCSubtarget.h
>     llvm/lib/Target/ARC/MCTargetDesc/ARCMCTargetDesc.cpp
>     llvm/lib/Target/VE/MCTargetDesc/VEMCTargetDesc.cpp
>     llvm/lib/Target/VE/VESubtarget.cpp
>     llvm/lib/Target/VE/VESubtarget.h
>
> Removed:
>
>
>
>
> ################################################################################
> diff  --git a/llvm/lib/Target/ARC/ARCSubtarget.cpp
> b/llvm/lib/Target/ARC/ARCSubtarget.cpp
> index bce2dbd2eaa6..409dd2a98ab4 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 0be797f753d5..1f1b27f13f68 100644
> --- a/llvm/lib/Target/ARC/ARCSubtarget.h
> +++ b/llvm/lib/Target/ARC/ARCSubtarget.h
> @@ -43,7 +43,7 @@ class ARCSubtarget : public ARCGenSubtargetInfo {
>
>    /// 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 3e3613ccb90f..358ee6002f80 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 a39cffc8f4a6..6a9ed481f373 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 a0b78d95e3cf..6fb699dbdd7a 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 f3a2c206162e..f4034df4dce8 100644
> --- a/llvm/lib/Target/VE/VESubtarget.h
> +++ b/llvm/lib/Target/VE/VESubtarget.h
> @@ -57,7 +57,7 @@ class VESubtarget : public VEGenSubtargetInfo {
>
>    /// 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
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200814/7caca6c6/attachment.html>