From a5158963437b4f2d10762ea08136cbdfc9a9f863 Mon Sep 17 00:00:00 2001 From: Artyom Skrobov Date: Thu, 23 Jan 2014 11:31:38 +0000 Subject: [PATCH] Prevent repetitive warnings for unrecognized processors and features llvm-svn: 199886 --- llvm/include/llvm/MC/SubtargetFeature.h | 6 +++ llvm/lib/MC/MCSubtargetInfo.cpp | 11 ++--- llvm/lib/MC/SubtargetFeature.cpp | 54 ++++++++++++++++--------- llvm/test/MC/ARM/unrecognized.ll | 15 +++++++ 4 files changed, 59 insertions(+), 27 deletions(-) create mode 100644 llvm/test/MC/ARM/unrecognized.ll diff --git a/llvm/include/llvm/MC/SubtargetFeature.h b/llvm/include/llvm/MC/SubtargetFeature.h index d0735ccd9fa3..ad7fec53ac3e 100644 --- a/llvm/include/llvm/MC/SubtargetFeature.h +++ b/llvm/include/llvm/MC/SubtargetFeature.h @@ -101,6 +101,12 @@ public: /// Adds the default features for the specified target triple. void getDefaultSubtargetFeatures(const Triple& Triple); + + /// Find KV in array using binary search. + /// T should be either SubtargetFeatureKV or SubtargetInfoKV + template + static const T *Find(StringRef Key, const T *Array, size_t Length, + const char* KeyType); }; } // End namespace llvm diff --git a/llvm/lib/MC/MCSubtargetInfo.cpp b/llvm/lib/MC/MCSubtargetInfo.cpp index 8d8e2900b678..ead7aa96d14b 100644 --- a/llvm/lib/MC/MCSubtargetInfo.cpp +++ b/llvm/lib/MC/MCSubtargetInfo.cpp @@ -96,14 +96,11 @@ MCSubtargetInfo::getSchedModelForCPU(StringRef CPU) const { #endif // Find entry - const SubtargetInfoKV *Found = - std::lower_bound(ProcSchedModels, ProcSchedModels+NumProcs, CPU); - if (Found == ProcSchedModels+NumProcs || StringRef(Found->Key) != CPU) { - errs() << "'" << CPU - << "' is not a recognized processor for this target" - << " (ignoring processor)\n"; + const SubtargetInfoKV *Found = SubtargetFeatures::Find(CPU, ProcSchedModels, + NumProcs, "processor"); + if (!Found) return &MCSchedModel::DefaultSchedModel; - } + assert(Found->Value && "Missing processor SchedModel value"); return (const MCSchedModel *)Found->Value; } diff --git a/llvm/lib/MC/SubtargetFeature.cpp b/llvm/lib/MC/SubtargetFeature.cpp index 2fb91f2125b1..c9d34703fcb7 100644 --- a/llvm/lib/MC/SubtargetFeature.cpp +++ b/llvm/lib/MC/SubtargetFeature.cpp @@ -11,9 +11,11 @@ // //===----------------------------------------------------------------------===// +#include "llvm/ADT/SmallSet.h" #include "llvm/MC/SubtargetFeature.h" #include "llvm/Support/Debug.h" #include "llvm/Support/Format.h" +#include "llvm/Support/SourceMgr.h" #include "llvm/Support/raw_ostream.h" #include #include @@ -118,19 +120,42 @@ void SubtargetFeatures::AddFeature(const StringRef String, } } +// This needs to be shared between the instantiations of Find<> +typedef std::pair KeyWithType; +static SmallSet reportedAsUnrecognized; + /// Find KV in array using binary search. -static const SubtargetFeatureKV *Find(StringRef S, const SubtargetFeatureKV *A, - size_t L) { +template +const T *SubtargetFeatures::Find(StringRef Key, const T *Array, size_t Length, + const char* KeyType) { // Determine the end of the array - const SubtargetFeatureKV *Hi = A + L; + const T *Hi = Array + Length; // Binary search the array - const SubtargetFeatureKV *F = std::lower_bound(A, Hi, S); + const T *F = std::lower_bound(Array, Hi, Key); // If not found then return NULL - if (F == Hi || StringRef(F->Key) != S) return NULL; + if (F == Hi || StringRef(F->Key) != Key) { + // If not yet reported, report now + KeyWithType current(KeyType, Key); + if(!reportedAsUnrecognized.count(current)) { + SmallString<1024> storage; + StringRef message = ("'" + Key + + "' is not a recognized " + KeyType + + " for this target (ignoring " + KeyType + + ")").toStringRef(storage); + SMDiagnostic(StringRef(), SourceMgr::DK_Warning, message) + .print(0, errs()); + reportedAsUnrecognized.insert(current); + } + return NULL; + } // Return the found array item return F; } +// Instantiate with for use in MCSubtargetInfo +template const SubtargetInfoKV *SubtargetFeatures::Find + (StringRef Key, const SubtargetInfoKV *Array, size_t Length, const char* KeyType); + /// getLongestEntryLength - Return the length of the longest entry in the table. /// static size_t getLongestEntryLength(const SubtargetFeatureKV *Table, @@ -228,7 +253,7 @@ SubtargetFeatures::ToggleFeature(uint64_t Bits, const StringRef Feature, size_t FeatureTableSize) { // Find feature in table. const SubtargetFeatureKV *FeatureEntry = - Find(StripFlag(Feature), FeatureTable, FeatureTableSize); + Find(StripFlag(Feature), FeatureTable, FeatureTableSize, "feature"); // If there is a match if (FeatureEntry) { if ((Bits & FeatureEntry->Value) == FeatureEntry->Value) { @@ -242,10 +267,6 @@ SubtargetFeatures::ToggleFeature(uint64_t Bits, const StringRef Feature, // For each feature that this implies, set it. SetImpliedBits(Bits, FeatureEntry, FeatureTable, FeatureTableSize); } - } else { - errs() << "'" << Feature - << "' is not a recognized feature for this target" - << " (ignoring feature)\n"; } return Bits; @@ -280,7 +301,8 @@ uint64_t SubtargetFeatures::getFeatureBits(const StringRef CPU, // Find CPU entry if CPU name is specified. if (!CPU.empty()) { - const SubtargetFeatureKV *CPUEntry = Find(CPU, CPUTable, CPUTableSize); + const SubtargetFeatureKV *CPUEntry = Find(CPU, CPUTable, CPUTableSize, + "processor"); // If there is a match if (CPUEntry) { // Set base feature bits @@ -292,10 +314,6 @@ uint64_t SubtargetFeatures::getFeatureBits(const StringRef CPU, if (CPUEntry->Value & FE.Value) SetImpliedBits(Bits, &FE, FeatureTable, FeatureTableSize); } - } else { - errs() << "'" << CPU - << "' is not a recognized processor for this target" - << " (ignoring processor)\n"; } } @@ -309,7 +327,7 @@ uint64_t SubtargetFeatures::getFeatureBits(const StringRef CPU, // Find feature in table. const SubtargetFeatureKV *FeatureEntry = - Find(StripFlag(Feature), FeatureTable, FeatureTableSize); + Find(StripFlag(Feature), FeatureTable, FeatureTableSize, "feature"); // If there is a match if (FeatureEntry) { // Enable/disable feature in bits @@ -324,10 +342,6 @@ uint64_t SubtargetFeatures::getFeatureBits(const StringRef CPU, // For each feature that implies this, clear it. ClearImpliedBits(Bits, FeatureEntry, FeatureTable, FeatureTableSize); } - } else { - errs() << "'" << Feature - << "' is not a recognized feature for this target" - << " (ignoring feature)\n"; } } diff --git a/llvm/test/MC/ARM/unrecognized.ll b/llvm/test/MC/ARM/unrecognized.ll new file mode 100644 index 000000000000..88fb96d1bf9b --- /dev/null +++ b/llvm/test/MC/ARM/unrecognized.ll @@ -0,0 +1,15 @@ +; RUN: llc -mcpu=invalid -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=CPU +; CPU: 'invalid' is not a recognized processor for this target (ignoring processor) +; CPU-NOT: 'invalid' is not a recognized processor for this target (ignoring processor) + +; RUN: llc -mattr=+foo,+bar -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=FEATURE +; FEATURE: 'foo' is not a recognized feature for this target (ignoring feature) +; FEATURE-NEXT: 'bar' is not a recognized feature for this target (ignoring feature) +; FEATURE-NOT: 'foo' is not a recognized feature for this target (ignoring feature) +; FEATURE-NOT: 'bar' is not a recognized feature for this target (ignoring feature) + +define void @foo() { +entry: + ret void +} +