Skip to content
Snippets Groups Projects
Commit 6031acb5 authored by Mick Jordan's avatar Mick Jordan
Browse files

mx.fastr: remove nocompile in _set_graal_options

parent 9de799fd
Branches
No related tags found
No related merge requests found
......@@ -92,13 +92,7 @@ def do_run_r(args, command, extraVmArgs=None, jdk=None, **kwargs):
vmArgs = ['-cp', mx.classpath('FASTR', jdk=jdk)]
if 'nocompile' in kwargs:
nocompile = True
del kwargs['nocompile']
else:
nocompile = False
vmArgs += set_graal_options(nocompile)
vmArgs += set_graal_options()
if extraVmArgs is None or not '-da' in extraVmArgs:
# unless explicitly disabled we enable assertion checking
......@@ -137,11 +131,12 @@ def _sanitize_vmArgs(jdk, vmArgs):
i = i + 1
return xargs
def set_graal_options(nocompile=False):
def set_graal_options():
'''
If Graal is enabled, set some options specific to FastR
'''
if _mx_graal:
result = ['-Dgraal.InliningDepthError=500', '-Dgraal.EscapeAnalysisIterations=3', '-XX:JVMCINMethodSizeLimit=1000000']
if nocompile:
result += ['-Dgraal.TruffleCompilationThreshold=100000']
return result
else:
return []
......@@ -345,8 +340,6 @@ def _junit_r_harness(args, vmArgs, jdk, junitArgs):
# no point in printing errors to file when running tests (that contain errors on purpose)
vmArgs += ['-DR:-PrintErrorStacktracesToFile']
vmArgs += set_graal_options(nocompile=True)
setREnvironment()
return mx.run_java(vmArgs + junitArgs, nonZeroIsFatal=False, jdk=jdk)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment