Skip to content

Commit

Permalink
[GR-55152] Remove PGO context insensitive config.
Browse files Browse the repository at this point in the history
PullRequest: graal/19440
  • Loading branch information
boris-spas committed Dec 13, 2024
2 parents c51b8f9 + adcedcb commit f4e613f
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions vm/mx.vm/mx_vm_benchmark.py
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,6 @@ def __init__(self, name, config_name, extra_java_args=None, extra_launcher_args=
self.pgo_instrumentation = False
self.pgo_exclude_conditional = False
self.pgo_sampler_only = False
self.pgo_context_sensitive = True
self.is_gate = False
self.is_quickbuild = False
self.use_string_inlining = False
Expand Down Expand Up @@ -585,9 +584,6 @@ def config_name(self):
if self.is_llvm is True:
config += ["llvm"]
is_pgo_set = False
if self.pgo_context_sensitive is False:
config += ["pgo-ctx-insens"]
is_pgo_set = True
if self.pgo_sampler_only is True:
config += ["pgo-sampler"]
is_pgo_set = True
Expand Down Expand Up @@ -643,7 +639,7 @@ def _configure_from_name(self, config_name):

# This defines the allowed config names for NativeImageVM. The ones registered will be available via --jvm-config
rule = r'^(?P<native_architecture>native-architecture-)?(?P<string_inlining>string-inlining-)?(?P<otw>otw-)?(?P<compacting_gc>compacting-gc-)?(?P<gate>gate-)?(?P<upx>upx-)?(?P<quickbuild>quickbuild-)?(?P<gc>g1gc-)?' \
r'(?P<llvm>llvm-)?(?P<pgo>pgo-|pgo-ctx-insens-|pgo-sampler-)?(?P<inliner>inline-)?' \
r'(?P<llvm>llvm-)?(?P<pgo>pgo-|pgo-sampler-)?(?P<inliner>inline-)?' \
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-)?' \
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-)?(default-)?(?P<edition>ce-|ee-)?$'

Expand Down Expand Up @@ -698,10 +694,6 @@ def _configure_from_name(self, config_name):
if pgo_mode == "pgo":
mx.logv(f"'pgo' is enabled for {config_name}")
self.pgo_instrumentation = True
elif pgo_mode == "pgo-ctx-insens":
mx.logv(f"'pgo-ctx-insens' is enabled for {config_name}")
self.pgo_instrumentation = True
self.pgo_context_sensitive = False
elif pgo_mode == "pgo-sampler":
self.pgo_instrumentation = True
self.pgo_sampler_only = True
Expand Down Expand Up @@ -1256,7 +1248,6 @@ def run_stage_instrument_run(self):
def run_stage_image(self):
executable_name_args = ['-o', self.config.final_image_name]
pgo_args = [f"--pgo={self.config.profile_path}"]
pgo_args += svm_experimental_options(['-H:' + ('+' if self.pgo_context_sensitive else '-') + 'PGOContextSensitivityEnabled'])
if self.adopted_jdk_pgo:
# choose appropriate profiles
jdk_version = mx_sdk_vm.get_jdk_version_for_profiles()
Expand Down

0 comments on commit f4e613f

Please sign in to comment.