Skip to content

Commit 703afc5

Browse files
committed
add otw config
1 parent d2e8dfd commit 703afc5

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

vm/mx.vm/mx_vm_benchmark.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,8 @@ def __init__(self, vm: NativeImageVM, bm_suite: BenchmarkSuite | NativeImageBenc
227227
base_image_build_args += ['-Ob']
228228
if vm.use_string_inlining:
229229
base_image_build_args += ['-H:+UseStringInlining']
230+
if vm.use_open_type_world:
231+
base_image_build_args += ['-H:-ClosedTypeWorld']
230232
if vm.is_llvm:
231233
base_image_build_args += ['--features=org.graalvm.home.HomeFinderFeature'] + ['-H:CompilerBackend=llvm', '-H:DeadlockWatchdogInterval=0']
232234
if vm.gc:
@@ -527,6 +529,7 @@ def __init__(self, name, config_name, extra_java_args=None, extra_launcher_args=
527529
self.gc = None
528530
self.native_architecture = False
529531
self.use_upx = False
532+
self.use_open_type_world = False
530533
self.graalvm_edition = None
531534
self.config: Optional[NativeImageBenchmarkConfig] = None
532535
self.stages_info: Optional[StagesInfo] = None
@@ -558,7 +561,7 @@ def _configure_from_name(self, config_name):
558561
return
559562

560563
# This defines the allowed config names for NativeImageVM. The ones registered will be available via --jvm-config
561-
rule = r'^(?P<native_architecture>native-architecture-)?(?P<string_inlining>string-inlining-)?(?P<gate>gate-)?(?P<upx>upx-)?(?P<quickbuild>quickbuild-)?(?P<gc>g1gc-)?(?P<llvm>llvm-)?(?P<pgo>pgo-|pgo-ctx-insens-|pgo-sampler-)?(?P<inliner>inline-)?' \
564+
rule = r'^(?P<native_architecture>native-architecture-)?(?P<string_inlining>string-inlining-)?(?P<otw>otw-)?(?P<gate>gate-)?(?P<upx>upx-)?(?P<quickbuild>quickbuild-)?(?P<gc>g1gc-)?(?P<llvm>llvm-)?(?P<pgo>pgo-|pgo-ctx-insens-|pgo-sampler-)?(?P<inliner>inline-)?' \
562565
r'(?P<analysis_context_sensitivity>insens-|allocsens-|1obj-|2obj1h-|3obj2h-|4obj3h-)?(?P<no_inlining_before_analysis>no-inline-)?(?P<jdk_profiles>jdk-profiles-collect-|adopted-jdk-pgo-)?' \
563566
r'(?P<profile_inference>profile-inference-feature-extraction-|profile-inference-pgo-|profile-inference-debug-)?(?P<sampler>safepoint-sampler-|async-sampler-)?(?P<optimization_level>O0-|O1-|O2-|O3-|Os-)?(?P<edition>ce-|ee-)?$'
564567

@@ -584,6 +587,10 @@ def _configure_from_name(self, config_name):
584587
mx.logv(f"'upx' is enabled for {config_name}")
585588
self.use_upx = True
586589

590+
if matching.group("otw") is not None:
591+
mx.logv(f"'otw' is enabled for {config_name}")
592+
self.use_open_type_world = True
593+
587594
if matching.group("quickbuild") is not None:
588595
mx.logv(f"'quickbuild' is enabled for {config_name}")
589596
self.is_quickbuild = True

0 commit comments

Comments
 (0)