Re: Access --param values through gcc_options structure

[Richard Guenther <richard dot guenther at gmail dot com>]

On Wed, Oct 13, 2010 at 10:55 PM, Joseph S. Myers
<joseph@codesourcery.com> wrote:
> This patch arranges for --param values to be stored through a pointer
> in the gcc_options structure. ?Information about which parameters are
> set moves to being accessed through the corresponding pointer in
> global_options_set, as for other options, while the default values go
> in a separate structure which is not overwritten by option processing,
> so avoiding the need for init_options_once to save some default values
> specially.
>
> It was indicated in
> <http://gcc.gnu.org/ml/gcc-patches/2010-10/msg01125.html> that the
> S390 back end should be using maybe_set_param_value consistently
> instead of set_param_value; this patch implements this.
>
> Bootstapped with no regressions on x86_64-unknown-linux-gnu. ?Also
> tested building cc1 for crosses to: arm-eabi picochip-none
> powerpc-eabi s390-linux-gnu sparc-elf spu-elf. ?OK to commit?

Ok.

Thanks,
Richard.

> 2010-10-13 ?Joseph Myers ?<joseph@codesourcery.com>
>
> ? ? ? ?* params.c (params_finished): New.
> ? ? ? ?(add_params): Assert !params_finished.
> ? ? ? ?(finish_params): New.
> ? ? ? ?(set_param_value_internal): Take params and params_set
> ? ? ? ?parameters. ?Assert params_finished.
> ? ? ? ?(set_param_value, maybe_set_param_value): Take params and
> ? ? ? ?params_set parameters. ?Update calls to set_param_value_internal.
> ? ? ? ?(set_default_param_value): Assert !params_finished. ?Don't use
> ? ? ? ?set_param_value_internal.
> ? ? ? ?(default_param_value, init_param_values): New.
> ? ? ? ?* params.h (struct param_info): Change value to default_value.
> ? ? ? ?Remove set.
> ? ? ? ?(set_param_value, maybe_set_param_value): Add params and
> ? ? ? ?params_set parameters.
> ? ? ? ?(PARAM_VALUE): Get parameters from global_options.
> ? ? ? ?(PARAM_SET_P): Remove.
> ? ? ? ?(finish_params, default_param_value, init_param_values): New.
> ? ? ? ?* common.opt (param_values): New Variable.
> ? ? ? ?* config/arm/arm.c (arm_option_override): Pass extra arguments to
> ? ? ? ?maybe_set_param_value.
> ? ? ? ?* config/i386/i386.c (ix86_option_override_internal): Pass extra
> ? ? ? ?arguments to maybe_set_param_value.
> ? ? ? ?* config/picochip/picochip.c (picochip_option_override): Pass
> ? ? ? ?extra arguments to maybe_set_param_value.
> ? ? ? ?* config/rs6000/rs6000.c (rs6000_option_override_internal): Pass
> ? ? ? ?extra arguments to maybe_set_param_value.
> ? ? ? ?* config/s390/s390.c (s390_option_override): Use
> ? ? ? ?maybe_set_param_value instead of set_param_value. ?Pass extra
> ? ? ? ?arguments to maybe_set_param_value.
> ? ? ? ?* config/sparc/sparc.c (sparc_option_override): Pass extra
> ? ? ? ?arguments to maybe_set_param_value.
> ? ? ? ?* config/spu/spu.c (spu_option_override): Pass extra arguments to
> ? ? ? ?maybe_set_param_value.
> ? ? ? ?* opts.c (handle_param): Take opts and opts_set parameters.
> ? ? ? ?Update call to set_param_value.
> ? ? ? ?(initial_min_crossjump_insns,
> ? ? ? ?initial_max_fields_for_field_sensitive,
> ? ? ? ?initial_loop_invariant_max_bbs_in_loop): Remove.
> ? ? ? ?(init_options_once): Don't set them.
> ? ? ? ?(init_options_struct): Initialize parameters structures.
> ? ? ? ?(default_options_optimization): Use default_param_value when
> ? ? ? ?restoring defaults. ?Update calls to maybe_set_param_value.
> ? ? ? ?(finish_options): Update calls to maybe_set_param_value.
> ? ? ? ?(common_handle_option): Update calls to handle_param and
> ? ? ? ?set_param_value.
> ? ? ? ?* toplev.c (DEFPARAM): Update definition for changes to
> ? ? ? ?param_info.
> ? ? ? ?(general_init): Call finish_params.
>
> Index: gcc/params.c
> ===================================================================
> --- gcc/params.c ? ? ? ?(revision 165418)
> +++ gcc/params.c ? ? ? ?(working copy)
> @@ -35,11 +35,17 @@ param_info *compiler_params;
> ?/* The number of entries in the table. ?*/
> ?static size_t num_compiler_params;
>
> +/* Whether the parameters have all been initialized and had their
> + ? default values determined. ?*/
> +static bool params_finished;
> +
> ?/* Add the N PARAMS to the current list of compiler parameters. ?*/
>
> ?void
> ?add_params (const param_info params[], size_t n)
> ?{
> + ?gcc_assert (!params_finished);
> +
> ? /* Allocate enough space for the new parameters. ?*/
> ? compiler_params = XRESIZEVEC (param_info, compiler_params,
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?num_compiler_params + n);
> @@ -51,25 +57,39 @@ add_params (const param_info params[], s
> ? num_compiler_params += n;
> ?}
>
> -/* Set the value of the parameter given by NUM to VALUE. ?If
> - ? EXPLICIT_P, this is being set by the user; otherwise it is being
> - ? set implicitly by the compiler. ?*/
> +/* Note that all parameters have been added and all default values
> + ? set. ?*/
> +
> +void
> +finish_params (void)
> +{
> + ?params_finished = true;
> +}
> +
> +/* Set the value of the parameter given by NUM to VALUE in PARAMS and
> + ? PARAMS_SET. ?If EXPLICIT_P, this is being set by the user;
> + ? otherwise it is being set implicitly by the compiler. ?*/
>
> ?static void
> ?set_param_value_internal (compiler_param num, int value,
> + ? ? ? ? ? ? ? ? ? ? ? ? int *params, int *params_set,
> ? ? ? ? ? ? ? ? ? ? ? ? ?bool explicit_p)
> ?{
> ? size_t i = (size_t) num;
>
> - ?compiler_params[i].value = value;
> + ?gcc_assert (params_finished);
> +
> + ?params[i] = value;
> ? if (explicit_p)
> - ? ?compiler_params[i].set = true;
> + ? ?params_set[i] = true;
> ?}
>
> -/* Set the VALUE associated with the parameter given by NAME. ?*/
> +/* Set the VALUE associated with the parameter given by NAME in PARAMS
> + ? and PARAMS_SET. ?*/
>
> ?void
> -set_param_value (const char *name, int value)
> +set_param_value (const char *name, int value,
> + ? ? ? ? ? ? ? ?int *params, int *params_set)
> ?{
> ? size_t i;
>
> @@ -90,7 +110,8 @@ set_param_value (const char *name, int v
> ? ? ? ? ? ? ? ? compiler_params[i].option,
> ? ? ? ? ? ? ? ? compiler_params[i].max_value);
> ? ? ? ?else
> - ? ? ? ? set_param_value_internal ((compiler_param) i, value, true);
> + ? ? ? ? set_param_value_internal ((compiler_param) i, value,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? params, params_set, true);
> ? ? ? ?return;
> ? ? ? }
>
> @@ -98,14 +119,16 @@ set_param_value (const char *name, int v
> ? error ("invalid parameter %qs", name);
> ?}
>
> -/* Set the value of the parameter given by NUM to VALUE, implicitly,
> - ? if it has not been set explicitly by the user. ?*/
> +/* Set the value of the parameter given by NUM to VALUE in PARAMS and
> + ? PARAMS_SET, implicitly, if it has not been set explicitly by the
> + ? user. ?*/
>
> ?void
> -maybe_set_param_value (compiler_param num, int value)
> +maybe_set_param_value (compiler_param num, int value,
> + ? ? ? ? ? ? ? ? ? ? ?int *params, int *params_set)
> ?{
> - ?if (!PARAM_SET_P (num))
> - ? ?set_param_value_internal (num, value, false);
> + ?if (!params_set[(int) num])
> + ? ?set_param_value_internal (num, value, params, params_set, false);
> ?}
>
> ?/* Set the default value of a parameter given by NUM to VALUE, before
> @@ -114,8 +137,31 @@ maybe_set_param_value (compiler_param nu
> ?void
> ?set_default_param_value (compiler_param num, int value)
> ?{
> - ?gcc_assert (!PARAM_SET_P (num));
> - ?set_param_value_internal (num, value, false);
> + ?gcc_assert (!params_finished);
> +
> + ?compiler_params[(int) num].default_value = value;
> +}
> +
> +/* Return the default value of parameter NUM. ?*/
> +
> +int
> +default_param_value (compiler_param num)
> +{
> + ?return compiler_params[(int) num].default_value;
> +}
> +
> +/* Initialize an array PARAMS with default values of the
> + ? parameters. ?*/
> +
> +void
> +init_param_values (int *params)
> +{
> + ?size_t i;
> +
> + ?gcc_assert (params_finished);
> +
> + ?for (i = 0; i < num_compiler_params; i++)
> + ? ?params[i] = compiler_params[i].default_value;
> ?}
>
> ?/* Return the current value of num_compiler_params, for the benefit of
> Index: gcc/params.h
> ===================================================================
> --- gcc/params.h ? ? ? ?(revision 165418)
> +++ gcc/params.h ? ? ? ?(working copy)
> @@ -44,11 +44,9 @@ typedef struct param_info
> ? /* The name used with the `--param <name>=<value>' switch to set this
> ? ? ?value. ?*/
> ? const char *const option;
> - ?/* The associated value. ?*/
> - ?int value;
>
> - ?/* True if the parameter was explicitly set. ?*/
> - ?bool set;
> + ?/* The default value. ?*/
> + ?int default_value;
>
> ? /* Minimum acceptable value. ?*/
> ? int min_value;
> @@ -72,9 +70,12 @@ extern size_t get_num_compiler_params (v
>
> ?extern void add_params (const param_info params[], size_t n);
>
> -/* Set the VALUE associated with the parameter given by NAME. ?*/
> +/* Set the VALUE associated with the parameter given by NAME in the
> + ? table PARAMS using PARAMS_SET to indicate which have been
> + ? explicitly set. ?*/
>
> -extern void set_param_value (const char *name, int value);
> +extern void set_param_value (const char *name, int value,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ?int *params, int *params_set);
>
>
> ?/* The parameters in use by language-independent code. ?*/
> @@ -90,22 +91,31 @@ typedef enum compiler_param
>
> ?/* The value of the parameter given by ENUM. ?Not an lvalue. ?*/
> ?#define PARAM_VALUE(ENUM) \
> - ?((int) compiler_params[(int) ENUM].value)
> + ?((int) global_options.x_param_values[(int) ENUM])
>
> ?/* Set the value of the parameter given by NUM to VALUE, implicitly,
> - ? if it has not been set explicitly by the user. ?*/
> + ? if it has not been set explicitly by the user, in the table PARAMS
> + ? using PARAMS_SET to indicate which have been explicitly set. ?*/
>
> -extern void maybe_set_param_value (compiler_param num, int value);
> +extern void maybe_set_param_value (compiler_param num, int value,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?int *params, int *params_set);
>
> ?/* Set the default value of a parameter given by NUM to VALUE, before
> ? ?option processing. ?*/
>
> ?extern void set_default_param_value (compiler_param num, int value);
>
> -/* True if the value of the parameter was explicitly changed. ?Not an
> - ? lvalue. ?*/
> -#define PARAM_SET_P(ENUM) \
> - ?((bool) compiler_params[(int) ENUM].set)
> +/* Note that all parameters have been added and all default values
> + ? set. ?*/
> +extern void finish_params (void);
> +
> +/* Return the default value of parameter NUM. ?*/
> +
> +extern int default_param_value (compiler_param num);
> +
> +/* Initialize an array PARAMS with default values of the
> + ? parameters. ?*/
> +extern void init_param_values (int *params);
>
> ?/* Macros for the various parameters. ?*/
> ?#define STRUCT_REORG_COLD_STRUCT_RATIO \
> Index: gcc/toplev.c
> ===================================================================
> --- gcc/toplev.c ? ? ? ?(revision 165418)
> +++ gcc/toplev.c ? ? ? ?(working copy)
> @@ -286,10 +286,10 @@ const char *user_label_prefix;
>
> ?static const param_info lang_independent_params[] = {
> ?#define DEFPARAM(ENUM, OPTION, HELP, DEFAULT, MIN, MAX) \
> - ?{ OPTION, DEFAULT, false, MIN, MAX, HELP },
> + ?{ OPTION, DEFAULT, MIN, MAX, HELP },
> ?#include "params.def"
> ?#undef DEFPARAM
> - ?{ NULL, 0, false, 0, 0, NULL }
> + ?{ NULL, 0, 0, 0, NULL }
> ?};
>
> ?/* Output files for assembler code (real compiler output)
> @@ -1698,6 +1698,7 @@ general_init (const char *argv0)
> ? init_ggc_heuristics();
> ? init_optimization_passes ();
> ? statistics_early_init ();
> + ?finish_params ();
> ?}
>
> ?/* Return true if the current target supports -fsection-anchors. ?*/
> Index: gcc/opts.c
> ===================================================================
> --- gcc/opts.c ?(revision 165418)
> +++ gcc/opts.c ?(working copy)
> @@ -362,7 +362,8 @@ static bool common_handle_option (struct
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?const struct cl_decoded_option *decoded,
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?unsigned int lang_mask, int kind,
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?const struct cl_option_handlers *handlers);
> -static void handle_param (const char *);
> +static void handle_param (struct gcc_options *opts,
> + ? ? ? ? ? ? ? ? ? ? ? ? struct gcc_options *opts_set, const char *carg);
> ?static char *write_langs (unsigned int lang_mask);
> ?static void complain_wrong_lang (const struct cl_decoded_option *,
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? unsigned int lang_mask);
> @@ -652,11 +653,6 @@ read_cmdline_options (struct gcc_options
> ?/* Language mask determined at initialization. ?*/
> ?static unsigned int initial_lang_mask;
>
> -/* Initial values of parameters we reset. ?*/
> -static int initial_min_crossjump_insns;
> -static int initial_max_fields_for_field_sensitive;
> -static int initial_loop_invariant_max_bbs_in_loop;
> -
> ?/* Initialize global options-related settings at start-up. ?*/
>
> ?void
> @@ -666,14 +662,6 @@ init_options_once (void)
> ? initial_lang_mask = lang_hooks.option_lang_mask ();
>
> ? lang_hooks.initialize_diagnostics (global_dc);
> -
> - ?/* Save initial values of parameters we reset. ?*/
> - ?initial_min_crossjump_insns
> - ? ?= PARAM_VALUE (PARAM_MIN_CROSSJUMP_INSNS);
> - ?initial_max_fields_for_field_sensitive
> - ? ?= PARAM_VALUE (PARAM_MAX_FIELDS_FOR_FIELD_SENSITIVE);
> - ?initial_loop_invariant_max_bbs_in_loop
> - ? ?= PARAM_VALUE (PARAM_LOOP_INVARIANT_MAX_BBS_IN_LOOP);
> ?}
>
> ?/* Initialize OPTS and OPTS_SET before using them in parsing options. ?*/
> @@ -681,9 +669,15 @@ init_options_once (void)
> ?void
> ?init_options_struct (struct gcc_options *opts, struct gcc_options *opts_set)
> ?{
> + ?size_t num_params = get_num_compiler_params ();
> +
> ? *opts = global_options_init;
> ? memset (opts_set, 0, sizeof (*opts_set));
>
> + ?opts->x_param_values = XNEWVEC (int, num_params);
> + ?opts_set->x_param_values = XCNEWVEC (int, num_params);
> + ?init_param_values (opts->x_param_values);
> +
> ? /* Use priority coloring if cover classes is not defined for the
> ? ? ?target. ?*/
> ? if (targetm.ira_cover_classes == NULL)
> @@ -853,12 +847,16 @@ default_options_optimization (struct gcc
> ? flag_ipa_sra = opt2;
>
> ? /* Track fields in field-sensitive alias analysis. ?*/
> - ?maybe_set_param_value (PARAM_MAX_FIELDS_FOR_FIELD_SENSITIVE,
> - ? ? ? ? ? ? ? ? ? ? ? ?opt2 ? 100 : initial_max_fields_for_field_sensitive);
> + ?maybe_set_param_value
> + ? ?(PARAM_MAX_FIELDS_FOR_FIELD_SENSITIVE,
> + ? ? opt2 ? 100 : default_param_value (PARAM_MAX_FIELDS_FOR_FIELD_SENSITIVE),
> + ? ? opts->x_param_values, opts_set->x_param_values);
>
> ? /* For -O1 only do loop invariant motion for very small loops. ?*/
> - ?maybe_set_param_value (PARAM_LOOP_INVARIANT_MAX_BBS_IN_LOOP,
> - ? ? ? ? ? ? ? ? ? ? ? ?opt2 ? initial_loop_invariant_max_bbs_in_loop : 1000);
> + ?maybe_set_param_value
> + ? ?(PARAM_LOOP_INVARIANT_MAX_BBS_IN_LOOP,
> + ? ? opt2 ? default_param_value (PARAM_LOOP_INVARIANT_MAX_BBS_IN_LOOP) : 1000,
> + ? ? opts->x_param_values, opts_set->x_param_values);
>
> ? /* -O3 optimizations. ?*/
> ? opt3 = (optimize >= 3);
> @@ -891,11 +889,13 @@ default_options_optimization (struct gcc
> ? ? ? ?optimize = 2;
>
> ? ? ? /* We want to crossjump as much as possible. ?*/
> - ? ? ?maybe_set_param_value (PARAM_MIN_CROSSJUMP_INSNS, 1);
> + ? ? ?maybe_set_param_value (PARAM_MIN_CROSSJUMP_INSNS, 1,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ?opts->x_param_values, opts_set->x_param_values);
> ? ? }
> ? else
> ? ? maybe_set_param_value (PARAM_MIN_CROSSJUMP_INSNS,
> - ? ? ? ? ? ? ? ? ? ? ? ? ?initial_min_crossjump_insns);
> + ? ? ? ? ? ? ? ? ? ? ? ? ?default_param_value (PARAM_MIN_CROSSJUMP_INSNS),
> + ? ? ? ? ? ? ? ? ? ? ? ? ?opts->x_param_values, opts_set->x_param_values);
>
> ? /* -Ofast adds optimizations to -O3. ?*/
> ? if (ofast)
> @@ -1115,8 +1115,10 @@ finish_options (struct gcc_options *opts
>
> ? if (flag_conserve_stack)
> ? ? {
> - ? ? ?maybe_set_param_value (PARAM_LARGE_STACK_FRAME, 100);
> - ? ? ?maybe_set_param_value (PARAM_STACK_FRAME_GROWTH, 40);
> + ? ? ?maybe_set_param_value (PARAM_LARGE_STACK_FRAME, 100,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ?opts->x_param_values, opts_set->x_param_values);
> + ? ? ?maybe_set_param_value (PARAM_STACK_FRAME_GROWTH, 40,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ?opts->x_param_values, opts_set->x_param_values);
> ? ? }
> ? if (flag_wpa || flag_ltrans)
> ? ? {
> @@ -1506,7 +1508,7 @@ common_handle_option (struct gcc_options
> ? switch (code)
> ? ? {
> ? ? case OPT__param:
> - ? ? ?handle_param (arg);
> + ? ? ?handle_param (opts, opts_set, arg);
> ? ? ? break;
>
> ? ? case OPT_v:
> @@ -1826,8 +1828,10 @@ common_handle_option (struct gcc_options
> ? ? ? break;
>
> ? ? case OPT_finline_limit_:
> - ? ? ?set_param_value ("max-inline-insns-single", value / 2);
> - ? ? ?set_param_value ("max-inline-insns-auto", value / 2);
> + ? ? ?set_param_value ("max-inline-insns-single", value / 2,
> + ? ? ? ? ? ? ? ? ? ? ?opts->x_param_values, opts_set->x_param_values);
> + ? ? ?set_param_value ("max-inline-insns-auto", value / 2,
> + ? ? ? ? ? ? ? ? ? ? ?opts->x_param_values, opts_set->x_param_values);
> ? ? ? break;
>
> ? ? case OPT_finstrument_functions_exclude_function_list_:
> @@ -2122,7 +2126,8 @@ common_handle_option (struct gcc_options
>
> ?/* Handle --param NAME=VALUE. ?*/
> ?static void
> -handle_param (const char *carg)
> +handle_param (struct gcc_options *opts, struct gcc_options *opts_set,
> + ? ? ? ? ? ? const char *carg)
> ?{
> ? char *equal, *arg;
> ? int value;
> @@ -2139,7 +2144,8 @@ handle_param (const char *carg)
> ? ? ? else
> ? ? ? ?{
> ? ? ? ? ?*equal = '\0';
> - ? ? ? ? set_param_value (arg, value);
> + ? ? ? ? set_param_value (arg, value,
> + ? ? ? ? ? ? ? ? ? ? ? ? ?opts->x_param_values, opts_set->x_param_values);
> ? ? ? ?}
> ? ? }
>
> Index: gcc/common.opt
> ===================================================================
> --- gcc/common.opt ? ? ?(revision 165418)
> +++ gcc/common.opt ? ? ?(working copy)
> @@ -55,6 +55,9 @@ enum ira_region flag_ira_region = IRA_RE
> ?Variable
> ?bool flag_warn_unused_result = false
>
> +Variable
> +int *param_values
> +
> ?###
> ?Driver
>
> Index: gcc/config/s390/s390.c
> ===================================================================
> --- gcc/config/s390/s390.c ? ? ?(revision 165418)
> +++ gcc/config/s390/s390.c ? ? ?(working copy)
> @@ -1687,22 +1687,42 @@ s390_option_override (void)
> ? if (s390_tune == PROCESSOR_2097_Z10
> ? ? ? || s390_tune == PROCESSOR_2817_Z196)
> ? ? {
> - ? ? ?maybe_set_param_value (PARAM_MAX_UNROLLED_INSNS, 100);
> - ? ? ?maybe_set_param_value (PARAM_MAX_UNROLL_TIMES, 32);
> - ? ? ?maybe_set_param_value (PARAM_MAX_COMPLETELY_PEELED_INSNS, 2000);
> - ? ? ?maybe_set_param_value (PARAM_MAX_COMPLETELY_PEEL_TIMES, 64);
> - ? ?}
> -
> - ?set_param_value ("max-pending-list-length", 256);
> + ? ? ?maybe_set_param_value (PARAM_MAX_UNROLLED_INSNS, 100,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ?global_options.x_param_values,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ?global_options_set.x_param_values);
> + ? ? ?maybe_set_param_value (PARAM_MAX_UNROLL_TIMES, 32,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ?global_options.x_param_values,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ?global_options_set.x_param_values);
> + ? ? ?maybe_set_param_value (PARAM_MAX_COMPLETELY_PEELED_INSNS, 2000,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ?global_options.x_param_values,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ?global_options_set.x_param_values);
> + ? ? ?maybe_set_param_value (PARAM_MAX_COMPLETELY_PEEL_TIMES, 64,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ?global_options.x_param_values,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ?global_options_set.x_param_values);
> + ? ?}
> +
> + ?maybe_set_param_value (PARAM_MAX_PENDING_LIST_LENGTH, 256,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options.x_param_values,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options_set.x_param_values);
> ? /* values for loop prefetching */
> - ?set_param_value ("l1-cache-line-size", 256);
> - ?maybe_set_param_value (PARAM_L1_CACHE_SIZE, 128);
> + ?maybe_set_param_value (PARAM_L1_CACHE_LINE_SIZE, 256,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options.x_param_values,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options_set.x_param_values);
> + ?maybe_set_param_value (PARAM_L1_CACHE_SIZE, 128,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options.x_param_values,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options_set.x_param_values);
> ? /* s390 has more than 2 levels and the size is much larger. ?Since
> ? ? ?we are always running virtualized assume that we only get a small
> ? ? ?part of the caches above l1. ?*/
> - ?maybe_set_param_value (PARAM_L2_CACHE_SIZE, 1500);
> - ?maybe_set_param_value (PARAM_PREFETCH_MIN_INSN_TO_MEM_RATIO, 2);
> - ?maybe_set_param_value (PARAM_SIMULTANEOUS_PREFETCHES, 6);
> + ?maybe_set_param_value (PARAM_L2_CACHE_SIZE, 1500,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options.x_param_values,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options_set.x_param_values);
> + ?maybe_set_param_value (PARAM_PREFETCH_MIN_INSN_TO_MEM_RATIO, 2,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options.x_param_values,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options_set.x_param_values);
> + ?maybe_set_param_value (PARAM_SIMULTANEOUS_PREFETCHES, 6,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options.x_param_values,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options_set.x_param_values);
>
> ? /* This cannot reside in s390_option_optimization since HAVE_prefetch
> ? ? ?requires the arch flags to be evaluated already. ?Since prefetching
> Index: gcc/config/spu/spu.c
> ===================================================================
> --- gcc/config/spu/spu.c ? ? ? ?(revision 165418)
> +++ gcc/config/spu/spu.c ? ? ? ?(working copy)
> @@ -514,7 +514,9 @@ spu_option_override (void)
> ? /* Small loops will be unpeeled at -O3. ?For SPU it is more important
> ? ? ?to keep code small by default. ?*/
> ? if (!flag_unroll_loops && !flag_peel_loops)
> - ? ?maybe_set_param_value (PARAM_MAX_COMPLETELY_PEEL_TIMES, 1);
> + ? ?maybe_set_param_value (PARAM_MAX_COMPLETELY_PEEL_TIMES, 1,
> + ? ? ? ? ? ? ? ? ? ? ? ? ?global_options.x_param_values,
> + ? ? ? ? ? ? ? ? ? ? ? ? ?global_options_set.x_param_values);
>
> ? flag_omit_frame_pointer = 1;
>
> Index: gcc/config/sparc/sparc.c
> ===================================================================
> --- gcc/config/sparc/sparc.c ? ?(revision 165418)
> +++ gcc/config/sparc/sparc.c ? ?(working copy)
> @@ -922,13 +922,17 @@ sparc_option_override (void)
> ? ? ? ? ? ? ? ? ? ? ? ? ? || sparc_cpu == PROCESSOR_NIAGARA2)
> ? ? ? ? ? ? ? ? ? ? ? ? ?? 2
> ? ? ? ? ? ? ? ? ? ? ? ? ?: (sparc_cpu == PROCESSOR_ULTRASPARC3
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ?? 8 : 3)));
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ?? 8 : 3)),
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options.x_param_values,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options_set.x_param_values);
> ? maybe_set_param_value (PARAM_L1_CACHE_LINE_SIZE,
> ? ? ? ? ? ? ? ? ? ? ? ? ((sparc_cpu == PROCESSOR_ULTRASPARC
> ? ? ? ? ? ? ? ? ? ? ? ? ? || sparc_cpu == PROCESSOR_ULTRASPARC3
> ? ? ? ? ? ? ? ? ? ? ? ? ? || sparc_cpu == PROCESSOR_NIAGARA
> ? ? ? ? ? ? ? ? ? ? ? ? ? || sparc_cpu == PROCESSOR_NIAGARA2)
> - ? ? ? ? ? ? ? ? ? ? ? ? ? 64 : 32));
> + ? ? ? ? ? ? ? ? ? ? ? ? ? 64 : 32),
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options.x_param_values,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options_set.x_param_values);
> ?}
>
> ?/* Miscellaneous utilities. ?*/
> Index: gcc/config/i386/i386.c
> ===================================================================
> --- gcc/config/i386/i386.c ? ? ?(revision 165418)
> +++ gcc/config/i386/i386.c ? ? ?(working copy)
> @@ -3633,10 +3633,18 @@ ix86_option_override_internal (bool main
> ? ? flag_schedule_insns_after_reload = flag_schedule_insns = 0;
>
> ? maybe_set_param_value (PARAM_SIMULTANEOUS_PREFETCHES,
> - ? ? ? ? ? ? ? ? ? ? ? ?ix86_cost->simultaneous_prefetches);
> - ?maybe_set_param_value (PARAM_L1_CACHE_LINE_SIZE, ix86_cost->prefetch_block);
> - ?maybe_set_param_value (PARAM_L1_CACHE_SIZE, ix86_cost->l1_cache_size);
> - ?maybe_set_param_value (PARAM_L2_CACHE_SIZE, ix86_cost->l2_cache_size);
> + ? ? ? ? ? ? ? ? ? ? ? ?ix86_cost->simultaneous_prefetches,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options.x_param_values,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options_set.x_param_values);
> + ?maybe_set_param_value (PARAM_L1_CACHE_LINE_SIZE, ix86_cost->prefetch_block,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options.x_param_values,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options_set.x_param_values);
> + ?maybe_set_param_value (PARAM_L1_CACHE_SIZE, ix86_cost->l1_cache_size,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options.x_param_values,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options_set.x_param_values);
> + ?maybe_set_param_value (PARAM_L2_CACHE_SIZE, ix86_cost->l2_cache_size,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options.x_param_values,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options_set.x_param_values);
>
> ? /* Enable sw prefetching at -O3 for CPUS that prefetching is helpful. ?*/
> ? if (flag_prefetch_loop_arrays < 0
> Index: gcc/config/rs6000/rs6000.c
> ===================================================================
> --- gcc/config/rs6000/rs6000.c ?(revision 165418)
> +++ gcc/config/rs6000/rs6000.c ?(working copy)
> @@ -3159,11 +3159,19 @@ rs6000_option_override_internal (const c
> ? ? ? }
>
> ? maybe_set_param_value (PARAM_SIMULTANEOUS_PREFETCHES,
> - ? ? ? ? ? ? ? ? ? ? ? ?rs6000_cost->simultaneous_prefetches);
> - ?maybe_set_param_value (PARAM_L1_CACHE_SIZE, rs6000_cost->l1_cache_size);
> + ? ? ? ? ? ? ? ? ? ? ? ?rs6000_cost->simultaneous_prefetches,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options.x_param_values,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options_set.x_param_values);
> + ?maybe_set_param_value (PARAM_L1_CACHE_SIZE, rs6000_cost->l1_cache_size,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options.x_param_values,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options_set.x_param_values);
> ? maybe_set_param_value (PARAM_L1_CACHE_LINE_SIZE,
> - ? ? ? ? ? ? ? ? ? ? ? ?rs6000_cost->cache_line_size);
> - ?maybe_set_param_value (PARAM_L2_CACHE_SIZE, rs6000_cost->l2_cache_size);
> + ? ? ? ? ? ? ? ? ? ? ? ?rs6000_cost->cache_line_size,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options.x_param_values,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options_set.x_param_values);
> + ?maybe_set_param_value (PARAM_L2_CACHE_SIZE, rs6000_cost->l2_cache_size,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options.x_param_values,
> + ? ? ? ? ? ? ? ? ? ? ? ?global_options_set.x_param_values);
>
> ? /* If using typedef char *va_list, signal that __builtin_va_start (&ap, 0)
> ? ? ?can be optimized to ap = __builtin_next_arg (0). ?*/
> Index: gcc/config/picochip/picochip.c
> ===================================================================
> --- gcc/config/picochip/picochip.c ? ? ?(revision 165418)
> +++ gcc/config/picochip/picochip.c ? ? ?(working copy)
> @@ -354,8 +354,12 @@ picochip_option_override (void)
> ? ? ?that could potentially increase stack size.*/
> ? ?if (flag_conserve_stack)
> ? ? ?{
> - ? ? ? maybe_set_param_value (PARAM_LARGE_STACK_FRAME, 0);
> - ? ? ? maybe_set_param_value (PARAM_STACK_FRAME_GROWTH, 0);
> + ? ? ? maybe_set_param_value (PARAM_LARGE_STACK_FRAME, 0,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? global_options.x_param_values,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? global_options_set.x_param_values);
> + ? ? ? maybe_set_param_value (PARAM_STACK_FRAME_GROWTH, 0,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? global_options.x_param_values,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? global_options_set.x_param_values);
> ? ? ?}
>
> ? /* Turn off the elimination of unused types. The elaborator
> Index: gcc/config/arm/arm.c
> ===================================================================
> --- gcc/config/arm/arm.c ? ? ? ?(revision 165418)
> +++ gcc/config/arm/arm.c ? ? ? ?(working copy)
> @@ -1958,7 +1958,9 @@ arm_option_override (void)
> ? ? ? ?but measurable, size reduction for PIC code. ?Therefore, we decrease
> ? ? ? ?the bar for unrestricted expression hoisting to the cost of PIC address
> ? ? ? ?calculation, which is 2 instructions. ?*/
> - ? ?maybe_set_param_value (PARAM_GCSE_UNRESTRICTED_COST, 2);
> + ? ?maybe_set_param_value (PARAM_GCSE_UNRESTRICTED_COST, 2,
> + ? ? ? ? ? ? ? ? ? ? ? ? ?global_options.x_param_values,
> + ? ? ? ? ? ? ? ? ? ? ? ? ?global_options_set.x_param_values);
>
> ? /* Register global variables with the garbage collector. ?*/
> ? arm_add_gc_roots ();
>
> --
> Joseph S. Myers
> joseph@codesourcery.com
>