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

Ledmington ledmington/compilation flags #379

Closed
wants to merge 3 commits into from
Closed

Ledmington ledmington/compilation flags #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd7e11c
Added second textbox for extra VM compilation switches
Oct 25, 2023
5b87fb7
Added compilation switches for jvm compilers
Oct 25, 2023
b589cdf
shortened new config labels
Oct 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 23 additions & 8 deletions core/src/main/java/org/adoptopenjdk/jitwatch/core/JITWatchConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ public enum OnStackReplacement
private static final String KEY_SANDBOX_PRINT_ASSEMBLY = SANDBOX_PREFIX + ".print.assembly";
private static final String KEY_SANDBOX_DISABLE_INLINING = SANDBOX_PREFIX + ".disable.inlining";
private static final String KEY_SANDBOX_COMPILER_THRESHOLD = SANDBOX_PREFIX + ".compiler.threshold";
private static final String KEY_SANDBOX_EXTRA_VM_SWITCHES = SANDBOX_PREFIX + ".extra.vm.switches";
private static final String KEY_SANDBOX_EXTRA_VM_COMPILATION_SWITCHES = SANDBOX_PREFIX + ".extra.vm.switches.compilation";
private static final String KEY_SANDBOX_EXTRA_VM_RUNTIME_SWITCHES = SANDBOX_PREFIX + ".extra.vm.switches.runtime";
private static final String KEY_SANDBOX_BACKGROUND_COMPILATION = SANDBOX_PREFIX + ".background.compilation";
private static final String KEY_SANDBOX_ON_STACK_REPLACEMENT = SANDBOX_PREFIX + ".on.stack.replacement";

Expand Down Expand Up @@ -112,7 +113,8 @@ public enum OnStackReplacement
private boolean disableInlining = false;

private int compileThreshold;
private String extraVMSwitches;
private String extraVMCompilationSwitches;
private String extraVMRuntimeSwitches;

private String profileName = S_PROFILE_DEFAULT;

Expand Down Expand Up @@ -354,7 +356,8 @@ public void unmarshalPropertiesToConfig()
compileThreshold = loadIntFromProperty(loadedProps, KEY_SANDBOX_COMPILER_THRESHOLD,
JITWatchConstants.DEFAULT_COMPILER_THRESHOLD);

extraVMSwitches = getProperty(loadedProps, KEY_SANDBOX_EXTRA_VM_SWITCHES, JITWatchConstants.S_EMPTY);
extraVMCompilationSwitches = getProperty(loadedProps, KEY_SANDBOX_EXTRA_VM_COMPILATION_SWITCHES, JITWatchConstants.S_EMPTY);
extraVMRuntimeSwitches = getProperty(loadedProps, KEY_SANDBOX_EXTRA_VM_RUNTIME_SWITCHES, JITWatchConstants.S_EMPTY);

noPromptHsdis = loadBooleanFromProperty(loadedProps, KEY_NO_PROMPT_HSDIS, false);
}
Expand Down Expand Up @@ -617,7 +620,9 @@ public void marshalConfigToProperties()

putProperty(loadedProps, KEY_SANDBOX_COMPILER_THRESHOLD, Integer.toString(compileThreshold));

putProperty(loadedProps, KEY_SANDBOX_EXTRA_VM_SWITCHES, extraVMSwitches);
putProperty(loadedProps, KEY_SANDBOX_EXTRA_VM_COMPILATION_SWITCHES, extraVMCompilationSwitches);

putProperty(loadedProps, KEY_SANDBOX_EXTRA_VM_RUNTIME_SWITCHES, extraVMRuntimeSwitches);

putProperty(loadedProps, KEY_NO_PROMPT_HSDIS, Boolean.toString(noPromptHsdis));
}
Expand Down Expand Up @@ -823,14 +828,24 @@ public void setCompileThreshold(int compileThreshold)
this.compileThreshold = compileThreshold;
}

public String getExtraVMSwitches()
public String getExtraVMCompilationSwitches()
{
return extraVMCompilationSwitches;
}

public void setExtraVMCompilationSwitches(String extraVMCompilationSwitches)
{
this.extraVMCompilationSwitches = extraVMCompilationSwitches;
}

public String getExtraVMRuntimeSwitches()
{
return extraVMSwitches;
return extraVMRuntimeSwitches;
}

