Skip to content

Commit a79c196

Browse files
committed
Remove obsolete iterative inliner and inline-explored (Thanks Patrick)
1 parent 29a0d42 commit a79c196

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

vm/mx.vm/mx_vm_benchmark.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ def _configure_from_name(self, config_name):
301301
return
302302

303303
# This defines the allowed config names for NativeImageVM. The ones registered will be available via --jvm-config
304-
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-)?(?P<inliner>inline-|iterative-|inline-explored-)?' \
304+
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-)?(?P<inliner>inline-)?' \
305305
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-)?' \
306306
r'(?P<profile_inference>profile-inference-feature-extraction-)?(?P<sampler>safepoint-sampler-|async-sampler-)?(?P<optimization_level>O0-|O1-|O2-|O3-)?(?P<edition>ce-|ee-)?$'
307307

@@ -355,17 +355,6 @@ def _configure_from_name(self, config_name):
355355
else:
356356
mx.abort(f"Unknown pgo mode: {pgo_mode}")
357357

358-
if matching.group("inliner") is not None:
359-
inliner = matching.group("inliner")[:-1]
360-
if inliner == "iterative":
361-
mx.logv(f"'iterative' inliner is enabled for {config_name}")
362-
self.pgo_instrumentation = True
363-
elif inliner == "inline-explored":
364-
mx.logv(f"'inline-explored' is enabled for {config_name}")
365-
self.pgo_instrumentation = True
366-
else:
367-
mx.abort(f"Unknown inliner configuration: {inliner}")
368-
369358
if matching.group("jdk_profiles") is not None:
370359
config = matching.group("jdk_profiles")[:-1]
371360
if config == 'jdk-profiles-collect':

0 commit comments

Comments
 (0)