On Thu, May 16, 2024 at 8:25 AM Hongyu Wang <hongyu.w...@intel.com> wrote:
>
> Hi,
>
> In ix86_override_options_after_change, calls to ix86_default_align
> and ix86_recompute_optlev_based_flags will cause mismatched target
> opt_set when doing cl_optimization_restore. Move them back to
> ix86_option_override_internal to solve the issue.
>
> Bootstrapped & regtested on x86_64-pc-linux-gnu, and Rainer helped to
> test with i386-pc-solaris2.11 which also passed 32/64bit tests.
Since this is a tricky area apparently without too much test coverage can
we have a testcase for this?
> Ok for trunk and backport down to gcc12?
>
> gcc/ChangeLog:
>
> PR target/113719
> * config/i386/i386-options.cc (ix86_override_options_after_change):
> Remove call to ix86_default_align and
> ix86_recompute_optlev_based_flags.
> (ix86_option_override_internal): Call ix86_default_align and
> ix86_recompute_optlev_based_flags.
> ---
> gcc/config/i386/i386-options.cc | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/gcc/config/i386/i386-options.cc b/gcc/config/i386/i386-options.cc
> index ac48b5c61c4..d97464f2c74 100644
> --- a/gcc/config/i386/i386-options.cc
> +++ b/gcc/config/i386/i386-options.cc
> @@ -1930,11 +1930,6 @@ ix86_recompute_optlev_based_flags (struct gcc_options
> *opts,
> void
> ix86_override_options_after_change (void)
> {
> - /* Default align_* from the processor table. */
> - ix86_default_align (&global_options);
> -
> - ix86_recompute_optlev_based_flags (&global_options, &global_options_set);
> -
> /* Disable unrolling small loops when there's explicit
> -f{,no}unroll-loop. */
> if ((OPTION_SET_P (flag_unroll_loops))
> @@ -2530,6 +2525,8 @@ ix86_option_override_internal (bool main_args_p,
>
> set_ix86_tune_features (opts, ix86_tune, opts->x_ix86_dump_tunes);
>
> + ix86_recompute_optlev_based_flags (opts, opts_set);
> +
> ix86_override_options_after_change ();
>
> ix86_tune_cost = processor_cost_table[ix86_tune];
> @@ -2565,6 +2562,9 @@ ix86_option_override_internal (bool main_args_p,
> || TARGET_64BIT_P (opts->x_ix86_isa_flags))
> opts->x_ix86_regparm = REGPARM_MAX;
>
> + /* Default align_* from the processor table. */
> + ix86_default_align (&global_options);
> +
> /* Provide default for -mbranch-cost= value. */
> SET_OPTION_IF_UNSET (opts, opts_set, ix86_branch_cost,
> ix86_tune_cost->branch_cost);
> --
> 2.31.1
>
