<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Feb 10, 2015 at 11:43 PM, David Majnemer <span dir="ltr"><<a href="mailto:david.majnemer@gmail.com" target="_blank">david.majnemer@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: majnemer<br>
Date: Wed Feb 11 01:43:56 2015<br>
New Revision: 228812<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=228812&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=228812&view=rev</a><br>
Log:<br>
AsmParser: Switch some vectors to maps<br></blockquote><div><br>Any better with unordered_map or DenseMap?<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
This speeds up parsing .ll files with metadata nodes with large IDs.<br>
<br>
Modified:<br>
llvm/trunk/lib/AsmParser/LLParser.cpp<br>
llvm/trunk/lib/AsmParser/LLParser.h<br>
<br>
Modified: llvm/trunk/lib/AsmParser/LLParser.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.cpp?rev=228812&r1=228811&r2=228812&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.cpp?rev=228812&r1=228811&r2=228812&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/AsmParser/LLParser.cpp (original)<br>
+++ llvm/trunk/lib/AsmParser/LLParser.cpp Wed Feb 11 01:43:56 2015<br>
@@ -117,10 +117,10 @@ bool LLParser::ValidateEndOfModule() {<br>
return Error(ForwardRefBlockAddresses.begin()->first.Loc,<br>
"expected function name in blockaddress");<br>
<br>
- for (unsigned i = 0, e = NumberedTypes.size(); i != e; ++i)<br>
- if (NumberedTypes[i].second.isValid())<br>
- return Error(NumberedTypes[i].second,<br>
- "use of undefined type '%" + Twine(i) + "'");<br>
+ for (const auto &NT : NumberedTypes)<br>
+ if (NT.second.second.isValid())<br>
+ return Error(NT.second.second,<br>
+ "use of undefined type '%" + Twine(NT.first) + "'");<br>
<br>
for (StringMap<std::pair<Type*, LocTy> >::iterator I =<br>
NamedTypes.begin(), E = NamedTypes.end(); I != E; ++I)<br>
@@ -149,9 +149,10 @@ bool LLParser::ValidateEndOfModule() {<br>
Twine(ForwardRefMDNodes.begin()->first) + "'");<br>
<br>
// Resolve metadata cycles.<br>
- for (auto &N : NumberedMetadata)<br>
- if (N && !N->isResolved())<br>
- N->resolveCycles();<br>
+ for (auto &N : NumberedMetadata) {<br>
+ if (N.second && !N.second->isResolved())<br>
+ N.second->resolveCycles();<br>
+ }<br>
<br>
// Look for intrinsic functions and CallInst that need to be upgraded<br>
for (Module::iterator FI = M->begin(), FE = M->end(); FI != FE; )<br>
@@ -304,9 +305,6 @@ bool LLParser::ParseUnnamedType() {<br>
ParseToken(lltok::kw_type, "expected 'type' after '='"))<br>
return true;<br>
<br>
- if (TypeID >= NumberedTypes.size())<br>
- NumberedTypes.resize(TypeID+1);<br>
-<br>
Type *Result = nullptr;<br>
if (ParseStructDefinition(TypeLoc, "",<br>
NumberedTypes[TypeID], Result)) return true;<br>
@@ -527,7 +525,7 @@ bool LLParser::ParseMDNodeID(MDNode *&Re<br>
return true;<br>
<br>
// If not a forward reference, just return it now.<br>
- if (MID < NumberedMetadata.size() && NumberedMetadata[MID] != nullptr) {<br>
+ if (NumberedMetadata.count(MID)) {<br>
Result = NumberedMetadata[MID];<br>
return false;<br>
}<br>
@@ -536,8 +534,6 @@ bool LLParser::ParseMDNodeID(MDNode *&Re<br>
auto &FwdRef = ForwardRefMDNodes[MID];<br>
FwdRef = std::make_pair(MDTuple::getTemporary(Context, None), Lex.getLoc());<br>
<br>
- if (NumberedMetadata.size() <= MID)<br>
- NumberedMetadata.resize(MID+1);<br>
Result = FwdRef.first.get();<br>
NumberedMetadata[MID].reset(Result);<br>
return false;<br>
@@ -604,10 +600,7 @@ bool LLParser::ParseStandaloneMetadata()<br>
<br>
assert(NumberedMetadata[MetadataID] == Init && "Tracking VH didn't work");<br>
} else {<br>
- if (MetadataID >= NumberedMetadata.size())<br>
- NumberedMetadata.resize(MetadataID+1);<br>
-<br>
- if (NumberedMetadata[MetadataID] != nullptr)<br>
+ if (NumberedMetadata.count(MetadataID))<br>
return TokError("Metadata id is already used");<br>
NumberedMetadata[MetadataID].reset(Init);<br>
}<br>
@@ -1704,8 +1697,6 @@ bool LLParser::ParseType(Type *&Result,<br>
<br>
case lltok::LocalVarID: {<br>
// Type ::= %4<br>
- if (Lex.getUIntVal() >= NumberedTypes.size())<br>
- NumberedTypes.resize(Lex.getUIntVal()+1);<br>
std::pair<Type*, LocTy> &Entry = NumberedTypes[Lex.getUIntVal()];<br>
<br>
// If the type hasn't been defined yet, create a forward definition and<br>
<br>
Modified: llvm/trunk/lib/AsmParser/LLParser.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.h?rev=228812&r1=228811&r2=228812&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.h?rev=228812&r1=228811&r2=228812&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/AsmParser/LLParser.h (original)<br>
+++ llvm/trunk/lib/AsmParser/LLParser.h Wed Feb 11 01:43:56 2015<br>
@@ -108,9 +108,9 @@ namespace llvm {<br>
// Type resolution handling data structures. The location is set when we<br>
// have processed a use of the type but not a definition yet.<br>
StringMap<std::pair<Type*, LocTy> > NamedTypes;<br>
- std::vector<std::pair<Type*, LocTy> > NumberedTypes;<br>
+ std::map<unsigned, std::pair<Type*, LocTy> > NumberedTypes;<br>
<br>
- std::vector<TrackingMDNodeRef> NumberedMetadata;<br>
+ std::map<unsigned, TrackingMDNodeRef> NumberedMetadata;<br>
std::map<unsigned, std::pair<TempMDTuple, LocTy>> ForwardRefMDNodes;<br>
<br>
// Global Value reference information.<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>