Fixed #6716 (Performance: Alternative String Representation in Match Compiler)
Quickfix of tools/test_matchcompiler.py for Alternative String Representation _matchStrs does not exist in Match Compiler anymore.
This commit is contained in:
Frank Zingsheim
parent
0e354a03bd
commit
6ba2534f32
|
|
@ -37,19 +37,15 @@ class MatchCompilerTest(unittest.TestCase):
|
|||
input = 'if (Token::Match(tok, "foobar")) {'
|
||||
output = self.mc._replaceTokenMatch(input)
|
||||
self.assertEqual(output, 'if (match1(tok)) {')
|
||||
self.assertEqual(1, len(self.mc._matchStrs))
|
||||
self.assertEqual(1, self.mc._matchStrs['foobar'])
|
||||
|
||||
input = 'if (Token::Match(tok->next()->next(), "foobar %type% %num%")) {'
|
||||
output = self.mc._replaceTokenMatch(input)
|
||||
self.assertEqual(output, 'if (match2(tok->next()->next())) {')
|
||||
self.assertEqual(1, len(self.mc._matchStrs))
|
||||
|
||||
input = 'if (Token::Match(tok, "foo\"special\"bar %num%")) {'
|
||||
output = self.mc._replaceTokenMatch(input)
|
||||
self.assertEqual(
|
||||
output, 'if (match3(tok)) {')
|
||||
self.assertEqual(2, len(self.mc._matchStrs))
|
||||
|
||||
# test that non-static patterns get passed on unmatched
|
||||
input = 'if (Token::Match(tok, "struct " + varname)) {'
|
||||
|
|
@ -67,134 +63,104 @@ class MatchCompilerTest(unittest.TestCase):
|
|||
input = 'if (Token::Match(tok, "foobar %varid%", 123)) {'
|
||||
output = self.mc._replaceTokenMatch(input)
|
||||
self.assertEqual(output, 'if (match1(tok, 123)) {')
|
||||
self.assertEqual(1, len(self.mc._matchStrs))
|
||||
|
||||
input = 'if (Token::Match(tok->next()->next(), "%varid% foobar", tok->varId())) {'
|
||||
output = self.mc._replaceTokenMatch(input)
|
||||
self.assertEqual(
|
||||
output, 'if (match2(tok->next()->next(), tok->varId())) {')
|
||||
self.assertEqual(1, len(self.mc._matchStrs))
|
||||
|
||||
input = 'if (Token::Match(tok, "foo\"special\"bar %type% %varid%", my_varid_cache)) {'
|
||||
output = self.mc._replaceTokenMatch(input)
|
||||
self.assertEqual(
|
||||
output, 'if (match3(tok, my_varid_cache)) {')
|
||||
self.assertEqual(2, len(self.mc._matchStrs))
|
||||
self.assertEqual(2, self.mc._matchStrs['foo"special"bar'])
|
||||
|
||||
# test caching: reuse existing matchX()
|
||||
input = 'if (Token::Match(tok, "foobar %varid%", 123)) {'
|
||||
output = self.mc._replaceTokenMatch(input)
|
||||
self.assertEqual(output, 'if (match1(tok, 123)) {')
|
||||
self.assertEqual(2, len(self.mc._matchStrs))
|
||||
|
||||
# two in one line
|
||||
input = 'if (Token::Match(tok, "foobar2 %varid%", 123) || Token::Match(tok, "%type% %varid%", 123)) {'
|
||||
output = self.mc._replaceTokenMatch(input)
|
||||
self.assertEqual(output, 'if (match4(tok, 123) || match5(tok, 123)) {')
|
||||
self.assertEqual(3, len(self.mc._matchStrs))
|
||||
|
||||
def test_replaceTokenSimpleMatch(self):
|
||||
input = 'if (Token::simpleMatch(tok, "foobar")) {'
|
||||
output = self.mc._replaceTokenMatch(input)
|
||||
self.assertEqual(output, 'if (match1(tok)) {')
|
||||
self.assertEqual(1, len(self.mc._matchStrs))
|
||||
self.assertEqual(1, self.mc._matchStrs['foobar'])
|
||||
|
||||
input = 'if (Token::simpleMatch(tok->next()->next(), "foobar")) {'
|
||||
output = self.mc._replaceTokenMatch(input)
|
||||
self.assertEqual(output, 'if (match1(tok->next()->next())) {')
|
||||
self.assertEqual(1, len(self.mc._matchStrs))
|
||||
self.assertEqual(1, self.mc._matchStrs['foobar'])
|
||||
|
||||
input = 'if (Token::simpleMatch(tok, "foo\"special\"bar")) {'
|
||||
output = self.mc._replaceTokenMatch(input)
|
||||
self.assertEqual(
|
||||
output, 'if (match2(tok)) {')
|
||||
self.assertEqual(2, len(self.mc._matchStrs))
|
||||
self.assertEqual(2, self.mc._matchStrs['foo\"special\"bar'])
|
||||
|
||||
def test_replaceTokenFindSimpleMatch(self):
|
||||
input = 'if (Token::findsimplematch(tok, "foobar")) {'
|
||||
output = self.mc._replaceTokenFindMatch(input)
|
||||
self.assertEqual(output, 'if (findmatch1(tok)) {')
|
||||
self.assertEqual(1, len(self.mc._matchStrs))
|
||||
self.assertEqual(1, self.mc._matchStrs['foobar'])
|
||||
self.assertEqual(output, 'if (findmatch1(tok) ) {')
|
||||
|
||||
input = 'if (Token::findsimplematch(tok->next()->next(), "foobar", tok->link())) {'
|
||||
output = self.mc._replaceTokenFindMatch(input)
|
||||
self.assertEqual(
|
||||
output, 'if (findmatch2(tok->next()->next(), tok->link())) {')
|
||||
self.assertEqual(1, len(self.mc._matchStrs))
|
||||
self.assertEqual(1, self.mc._matchStrs['foobar'])
|
||||
output, 'if (findmatch2(tok->next()->next(), tok->link()) ) {')
|
||||
|
||||
input = 'if (Token::findsimplematch(tok, "foo\"special\"bar")) {'
|
||||
output = self.mc._replaceTokenFindMatch(input)
|
||||
self.assertEqual(
|
||||
output, 'if (findmatch3(tok)) {')
|
||||
self.assertEqual(2, len(self.mc._matchStrs))
|
||||
self.assertEqual(2, self.mc._matchStrs['foo\"special\"bar'])
|
||||
output, 'if (findmatch3(tok) ) {')
|
||||
|
||||
def test_replaceTokenFindMatch(self):
|
||||
input = 'if (Token::findmatch(tok, "foobar")) {'
|
||||
output = self.mc._replaceTokenFindMatch(input)
|
||||
self.assertEqual(output, 'if (findmatch1(tok)) {')
|
||||
self.assertEqual(1, len(self.mc._matchStrs))
|
||||
self.assertEqual(1, self.mc._matchStrs['foobar'])
|
||||
self.assertEqual(output, 'if (findmatch1(tok) ) {')
|
||||
|
||||
# findmatch with varid
|
||||
input = 'if (Token::findmatch(tok, "foobar %varid%", tok->varId())) {'
|
||||
output = self.mc._replaceTokenFindMatch(input)
|
||||
self.assertEqual(output, 'if (findmatch2(tok, tok->varId())) {')
|
||||
self.assertEqual(1, len(self.mc._matchStrs))
|
||||
self.assertEqual(1, self.mc._matchStrs['foobar'])
|
||||
self.assertEqual(output, 'if (findmatch2(tok, tok->varId()) ) {')
|
||||
|
||||
# findmatch with end token
|
||||
input = 'if (Token::findmatch(tok->next()->next(), "foobar %type%", tok->link())) {'
|
||||
output = self.mc._replaceTokenFindMatch(input)
|
||||
self.assertEqual(
|
||||
output, 'if (findmatch3(tok->next()->next(), tok->link())) {')
|
||||
self.assertEqual(1, len(self.mc._matchStrs))
|
||||
self.assertEqual(1, self.mc._matchStrs['foobar'])
|
||||
output, 'if (findmatch3(tok->next()->next(), tok->link()) ) {')
|
||||
|
||||
# findmatch with end token and varid
|
||||
input = 'if (Token::findmatch(tok->next()->next(), "foobar %type% %varid%", tok->link(), 123)) {'
|
||||
output = self.mc._replaceTokenFindMatch(input)
|
||||
self.assertEqual(
|
||||
output, 'if (findmatch4(tok->next()->next(), tok->link(), 123)) {')
|
||||
self.assertEqual(1, len(self.mc._matchStrs))
|
||||
self.assertEqual(1, self.mc._matchStrs['foobar'])
|
||||
output, 'if (findmatch4(tok->next()->next(), tok->link(), 123) ) {')
|
||||
|
||||
def test_parseStringComparison(self):
|
||||
input = 'str == "abc"'
|
||||
res = self.mc._parseStringComparison(input, 5) # offset '5' is chosen as an abritary start offset to look for "
|
||||
self.assertEqual(2, len(res))
|
||||
self.assertEqual(7, res[0])
|
||||
self.assertEqual(12, res[1])
|
||||
self.assertEqual('str == matchStr', input[:res[0]] + "matchStr" + input[res[1]:])
|
||||
self.assertEqual('str == MatchCompiler::makeConstString("abc")', input[:res[0]] + "MatchCompiler::makeConstString(" + input[res[0]:res[1]] + ")" + input[res[1]:])
|
||||
|
||||
input = 'str == "a\\"b\\"c"'
|
||||
res = self.mc._parseStringComparison(input, 5)
|
||||
self.assertEqual(2, len(res))
|
||||
self.assertEqual(7, res[0])
|
||||
self.assertEqual(16, res[1])
|
||||
self.assertEqual('str == matchStr', input[:res[0]] + "matchStr" + input[res[1]:])
|
||||
self.assertEqual('str == MatchCompiler::makeConstString("a\\"b\\"c")', input[:res[0]] + "MatchCompiler::makeConstString(" + input[res[0]:res[1]] + ")" + input[res[1]:])
|
||||
|
||||
def test_replaceCStrings(self):
|
||||
# str() ==
|
||||
input = 'if (tok2->str() == "abc") {'
|
||||
output = self.mc._replaceCStrings(input)
|
||||
self.assertEqual("if (tok2->str() == matchStr1) {", output)
|
||||
self.assertEqual('if (tok2->str() == MatchCompiler::makeConstString("abc")) {', output)
|
||||
|
||||
# str() !=
|
||||
input = 'if (tok2->str() != "xyz") {'
|
||||
output = self.mc._replaceCStrings(input)
|
||||
self.assertEqual("if (tok2->str() != matchStr2) {", output)
|
||||
self.assertEqual('if (tok2->str() != MatchCompiler::makeConstString("xyz")) {', output)
|
||||
|
||||
# strAt()
|
||||
input = 'if (match16(parent->tokAt(-3)) && tok->strAt(1) == ")")'
|
||||
output = self.mc._replaceCStrings(input)
|
||||
self.assertEqual('if (match16(parent->tokAt(-3)) && tok->strAt(1) == matchStr3)', output)
|
||||
self.assertEqual('if (match16(parent->tokAt(-3)) && tok->strAt(1) == MatchCompiler::makeConstString(")"))', output)
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
|
|
|||
Loading…
Reference in New Issue