whitespace

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@128701 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Andrew Trick 2011-04-01 01:56:55 +00:00
parent 8e23e815ad
commit da96cf2029
2 changed files with 68 additions and 68 deletions

View File

@ -31,24 +31,24 @@ void SubtargetEmitter::Enumeration(raw_ostream &OS,
// Open enumeration // Open enumeration
OS << "enum {\n"; OS << "enum {\n";
// For each record // For each record
for (unsigned i = 0, N = DefList.size(); i < N;) { for (unsigned i = 0, N = DefList.size(); i < N;) {
// Next record // Next record
Record *Def = DefList[i]; Record *Def = DefList[i];
// Get and emit name // Get and emit name
OS << " " << Def->getName(); OS << " " << Def->getName();
// If bit flags then emit expression (1 << i) // If bit flags then emit expression (1 << i)
if (isBits) OS << " = " << " 1 << " << i; if (isBits) OS << " = " << " 1 << " << i;
// Depending on 'if more in the list' emit comma // Depending on 'if more in the list' emit comma
if (++i < N) OS << ","; if (++i < N) OS << ",";
OS << "\n"; OS << "\n";
} }
// Close enumeration // Close enumeration
OS << "};\n"; OS << "};\n";
} }
@ -66,7 +66,7 @@ void SubtargetEmitter::FeatureKeyValues(raw_ostream &OS) {
// Begin feature table // Begin feature table
OS << "// Sorted (by key) array of values for CPU features.\n" OS << "// Sorted (by key) array of values for CPU features.\n"
<< "static const llvm::SubtargetFeatureKV FeatureKV[] = {\n"; << "static const llvm::SubtargetFeatureKV FeatureKV[] = {\n";
// For each feature // For each feature
for (unsigned i = 0, N = FeatureList.size(); i < N; ++i) { for (unsigned i = 0, N = FeatureList.size(); i < N; ++i) {
// Next feature // Next feature
@ -75,18 +75,18 @@ void SubtargetEmitter::FeatureKeyValues(raw_ostream &OS) {
const std::string &Name = Feature->getName(); const std::string &Name = Feature->getName();
const std::string &CommandLineName = Feature->getValueAsString("Name"); const std::string &CommandLineName = Feature->getValueAsString("Name");
const std::string &Desc = Feature->getValueAsString("Desc"); const std::string &Desc = Feature->getValueAsString("Desc");
if (CommandLineName.empty()) continue; if (CommandLineName.empty()) continue;
// Emit as { "feature", "description", featureEnum, i1 | i2 | ... | in } // Emit as { "feature", "description", featureEnum, i1 | i2 | ... | in }
OS << " { " OS << " { "
<< "\"" << CommandLineName << "\", " << "\"" << CommandLineName << "\", "
<< "\"" << Desc << "\", " << "\"" << Desc << "\", "
<< Name << ", "; << Name << ", ";
const std::vector<Record*> &ImpliesList = const std::vector<Record*> &ImpliesList =
Feature->getValueAsListOfDefs("Implies"); Feature->getValueAsListOfDefs("Implies");
if (ImpliesList.empty()) { if (ImpliesList.empty()) {
OS << "0"; OS << "0";
} else { } else {
@ -97,13 +97,13 @@ void SubtargetEmitter::FeatureKeyValues(raw_ostream &OS) {
} }
OS << " }"; OS << " }";
// Depending on 'if more in the list' emit comma // Depending on 'if more in the list' emit comma
if ((i + 1) < N) OS << ","; if ((i + 1) < N) OS << ",";
OS << "\n"; OS << "\n";
} }
// End feature table // End feature table
OS << "};\n"; OS << "};\n";
@ -126,21 +126,21 @@ void SubtargetEmitter::CPUKeyValues(raw_ostream &OS) {
// Begin processor table // Begin processor table
OS << "// Sorted (by key) array of values for CPU subtype.\n" OS << "// Sorted (by key) array of values for CPU subtype.\n"
<< "static const llvm::SubtargetFeatureKV SubTypeKV[] = {\n"; << "static const llvm::SubtargetFeatureKV SubTypeKV[] = {\n";
// For each processor // For each processor
for (unsigned i = 0, N = ProcessorList.size(); i < N;) { for (unsigned i = 0, N = ProcessorList.size(); i < N;) {
// Next processor // Next processor
Record *Processor = ProcessorList[i]; Record *Processor = ProcessorList[i];
const std::string &Name = Processor->getValueAsString("Name"); const std::string &Name = Processor->getValueAsString("Name");
const std::vector<Record*> &FeatureList = const std::vector<Record*> &FeatureList =
Processor->getValueAsListOfDefs("Features"); Processor->getValueAsListOfDefs("Features");
// Emit as { "cpu", "description", f1 | f2 | ... fn }, // Emit as { "cpu", "description", f1 | f2 | ... fn },
OS << " { " OS << " { "
<< "\"" << Name << "\", " << "\"" << Name << "\", "
<< "\"Select the " << Name << " processor\", "; << "\"Select the " << Name << " processor\", ";
if (FeatureList.empty()) { if (FeatureList.empty()) {
OS << "0"; OS << "0";
} else { } else {
@ -149,16 +149,16 @@ void SubtargetEmitter::CPUKeyValues(raw_ostream &OS) {
if (++j < M) OS << " | "; if (++j < M) OS << " | ";
} }
} }
// The "0" is for the "implies" section of this data structure. // The "0" is for the "implies" section of this data structure.
OS << ", 0 }"; OS << ", 0 }";
// Depending on 'if more in the list' emit comma // Depending on 'if more in the list' emit comma
if (++i < N) OS << ","; if (++i < N) OS << ",";
OS << "\n"; OS << "\n";
} }
// End processor table // End processor table
OS << "};\n"; OS << "};\n";
@ -185,7 +185,7 @@ CollectAllItinClasses(raw_ostream &OS,
// Assign itinerary class a unique number // Assign itinerary class a unique number
ItinClassesMap[ItinClass->getName()] = i; ItinClassesMap[ItinClass->getName()] = i;
} }
// Emit size of table // Emit size of table
OS<<"\nenum {\n"; OS<<"\nenum {\n";
OS<<" ItinClassesSize = " << N << "\n"; OS<<" ItinClassesSize = " << N << "\n";
@ -213,21 +213,21 @@ void SubtargetEmitter::FormItineraryStageString(const std::string &Name,
for (unsigned i = 0; i < N;) { for (unsigned i = 0; i < N;) {
// Next stage // Next stage
const Record *Stage = StageList[i]; const Record *Stage = StageList[i];
// Form string as ,{ cycles, u1 | u2 | ... | un, timeinc, kind } // Form string as ,{ cycles, u1 | u2 | ... | un, timeinc, kind }
int Cycles = Stage->getValueAsInt("Cycles"); int Cycles = Stage->getValueAsInt("Cycles");
ItinString += " { " + itostr(Cycles) + ", "; ItinString += " { " + itostr(Cycles) + ", ";
// Get unit list // Get unit list
const std::vector<Record*> &UnitList = Stage->getValueAsListOfDefs("Units"); const std::vector<Record*> &UnitList = Stage->getValueAsListOfDefs("Units");
// For each unit // For each unit
for (unsigned j = 0, M = UnitList.size(); j < M;) { for (unsigned j = 0, M = UnitList.size(); j < M;) {
// Add name and bitwise or // Add name and bitwise or
ItinString += Name + "FU::" + UnitList[j]->getName(); ItinString += Name + "FU::" + UnitList[j]->getName();
if (++j < M) ItinString += " | "; if (++j < M) ItinString += " | ";
} }
int TimeInc = Stage->getValueAsInt("TimeInc"); int TimeInc = Stage->getValueAsInt("TimeInc");
ItinString += ", " + itostr(TimeInc); ItinString += ", " + itostr(TimeInc);
@ -256,7 +256,7 @@ void SubtargetEmitter::FormItineraryOperandCycleString(Record *ItinData,
for (unsigned i = 0; i < N;) { for (unsigned i = 0; i < N;) {
// Next operand cycle // Next operand cycle
const int OCycle = OperandCycleList[i]; const int OCycle = OperandCycleList[i];
ItinString += " " + itostr(OCycle); ItinString += " " + itostr(OCycle);
if (++i < N) ItinString += ", "; if (++i < N) ItinString += ", ";
} }
@ -292,7 +292,7 @@ void SubtargetEmitter::EmitStageAndOperandCycleData(raw_ostream &OS,
// Gather processor iteraries // Gather processor iteraries
std::vector<Record*> ProcItinList = std::vector<Record*> ProcItinList =
Records.getAllDerivedDefinitions("ProcessorItineraries"); Records.getAllDerivedDefinitions("ProcessorItineraries");
// If just no itinerary then don't bother // If just no itinerary then don't bother
if (ProcItinList.size() < 2) return; if (ProcItinList.size() < 2) return;
@ -332,7 +332,7 @@ void SubtargetEmitter::EmitStageAndOperandCycleData(raw_ostream &OS,
// Begin stages table // Begin stages table
std::string StageTable = "\nstatic const llvm::InstrStage Stages[] = {\n"; std::string StageTable = "\nstatic const llvm::InstrStage Stages[] = {\n";
StageTable += " { 0, 0, 0, llvm::InstrStage::Required }, // No itinerary\n"; StageTable += " { 0, 0, 0, llvm::InstrStage::Required }, // No itinerary\n";
// Begin operand cycle table // Begin operand cycle table
std::string OperandCycleTable = "static const unsigned OperandCycles[] = {\n"; std::string OperandCycleTable = "static const unsigned OperandCycles[] = {\n";
OperandCycleTable += " 0, // No itinerary\n"; OperandCycleTable += " 0, // No itinerary\n";
@ -340,32 +340,32 @@ void SubtargetEmitter::EmitStageAndOperandCycleData(raw_ostream &OS,
// Begin pipeline bypass table // Begin pipeline bypass table
std::string BypassTable = "static const unsigned ForwardingPathes[] = {\n"; std::string BypassTable = "static const unsigned ForwardingPathes[] = {\n";
BypassTable += " 0, // No itinerary\n"; BypassTable += " 0, // No itinerary\n";
unsigned StageCount = 1, OperandCycleCount = 1; unsigned StageCount = 1, OperandCycleCount = 1;
unsigned ItinStageEnum = 1, ItinOperandCycleEnum = 1; unsigned ItinStageEnum = 1, ItinOperandCycleEnum = 1;
std::map<std::string, unsigned> ItinStageMap, ItinOperandMap; std::map<std::string, unsigned> ItinStageMap, ItinOperandMap;
for (unsigned i = 0, N = ProcItinList.size(); i < N; i++) { for (unsigned i = 0, N = ProcItinList.size(); i < N; i++) {
// Next record // Next record
Record *Proc = ProcItinList[i]; Record *Proc = ProcItinList[i];
// Get processor itinerary name // Get processor itinerary name
const std::string &Name = Proc->getName(); const std::string &Name = Proc->getName();
// Skip default // Skip default
if (Name == "NoItineraries") continue; if (Name == "NoItineraries") continue;
// Create and expand processor itinerary to cover all itinerary classes // Create and expand processor itinerary to cover all itinerary classes
std::vector<InstrItinerary> ItinList; std::vector<InstrItinerary> ItinList;
ItinList.resize(NItinClasses); ItinList.resize(NItinClasses);
// Get itinerary data list // Get itinerary data list
std::vector<Record*> ItinDataList = Proc->getValueAsListOfDefs("IID"); std::vector<Record*> ItinDataList = Proc->getValueAsListOfDefs("IID");
// For each itinerary data // For each itinerary data
for (unsigned j = 0, M = ItinDataList.size(); j < M; j++) { for (unsigned j = 0, M = ItinDataList.size(); j < M; j++) {
// Next itinerary data // Next itinerary data
Record *ItinData = ItinDataList[j]; Record *ItinData = ItinDataList[j];
// Get string and stage count // Get string and stage count
std::string ItinStageString; std::string ItinStageString;
unsigned NStages; unsigned NStages;
@ -394,7 +394,7 @@ void SubtargetEmitter::EmitStageAndOperandCycleData(raw_ostream &OS,
ItinStageEnum++; ItinStageEnum++;
} }
} }
// Check to see if operand cycle already exists and create if it doesn't // Check to see if operand cycle already exists and create if it doesn't
unsigned FindOperandCycle = 0; unsigned FindOperandCycle = 0;
if (NOperandCycles > 0) { if (NOperandCycles > 0) {
@ -402,25 +402,25 @@ void SubtargetEmitter::EmitStageAndOperandCycleData(raw_ostream &OS,
FindOperandCycle = ItinOperandMap[ItinOperandString]; FindOperandCycle = ItinOperandMap[ItinOperandString];
if (FindOperandCycle == 0) { if (FindOperandCycle == 0) {
// Emit as cycle, // index // Emit as cycle, // index
OperandCycleTable += ItinOperandCycleString + ", // " + OperandCycleTable += ItinOperandCycleString + ", // " +
itostr(ItinOperandCycleEnum) + "\n"; itostr(ItinOperandCycleEnum) + "\n";
// Record Itin class number. // Record Itin class number.
ItinOperandMap[ItinOperandCycleString] = ItinOperandMap[ItinOperandCycleString] =
FindOperandCycle = OperandCycleCount; FindOperandCycle = OperandCycleCount;
// Emit as bypass, // index // Emit as bypass, // index
BypassTable += ItinBypassString + ", // " + BypassTable += ItinBypassString + ", // " +
itostr(ItinOperandCycleEnum) + "\n"; itostr(ItinOperandCycleEnum) + "\n";
OperandCycleCount += NOperandCycles; OperandCycleCount += NOperandCycles;
ItinOperandCycleEnum++; ItinOperandCycleEnum++;
} }
} }
// Locate where to inject into processor itinerary table // Locate where to inject into processor itinerary table
const std::string &Name = ItinData->getValueAsDef("TheClass")->getName(); const std::string &Name = ItinData->getValueAsDef("TheClass")->getName();
unsigned Find = ItinClassesMap[Name]; unsigned Find = ItinClassesMap[Name];
// Set up itinerary as location and location + stage count // Set up itinerary as location and location + stage count
unsigned NumUOps = ItinClassList[Find]->getValueAsInt("NumMicroOps"); unsigned NumUOps = ItinClassList[Find]->getValueAsInt("NumMicroOps");
InstrItinerary Intinerary = { NumUOps, FindStage, FindStage + NStages, InstrItinerary Intinerary = { NumUOps, FindStage, FindStage + NStages,
@ -430,7 +430,7 @@ void SubtargetEmitter::EmitStageAndOperandCycleData(raw_ostream &OS,
// Inject - empty slots will be 0, 0 // Inject - empty slots will be 0, 0
ItinList[Find] = Intinerary; ItinList[Find] = Intinerary;
} }
// Add process itinerary to list // Add process itinerary to list
ProcList.push_back(ItinList); ProcList.push_back(ItinList);
} }
@ -450,7 +450,7 @@ void SubtargetEmitter::EmitStageAndOperandCycleData(raw_ostream &OS,
OS << StageTable; OS << StageTable;
OS << OperandCycleTable; OS << OperandCycleTable;
OS << BypassTable; OS << BypassTable;
// Emit size of tables // Emit size of tables
OS<<"\nenum {\n"; OS<<"\nenum {\n";
OS<<" StagesSize = sizeof(Stages)/sizeof(llvm::InstrStage),\n"; OS<<" StagesSize = sizeof(Stages)/sizeof(llvm::InstrStage),\n";
@ -466,7 +466,7 @@ void SubtargetEmitter::EmitProcessorData(raw_ostream &OS,
// Get an iterator for processor itinerary stages // Get an iterator for processor itinerary stages
std::vector<std::vector<InstrItinerary> >::iterator std::vector<std::vector<InstrItinerary> >::iterator
ProcListIter = ProcList.begin(); ProcListIter = ProcList.begin();
// For each processor itinerary // For each processor itinerary
std::vector<Record*> Itins = std::vector<Record*> Itins =
Records.getAllDerivedDefinitions("ProcessorItineraries"); Records.getAllDerivedDefinitions("ProcessorItineraries");
@ -476,35 +476,35 @@ void SubtargetEmitter::EmitProcessorData(raw_ostream &OS,
// Get processor itinerary name // Get processor itinerary name
const std::string &Name = Itin->getName(); const std::string &Name = Itin->getName();
// Skip default // Skip default
if (Name == "NoItineraries") continue; if (Name == "NoItineraries") continue;
// Begin processor itinerary table // Begin processor itinerary table
OS << "\n"; OS << "\n";
OS << "static const llvm::InstrItinerary " << Name << "[] = {\n"; OS << "static const llvm::InstrItinerary " << Name << "[] = {\n";
// For each itinerary class // For each itinerary class
std::vector<InstrItinerary> &ItinList = *ProcListIter++; std::vector<InstrItinerary> &ItinList = *ProcListIter++;
for (unsigned j = 0, M = ItinList.size(); j < M; ++j) { for (unsigned j = 0, M = ItinList.size(); j < M; ++j) {
InstrItinerary &Intinerary = ItinList[j]; InstrItinerary &Intinerary = ItinList[j];
// Emit in the form of // Emit in the form of
// { firstStage, lastStage, firstCycle, lastCycle } // index // { firstStage, lastStage, firstCycle, lastCycle } // index
if (Intinerary.FirstStage == 0) { if (Intinerary.FirstStage == 0) {
OS << " { 1, 0, 0, 0, 0 }"; OS << " { 1, 0, 0, 0, 0 }";
} else { } else {
OS << " { " << OS << " { " <<
Intinerary.NumMicroOps << ", " << Intinerary.NumMicroOps << ", " <<
Intinerary.FirstStage << ", " << Intinerary.FirstStage << ", " <<
Intinerary.LastStage << ", " << Intinerary.LastStage << ", " <<
Intinerary.FirstOperandCycle << ", " << Intinerary.FirstOperandCycle << ", " <<
Intinerary.LastOperandCycle << " }"; Intinerary.LastOperandCycle << " }";
} }
OS << ", // " << j << "\n"; OS << ", // " << j << "\n";
} }
// End processor itinerary table // End processor itinerary table
OS << " { 1, ~0U, ~0U, ~0U, ~0U } // end marker\n"; OS << " { 1, ~0U, ~0U, ~0U, ~0U } // end marker\n";
OS << "};\n"; OS << "};\n";
@ -524,7 +524,7 @@ void SubtargetEmitter::EmitProcessorLookup(raw_ostream &OS) {
OS << "\n"; OS << "\n";
OS << "// Sorted (by key) array of itineraries for CPU subtype.\n" OS << "// Sorted (by key) array of itineraries for CPU subtype.\n"
<< "static const llvm::SubtargetInfoKV ProcItinKV[] = {\n"; << "static const llvm::SubtargetInfoKV ProcItinKV[] = {\n";
// For each processor // For each processor
for (unsigned i = 0, N = ProcessorList.size(); i < N;) { for (unsigned i = 0, N = ProcessorList.size(); i < N;) {
// Next processor // Next processor
@ -533,20 +533,20 @@ void SubtargetEmitter::EmitProcessorLookup(raw_ostream &OS) {
const std::string &Name = Processor->getValueAsString("Name"); const std::string &Name = Processor->getValueAsString("Name");
const std::string &ProcItin = const std::string &ProcItin =
Processor->getValueAsDef("ProcItin")->getName(); Processor->getValueAsDef("ProcItin")->getName();
// Emit as { "cpu", procinit }, // Emit as { "cpu", procinit },
OS << " { " OS << " { "
<< "\"" << Name << "\", " << "\"" << Name << "\", "
<< "(void *)&" << ProcItin; << "(void *)&" << ProcItin;
OS << " }"; OS << " }";
// Depending on ''if more in the list'' emit comma // Depending on ''if more in the list'' emit comma
if (++i < N) OS << ","; if (++i < N) OS << ",";
OS << "\n"; OS << "\n";
} }
// End processor table // End processor table
OS << "};\n"; OS << "};\n";
@ -566,13 +566,13 @@ void SubtargetEmitter::EmitData(raw_ostream &OS) {
std::vector<Record*> ItinClassList = std::vector<Record*> ItinClassList =
Records.getAllDerivedDefinitions("InstrItinClass"); Records.getAllDerivedDefinitions("InstrItinClass");
std::sort(ItinClassList.begin(), ItinClassList.end(), LessRecord()); std::sort(ItinClassList.begin(), ItinClassList.end(), LessRecord());
// Enumerate all the itinerary classes // Enumerate all the itinerary classes
unsigned NItinClasses = CollectAllItinClasses(OS, ItinClassesMap, unsigned NItinClasses = CollectAllItinClasses(OS, ItinClassesMap,
ItinClassList); ItinClassList);
// Make sure the rest is worth the effort // Make sure the rest is worth the effort
HasItineraries = NItinClasses != 1; // Ignore NoItinerary. HasItineraries = NItinClasses != 1; // Ignore NoItinerary.
if (HasItineraries) { if (HasItineraries) {
std::vector<std::vector<InstrItinerary> > ProcList; std::vector<std::vector<InstrItinerary> > ProcList;
// Emit the stage data // Emit the stage data
@ -594,8 +594,8 @@ void SubtargetEmitter::ParseFeaturesFunction(raw_ostream &OS) {
Records.getAllDerivedDefinitions("SubtargetFeature"); Records.getAllDerivedDefinitions("SubtargetFeature");
std::sort(Features.begin(), Features.end(), LessRecord()); std::sort(Features.begin(), Features.end(), LessRecord());
OS << "// ParseSubtargetFeatures - Parses features string setting specified\n" OS << "// ParseSubtargetFeatures - Parses features string setting specified\n"
<< "// subtarget options.\n" << "// subtarget options.\n"
<< "std::string llvm::"; << "std::string llvm::";
OS << Target; OS << Target;
OS << "Subtarget::ParseSubtargetFeatures(const std::string &FS,\n" OS << "Subtarget::ParseSubtargetFeatures(const std::string &FS,\n"
@ -618,7 +618,7 @@ void SubtargetEmitter::ParseFeaturesFunction(raw_ostream &OS) {
OS << " if ((Bits & " << Instance << ") != 0) " OS << " if ((Bits & " << Instance << ") != 0) "
<< Attribute << " = " << Value << ";\n"; << Attribute << " = " << Value << ";\n";
else else
OS << " if ((Bits & " << Instance << ") != 0 && " << Attribute << OS << " if ((Bits & " << Instance << ") != 0 && " << Attribute <<
" < " << Value << ") " << Attribute << " = " << Value << ";\n"; " < " << Value << ") " << Attribute << " = " << Value << ";\n";
} }

View File

@ -24,11 +24,11 @@
namespace llvm { namespace llvm {
class SubtargetEmitter : public TableGenBackend { class SubtargetEmitter : public TableGenBackend {
RecordKeeper &Records; RecordKeeper &Records;
std::string Target; std::string Target;
bool HasItineraries; bool HasItineraries;
void Enumeration(raw_ostream &OS, const char *ClassName, bool isBits); void Enumeration(raw_ostream &OS, const char *ClassName, bool isBits);
void FeatureKeyValues(raw_ostream &OS); void FeatureKeyValues(raw_ostream &OS);
void CPUKeyValues(raw_ostream &OS); void CPUKeyValues(raw_ostream &OS);
@ -52,7 +52,7 @@ class SubtargetEmitter : public TableGenBackend {
void EmitProcessorLookup(raw_ostream &OS); void EmitProcessorLookup(raw_ostream &OS);
void EmitData(raw_ostream &OS); void EmitData(raw_ostream &OS);
void ParseFeaturesFunction(raw_ostream &OS); void ParseFeaturesFunction(raw_ostream &OS);
public: public:
SubtargetEmitter(RecordKeeper &R) : Records(R), HasItineraries(false) {} SubtargetEmitter(RecordKeeper &R) : Records(R), HasItineraries(false) {}