luke
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve Verilation performance on internal strings, msg1975.

This commit is contained in:
Wilson Snyder 2016-09-08 22:04:14 -04:00
parent 26774eb045
commit 45d7312dfc
2 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changes
View File

@ -10,6 +10,8 @@ indicates the contributor was also the author of the fix; Thanks!
**** Fix error on wide numbers that represent small msb/lsb, msg1991. [Mandy Xu] **** Fix error on wide numbers that represent small msb/lsb, msg1991. [Mandy Xu]
**** Improve Verilation performance on internal strings, msg1975. [Johan Bjork]
* Verilator 3.886 2016-07-30 * Verilator 3.886 2016-07-30

69
src/V3Ast.cpp
View File

@ -166,44 +166,53 @@ string AstNode::vcdName(const string& namein) {
} }
string AstNode::prettyName(const string& namein) { string AstNode::prettyName(const string& namein) {
// This function is somewhat hot, so we short-circuit some compares
string pretty; string pretty;
pretty = ""; pretty = "";
pretty.reserve(namein.length());
for (const char* pos = namein.c_str(); *pos; ) { for (const char* pos = namein.c_str(); *pos; ) {
if (0==strncmp(pos,"__BRA__",7)) { if (pos[0]=='-' && pos[1]=='>') { // ->
pretty += "[";
pos += 7;
}
else if (0==strncmp(pos,"__KET__",7)) {
pretty += "]";
pos += 7;
}
else if (0==strncmp(pos,"__DOT__",7)) {
pretty += ".";
pos += 7;
}
else if (0==strncmp(pos,"->",2)) {
pretty += "."; pretty += ".";
pos += 2; pos += 2;
continue;
} }
else if (0==strncmp(pos,"__PVT__",7)) { if (pos[0]=='_' && pos[1]=='_') { // Short-circuit
pretty += ""; if (0==strncmp(pos,"__BRA__",7)) {
pos += 7; pretty += "[";
} pos += 7;
else if (pos[0]=='_' && pos[1]=='_' && pos[2]=='0' continue;
&& isxdigit(pos[3]) && isxdigit(pos[4])) { }
char value = 0; if (0==strncmp(pos,"__KET__",7)) {
value += 16*(isdigit(pos[3]) ? (pos[3]-'0') : (tolower(pos[3])-'a'+10)); pretty += "]";
value += (isdigit(pos[4]) ? (pos[4]-'0') : (tolower(pos[4])-'a'+10)); pos += 7;
pretty += value; continue;
pos += 5; }
} if (0==strncmp(pos,"__DOT__",7)) {
else { pretty += ".";
pretty += pos[0]; pos += 7;
++pos; continue;
}
if (0==strncmp(pos,"__PVT__",7)) {
pretty += "";
pos += 7;
continue;
}
if (pos[0]=='_' && pos[1]=='_' && pos[2]=='0'
&& isxdigit(pos[3]) && isxdigit(pos[4])) {
char value = 0;
value += 16*(isdigit(pos[3]) ? (pos[3]-'0') : (tolower(pos[3])-'a'+10));
value += (isdigit(pos[4]) ? (pos[4]-'0') : (tolower(pos[4])-'a'+10));
pretty += value;
pos += 5;
continue;
}
} }
// Default
pretty += pos[0];
++pos;
} }
if (pretty.substr(0,4) == "TOP.") pretty.replace(0,4,""); if (pretty[0]=='T' && pretty.substr(0,4) == "TOP.") pretty.replace(0,4,"");
if (pretty.substr(0,5) == "TOP->") pretty.replace(0,5,""); if (pretty[0]=='T' && pretty.substr(0,5) == "TOP->") pretty.replace(0,5,"");
return pretty; return pretty;
} }