mirror of
https://github.com/llvm/llvm-project.git
synced 2025-04-28 06:56:06 +00:00
[TableGen] Emit better error message for duplicate Subtarget features. (#102090)
- Keep track of last definition of a feature in a `DenseMap` and use it to report a better error message when a duplicate feature is found. - Use StringMap instead of a std::map in `EmitStageAndOperandCycleData` - Add a unit test to check if duplicate names are flagged.
This commit is contained in:
parent
28fa83f8d4
commit
4c97c52fe0
12
llvm/test/TableGen/SubtargetFeatureUniqueNames.td
Normal file
12
llvm/test/TableGen/SubtargetFeatureUniqueNames.td
Normal file
@ -0,0 +1,12 @@
|
||||
// RUN: not llvm-tblgen -gen-subtarget -I %p/../../include %s 2>&1 | FileCheck %s -DFILE=%s
|
||||
// Verify that subtarget features with same names result in an error.
|
||||
|
||||
include "llvm/Target/Target.td"
|
||||
|
||||
def MyTarget : Target;
|
||||
|
||||
def FeatureA : SubtargetFeature<"NameA", "", "", "">;
|
||||
|
||||
// CHECK: [[FILE]]:[[@LINE+2]]:5: error: Feature `NameA` already defined.
|
||||
// CHECK: [[FILE]]:[[@LINE-3]]:5: note: Previous definition here.
|
||||
def FeatureB : SubtargetFeature<"NameA", "", "", "">;
|
@ -14,9 +14,11 @@
|
||||
#include "Common/CodeGenSchedule.h"
|
||||
#include "Common/CodeGenTarget.h"
|
||||
#include "Common/PredicateExpander.h"
|
||||
#include "llvm/ADT/DenseMap.h"
|
||||
#include "llvm/ADT/STLExtras.h"
|
||||
#include "llvm/ADT/SmallPtrSet.h"
|
||||
#include "llvm/ADT/StringExtras.h"
|
||||
#include "llvm/ADT/StringMap.h"
|
||||
#include "llvm/ADT/StringRef.h"
|
||||
#include "llvm/MC/MCInstrItineraries.h"
|
||||
#include "llvm/MC/MCSchedule.h"
|
||||
@ -31,8 +33,6 @@
|
||||
#include <cassert>
|
||||
#include <cstdint>
|
||||
#include <iterator>
|
||||
#include <map>
|
||||
#include <set>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
@ -259,8 +259,8 @@ unsigned SubtargetEmitter::FeatureKeyValues(
|
||||
|
||||
llvm::sort(FeatureList, LessRecordFieldName());
|
||||
|
||||
// Check that there are no duplicate keys
|
||||
std::set<StringRef> UniqueKeys;
|
||||
// Check that there are no duplicate features.
|
||||
DenseMap<StringRef, const Record *> UniqueFeatures;
|
||||
|
||||
// Begin feature table
|
||||
OS << "// Sorted (by key) array of values for CPU features.\n"
|
||||
@ -291,9 +291,12 @@ unsigned SubtargetEmitter::FeatureKeyValues(
|
||||
OS << " },\n";
|
||||
++NumFeatures;
|
||||
|
||||
if (!UniqueKeys.insert(CommandLineName).second)
|
||||
PrintFatalError("Duplicate key in SubtargetFeatureKV: " +
|
||||
CommandLineName);
|
||||
auto [It, Inserted] = UniqueFeatures.insert({CommandLineName, Feature});
|
||||
if (!Inserted) {
|
||||
PrintError(Feature, "Feature `" + CommandLineName + "` already defined.");
|
||||
const Record *Previous = It->second;
|
||||
PrintFatalNote(Previous, "Previous definition here.");
|
||||
}
|
||||
}
|
||||
|
||||
// End feature table
|
||||
@ -494,7 +497,7 @@ void SubtargetEmitter::EmitStageAndOperandCycleData(
|
||||
// operand cycles, and pipeline bypass tables. Then add the new Itinerary
|
||||
// object with computed offsets to the ProcItinLists result.
|
||||
unsigned StageCount = 1, OperandCycleCount = 1;
|
||||
std::map<std::string, unsigned> ItinStageMap, ItinOperandMap;
|
||||
StringMap<unsigned> ItinStageMap, ItinOperandMap;
|
||||
for (const CodeGenProcModel &ProcModel : SchedModels.procModels()) {
|
||||
// Add process itinerary to the list.
|
||||
std::vector<InstrItinerary> &ItinList = ProcItinLists.emplace_back();
|
||||
|
Loading…
x
Reference in New Issue
Block a user