Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Parallel lock free testing, remove potential deadlocks, cache static data, go to descriptor via test #3752

Merged
merged 20 commits into from
Jun 26, 2022
Merged

Parallel lock free testing, remove potential deadlocks, cache static data, go to descriptor via test #3752

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
84c9780
Implement fast parallel lock-free in-process testing for Java
KvanTTT Jun 21, 2022
e942e1a
Add final modifier to all static fields where it's possible
KvanTTT Jun 17, 2022
36b885c
Remove doubtful and not used static fields
KvanTTT Jun 17, 2022
4ccbb41
Fix potential deadlocks in Java runtime
KvanTTT Jun 17, 2022
dbce6b2
Unify C#, C++, Dart, Go, Python runtimes
KvanTTT Jun 19, 2022
8861ac4
Use AtomicInteger instead of int for static PredictionContext.globalN…
KvanTTT Jun 17, 2022
3c30268
Remove lock in Generator (now ANTLR tool is thread-safe)
KvanTTT Jun 17, 2022
7c5b3c2
Cache templates for codegen to static field, load only one time
KvanTTT Nov 26, 2021
f19cd67
Cache LeftRecursiveRules.stg to static field
KvanTTT Jun 18, 2022
6681a7a
Cache ANTLR error message templates to static field
KvanTTT Jun 18, 2022
93970f4
Cache runtime test templates to static field
KvanTTT Jun 18, 2022
1b9d77c
Clarify message of failed runtime tests
KvanTTT Jun 19, 2022
99fab5c
Pass testSourceUri to dynamicTest and to dynamicContainer for conveni…
KvanTTT Jun 20, 2022
8e6e1ed
Extract prepareGrammars method
KvanTTT Jun 20, 2022
2e8e3a8
Remove useless and outdated files
KvanTTT Jun 20, 2022
22cbf3c
Update pom.xml in runtime-testsuite
KvanTTT Jun 25, 2022
d287f1c
Use runtimePath instead of targetClassesPath for runtimes' sources
KvanTTT Jun 25, 2022
f235d33
Update doc
KvanTTT Jun 25, 2022
d40067d
Fix potential problems with concurrent access to hash maps
KvanTTT Jun 26, 2022
de255cc
Restore info about `mvn -Dtest=java.** test` in antlr-project-testing.md
KvanTTT Jun 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 17 additions & 13 deletions tool/src/org/antlr/v4/codegen/Target.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,7 @@
import org.antlr.v4.tool.Grammar;
import org.antlr.v4.tool.Rule;
import org.antlr.v4.tool.ast.GrammarAST;
import org.stringtemplate.v4.NumberRenderer;
import org.stringtemplate.v4.ST;
import org.stringtemplate.v4.STErrorListener;
import org.stringtemplate.v4.STGroup;
import org.stringtemplate.v4.STGroupFile;
import org.stringtemplate.v4.StringRenderer;
import org.stringtemplate.v4.*;
import org.stringtemplate.v4.misc.STMessage;

import java.util.HashMap;
Expand All @@ -32,8 +27,9 @@

