|
23 | 23 | import mx |
24 | 24 | import mx_benchmark |
25 | 25 | import mx_espresso |
| 26 | +import mx_sdk_benchmark |
26 | 27 |
|
27 | 28 | from mx_benchmark import GuestVm, JavaVm |
28 | 29 | from mx_sdk_benchmark import _daCapoScalaConfig |
@@ -64,14 +65,12 @@ def hosting_registry(self): |
64 | 65 | def with_host_vm(self, host_vm): |
65 | 66 | _host_vm = host_vm |
66 | 67 | 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) |
75 | 74 | return self.__class__(self.config_name(), self._options, _host_vm) |
76 | 75 |
|
77 | 76 | def run(self, cwd, args): |
|
0 commit comments