maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert r188164: Stablize MCK_Reg ordering in AsmMatcherEmitter 

Apparently caused a failure on Darwin

llvm-svn: 188166
This commit is contained in:
Richard Sandiford 2013-08-12 10:57:51 +00:00
parent 912198585d
commit 173cf4077f
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
llvm/utils/TableGen/AsmMatcherEmitter.cpp
View File

@ -125,8 +125,6 @@ namespace {
class AsmMatcherInfo; class AsmMatcherInfo;
struct SubtargetFeatureInfo; struct SubtargetFeatureInfo;
typedef std::set<Record *, LessRecordByID> RegisterSet;
class AsmMatcherEmitter { class AsmMatcherEmitter {
RecordKeeper &Records; RecordKeeper &Records;
public: public:
@ -187,7 +185,7 @@ struct ClassInfo {
std::string ParserMethod; std::string ParserMethod;
/// For register classes, the records for all the registers in this class. /// For register classes, the records for all the registers in this class.
RegisterSet Registers; std::set<Record*> Registers;
/// For custom match classes, he diagnostic kind for when the predicate fails. /// For custom match classes, he diagnostic kind for when the predicate fails.
std::string DiagnosticType; std::string DiagnosticType;
@ -215,8 +213,8 @@ public:
if (!isRegisterClass() || !RHS.isRegisterClass()) if (!isRegisterClass() || !RHS.isRegisterClass())
return false; return false;
RegisterSet Tmp; std::set<Record*> Tmp;
std::insert_iterator<RegisterSet> II(Tmp, Tmp.begin()); std::insert_iterator< std::set<Record*> > II(Tmp, Tmp.begin());
std::set_intersection(Registers.begin(), Registers.end(), std::set_intersection(Registers.begin(), Registers.end(),
RHS.Registers.begin(), RHS.Registers.end(), RHS.Registers.begin(), RHS.Registers.end(),
II); II);
@ -1057,32 +1055,32 @@ buildRegisterClasses(SmallPtrSet<Record*, 16> &SingletonRegisters) {
Target.getRegBank().getRegClasses(); Target.getRegBank().getRegClasses();
// The register sets used for matching. // The register sets used for matching.
std::set<RegisterSet> RegisterSets; std::set< std::set<Record*> > RegisterSets;
// Gather the defined sets. // Gather the defined sets.
for (ArrayRef<CodeGenRegisterClass*>::const_iterator it = for (ArrayRef<CodeGenRegisterClass*>::const_iterator it =
RegClassList.begin(), ie = RegClassList.end(); it != ie; ++it) RegClassList.begin(), ie = RegClassList.end(); it != ie; ++it)
RegisterSets.insert(RegisterSet( RegisterSets.insert(std::set<Record*>(
(*it)->getOrder().begin(), (*it)->getOrder().end())); (*it)->getOrder().begin(), (*it)->getOrder().end()));
// Add any required singleton sets. // Add any required singleton sets.
for (SmallPtrSet<Record*, 16>::iterator it = SingletonRegisters.begin(), for (SmallPtrSet<Record*, 16>::iterator it = SingletonRegisters.begin(),
ie = SingletonRegisters.end(); it != ie; ++it) { ie = SingletonRegisters.end(); it != ie; ++it) {
Record *Rec = *it; Record *Rec = *it;
RegisterSets.insert(RegisterSet(&Rec, &Rec + 1)); RegisterSets.insert(std::set<Record*>(&Rec, &Rec + 1));
} }
// Introduce derived sets where necessary (when a register does not determine // Introduce derived sets where necessary (when a register does not determine
// a unique register set class), and build the mapping of registers to the set // a unique register set class), and build the mapping of registers to the set
// they should classify to. // they should classify to.
std::map<Record*, RegisterSet> RegisterMap; std::map<Record*, std::set<Record*> > RegisterMap;
for (std::vector<CodeGenRegister*>::const_iterator it = Registers.begin(), for (std::vector<CodeGenRegister*>::const_iterator it = Registers.begin(),
ie = Registers.end(); it != ie; ++it) { ie = Registers.end(); it != ie; ++it) {
const CodeGenRegister &CGR = **it; const CodeGenRegister &CGR = **it;
// Compute the intersection of all sets containing this register. // Compute the intersection of all sets containing this register.
RegisterSet ContainingSet; std::set<Record*> ContainingSet;
for (std::set<RegisterSet>::iterator it = RegisterSets.begin(), for (std::set< std::set<Record*> >::iterator it = RegisterSets.begin(),
ie = RegisterSets.end(); it != ie; ++it) { ie = RegisterSets.end(); it != ie; ++it) {
if (!it->count(CGR.TheDef)) if (!it->count(CGR.TheDef))
continue; continue;
@ -1092,10 +1090,10 @@ buildRegisterClasses(SmallPtrSet<Record*, 16> &SingletonRegisters) {
continue; continue;
} }
RegisterSet Tmp; std::set<Record*> Tmp;
std::swap(Tmp, ContainingSet); std::swap(Tmp, ContainingSet);
std::insert_iterator<RegisterSet> II(ContainingSet, std::insert_iterator< std::set<Record*> > II(ContainingSet,
ContainingSet.begin()); ContainingSet.begin());
std::set_intersection(Tmp.begin(), Tmp.end(), it->begin(), it->end(), II); std::set_intersection(Tmp.begin(), Tmp.end(), it->begin(), it->end(), II);
} }
@ -1106,9 +1104,9 @@ buildRegisterClasses(SmallPtrSet<Record*, 16> &SingletonRegisters) {
} }
// Construct the register classes. // Construct the register classes.
std::map<RegisterSet, ClassInfo*> RegisterSetClasses; std::map<std::set<Record*>, ClassInfo*> RegisterSetClasses;
unsigned Index = 0; unsigned Index = 0;
for (std::set<RegisterSet>::iterator it = RegisterSets.begin(), for (std::set< std::set<Record*> >::iterator it = RegisterSets.begin(),
ie = RegisterSets.end(); it != ie; ++it, ++Index) { ie = RegisterSets.end(); it != ie; ++it, ++Index) {
ClassInfo *CI = new ClassInfo(); ClassInfo *CI = new ClassInfo();
CI->Kind = ClassInfo::RegisterClass0 + Index; CI->Kind = ClassInfo::RegisterClass0 + Index;
@ -1126,10 +1124,10 @@ buildRegisterClasses(SmallPtrSet<Record*, 16> &SingletonRegisters) {
// Find the superclasses; we could compute only the subgroup lattice edges, // Find the superclasses; we could compute only the subgroup lattice edges,
// but there isn't really a point. // but there isn't really a point.
for (std::set<RegisterSet>::iterator it = RegisterSets.begin(), for (std::set< std::set<Record*> >::iterator it = RegisterSets.begin(),
ie = RegisterSets.end(); it != ie; ++it) { ie = RegisterSets.end(); it != ie; ++it) {
ClassInfo *CI = RegisterSetClasses[*it]; ClassInfo *CI = RegisterSetClasses[*it];
for (std::set<RegisterSet>::iterator it2 = RegisterSets.begin(), for (std::set< std::set<Record*> >::iterator it2 = RegisterSets.begin(),
ie2 = RegisterSets.end(); it2 != ie2; ++it2) ie2 = RegisterSets.end(); it2 != ie2; ++it2)
if (*it != *it2 && if (*it != *it2 &&
std::includes(it2->begin(), it2->end(), it->begin(), it->end())) std::includes(it2->begin(), it2->end(), it->begin(), it->end()))
@ -1144,8 +1142,8 @@ buildRegisterClasses(SmallPtrSet<Record*, 16> &SingletonRegisters) {
Record *Def = RC.getDef(); Record *Def = RC.getDef();
if (!Def) if (!Def)
continue; continue;
ClassInfo *CI = RegisterSetClasses[RegisterSet(RC.getOrder().begin(), ClassInfo *CI = RegisterSetClasses[std::set<Record*>(RC.getOrder().begin(),
RC.getOrder().end())]; RC.getOrder().end())];
if (CI->ValueName.empty()) { if (CI->ValueName.empty()) {
CI->ClassName = RC.getName(); CI->ClassName = RC.getName();
CI->Name = "MCK_" + RC.getName(); CI->Name = "MCK_" + RC.getName();
@ -1157,7 +1155,7 @@ buildRegisterClasses(SmallPtrSet<Record*, 16> &SingletonRegisters) {
} }
// Populate the map for individual registers. // Populate the map for individual registers.
for (std::map<Record*, RegisterSet>::iterator it = RegisterMap.begin(), for (std::map<Record*, std::set<Record*> >::iterator it = RegisterMap.begin(),
ie = RegisterMap.end(); it != ie; ++it) ie = RegisterMap.end(); it != ie; ++it)
RegisterClasses[it->first] = RegisterSetClasses[it->second]; RegisterClasses[it->first] = RegisterSetClasses[it->second];