RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-03-05 09:09:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ArrayRef-ize the Feature and Processor tables for SubtargetFeatures.

Browse Source 
This removes arguments passed everywhere and allows the use of
standard iteration over lists.
Should be no functional change.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@208127 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Christopher 2014-05-06 20:23:04 +00:00
parent 3949749701
commit d474181920
5 changed files with 73 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/llvm/MC/MCSubtargetInfo.h
View File

@ -28,8 +28,8 @@ class StringRef;
/// ///
class MCSubtargetInfo { class MCSubtargetInfo {
std::string TargetTriple; // Target triple std::string TargetTriple; // Target triple
const SubtargetFeatureKV *ProcFeatures; // Processor feature list ArrayRef<SubtargetFeatureKV> ProcFeatures; // Processor feature list
const SubtargetFeatureKV *ProcDesc; // Processor descriptions ArrayRef<SubtargetFeatureKV> ProcDesc; // Processor descriptions
// Scheduler machine model // Scheduler machine model
const SubtargetInfoKV *ProcSchedModels; const SubtargetInfoKV *ProcSchedModels;
@ -41,21 +41,18 @@ class MCSubtargetInfo {
const InstrStage *Stages; // Instruction itinerary stages const InstrStage *Stages; // Instruction itinerary stages
const unsigned *OperandCycles; // Itinerary operand cycles const unsigned *OperandCycles; // Itinerary operand cycles
const unsigned *ForwardingPaths; // Forwarding paths const unsigned *ForwardingPaths; // Forwarding paths
unsigned NumFeatures; // Number of processor features
unsigned NumProcs; // Number of processors
uint64_t FeatureBits; // Feature bits for current CPU + FS uint64_t FeatureBits; // Feature bits for current CPU + FS
public: public:
void InitMCSubtargetInfo(StringRef TT, StringRef CPU, StringRef FS, void InitMCSubtargetInfo(StringRef TT, StringRef CPU, StringRef FS,
const SubtargetFeatureKV *PF, ArrayRef<SubtargetFeatureKV> PF,
const SubtargetFeatureKV *PD, ArrayRef<SubtargetFeatureKV> PD,
const SubtargetInfoKV *ProcSched, const SubtargetInfoKV *ProcSched,
const MCWriteProcResEntry *WPR, const MCWriteProcResEntry *WPR,
const MCWriteLatencyEntry *WL, const MCWriteLatencyEntry *WL,
const MCReadAdvanceEntry *RA, const MCReadAdvanceEntry *RA,
const InstrStage *IS, const InstrStage *IS,
const unsigned *OC, const unsigned *FP, const unsigned *OC, const unsigned *FP);
unsigned NF, unsigned NP);
/// getTargetTriple - Return the target triple string. /// getTargetTriple - Return the target triple string.
StringRef getTargetTriple() const { StringRef getTargetTriple() const {

11
include/llvm/MC/SubtargetFeature.h
View File

@ -18,9 +18,9 @@
#ifndef LLVM_MC_SUBTARGETFEATURE_H #ifndef LLVM_MC_SUBTARGETFEATURE_H
#define LLVM_MC_SUBTARGETFEATURE_H #define LLVM_MC_SUBTARGETFEATURE_H
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/Triple.h" #include "llvm/ADT/Triple.h"
#include "llvm/Support/DataTypes.h" #include "llvm/Support/DataTypes.h"
#include <vector>
namespace llvm { namespace llvm {
class raw_ostream; class raw_ostream;
@ -83,15 +83,12 @@ public:
/// ToggleFeature - Toggle a feature and returns the newly updated feature /// ToggleFeature - Toggle a feature and returns the newly updated feature
/// bits. /// bits.
uint64_t ToggleFeature(uint64_t Bits, const StringRef String, uint64_t ToggleFeature(uint64_t Bits, const StringRef String,
const SubtargetFeatureKV *FeatureTable, ArrayRef<SubtargetFeatureKV> FeatureTable);
size_t FeatureTableSize);
/// Get feature bits of a CPU. /// Get feature bits of a CPU.
uint64_t getFeatureBits(const StringRef CPU, uint64_t getFeatureBits(const StringRef CPU,
const SubtargetFeatureKV *CPUTable, ArrayRef<SubtargetFeatureKV> CPUTable,
size_t CPUTableSize, ArrayRef<SubtargetFeatureKV> FeatureTable);
const SubtargetFeatureKV *FeatureTable,
size_t FeatureTableSize);
/// Print feature string. /// Print feature string.
void print(raw_ostream &OS) const; void print(raw_ostream &OS) const;

17
lib/MC/MCSubtargetInfo.cpp
View File

@ -24,9 +24,7 @@ MCSchedModel MCSchedModel::DefaultSchedModel; // For unknown processors.
void void
MCSubtargetInfo::InitMCProcessorInfo(StringRef CPU, StringRef FS) { MCSubtargetInfo::InitMCProcessorInfo(StringRef CPU, StringRef FS) {
SubtargetFeatures Features(FS); SubtargetFeatures Features(FS);
FeatureBits = Features.getFeatureBits(CPU, ProcDesc, NumProcs, FeatureBits = Features.getFeatureBits(CPU, ProcDesc, ProcFeatures);
ProcFeatures, NumFeatures);
InitCPUSchedModel(CPU); InitCPUSchedModel(CPU);
} }
@ -40,16 +38,15 @@ MCSubtargetInfo::InitCPUSchedModel(StringRef CPU) {
void void
MCSubtargetInfo::InitMCSubtargetInfo(StringRef TT, StringRef CPU, StringRef FS, MCSubtargetInfo::InitMCSubtargetInfo(StringRef TT, StringRef CPU, StringRef FS,
const SubtargetFeatureKV *PF, ArrayRef<SubtargetFeatureKV> PF,
const SubtargetFeatureKV *PD, ArrayRef<SubtargetFeatureKV> PD,
const SubtargetInfoKV *ProcSched, const SubtargetInfoKV *ProcSched,
const MCWriteProcResEntry *WPR, const MCWriteProcResEntry *WPR,
const MCWriteLatencyEntry *WL, const MCWriteLatencyEntry *WL,
const MCReadAdvanceEntry *RA, const MCReadAdvanceEntry *RA,
const InstrStage *IS, const InstrStage *IS,
const unsigned *OC, const unsigned *OC,
const unsigned *FP, const unsigned *FP) {
unsigned NF, unsigned NP) {
TargetTriple = TT; TargetTriple = TT;
ProcFeatures = PF; ProcFeatures = PF;
ProcDesc = PD; ProcDesc = PD;
@ -61,8 +58,6 @@ MCSubtargetInfo::InitMCSubtargetInfo(StringRef TT, StringRef CPU, StringRef FS,
Stages = IS; Stages = IS;
OperandCycles = OC; OperandCycles = OC;
ForwardingPaths = FP; ForwardingPaths = FP;
NumFeatures = NF;
NumProcs = NP;
InitMCProcessorInfo(CPU, FS); InitMCProcessorInfo(CPU, FS);
} }
@ -78,8 +73,7 @@ uint64_t MCSubtargetInfo::ToggleFeature(uint64_t FB) {
/// bits. This version will also change all implied bits. /// bits. This version will also change all implied bits.
uint64_t MCSubtargetInfo::ToggleFeature(StringRef FS) { uint64_t MCSubtargetInfo::ToggleFeature(StringRef FS) {
SubtargetFeatures Features; SubtargetFeatures Features;
FeatureBits = Features.ToggleFeature(FeatureBits, FS, FeatureBits = Features.ToggleFeature(FeatureBits, FS, ProcFeatures);
ProcFeatures, NumFeatures);
return FeatureBits; return FeatureBits;
} }
@ -88,6 +82,7 @@ const MCSchedModel *
MCSubtargetInfo::getSchedModelForCPU(StringRef CPU) const { MCSubtargetInfo::getSchedModelForCPU(StringRef CPU) const {
assert(ProcSchedModels && "Processor machine model not available!"); assert(ProcSchedModels && "Processor machine model not available!");
unsigned NumProcs = ProcDesc.size();
#ifndef NDEBUG #ifndef NDEBUG
for (size_t i = 1; i < NumProcs; i++) { for (size_t i = 1; i < NumProcs; i++) {
assert(strcmp(ProcSchedModels[i - 1].Key, ProcSchedModels[i].Key) < 0 && assert(strcmp(ProcSchedModels[i - 1].Key, ProcSchedModels[i].Key) < 0 &&

106
lib/MC/SubtargetFeature.cpp
View File

@ -105,49 +105,43 @@ void SubtargetFeatures::AddFeature(const StringRef String) {
} }
/// Find KV in array using binary search. /// Find KV in array using binary search.
static const SubtargetFeatureKV *Find(StringRef S, const SubtargetFeatureKV *A, static const SubtargetFeatureKV *Find(StringRef S,
size_t L) { ArrayRef<SubtargetFeatureKV> A) {
// Determine the end of the array
const SubtargetFeatureKV *Hi = A + L;
// Binary search the array // Binary search the array
const SubtargetFeatureKV *F = std::lower_bound(A, Hi, S); auto F = std::lower_bound(A.begin(), A.end(), S);
// If not found then return NULL // If not found then return NULL
if (F == Hi || StringRef(F->Key) != S) return nullptr; if (F == A.end() || StringRef(F->Key) != S) return nullptr;
// Return the found array item // Return the found array item
return F; return F;
} }
/// getLongestEntryLength - Return the length of the longest entry in the table. /// getLongestEntryLength - Return the length of the longest entry in the table.
/// ///
static size_t getLongestEntryLength(const SubtargetFeatureKV *Table, static size_t getLongestEntryLength(ArrayRef<SubtargetFeatureKV> Table) {
size_t Size) {
size_t MaxLen = 0; size_t MaxLen = 0;
for (size_t i = 0; i < Size; i++) for (auto &I : Table)
MaxLen = std::max(MaxLen, std::strlen(Table[i].Key)); MaxLen = std::max(MaxLen, std::strlen(I.Key));
return MaxLen; return MaxLen;
} }
/// Display help for feature choices. /// Display help for feature choices.
/// ///
static void Help(const SubtargetFeatureKV *CPUTable, size_t CPUTableSize, static void Help(ArrayRef<SubtargetFeatureKV> CPUTable,
const SubtargetFeatureKV *FeatTable, ArrayRef<SubtargetFeatureKV> FeatTable) {
size_t FeatTableSize) {
// Determine the length of the longest CPU and Feature entries. // Determine the length of the longest CPU and Feature entries.
unsigned MaxCPULen = getLongestEntryLength(CPUTable, CPUTableSize); unsigned MaxCPULen = getLongestEntryLength(CPUTable);
unsigned MaxFeatLen = getLongestEntryLength(FeatTable, FeatTableSize); unsigned MaxFeatLen = getLongestEntryLength(FeatTable);
// Print the CPU table. // Print the CPU table.
errs() << "Available CPUs for this target:\n\n"; errs() << "Available CPUs for this target:\n\n";
for (size_t i = 0; i != CPUTableSize; i++) for (auto &CPU : CPUTable)
errs() << format(" %-*s - %s.\n", errs() << format(" %-*s - %s.\n", MaxCPULen, CPU.Key, CPU.Desc);
MaxCPULen, CPUTable[i].Key, CPUTable[i].Desc);
errs() << '\n'; errs() << '\n';
// Print the Feature table. // Print the Feature table.
errs() << "Available features for this target:\n\n"; errs() << "Available features for this target:\n\n";
for (size_t i = 0; i != FeatTableSize; i++) for (auto &Feature : FeatTable)
errs() << format(" %-*s - %s.\n", errs() << format(" %-*s - %s.\n", MaxFeatLen, Feature.Key, Feature.Desc);
MaxFeatLen, FeatTable[i].Key, FeatTable[i].Desc);
errs() << '\n'; errs() << '\n';
errs() << "Use +feature to enable a feature, or -feature to disable it.\n" errs() << "Use +feature to enable a feature, or -feature to disable it.\n"
@ -173,16 +167,13 @@ std::string SubtargetFeatures::getString() const {
/// ///
static static
void SetImpliedBits(uint64_t &Bits, const SubtargetFeatureKV *FeatureEntry, void SetImpliedBits(uint64_t &Bits, const SubtargetFeatureKV *FeatureEntry,
const SubtargetFeatureKV *FeatureTable, ArrayRef<SubtargetFeatureKV> FeatureTable) {
size_t FeatureTableSize) { for (auto &FE : FeatureTable) {
for (size_t i = 0; i < FeatureTableSize; ++i) {
const SubtargetFeatureKV &FE = FeatureTable[i];
if (FeatureEntry->Value == FE.Value) continue; if (FeatureEntry->Value == FE.Value) continue;
if (FeatureEntry->Implies & FE.Value) { if (FeatureEntry->Implies & FE.Value) {
Bits |= FE.Value; Bits |= FE.Value;
SetImpliedBits(Bits, &FE, FeatureTable, FeatureTableSize); SetImpliedBits(Bits, &FE, FeatureTable);
} }
} }
} }
@ -192,41 +183,38 @@ void SetImpliedBits(uint64_t &Bits, const SubtargetFeatureKV *FeatureEntry,
/// ///
static static
void ClearImpliedBits(uint64_t &Bits, const SubtargetFeatureKV *FeatureEntry, void ClearImpliedBits(uint64_t &Bits, const SubtargetFeatureKV *FeatureEntry,
const SubtargetFeatureKV *FeatureTable, ArrayRef<SubtargetFeatureKV> FeatureTable) {
size_t FeatureTableSize) { for (auto &FE : FeatureTable) {
for (size_t i = 0; i < FeatureTableSize; ++i) {
const SubtargetFeatureKV &FE = FeatureTable[i];
if (FeatureEntry->Value == FE.Value) continue; if (FeatureEntry->Value == FE.Value) continue;
if (FE.Implies & FeatureEntry->Value) { if (FE.Implies & FeatureEntry->Value) {
Bits &= ~FE.Value; Bits &= ~FE.Value;
ClearImpliedBits(Bits, &FE, FeatureTable, FeatureTableSize); ClearImpliedBits(Bits, &FE, FeatureTable);
} }
} }
} }
/// ToggleFeature - Toggle a feature and returns the newly updated feature /// ToggleFeature - Toggle a feature and returns the newly updated feature
/// bits. /// bits.
uint64_t uint64_t SubtargetFeatures::ToggleFeature(
SubtargetFeatures::ToggleFeature(uint64_t Bits, const StringRef Feature, uint64_t Bits, const StringRef Feature,
const SubtargetFeatureKV *FeatureTable, ArrayRef<SubtargetFeatureKV> FeatureTable) {
size_t FeatureTableSize) {
// Find feature in table. // Find feature in table.
const SubtargetFeatureKV *FeatureEntry = const SubtargetFeatureKV *FeatureEntry =
Find(StripFlag(Feature), FeatureTable, FeatureTableSize); Find(StripFlag(Feature), FeatureTable);
// If there is a match // If there is a match
if (FeatureEntry) { if (FeatureEntry) {
if ((Bits & FeatureEntry->Value) == FeatureEntry->Value) { if ((Bits & FeatureEntry->Value) == FeatureEntry->Value) {
Bits &= ~FeatureEntry->Value; Bits &= ~FeatureEntry->Value;
// For each feature that implies this, clear it. // For each feature that implies this, clear it.
ClearImpliedBits(Bits, FeatureEntry, FeatureTable, FeatureTableSize); ClearImpliedBits(Bits, FeatureEntry, FeatureTable);
} else { } else {
Bits |= FeatureEntry->Value; Bits |= FeatureEntry->Value;
// For each feature that this implies, set it. // For each feature that this implies, set it.
SetImpliedBits(Bits, FeatureEntry, FeatureTable, FeatureTableSize); SetImpliedBits(Bits, FeatureEntry, FeatureTable);
} }
} else { } else {
errs() << "'" << Feature errs() << "'" << Feature
@ -240,20 +228,20 @@ SubtargetFeatures::ToggleFeature(uint64_t Bits, const StringRef Feature,
/// getFeatureBits - Get feature bits a CPU. /// getFeatureBits - Get feature bits a CPU.
/// ///
uint64_t SubtargetFeatures::getFeatureBits(const StringRef CPU, uint64_t
const SubtargetFeatureKV *CPUTable, SubtargetFeatures::getFeatureBits(const StringRef CPU,
size_t CPUTableSize, ArrayRef<SubtargetFeatureKV> CPUTable,
const SubtargetFeatureKV *FeatureTable, ArrayRef<SubtargetFeatureKV> FeatureTable) {
size_t FeatureTableSize) {
if (!FeatureTableSize || !CPUTableSize) if (CPUTable.empty() || FeatureTable.empty())
return 0; return 0;
#ifndef NDEBUG #ifndef NDEBUG
for (size_t i = 1; i < CPUTableSize; i++) { for (size_t i = 1, e = CPUTable.size(); i != e; ++i) {
assert(strcmp(CPUTable[i - 1].Key, CPUTable[i].Key) < 0 && assert(strcmp(CPUTable[i - 1].Key, CPUTable[i].Key) < 0 &&
"CPU table is not sorted"); "CPU table is not sorted");
} }
for (size_t i = 1; i < FeatureTableSize; i++) { for (size_t i = 1, e = FeatureTable.size(); i != e; ++i) {
assert(strcmp(FeatureTable[i - 1].Key, FeatureTable[i].Key) < 0 && assert(strcmp(FeatureTable[i - 1].Key, FeatureTable[i].Key) < 0 &&
"CPU features table is not sorted"); "CPU features table is not sorted");
} }
@ -262,21 +250,21 @@ uint64_t SubtargetFeatures::getFeatureBits(const StringRef CPU,
// Check if help is needed // Check if help is needed
if (CPU == "help") if (CPU == "help")
Help(CPUTable, CPUTableSize, FeatureTable, FeatureTableSize); Help(CPUTable, FeatureTable);
// Find CPU entry if CPU name is specified. // Find CPU entry if CPU name is specified.
else if (!CPU.empty()) { else if (!CPU.empty()) {
const SubtargetFeatureKV *CPUEntry = Find(CPU, CPUTable, CPUTableSize); const SubtargetFeatureKV *CPUEntry = Find(CPU, CPUTable);
// If there is a match // If there is a match
if (CPUEntry) { if (CPUEntry) {
// Set base feature bits // Set base feature bits
Bits = CPUEntry->Value; Bits = CPUEntry->Value;
// Set the feature implied by this CPU feature, if any. // Set the feature implied by this CPU feature, if any.
for (size_t i = 0; i < FeatureTableSize; ++i) { for (auto &FE : FeatureTable) {
const SubtargetFeatureKV &FE = FeatureTable[i];
if (CPUEntry->Value & FE.Value) if (CPUEntry->Value & FE.Value)
SetImpliedBits(Bits, &FE, FeatureTable, FeatureTableSize); SetImpliedBits(Bits, &FE, FeatureTable);
} }
} else { } else {
errs() << "'" << CPU errs() << "'" << CPU
@ -286,16 +274,14 @@ uint64_t SubtargetFeatures::getFeatureBits(const StringRef CPU,
} }
// Iterate through each feature // Iterate through each feature
for (size_t i = 0, E = Features.size(); i < E; i++) { for (auto &Feature : Features) {
const StringRef Feature = Features[i];
// Check for help // Check for help
if (Feature == "+help") if (Feature == "+help")
Help(CPUTable, CPUTableSize, FeatureTable, FeatureTableSize); Help(CPUTable, FeatureTable);
// Find feature in table. // Find feature in table.
const SubtargetFeatureKV *FeatureEntry = const SubtargetFeatureKV *FeatureEntry =
Find(StripFlag(Feature), FeatureTable, FeatureTableSize); Find(StripFlag(Feature), FeatureTable);
// If there is a match // If there is a match
if (FeatureEntry) { if (FeatureEntry) {
// Enable/disable feature in bits // Enable/disable feature in bits
@ -303,12 +289,12 @@ uint64_t SubtargetFeatures::getFeatureBits(const StringRef CPU,
Bits |= FeatureEntry->Value; Bits |= FeatureEntry->Value;
// For each feature that this implies, set it. // For each feature that this implies, set it.
SetImpliedBits(Bits, FeatureEntry, FeatureTable, FeatureTableSize); SetImpliedBits(Bits, FeatureEntry, FeatureTable);
} else { } else {
Bits &= ~FeatureEntry->Value; Bits &= ~FeatureEntry->Value;
// For each feature that implies this, clear it. // For each feature that implies this, clear it.
ClearImpliedBits(Bits, FeatureEntry, FeatureTable, FeatureTableSize); ClearImpliedBits(Bits, FeatureEntry, FeatureTable);
} }
} else { } else {
errs() << "'" << Feature errs() << "'" << Feature

24
utils/TableGen/SubtargetEmitter.cpp
View File

@ -1454,11 +1454,11 @@ void SubtargetEmitter::run(raw_ostream &OS) {
if (NumFeatures) if (NumFeatures)
OS << Target << "FeatureKV, "; OS << Target << "FeatureKV, ";
else else
OS << "0, "; OS << "None, ";
if (NumProcs) if (NumProcs)
OS << Target << "SubTypeKV, "; OS << Target << "SubTypeKV, ";
else else
OS << "0, "; OS << "None, ";
OS << '\n'; OS.indent(22); OS << '\n'; OS.indent(22);
OS << Target << "ProcSchedKV, " OS << Target << "ProcSchedKV, "
<< Target << "WriteProcResTable, " << Target << "WriteProcResTable, "
@ -1468,10 +1468,10 @@ void SubtargetEmitter::run(raw_ostream &OS) {
OS << '\n'; OS.indent(22); OS << '\n'; OS.indent(22);
OS << Target << "Stages, " OS << Target << "Stages, "
<< Target << "OperandCycles, " << Target << "OperandCycles, "
<< Target << "ForwardingPaths, "; << Target << "ForwardingPaths";
} else } else
OS << "0, 0, 0, "; OS << "0, 0, 0";
OS << NumFeatures << ", " << NumProcs << ");\n}\n\n"; OS << ");\n}\n\n";
OS << "} // End llvm namespace \n"; OS << "} // End llvm namespace \n";
@ -1532,13 +1532,13 @@ void SubtargetEmitter::run(raw_ostream &OS) {
<< " : TargetSubtargetInfo() {\n" << " : TargetSubtargetInfo() {\n"
<< " InitMCSubtargetInfo(TT, CPU, FS, "; << " InitMCSubtargetInfo(TT, CPU, FS, ";
if (NumFeatures) if (NumFeatures)
OS << Target << "FeatureKV, "; OS << "makeArrayRef(" << Target << "FeatureKV, " << NumFeatures << "), ";
else else
OS << "0, "; OS << "None, ";
if (NumProcs) if (NumProcs)
OS << Target << "SubTypeKV, "; OS << "makeArrayRef(" << Target << "SubTypeKV, " << NumProcs << "), ";
else else
OS << "0, "; OS << "None, ";
OS << '\n'; OS.indent(22); OS << '\n'; OS.indent(22);
OS << Target << "ProcSchedKV, " OS << Target << "ProcSchedKV, "
<< Target << "WriteProcResTable, " << Target << "WriteProcResTable, "
@ -1548,10 +1548,10 @@ void SubtargetEmitter::run(raw_ostream &OS) {
if (SchedModels.hasItineraries()) { if (SchedModels.hasItineraries()) {
OS << Target << "Stages, " OS << Target << "Stages, "
<< Target << "OperandCycles, " << Target << "OperandCycles, "
<< Target << "ForwardingPaths, "; << Target << "ForwardingPaths";
} else } else
OS << "0, 0, 0, "; OS << "0, 0, 0";
OS << NumFeatures << ", " << NumProcs << ");\n}\n\n"; OS << ");\n}\n\n";
EmitSchedModelHelpers(ClassName, OS); EmitSchedModelHelpers(ClassName, OS);