<div dir="ltr">Thanks. I forgot about the non default build targets.<div><br clear="all"><div><div dir="ltr" class="gmail_signature" data-smartmail="gmail_signature">~Craig</div></div><br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Aug 14, 2020 at 3:52 PM Fangrui Song via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><br>
Author: Fangrui Song<br>
Date: 2020-08-14T15:50:53-07:00<br>
New Revision: 58f5966d5bc197a052f638545cc5fecc2f3277de<br>
<br>
URL: <a href="https://github.com/llvm/llvm-project/commit/58f5966d5bc197a052f638545cc5fecc2f3277de" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/58f5966d5bc197a052f638545cc5fecc2f3277de</a><br>
DIFF: <a href="https://github.com/llvm/llvm-project/commit/58f5966d5bc197a052f638545cc5fecc2f3277de.diff" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/58f5966d5bc197a052f638545cc5fecc2f3277de.diff</a><br>
<br>
LOG: Fix TargetSubtargetInfo derivatives after D85165<br>
<br>
Added: <br>
<br>
<br>
Modified: <br>
llvm/lib/Target/ARC/ARCSubtarget.cpp<br>
llvm/lib/Target/ARC/ARCSubtarget.h<br>
llvm/lib/Target/ARC/MCTargetDesc/ARCMCTargetDesc.cpp<br>
llvm/lib/Target/VE/MCTargetDesc/VEMCTargetDesc.cpp<br>
llvm/lib/Target/VE/VESubtarget.cpp<br>
llvm/lib/Target/VE/VESubtarget.h<br>
<br>
Removed: <br>
<br>
<br>
<br>
################################################################################<br>
diff --git a/llvm/lib/Target/ARC/ARCSubtarget.cpp b/llvm/lib/Target/ARC/ARCSubtarget.cpp<br>
index bce2dbd2eaa6..409dd2a98ab4 100644<br>
--- a/llvm/lib/Target/ARC/ARCSubtarget.cpp<br>
+++ b/llvm/lib/Target/ARC/ARCSubtarget.cpp<br>
@@ -26,5 +26,5 @@ void ARCSubtarget::anchor() {}<br>
<br>
ARCSubtarget::ARCSubtarget(const Triple &TT, const std::string &CPU,<br>
const std::string &FS, const TargetMachine &TM)<br>
- : ARCGenSubtargetInfo(TT, CPU, FS), FrameLowering(*this),<br>
+ : ARCGenSubtargetInfo(TT, CPU, /*TuneCPU=*/CPU, FS), FrameLowering(*this),<br>
TLInfo(TM, *this) {}<br>
<br>
diff --git a/llvm/lib/Target/ARC/ARCSubtarget.h b/llvm/lib/Target/ARC/ARCSubtarget.h<br>
index 0be797f753d5..1f1b27f13f68 100644<br>
--- a/llvm/lib/Target/ARC/ARCSubtarget.h<br>
+++ b/llvm/lib/Target/ARC/ARCSubtarget.h<br>
@@ -43,7 +43,7 @@ class ARCSubtarget : public ARCGenSubtargetInfo {<br>
<br>
/// Parses features string setting specified subtarget options.<br>
/// Definition of function is auto generated by tblgen.<br>
- void ParseSubtargetFeatures(StringRef CPU, StringRef FS);<br>
+ void ParseSubtargetFeatures(StringRef CPU, StringRef TuneCPU, StringRef FS);<br>
<br>
const ARCInstrInfo *getInstrInfo() const override { return &InstrInfo; }<br>
const ARCFrameLowering *getFrameLowering() const override {<br>
<br>
diff --git a/llvm/lib/Target/ARC/MCTargetDesc/ARCMCTargetDesc.cpp b/llvm/lib/Target/ARC/MCTargetDesc/ARCMCTargetDesc.cpp<br>
index 3e3613ccb90f..358ee6002f80 100644<br>
--- a/llvm/lib/Target/ARC/MCTargetDesc/ARCMCTargetDesc.cpp<br>
+++ b/llvm/lib/Target/ARC/MCTargetDesc/ARCMCTargetDesc.cpp<br>
@@ -48,7 +48,7 @@ static MCRegisterInfo *createARCMCRegisterInfo(const Triple &TT) {<br>
<br>
static MCSubtargetInfo *createARCMCSubtargetInfo(const Triple &TT,<br>
StringRef CPU, StringRef FS) {<br>
- return createARCMCSubtargetInfoImpl(TT, CPU, FS);<br>
+ return createARCMCSubtargetInfoImpl(TT, CPU, /*TuneCPU=*/CPU, FS);<br>
}<br>
<br>
static MCAsmInfo *createARCMCAsmInfo(const MCRegisterInfo &MRI,<br>
<br>
diff --git a/llvm/lib/Target/VE/MCTargetDesc/VEMCTargetDesc.cpp b/llvm/lib/Target/VE/MCTargetDesc/VEMCTargetDesc.cpp<br>
index a39cffc8f4a6..6a9ed481f373 100644<br>
--- a/llvm/lib/Target/VE/MCTargetDesc/VEMCTargetDesc.cpp<br>
+++ b/llvm/lib/Target/VE/MCTargetDesc/VEMCTargetDesc.cpp<br>
@@ -57,7 +57,7 @@ static MCSubtargetInfo *createVEMCSubtargetInfo(const Triple &TT, StringRef CPU,<br>
StringRef FS) {<br>
if (CPU.empty())<br>
CPU = "ve";<br>
- return createVEMCSubtargetInfoImpl(TT, CPU, FS);<br>
+ return createVEMCSubtargetInfoImpl(TT, CPU, /*TuneCPU=*/CPU, FS);<br>
}<br>
<br>
static MCTargetStreamer *<br>
<br>
diff --git a/llvm/lib/Target/VE/VESubtarget.cpp b/llvm/lib/Target/VE/VESubtarget.cpp<br>
index a0b78d95e3cf..6fb699dbdd7a 100644<br>
--- a/llvm/lib/Target/VE/VESubtarget.cpp<br>
+++ b/llvm/lib/Target/VE/VESubtarget.cpp<br>
@@ -33,14 +33,14 @@ VESubtarget &VESubtarget::initializeSubtargetDependencies(StringRef CPU,<br>
CPUName = "ve";<br>
<br>
// Parse features string.<br>
- ParseSubtargetFeatures(CPUName, FS);<br>
+ ParseSubtargetFeatures(CPUName, /*TuneCPU=*/CPU, FS);<br>
<br>
return *this;<br>
}<br>
<br>
VESubtarget::VESubtarget(const Triple &TT, const std::string &CPU,<br>
const std::string &FS, const TargetMachine &TM)<br>
- : VEGenSubtargetInfo(TT, CPU, FS), TargetTriple(TT),<br>
+ : VEGenSubtargetInfo(TT, CPU, /*TuneCPU=*/CPU, FS), TargetTriple(TT),<br>
InstrInfo(initializeSubtargetDependencies(CPU, FS)), TLInfo(TM, *this),<br>
FrameLowering(*this) {}<br>
<br>
<br>
diff --git a/llvm/lib/Target/VE/VESubtarget.h b/llvm/lib/Target/VE/VESubtarget.h<br>
index f3a2c206162e..f4034df4dce8 100644<br>
--- a/llvm/lib/Target/VE/VESubtarget.h<br>
+++ b/llvm/lib/Target/VE/VESubtarget.h<br>
@@ -57,7 +57,7 @@ class VESubtarget : public VEGenSubtargetInfo {<br>
<br>
/// ParseSubtargetFeatures - Parses features string setting specified<br>
/// subtarget options. Definition of function is auto generated by tblgen.<br>
- void ParseSubtargetFeatures(StringRef CPU, StringRef FS);<br>
+ void ParseSubtargetFeatures(StringRef CPU, StringRef TuneCPU, StringRef FS);<br>
VESubtarget &initializeSubtargetDependencies(StringRef CPU, StringRef FS);<br>
<br>
/// Given a actual stack size as determined by FrameInfo, this function<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>