Skip to content

Commit 481c1d7

Browse files
committed
Move NativeImageVM and its dependencies to mx_sdk_benchmark
1 parent 0465567 commit 481c1d7

File tree

4 files changed

+1503
-1447
lines changed

4 files changed

+1503
-1447
lines changed

espresso/mx.espresso/mx_espresso_benchmarks.py

+7-8
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import mx
2424
import mx_benchmark
2525
import mx_espresso
26+
import mx_sdk_benchmark
2627

2728
from mx_benchmark import GuestVm, JavaVm
2829
from mx_sdk_benchmark import _daCapoScalaConfig
@@ -64,14 +65,12 @@ def hosting_registry(self):
6465
def with_host_vm(self, host_vm):
6566
_host_vm = host_vm
6667
if hasattr(host_vm, 'run_launcher'):
67-
if mx.suite('vm', fatalIfMissing=False):
68-
import mx_vm_benchmark
69-
# If needed, clone the host_vm and replace the `--native` argument with `-truffle`
70-
if isinstance(host_vm, mx_vm_benchmark.GraalVm) and '--native' in host_vm.extra_launcher_args:
71-
extra_launcher_args = list(host_vm.extra_launcher_args)
72-
extra_launcher_args.remove('--native')
73-
extra_launcher_args.append('-truffle')
74-
_host_vm = mx_vm_benchmark.GraalVm(host_vm.name(), host_vm.config_name(), list(host_vm.extra_java_args), extra_launcher_args)
68+
# If needed, clone the host_vm and replace the `--native` argument with `-truffle`
69+
if isinstance(host_vm, mx_sdk_benchmark.GraalVm) and '--native' in host_vm.extra_launcher_args:
70+
extra_launcher_args = list(host_vm.extra_launcher_args)
71+
extra_launcher_args.remove('--native')
72+
extra_launcher_args.append('-truffle')
73+
_host_vm = mx_sdk_benchmark.GraalVm(host_vm.name(), host_vm.config_name(), list(host_vm.extra_java_args), extra_launcher_args)
7574
return self.__class__(self.config_name(), self._options, _host_vm)
7675

7776
def run(self, cwd, args):

sdk/OWNERS.toml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[[rule]]
2+
files = ["mx_sdk_benchmark.py"]
3+
any = [
4+
5+
]

0 commit comments

Comments
 (0)