@@ -200,7 +200,6 @@ def __init__(self, name, config_name, extra_java_args=None, extra_launcher_args=
200200 self .pgo_aot_inline = False
201201 self .pgo_instrumented_iterations = 0
202202 self .pgo_context_sensitive = True
203- self .pgo_inline_explored = False
204203 self .is_gate = False
205204 self .is_quickbuild = False
206205 self .use_string_inlining = False
@@ -291,7 +290,6 @@ def _configure_from_name(self, config_name):
291290 elif inliner == "inline-explored" :
292291 mx .logv ("'inline-explored' is enabled for {}" .format (config_name ))
293292 self .pgo_instrumented_iterations = 3
294- self .pgo_inline_explored = True
295293 else :
296294 mx .abort ("Unknown inliner configuration: {}" .format (inliner ))
297295
@@ -747,10 +745,9 @@ def run_stage_agent(self, config, stages):
747745 def run_stage_instrument_image (self , config , stages , out , i , instrumentation_image_name , image_path , image_path_latest , instrumented_iterations ):
748746 executable_name_args = ['-H:Name=' + instrumentation_image_name ]
749747 pgo_args = ['--pgo=' + config .latest_profile_path ]
750- pgo_args += ['-H:' + ('+' if self .pgo_context_sensitive else '-' ) + 'EnablePGOContextSensitivity ' ]
748+ pgo_args += ['-H:' + ('+' if self .pgo_context_sensitive else '-' ) + 'PGOContextSensitivityEnabled ' ]
751749 pgo_args += ['-H:+AOTInliner' ] if self .pgo_aot_inline else ['-H:-AOTInliner' ]
752750 instrument_args = ['--pgo-instrument' ] + ([] if i == 0 else pgo_args )
753- instrument_args += ['-H:+InlineAllExplored' ] if self .pgo_inline_explored else []
754751
755752 with stages .set_command (config .base_image_build_args + executable_name_args + instrument_args ) as s :
756753 s .execute_command ()
@@ -761,7 +758,7 @@ def run_stage_instrument_image(self, config, stages, out, i, instrumentation_ima
761758 out ('Instrumented image size: ' + str (image_size ) + ' B' )
762759
763760 def run_stage_instrument_run (self , config , stages , image_path , profile_path ):
764- image_run_cmd = [image_path , '-XX:ProfilesDumpFile =' + profile_path ]
761+ image_run_cmd = [image_path , '-XX:ProfilingDumpFile =' + profile_path ]
765762 image_run_cmd += config .extra_profile_run_args
766763 with stages .set_command (image_run_cmd ) as s :
767764 s .execute_command ()
@@ -771,7 +768,7 @@ def run_stage_instrument_run(self, config, stages, image_path, profile_path):
771768 def run_stage_image (self , config , stages ):
772769 executable_name_args = ['-H:Name=' + config .final_image_name ]
773770 pgo_args = ['--pgo=' + config .latest_profile_path ]
774- pgo_args += ['-H:' + ('+' if self .pgo_context_sensitive else '-' ) + 'EnablePGOContextSensitivity ' ]
771+ pgo_args += ['-H:' + ('+' if self .pgo_context_sensitive else '-' ) + 'PGOContextSensitivityEnabled ' ]
775772 pgo_args += ['-H:+AOTInliner' ] if self .pgo_aot_inline else ['-H:-AOTInliner' ]
776773 instrumented_iterations = self .pgo_instrumented_iterations if config .pgo_iteration_num is None else int (config .pgo_iteration_num )
777774 ml_args = ['-H:+ProfileInference' ] if self .ml == 'ml-profile-inference' else []
0 commit comments