public void setExtraVMSwitches(String extraVMSwitches)
public void setExtraVMRuntimeSwitches(String extraVMRuntimeSwitches)
{
this.extraVMSwitches = extraVMSwitches;
this.extraVMRuntimeSwitches = extraVMRuntimeSwitches;
}

public CompressedOops getCompressedOopsMode()
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/org/adoptopenjdk/jitwatch/process/compiler/CompilerGroovy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public CompilerGroovy(String languageHomeDir) throws FileNotFoundException
}

@Override
public boolean compile(List<File> sourceFiles, List<String> classpathEntries, File outputDir, Map<String, String> environment, ILogListener logListener)
public boolean compile(List<File> sourceFiles, List<String> classpathEntries, List<String> vmOptions, File outputDir, Map<String, String> environment, ILogListener logListener)
throws IOException
{
List<String> commands = new ArrayList<>();
Expand All @@ -49,6 +49,7 @@ public boolean compile(List<File> sourceFiles, List<String> classpathEntries, Fi
String outputDirPath = outputDir.getAbsolutePath().toString();

List<String> compileOptions = Arrays.asList(new String[] { "-d", outputDirPath });
commands.addAll(vmOptions);

commands.addAll(compileOptions);

Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/org/adoptopenjdk/jitwatch/process/compiler/CompilerJRuby.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public CompilerJRuby(String languageHomeDir) throws FileNotFoundException
}

@Override
public boolean compile(List<File> sourceFiles, List<String> classpathEntries, File outputDir, Map<String, String> environment, ILogListener logListener)
public boolean compile(List<File> sourceFiles, List<String> classpathEntries, List<String> vmOptions, File outputDir, Map<String, String> environment, ILogListener logListener)
throws IOException
{
List<String> commands = new ArrayList<>();
Expand All @@ -58,6 +58,7 @@ public boolean compile(List<File> sourceFiles, List<String> classpathEntries, Fi
//
// commands.addAll(compileOptions);
//
commands.addAll(vmOptions);

if (classpathEntries.size() > 0)
{
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/org/adoptopenjdk/jitwatch/process/compiler/CompilerJava.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public CompilerJava(String languageHomeDir) throws FileNotFoundException
}

@Override
public boolean compile(List<File> sourceFiles, List<String> classpathEntries, File outputDir, Map<String, String> environment, ILogListener logListener)
public boolean compile(List<File> sourceFiles, List<String> classpathEntries, List<String> vmOptions, File outputDir, Map<String, String> environment, ILogListener logListener)
throws IOException
{
List<String> commands = new ArrayList<>();
Expand All @@ -54,6 +54,7 @@ public boolean compile(List<File> sourceFiles, List<String> classpathEntries, Fi
commands.add(compilerPath.toString());

List<String> compileOptions = Arrays.asList(new String[] { "-g", "-d", outputDirPath });
commands.addAll(vmOptions);

commands.addAll(compileOptions);

Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/org/adoptopenjdk/jitwatch/process/compiler/CompilerJavaScript.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public CompilerJavaScript(String languageHomeDir) throws FileNotFoundException
}

@Override
public boolean compile(List<File> sourceFiles, List<String> classpathEntries, File outputDir, Map<String, String> environment, ILogListener logListener)
public boolean compile(List<File> sourceFiles, List<String> classpathEntries, List<String> vmOptions, File outputDir, Map<String, String> environment, ILogListener logListener)
throws IOException
{
List<String> commands = new ArrayList<>();
Expand All @@ -50,6 +50,7 @@ public boolean compile(List<File> sourceFiles, List<String> classpathEntries, Fi

// TODO support optimistic typing shortcuts
List<String> compileOptions = Arrays.asList(new String[] { "-ot=false", "-co", "--dump-debug-dir=" + outputDirPath });
commands.addAll(vmOptions);

commands.addAll(compileOptions);

Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/org/adoptopenjdk/jitwatch/process/compiler/CompilerKotlin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public CompilerKotlin(String languageHomeDir) throws FileNotFoundException
}

@Override
public boolean compile(List<File> sourceFiles, List<String> classpathEntries, File outputDir, Map<String, String> environment, ILogListener logListener)
public boolean compile(List<File> sourceFiles, List<String> classpathEntries, List<String> vmOptions, File outputDir, Map<String, String> environment, ILogListener logListener)
throws IOException
{
List<String> commands = new ArrayList<>();
Expand All @@ -53,6 +53,7 @@ public boolean compile(List<File> sourceFiles, List<String> classpathEntries, Fi
"-include-runtime",
"-d",
outputDirPath + File.separator + KOTLIN_EXECUTABLE_JAR });
commands.addAll(vmOptions);

commands.addAll(compileOptions);

Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/org/adoptopenjdk/jitwatch/process/compiler/CompilerScala.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public CompilerScala(String languageHomeDir) throws FileNotFoundException
}

@Override
public boolean compile(List<File> sourceFiles, List<String> classpathEntries, File outputDir, Map<String, String> environment,ILogListener logListener)
public boolean compile(List<File> sourceFiles, List<String> classpathEntries, List<String> vmOptions, File outputDir, Map<String, String> environment,ILogListener logListener)
throws IOException
{
List<String> commands = new ArrayList<>();
Expand All @@ -54,6 +54,7 @@ public boolean compile(List<File> sourceFiles, List<String> classpathEntries, Fi
String outputDirPath = outputDir.getAbsolutePath().toString();

List<String> compileOptions = Arrays.asList(new String[] { "-print", "-g:vars", "-d", outputDirPath });
commands.addAll(vmOptions);

commands.addAll(compileOptions);

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/adoptopenjdk/jitwatch/process/compiler/ICompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@

public interface ICompiler extends IExternalProcess
{
public boolean compile(List<File> sourceFiles, List<String> classpathEntries, File outputDir, Map<String, String> environment, ILogListener logListener) throws IOException;
public boolean compile(List<File> sourceFiles, List<String> classpathEntries, List<String> vmOptions, File outputDir, Map<String, String> environment, ILogListener logListener) throws IOException;
}
4 changes: 3 additions & 1 deletion core/src/test/java/org/adoptopenjdk/jitwatch/test/TestBytecodeLoaderWithInnerClasses.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,9 @@ public class TestBytecodeLoaderWithInnerClasses

List<String> compileClasspath = new ArrayList<>();

boolean success = compiler.compile(sources, compileClasspath, pathToTempClassDir.toFile(), Collections.emptyMap(),
List<String> vmOptions = new ArrayList<>();

boolean success = compiler.compile(sources, compileClasspath, vmOptions, pathToTempClassDir.toFile(), Collections.emptyMap(),
new NullLogListener());

if (!success)
Expand Down
4 changes: 3 additions & 1 deletion core/src/test/java/org/adoptopenjdk/jitwatch/test/TestCompilationUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ private void deleteFile(File file)

List<String> compileClasspath = new ArrayList<>();

boolean success = compiler.compile(sources, compileClasspath, tempDirPath.toFile(), Collections.emptyMap(),
List<String> vmOptions = new ArrayList<>();

boolean success = compiler.compile(sources, compileClasspath, vmOptions, tempDirPath.toFile(), Collections.emptyMap(),
new NullLogListener());

if (!success)
Expand Down
8 changes: 5 additions & 3 deletions ui/src/main/java/org/adoptopenjdk/jitwatch/sandbox/Sandbox.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,9 @@ public void runSandbox(String language, List<File> compileList, File fileToRun)

lastProcess = compiler;

boolean compiledOK = compiler.compile(compileList, buildUniqueClasspath(logParser.getConfig()), SANDBOX_CLASS_DIR.toFile(),
List<String> compilationSwitches = Arrays.asList(logParser.getConfig().getExtraVMCompilationSwitches().split(" "));

boolean compiledOK = compiler.compile(compileList, buildUniqueClasspath(logParser.getConfig()), compilationSwitches, SANDBOX_CLASS_DIR.toFile(),
Collections.<String, String>emptyMap(), logListener);

logListener.handleLogEntry("Compilation success: " + compiledOK);
Expand Down Expand Up @@ -322,9 +324,9 @@ else if (onStackReplacementMode == OnStackReplacement.FORCE_NO_ON_STACK_REPLACEM
options.add("-XX:CompileThreshold=" + logParser.getConfig().getCompileThreshold());
}

if (logParser.getConfig().getExtraVMSwitches().length() > 0)
if (logParser.getConfig().getExtraVMRuntimeSwitches().length() > 0)
{
String extraSwitchString = logParser.getConfig().getExtraVMSwitches();
String extraSwitchString = logParser.getConfig().getExtraVMRuntimeSwitches();
String[] switches = extraSwitchString.split(S_SPACE);

for (String sw : switches)
Expand Down
53 changes: 40 additions & 13 deletions ui/src/main/java/org/adoptopenjdk/jitwatch/ui/sandbox/SandboxConfigStage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ public class SandboxConfigStage extends Stage
private TextField txtFreqInline;
private TextField txtMaxInline;
private TextField txtCompilerThreshold;
private TextField txtExtraSwitches;
private TextField txtExtraCompilationSwitches;
private TextField txtExtraRuntimeSwitches;

private CheckBox checkBoxPrintAssembly;
private CheckBox checkBoxDisableInlining;
Expand Down Expand Up @@ -102,7 +103,9 @@ public SandboxConfigStage(final IStageClosedListener closedListener, final JITWa

vbox.getChildren().add(buildHBoxCompilationThreshold());

vbox.getChildren().add(buildHBoxExtraSwitches());
vbox.getChildren().add(buildHBoxExtraCompilationSwitches());

vbox.getChildren().add(buildHBoxExtraRuntimeSwitches());

vbox.getChildren().add(buildHBoxButtons());

Expand All @@ -124,7 +127,9 @@ public void handle(ActionEvent e)

setCompilerThreshold(config);

setExtraVMSwitches(config);
setExtraVMCompilationSwitches(config);

setExtraVMRuntimeSwitches(config);

config.setPrintAssembly(checkBoxPrintAssembly.isSelected());
config.setDisableInlining(checkBoxDisableInlining.isSelected());
Expand Down Expand Up @@ -162,9 +167,14 @@ private void setCompilerThreshold(JITWatchConfig config)
}
}

private void setExtraVMSwitches(JITWatchConfig config)
private void setExtraVMCompilationSwitches(JITWatchConfig config)
{
config.setExtraVMSwitches(txtExtraSwitches.getText().trim());
config.setExtraVMCompilationSwitches(txtExtraCompilationSwitches.getText().trim());
}

private void setExtraVMRuntimeSwitches(JITWatchConfig config)
{
config.setExtraVMRuntimeSwitches(txtExtraRuntimeSwitches.getText().trim());
}

private void setMaximumInlineSize(JITWatchConfig config)
Expand Down Expand Up @@ -527,19 +537,36 @@ private HBox buildHBoxCompilationThreshold()
return hbox;
}

private HBox buildHBoxExtraSwitches()
private HBox buildHBoxExtraCompilationSwitches()
{
HBox hbox = new HBox();

Label labelExtraCompilation = new Label("Compilation options:");
labelExtraCompilation.setMinWidth(labelWidth);

txtExtraCompilationSwitches = new TextField(config.getExtraVMCompilationSwitches());
txtExtraCompilationSwitches.prefWidthProperty().bind(scene.widthProperty());
txtExtraCompilationSwitches.setAlignment(Pos.BASELINE_LEFT);

hbox.getChildren().add(labelExtraCompilation);
hbox.getChildren().add(txtExtraCompilationSwitches);

return hbox;
}

private HBox buildHBoxExtraRuntimeSwitches()
{
HBox hbox = new HBox();

Label labelExtra = new Label("Extra VM switches:");
labelExtra.setMinWidth(labelWidth);
Label labelExtraRuntime = new Label("Runtime options:");
labelExtraRuntime.setMinWidth(labelWidth);

txtExtraSwitches = new TextField(config.getExtraVMSwitches());
txtExtraSwitches.prefWidthProperty().bind(scene.widthProperty());
txtExtraSwitches.setAlignment(Pos.BASELINE_LEFT);
txtExtraRuntimeSwitches = new TextField(config.getExtraVMRuntimeSwitches());
txtExtraRuntimeSwitches.prefWidthProperty().bind(scene.widthProperty());
txtExtraRuntimeSwitches.setAlignment(Pos.BASELINE_LEFT);

hbox.getChildren().add(labelExtra);
hbox.getChildren().add(txtExtraSwitches);
hbox.getChildren().add(labelExtraRuntime);
hbox.getChildren().add(txtExtraRuntimeSwitches);

return hbox;
}
Expand Down
Loading