jasder
/
antlr
1
0
Fork 1
Code Issues Pull Requests Releases 1 Wiki Activity

Merge pull request #913 from sharwell/fix-909 

Move TestPerformance.testExpressionGrammar to the runtime test suite
This commit is contained in:
Terence Parr 2015-06-19 12:11:12 -07:00
parent e8c6b32283 3c9aabfb80
commit 4115a0ad47
7 changed files with 84 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Index.stg
View File

@ -9,6 +9,7 @@ TestFolders ::= [
"ParserErrors": [], "ParserErrors": [],
"ParserExec": [], "ParserExec": [],
"ParseTrees": [], "ParseTrees": [],
"Performance": [],
"SemPredEvalLexer": [], "SemPredEvalLexer": [],
"SemPredEvalParser": [], "SemPredEvalParser": [],
"Sets": [] "Sets": []

54
runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Performance/ExpressionGrammar.stg Normal file
View File

@ -0,0 +1,54 @@
/*
* This is a regression test for antlr/antlr4#192 "Poor performance of
* expression parsing".
* https://github.com/antlr/antlr4/issues/192
*/
TestType() ::= "Parser"
Options ::= [
"Timeout": "60000"
]
Grammar ::= [
"Expr": {<grammar("Expr")>}
]
InputFragment() ::= <<
not X1 and not X2 and not X3 and not X4 and not X5 and not X6 and not X7 and not X8 and not X9 and not X10 and not X11 and not X12 or
X1 and not X2 and not X3 and not X4 and not X5 and not X6 and not X7 and not X8 and not X9 and not X10 and not X11 and not X12 or
not X1 and X2 and not X3 and not X4 and not X5 and not X6 and not X7 and not X8 and not X9 and not X10 and not X11 and not X12 or
not X1 and not X2 and X3 and not X4 and not X5 and not X6 and not X7 and not X8 and not X9 and not X10 and not X11 and not X12 or
not X1 and not X2 and not X3 and X4 and not X5 and not X6 and not X7 and not X8 and not X9 and not X10 and not X11 and not X12 or
not X1 and not X2 and not X3 and not X4 and X5 and not X6 and not X7 and not X8 and not X9 and not X10 and not X11 and not X12 or
not X1 and not X2 and not X3 and not X4 and not X5 and X6 and not X7 and not X8 and not X9 and not X10 and not X11 and not X12 or
not X1 and not X2 and not X3 and not X4 and not X5 and not X6 and X7 and not X8 and not X9 and not X10 and not X11 and not X12 or
not X1 and not X2 and not X3 and not X4 and not X5 and not X6 and not X7 and X8 and not X9 and not X10 and not X11 and not X12 or
not X1 and not X2 and not X3 and not X4 and not X5 and not X6 and not X7 and not X8 and X9 and not X10 and not X11 and not X12 or
not X1 and not X2 and not X3 and not X4 and not X5 and not X6 and not X7 and not X8 and not X9 and X10 and not X11 and not X12 or
not X1 and not X2 and not X3 and not X4 and not X5 and not X6 and not X7 and not X8 and not X9 and not X10 and X11 and not X12 or
not X1 and not X2 and not X3 and not X4 and not X5 and not X6 and not X7 and not X8 and not X9 and not X10 and not X11 and X12
>>
Rule() ::= "program"
Output() ::= ""
Errors() ::= ""
grammar(grammarName) ::= <<
grammar <grammarName>;
program: expr EOF;
expr
: ID
| 'not' expr
| expr 'and' expr
| expr 'or' expr
;
ID: [a-zA-Z_][a-zA-Z_0-9]*;
WS: [ \t\n\r\f]+ -> skip;
ERROR: .;
>>

5
runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Performance/ExpressionGrammar_1.stg Normal file
View File

@ -0,0 +1,5 @@
import "ExpressionGrammar.stg"
Input() ::= <<
<InputFragment()>
>>

14
runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Performance/ExpressionGrammar_2.stg Normal file
View File

@ -0,0 +1,14 @@
import "ExpressionGrammar.stg"
Input() ::= <<
<InputFragment()> or
<InputFragment()> or
<InputFragment()> or
<InputFragment()> or
<InputFragment()> or
<InputFragment()> or
<InputFragment()> or
<InputFragment()> or
<InputFragment()> or
<InputFragment()>
>>

7
runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Performance/Index.stg Normal file
View File

@ -0,0 +1,7 @@
//TestFolders ::= [
//]
TestTemplates ::= [
"ExpressionGrammar_1": [],
"ExpressionGrammar_2": []
]

3
tool/test/org/antlr/v4/test/runtime/java/Java.test.stg
View File

@ -112,6 +112,9 @@ public void test<test.name>() throws Exception {
testAnnotations(test) ::= <% testAnnotations(test) ::= <%
@Test @Test
<if(test.Options.("Timeout"))>
(timeout = <test.Options.("Timeout")>)
<endif>
<if(test.Options.("Ignore"))> <if(test.Options.("Ignore"))>
<\n>@Ignore(<writeStringLiteral(test.Options.("Ignore"))>) <\n>@Ignore(<writeStringLiteral(test.Options.("Ignore"))>)
<elseif(IgnoredTests.(({<file.name>.<test.name>})))> <elseif(IgnoredTests.(({<file.name>.<test.name>})))>

53
tool/test/org/antlr/v4/test/tool/TestPerformance.java
View File

@ -1943,59 +1943,6 @@ public class TestPerformance extends BaseTest {
} }
} }
/**
* This is a regression test for antlr/antlr4#192 "Poor performance of
* expression parsing".
* https://github.com/antlr/antlr4/issues/192
*/
@Test(timeout = 60000)
public void testExpressionGrammar() {
String grammar =
"grammar Expr;\n" +
"\n" +
"program: expr EOF;\n" +
"\n" +
"expr: ID\n" +
" | 'not' expr\n" +
" | expr 'and' expr\n" +
" | expr 'or' expr\n" +
" ;\n" +
"\n" +
"ID: [a-zA-Z_][a-zA-Z_0-9]*;\n" +
"WS: [ \\t\\n\\r\\f]+ -> skip;\n" +
"ERROR: .;\n";
String input =
"not X1 and not X2 and not X3 and not X4 and not X5 and not X6 and not X7 and not X8 and not X9 and not X10 and not X11 and not X12 or\n" +
" X1 and not X2 and not X3 and not X4 and not X5 and not X6 and not X7 and not X8 and not X9 and not X10 and not X11 and not X12 or\n" +
"not X1 and X2 and not X3 and not X4 and not X5 and not X6 and not X7 and not X8 and not X9 and not X10 and not X11 and not X12 or\n" +
"not X1 and not X2 and X3 and not X4 and not X5 and not X6 and not X7 and not X8 and not X9 and not X10 and not X11 and not X12 or\n" +
"not X1 and not X2 and not X3 and X4 and not X5 and not X6 and not X7 and not X8 and not X9 and not X10 and not X11 and not X12 or\n" +
"not X1 and not X2 and not X3 and not X4 and X5 and not X6 and not X7 and not X8 and not X9 and not X10 and not X11 and not X12 or\n" +
"not X1 and not X2 and not X3 and not X4 and not X5 and X6 and not X7 and not X8 and not X9 and not X10 and not X11 and not X12 or\n" +
"not X1 and not X2 and not X3 and not X4 and not X5 and not X6 and X7 and not X8 and not X9 and not X10 and not X11 and not X12 or\n" +
"not X1 and not X2 and not X3 and not X4 and not X5 and not X6 and not X7 and X8 and not X9 and not X10 and not X11 and not X12 or\n" +
"not X1 and not X2 and not X3 and not X4 and not X5 and not X6 and not X7 and not X8 and X9 and not X10 and not X11 and not X12 or\n" +
"not X1 and not X2 and not X3 and not X4 and not X5 and not X6 and not X7 and not X8 and not X9 and X10 and not X11 and not X12 or\n" +
"not X1 and not X2 and not X3 and not X4 and not X5 and not X6 and not X7 and not X8 and not X9 and not X10 and X11 and not X12 or\n" +
"not X1 and not X2 and not X3 and not X4 and not X5 and not X6 and not X7 and not X8 and not X9 and not X10 and not X11 and X12\n";
String found = execParser("Expr.g4", grammar, "ExprParser", "ExprLexer", "program",
input, false);
Assert.assertEquals("", found);
Assert.assertEquals(null, stderrDuringParse);
List<String> inputs = new ArrayList<String>();
for (int i = 0; i < 10; i++) {
inputs.add(input);
}
input = Utils.join(inputs.iterator(), " or\n");
found = execParser("Expr.g4", grammar, "ExprParser", "ExprLexer", "program",
input, false);
Assert.assertEquals("", found);
Assert.assertEquals(null, stderrDuringParse);
}
@Test(timeout = 20000) @Test(timeout = 20000)
public void testExponentialInclude() { public void testExponentialInclude() {
String grammarFormat = String grammarFormat =