On 5/20/21 9:55 AM, Richard Biener wrote:
On Thu, May 20, 2021 at 12:29 AM Joern Wolfgang Rennecke
<joern.renne...@riscy-ip.com> wrote:
We set default for some target options in TARGET_OPTION_OPTIMIZATION_TABLE,
but these can be overridden by specifying the corresponding explicit
-mXXX / -mno-XXX options.
When a function bears the attribue
__attribute__ ((optimize("02")))
the target options are set to the default for that optimization level,
which can be different from what was selected for the file as a whole.
As handle_optimize_attribute is right now, it will thus clobber the
target options, and with enable_checking it will then abort.
The attached patch makes it save and restore the target options.
Bootstrapped and regression tested on x86_64-pc-linux-gnu.
Interesting, I prepared very similar patch for this stage1. My patch covers few
more
cases where target options interfere with optimize options (and vice versa).
That looks reasonable but of course it doesn't solve the issue that those
altered target options will not be in effect on the optimize("O2") function.
IIRC Martin has changes in the works to unify target & optimize here
which should obsolete this fix. Martin - what's the state of this? Do you
think this patch makes sense in the mean time (and maybe also on
the branch though the assert is not in effect there but the behavior
is still observed and unexpected).
Well, I really tried doing the merge but I failed. It's pretty huge task and I
was
unable to get something reasonable for x86_64 target :/ However, my patch
mitigates
2 more cases.
Patch can bootstrap on x86_64-linux-gnu and survives regression tests.
Ready to be installed?
Thanks,
Martin
Thanks,
Richard.
>From 156fb01d35ab6222719d260e0fb3386d53f314b0 Mon Sep 17 00:00:00 2001
From: Martin Liska <mli...@suse.cz>
Date: Wed, 10 Mar 2021 15:12:31 +0100
Subject: [PATCH] Improve global state for options.
gcc/c-family/ChangeLog:
PR tree-optimization/92860
PR target/99592
* c-attribs.c (handle_optimize_attribute): Save target node
before calling parse_optimize_options and save it in case
it changes.
* c-pragma.c (handle_pragma_target): Similarly for pragma.
(handle_pragma_pop_options): Likewise here.
gcc/ChangeLog:
PR tree-optimization/92860
PR target/99592
* optc-save-gen.awk: Remove exceptions.
---
gcc/c-family/c-attribs.c | 9 +++++++++
gcc/c-family/c-pragma.c | 16 ++++++++++++----
gcc/optc-save-gen.awk | 9 ---------
3 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/gcc/c-family/c-attribs.c b/gcc/c-family/c-attribs.c
index ccf9e4ccf0b..96305250d98 100644
--- a/gcc/c-family/c-attribs.c
+++ b/gcc/c-family/c-attribs.c
@@ -5363,6 +5363,8 @@ handle_optimize_attribute (tree *node, tree name, tree args,
/* Save current options. */
cl_optimization_save (&cur_opts, &global_options, &global_options_set);
+ tree prev_target_node = build_target_option_node (&global_options,
+ &global_options_set);
/* If we previously had some optimization options, use them as the
default. */
@@ -5381,10 +5383,17 @@ handle_optimize_attribute (tree *node, tree name, tree args,
parse_optimize_options (args, true);
DECL_FUNCTION_SPECIFIC_OPTIMIZATION (*node)
= build_optimization_node (&global_options, &global_options_set);
+ tree target_node = build_target_option_node (&global_options,
+ &global_options_set);
+ if (prev_target_node != target_node)
+ DECL_FUNCTION_SPECIFIC_TARGET (*node) = target_node;
/* Restore current options. */
cl_optimization_restore (&global_options, &global_options_set,
&cur_opts);
+ cl_target_option_restore (&global_options, &global_options_set,
+ TREE_TARGET_OPTION (prev_target_node));
+
if (saved_global_options != NULL)
{
cl_optimization_compare (saved_global_options, &global_options);
diff --git a/gcc/c-family/c-pragma.c b/gcc/c-family/c-pragma.c
index 4f8e8e0128c..7f658ea5646 100644
--- a/gcc/c-family/c-pragma.c
+++ b/gcc/c-family/c-pragma.c
@@ -918,6 +918,12 @@ handle_pragma_target(cpp_reader *ARG_UNUSED(dummy))
if (targetm.target_option.pragma_parse (args, NULL_TREE))
current_target_pragma = chainon (current_target_pragma, args);
+
+ /* A target pragma can also influence optimization options. */
+ tree current_optimize
+ = build_optimization_node (&global_options, &global_options_set);
+ if (current_optimize != optimization_current_node)
+ optimization_current_node = current_optimize;
}
}
@@ -1078,12 +1084,14 @@ handle_pragma_pop_options (cpp_reader *ARG_UNUSED(dummy))
target_option_current_node = p->target_binary;
}
+ /* Always restore optimization options as optimization_current_node is
+ * overwritten by invoke_set_current_function_hook. */
+ cl_optimization_restore (&global_options, &global_options_set,
+ TREE_OPTIMIZATION (p->optimize_binary));
+
if (p->optimize_binary != optimization_current_node)
{
- tree old_optimize = optimization_current_node;
- cl_optimization_restore (&global_options, &global_options_set,
- TREE_OPTIMIZATION (p->optimize_binary));
- c_cpp_builtins_optimize_pragma (parse_in, old_optimize,
+ c_cpp_builtins_optimize_pragma (parse_in, optimization_current_node,
p->optimize_binary);
optimization_current_node = p->optimize_binary;
}
diff --git a/gcc/optc-save-gen.awk b/gcc/optc-save-gen.awk
index 19afa895930..e2a9a496bfd 100644
--- a/gcc/optc-save-gen.awk
+++ b/gcc/optc-save-gen.awk
@@ -1438,19 +1438,10 @@ print "{"
checked_options["flag_merge_constants"]++
checked_options["param_max_fields_for_field_sensitive"]++
checked_options["flag_omit_frame_pointer"]++
-checked_options["unroll_only_small_loops"]++
# arc exceptions
checked_options["TARGET_ALIGN_CALL"]++
checked_options["TARGET_CASE_VECTOR_PC_RELATIVE"]++
checked_options["arc_size_opt_level"]++
-# arm exceptions
-checked_options["arm_fp16_format"]++
-checked_options["flag_ipa_ra"]++
-# s390 exceptions
-checked_options["param_max_completely_peel_times"]++
-checked_options["param_max_completely_peeled_insns"]++
-checked_options["param_max_unroll_times"]++
-checked_options["param_max_unrolled_insns"]++
for (i = 0; i < n_opts; i++) {
--
2.31.1
