From 7d7d865733ce2ac356b11bd0a0e1b5fa0b52ddfa Mon Sep 17 00:00:00 2001 From: Kyrylo Tkachov Date: Thu, 24 Apr 2025 00:34:09 -0700 Subject: [PATCH] opts.cc Simplify handling of explicit -flto-partition= and -fipa-reorder-for-locality The handling of an explicit -flto-partition= and -fipa-reorder-for-locality should be simpler. No need to have a new default option. We can use opts_set to check if -flto-partition is explicitly set and use that information in the error handling. Remove -flto-partition=default and update accordingly. Bootstrapped and tested on aarch64-none-linux-gnu. Signed-off-by: Kyrylo Tkachov gcc/ * common.opt (LTO_PARTITION_DEFAULT): Delete. (flto-partition=): Change default back to balanced. * flag-types.h (lto_partition_model): Remove LTO_PARTITION_DEFAULT. * opts.cc (validate_ipa_reorder_locality_lto_partition): Check opts_set->x_flag_lto_partition instead of LTO_PARTITION_DEFAULT. (finish_options): Remove handling of LTO_PARTITION_DEFAULT. gcc/testsuite/ * gcc.dg/completion-2.c: Remove check for default. --- gcc/common.opt | 5 +---- gcc/flag-types.h | 1 - gcc/opts.cc | 4 +--- gcc/testsuite/gcc.dg/completion-2.c | 1 - 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/gcc/common.opt b/gcc/common.opt index 88d987e6ab1..e3fa0dacec4 100644 --- a/gcc/common.opt +++ b/gcc/common.opt @@ -2278,9 +2278,6 @@ Number of cache entries in incremental LTO after which to prune old entries. Enum Name(lto_partition_model) Type(enum lto_partition_model) UnknownError(unknown LTO partitioning model %qs) -EnumValue -Enum(lto_partition_model) String(default) Value(LTO_PARTITION_DEFAULT) - EnumValue Enum(lto_partition_model) String(none) Value(LTO_PARTITION_NONE) @@ -2300,7 +2297,7 @@ EnumValue Enum(lto_partition_model) String(cache) Value(LTO_PARTITION_CACHE) flto-partition= -Common Joined RejectNegative Enum(lto_partition_model) Var(flag_lto_partition) Init(LTO_PARTITION_DEFAULT) +Common Joined RejectNegative Enum(lto_partition_model) Var(flag_lto_partition) Init(LTO_PARTITION_BALANCED) Specify the algorithm to partition symbols and vars at linktime. ; The initial value of -1 comes from Z_DEFAULT_COMPRESSION in zlib.h. diff --git a/gcc/flag-types.h b/gcc/flag-types.h index db573768c23..f4d8112f815 100644 --- a/gcc/flag-types.h +++ b/gcc/flag-types.h @@ -405,7 +405,6 @@ enum lto_partition_model { LTO_PARTITION_1TO1 = 3, LTO_PARTITION_MAX = 4, LTO_PARTITION_CACHE = 5, - LTO_PARTITION_DEFAULT= 6 }; /* flag_lto_locality_cloning initialization values. */ diff --git a/gcc/opts.cc b/gcc/opts.cc index 5e7b77dab2f..ca38363114a 100644 --- a/gcc/opts.cc +++ b/gcc/opts.cc @@ -1047,7 +1047,7 @@ validate_ipa_reorder_locality_lto_partition (struct gcc_options *opts, { static bool validated_p = false; - if (opts->x_flag_lto_partition != LTO_PARTITION_DEFAULT) + if (opts_set->x_flag_lto_partition) { if (opts_set->x_flag_ipa_reorder_for_locality && !validated_p) error ("%<-fipa-reorder-for-locality%> is incompatible with" @@ -1269,8 +1269,6 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set, SET_OPTION_IF_UNSET (opts, opts_set, flag_reorder_functions, 1); validate_ipa_reorder_locality_lto_partition (opts, opts_set); - if (opts_set->x_flag_lto_partition != LTO_PARTITION_DEFAULT) - opts_set->x_flag_lto_partition = opts->x_flag_lto_partition = LTO_PARTITION_BALANCED; /* The -gsplit-dwarf option requires -ggnu-pubnames. */ if (opts->x_dwarf_split_debug_info) diff --git a/gcc/testsuite/gcc.dg/completion-2.c b/gcc/testsuite/gcc.dg/completion-2.c index 46c511c8c2f..99e65312201 100644 --- a/gcc/testsuite/gcc.dg/completion-2.c +++ b/gcc/testsuite/gcc.dg/completion-2.c @@ -5,7 +5,6 @@ -flto-partition=1to1 -flto-partition=balanced -flto-partition=cache --flto-partition=default -flto-partition=max -flto-partition=none -flto-partition=one -- 2.44.0