/** */
public abstract class Target {
private final static Map<String, STGroup> languageTemplates = new HashMap<>();

protected final CodeGenerator gen;
private STGroup templates;

protected static final Map<Character, String> defaultCharValueEscape;
static {
Expand Down Expand Up @@ -92,14 +88,22 @@ public String getVersion() {
}

public STGroup getTemplates() {
String language = getLanguage();
STGroup templates = languageTemplates.get(language);

if (templates == null) {
parrt marked this conversation as resolved.
Show resolved Hide resolved
String version = getVersion();
if ( version==null ||
!RuntimeMetaData.getMajorMinorVersion(version).equals(RuntimeMetaData.getMajorMinorVersion(Tool.VERSION)))
{
gen.tool.errMgr.toolError(ErrorType.INCOMPATIBLE_TOOL_AND_TEMPLATES, version, Tool.VERSION, getLanguage());
synchronized (languageTemplates) {
templates = languageTemplates.get(language);
if (templates == null) {
String version = getVersion();
if (version == null ||
!RuntimeMetaData.getMajorMinorVersion(version).equals(RuntimeMetaData.getMajorMinorVersion(Tool.VERSION))) {
gen.tool.errMgr.toolError(ErrorType.INCOMPATIBLE_TOOL_AND_TEMPLATES, version, Tool.VERSION, language);
}
templates = loadTemplates();
languageTemplates.put(language, templates);
}
}
templates = loadTemplates();
}

return templates;
Expand Down
35 changes: 0 additions & 35 deletions tool/src/org/antlr/v4/codegen/target/CSharpTarget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,41 +136,6 @@ protected String escapeWord(String word) {
return "@" + word;
}

@Override
protected STGroup loadTemplates() {
// override the superclass behavior to put all C# templates in the same folder
STGroup result = new STGroupFile(CodeGenerator.TEMPLATE_ROOT+"/CSharp/"+ getLanguage()+STGroup.GROUP_FILE_EXTENSION);
result.registerRenderer(Integer.class, new NumberRenderer());
result.registerRenderer(String.class, new StringRenderer());
result.setListener(new STErrorListener() {
@Override
public void compileTimeError(STMessage msg) {
reportError(msg);
}

@Override
public void runTimeError(STMessage msg) {
reportError(msg);
}

@Override
public void IOError(STMessage msg) {
reportError(msg);
}

@Override
public void internalError(STMessage msg) {
reportError(msg);
}

private void reportError(STMessage msg) {
getCodeGenerator().tool.errMgr.toolError(ErrorType.STRING_TEMPLATE_WARNING, msg.cause, msg.toString());
}
});

return result;
}

@Override
public boolean isATNSerializedAsInts() {
return true;
Expand Down
41 changes: 0 additions & 41 deletions tool/src/org/antlr/v4/codegen/target/CppTarget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,7 @@

import org.antlr.v4.codegen.CodeGenerator;
import org.antlr.v4.codegen.Target;
import org.antlr.v4.tool.ErrorType;
import org.stringtemplate.v4.NumberRenderer;
import org.stringtemplate.v4.ST;
import org.stringtemplate.v4.STErrorListener;
import org.stringtemplate.v4.STGroup;
import org.stringtemplate.v4.StringRenderer;
import org.stringtemplate.v4.misc.STMessage;

import java.util.*;

public class CppTarget extends Target {
Expand Down Expand Up @@ -124,38 +117,4 @@ public String getBaseVisitorFileName(boolean header) {
String listenerName = gen.g.name + "BaseVisitor";
return listenerName+extST.render();
}

@Override
protected STGroup loadTemplates() {
STGroup result = super.loadTemplates();
result.registerRenderer(Integer.class, new NumberRenderer());
result.registerRenderer(String.class, new StringRenderer());
result.setListener(new STErrorListener() {
@Override
public void compileTimeError(STMessage msg) {
reportError(msg);
}

@Override
public void runTimeError(STMessage msg) {
reportError(msg);
}

@Override
public void IOError(STMessage msg) {
reportError(msg);
}

@Override
public void internalError(STMessage msg) {
reportError(msg);
}

private void reportError(STMessage msg) {
getCodeGenerator().tool.errMgr.toolError(ErrorType.STRING_TEMPLATE_WARNING, msg.cause, msg.toString());
}
});

return result;
}
}
15 changes: 1 addition & 14 deletions tool/src/org/antlr/v4/codegen/target/DartTarget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,13 @@

import org.antlr.v4.codegen.CodeGenerator;
import org.antlr.v4.codegen.Target;
import org.stringtemplate.v4.STGroup;
import org.stringtemplate.v4.StringRenderer;

import java.util.*;

public class DartTarget extends Target {
protected static final Map<Character, String> targetCharValueEscape;
static {
HashMap<Character, String> map = new HashMap<>();
for (Map.Entry<Character, String> entry : defaultCharValueEscape.entrySet()) {
map.put(entry.getKey(), entry.getValue());
}
HashMap<Character, String> map = new HashMap<>(defaultCharValueEscape);
addEscapedChar(map, '$');
targetCharValueEscape = map;
}
Expand Down Expand Up @@ -63,14 +58,6 @@ public Set<String> getReservedWords() {
return reservedWords;
}

@Override
protected STGroup loadTemplates() {
STGroup result = super.loadTemplates();
result.registerRenderer(String.class, new StringRenderer(), true);

return result;
}

@Override
public boolean isATNSerializedAsInts() {
return true;
Expand Down
20 changes: 0 additions & 20 deletions tool/src/org/antlr/v4/codegen/target/GoTarget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,6 @@ public int getInlineTestSetWordSize() {
return 32;
}

@Override
protected STGroup loadTemplates() {
STGroup result = super.loadTemplates();
result.registerRenderer(String.class, new JavaStringRenderer(), true);
return result;
}

public String getRecognizerFileName(boolean header) {
CodeGenerator gen = getCodeGenerator();
Grammar g = gen.g;
Expand Down Expand Up @@ -164,17 +157,4 @@ public String getBaseVisitorFileName(boolean header) {
assert g.name != null;
return g.name.toLowerCase()+"_base_visitor.go";
}

protected static class JavaStringRenderer extends StringRenderer {
@Override
public String toString(Object o, String formatString, Locale locale) {

if ("java-escape".equals(formatString)) {
// 5C is the hex code for the \ itself
return ((String)o).replace("\\u", "\\u005Cu");
}

return super.toString(o, formatString, locale);
}
}
}
25 changes: 0 additions & 25 deletions tool/src/org/antlr/v4/codegen/target/JavaScriptTarget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,9 @@

import org.antlr.v4.codegen.CodeGenerator;
import org.antlr.v4.codegen.Target;
import org.antlr.v4.tool.ast.GrammarAST;
import org.stringtemplate.v4.STGroup;
import org.stringtemplate.v4.StringRenderer;

import java.util.Arrays;
import java.util.HashSet;
import java.util.Locale;
import java.util.Set;

public class JavaScriptTarget extends Target {
Expand Down Expand Up @@ -56,27 +52,6 @@ public int getInlineTestSetWordSize() {
return 32;
}

@Override
protected STGroup loadTemplates() {
STGroup result = super.loadTemplates();
result.registerRenderer(String.class, new JavaStringRenderer(), true);
return result;
}

protected static class JavaStringRenderer extends StringRenderer {

@Override
public String toString(Object o, String formatString, Locale locale) {
if ("java-escape".equals(formatString)) {
// 5C is the hex code for the \ itself
return ((String)o).replace("\\u", "\\u005Cu");
}

return super.toString(o, formatString, locale);
}

}

@Override
public boolean wantsBaseListener() {
return false;
Expand Down
25 changes: 0 additions & 25 deletions tool/src/org/antlr/v4/codegen/target/JavaTarget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,31 +49,6 @@ public int getSerializedATNSegmentLimit() {
return 65535 / 3;
}

@Override
protected STGroup loadTemplates() {
STGroup result = targetTemplates.get();
if (result == null) {
result = super.loadTemplates();
result.registerRenderer(String.class, new JavaStringRenderer(), true);
targetTemplates.set(result);
}

return result;
}

protected static class JavaStringRenderer extends StringRenderer {

@Override
public String toString(Object o, String formatString, Locale locale) {
if ("java-escape".equals(formatString)) {
// 5C is the hex code for the \ itself
return ((String)o).replace("\\u", "\\u005Cu");
}

return super.toString(o, formatString, locale);
}
}

@Override
public boolean isATNSerializedAsInts() {
return false;
Expand Down
10 changes: 0 additions & 10 deletions tool/src/org/antlr/v4/codegen/target/PHPTarget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@

import org.antlr.v4.codegen.CodeGenerator;
import org.antlr.v4.codegen.Target;
import org.stringtemplate.v4.STGroup;
import org.stringtemplate.v4.StringRenderer;

import java.util.*;

Expand Down Expand Up @@ -73,14 +71,6 @@ protected Set<String> getReservedWords() {
return reservedWords;
}

@Override
protected STGroup loadTemplates() {
STGroup result = super.loadTemplates();
result.registerRenderer(String.class, new StringRenderer(), true);

return result;
}

@Override
public boolean supportsOverloadedMethods() {
return false;
Expand Down
17 changes: 0 additions & 17 deletions tool/src/org/antlr/v4/codegen/target/Python2Target.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@

import org.antlr.v4.codegen.CodeGenerator;
import org.antlr.v4.codegen.Target;
import org.stringtemplate.v4.STGroup;
import org.stringtemplate.v4.StringRenderer;

import java.util.*;

Expand Down Expand Up @@ -76,21 +74,6 @@ protected Set<String> getReservedWords() {
return reservedWords;
}

@Override
protected STGroup loadTemplates() {
STGroup result = super.loadTemplates();
result.registerRenderer(String.class, new PythonStringRenderer(), true);
return result;
}

protected static class PythonStringRenderer extends StringRenderer {

@Override
public String toString(Object o, String formatString, Locale locale) {
return super.toString(o, formatString, locale);
}
}

@Override
public boolean wantsBaseListener() {
return false;
Expand Down
17 changes: 0 additions & 17 deletions tool/src/org/antlr/v4/codegen/target/Python3Target.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@

import org.antlr.v4.codegen.CodeGenerator;
import org.antlr.v4.codegen.Target;
import org.stringtemplate.v4.STGroup;
import org.stringtemplate.v4.StringRenderer;

import java.util.*;

Expand Down Expand Up @@ -75,21 +73,6 @@ protected Set<String> getReservedWords() {
return reservedWords;
}

@Override
protected STGroup loadTemplates() {
STGroup result = super.loadTemplates();
result.registerRenderer(String.class, new PythonStringRenderer(), true);
return result;
}

protected static class PythonStringRenderer extends StringRenderer {

@Override
public String toString(Object o, String formatString, Locale locale) {
return super.toString(o, formatString, locale);
}
}

@Override
public boolean wantsBaseListener() {
return false;
Expand Down