From patchwork Fri Feb 15 17:52:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aldy Hernandez X-Patchwork-Id: 220786 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id C34BD2C0085 for ; Sat, 16 Feb 2013 04:52:39 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1361555560; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: References:In-Reply-To:Content-Type:Mailing-List:Precedence: List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=QINSgXS/4IKY9/tkgFij0nx5ePI=; b=T+CRqYdoKGrORbV 7wpW8KPNzKHT/8Khj/OmZ2rx1uy/g8ndlH6Y77POGZjkt0YRMkmt3EgMC+5q5Hk5 f8EQhpYLpYGKxnXrJgazKPuZLeNBUoTAuzdSCjRa+IDIcm6L0PZT5KCFNExMXQM/ 60PgkuFUgzX3Dt2G2lNd6omqt518= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:References:In-Reply-To:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=X/JaKgf0TvXXcuIbhNQk+sH6cqlyAm6L1fYO1JWonK54dYEUYXHfy6+XGzV3Iy qI3cqXhMHPei1hj/a7laT12LSN6CCoaqSlRWAZ5A9y15FZjl/59nUbrgPxMHEX13 UoWvUMRmHcD25wde7ETOue2cGxkha0tQsQ2qtWITiDpd8=; Received: (qmail 24162 invoked by alias); 15 Feb 2013 17:52:32 -0000 Received: (qmail 24153 invoked by uid 22791); 15 Feb 2013 17:52:31 -0000 X-SWARE-Spam-Status: No, hits=-7.0 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, KHOP_SPAMHAUS_DROP, KHOP_THREADED, RCVD_IN_DNSWL_HI, RCVD_IN_HOSTKARMA_W, RP_MATCHES_RCVD, SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 15 Feb 2013 17:52:17 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r1FHqGX5003544 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 15 Feb 2013 12:52:16 -0500 Received: from houston.quesejoda.com (vpn-50-249.rdu2.redhat.com [10.10.50.249]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r1FHqF07017150; Fri, 15 Feb 2013 12:52:15 -0500 Message-ID: <511E75CF.3070206@redhat.com> Date: Fri, 15 Feb 2013 11:52:15 -0600 From: Aldy Hernandez User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: Jakub Jelinek CC: gcc-patches , rdsandiford@googlemail.com Subject: Re: PR target/52555: attribute optimize is overriding command line options References: <51198989.7090803@redhat.com> <20130212140503.GD4385@tucnak.redhat.com> <878v6twl42.fsf@talisman.default> <511A7BBF.1030401@redhat.com> <874nhhwhvi.fsf@talisman.default> <511BCFC2.6070601@redhat.com> <874nhgumeg.fsf@talisman.default> <511BD678.2090206@redhat.com> <20130213195406.GA4385@tucnak.redhat.com> <511E6EF5.6040709@redhat.com> <20130215173505.GT1215@tucnak.zalov.cz> In-Reply-To: <20130215173505.GT1215@tucnak.zalov.cz> Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org > Looks good, just a few nits. But please wait for Richard's feedback on it. Will do. >> + this_fn_optabs = fn->optabs ? (struct target_optabs *) fn->optabs >> + : this_target_optabs; > > I'd prefer : here be below ? on the line above it. Blame emacs. I use whatever indentation it decides to use. > >> + /* ?? An existing optabs indicates multiple ((optimize)) >> + attributes for the same function. Is this even valid? For >> + now, just clobber the existing entry with the new optabs. */ >> + if (TREE_OPTIMIZATION_OPTABS (optnode)) >> + XDELETE (TREE_OPTIMIZATION_OPTABS (optnode)); > > The comment is wrong, > void foo (void) __attribute__((optimize (2))); > void foo (void) __attribute__((optimize ("fast-math"))); > void foo (void) __attribute__((optimize ("unroll-loops"))); Oh, that's just sick. Fair enough, I removed the comment altogether. > Plus XDELETE on GC allocated memory is wrong. Just remove the comment > and if and XDELETE lines. And this is just embarrassing...fixed. Thanks. Retesting the attached patch. +2013-02-15 Aldy Hernandez + Jakub Jelinek + + PR target/52555 + * genopinit.c (raw_optab_handler): Use this_fn_optabs. + (swap_optab_enable): Same. + (init_all_optabs): Use argument instead of global. + * tree.h (struct tree_optimization_option): New field + target_optabs. + * expr.h (init_all_optabs): Add argument to prototype. + (TREE_OPTIMIZATION_OPTABS): New. + (save_optabs_if_changed): Protoize. + * optabs.h: Declare this_fn_optabs. + * optabs.c (save_optabs_if_changed): New. + Declare this_fn_optabs. + (init_optabs): Add argument to init_all_optabs() call. + * function.c (invoke_set_current_function_hook): Handle per + function optabs. + * function.h (struct function): New field optabs. + * config/mips/mips.c (mips_set_mips16_mode): Handle when + optimization_current_node has changed. c/family + PR target/52555 + * c-common.c (handle_optimize_attribute): Call + save_optabs_if_changed. diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c index 1e6afaa..a1d47a6 100644 --- a/gcc/c-family/c-common.c +++ b/gcc/c-family/c-common.c @@ -8925,6 +8925,8 @@ handle_optimize_attribute (tree *node, tree name, tree args, DECL_FUNCTION_SPECIFIC_OPTIMIZATION (*node) = build_optimization_node (); + save_optabs_if_changed (*node); + /* Restore current options. */ cl_optimization_restore (&global_options, &cur_opts); } diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c index b203cdd..5e98485 100644 --- a/gcc/config/mips/mips.c +++ b/gcc/config/mips/mips.c @@ -16313,7 +16313,26 @@ mips_set_mips16_mode (int mips16_p) if (mips16_p) { if (!mips16_globals) - mips16_globals = save_target_globals (); + { + if (optimization_current_node != optimization_default_node) + { + tree opts = optimization_current_node; + /* Temporarily switch to the default optimization node, + so that *this_target_optabs is set to the default, + not reflecting whatever the first mips16 function + uses for the optimize attribute. */ + optimization_current_node = optimization_default_node; + cl_optimization_restore + (&global_options, + TREE_OPTIMIZATION (optimization_default_node)); + mips16_globals = save_target_globals (); + optimization_current_node = opts; + cl_optimization_restore (&global_options, + TREE_OPTIMIZATION (opts)); + } + else + mips16_globals = save_target_globals (); + } else restore_target_globals (mips16_globals); } diff --git a/gcc/expr.h b/gcc/expr.h index f5063b4..15fcb47 100644 --- a/gcc/expr.h +++ b/gcc/expr.h @@ -718,7 +718,7 @@ extern bool split_comparison (enum rtx_code, enum machine_mode, /* Call this once to initialize the contents of the optabs appropriately for the current target machine. */ extern void init_optabs (void); -extern void init_all_optabs (void); +extern void init_all_optabs (struct target_optabs *); /* Call this to initialize an optab function entry. */ extern rtx init_one_libfunc (const char *); diff --git a/gcc/function.c b/gcc/function.c index 4ce2259..c87f62d 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -4400,6 +4400,27 @@ invoke_set_current_function_hook (tree fndecl) } targetm.set_current_function (fndecl); + + if (opts == optimization_default_node) + this_fn_optabs = this_target_optabs; + else + { + struct function *fn = DECL_STRUCT_FUNCTION (fndecl); + if (fn->optabs == NULL) + { + if (!SWITCHABLE_TARGET + || this_target_optabs == &default_target_optabs) + fn->optabs = TREE_OPTIMIZATION_OPTABS (opts); + else + { + fn->optabs = (unsigned char *) + ggc_alloc_atomic (sizeof (struct target_optabs)); + init_all_optabs ((struct target_optabs *) fn->optabs); + } + } + this_fn_optabs = fn->optabs ? (struct target_optabs *) fn->optabs + : this_target_optabs; + } } } diff --git a/gcc/function.h b/gcc/function.h index 89d71e5..53e28b7 100644 --- a/gcc/function.h +++ b/gcc/function.h @@ -580,6 +580,9 @@ struct GTY(()) function { a string describing the reason for failure. */ const char * GTY((skip)) cannot_be_copied_reason; + /* Optabs for this function. This is of type `struct target_optabs *'. */ + unsigned char *GTY ((atomic)) optabs; + /* Collected bit flags. */ /* Number of units of general registers that need saving in stdarg diff --git a/gcc/genopinit.c b/gcc/genopinit.c index 1bb2f77..fb80717 100644 --- a/gcc/genopinit.c +++ b/gcc/genopinit.c @@ -422,8 +422,8 @@ main (int argc, char **argv) fprintf (s_file, " { %#08x, CODE_FOR_%s },\n", p->sort_num, p->name); fprintf (s_file, "};\n\n"); - fprintf (s_file, "void\ninit_all_optabs (void)\n{\n"); - fprintf (s_file, " bool *ena = this_target_optabs->pat_enable;\n"); + fprintf (s_file, "void\ninit_all_optabs (struct target_optabs *optabs)\n{\n"); + fprintf (s_file, " bool *ena = optabs->pat_enable;\n"); for (i = 0; patterns.iterate (i, &p); ++i) fprintf (s_file, " ena[%u] = HAVE_%s;\n", i, p->name); fprintf (s_file, "}\n\n"); @@ -456,7 +456,7 @@ main (int argc, char **argv) "raw_optab_handler (unsigned scode)\n" "{\n" " int i = lookup_handler (scode);\n" - " return (i >= 0 && this_target_optabs->pat_enable[i]\n" + " return (i >= 0 && this_fn_optabs->pat_enable[i]\n" " ? pats[i].icode : CODE_FOR_nothing);\n" "}\n\n"); @@ -468,8 +468,8 @@ main (int argc, char **argv) " int i = lookup_handler (scode);\n" " if (i >= 0)\n" " {\n" - " bool ret = this_target_optabs->pat_enable[i];\n" - " this_target_optabs->pat_enable[i] = set;\n" + " bool ret = this_fn_optabs->pat_enable[i];\n" + " this_fn_optabs->pat_enable[i] = set;\n" " return ret;\n" " }\n" " else\n" diff --git a/gcc/optabs.c b/gcc/optabs.c index c1dacf4..c5778d1 100644 --- a/gcc/optabs.c +++ b/gcc/optabs.c @@ -44,6 +44,7 @@ along with GCC; see the file COPYING3. If not see struct target_optabs default_target_optabs; struct target_libfuncs default_target_libfuncs; +struct target_optabs *this_fn_optabs = &default_target_optabs; #if SWITCHABLE_TARGET struct target_optabs *this_target_optabs = &default_target_optabs; struct target_libfuncs *this_target_libfuncs = &default_target_libfuncs; @@ -6150,7 +6151,7 @@ init_optabs (void) libfunc_hash = htab_create_ggc (10, hash_libfunc, eq_libfunc, NULL); /* Fill in the optabs with the insns we support. */ - init_all_optabs (); + init_all_optabs (this_fn_optabs); /* The ffs function operates on `int'. Fall back on it if we do not have a libgcc2 function for that width. */ @@ -6207,6 +6208,38 @@ init_optabs (void) targetm.init_libfuncs (); } +/* Recompute the optabs and save them if they have changed. */ + +void +save_optabs_if_changed (tree fndecl) +{ + /* ?? If this fails, we should temporarily restore the default + target first (set_cfun (NULL) ??), do the rest of this function, + and then restore it. */ + gcc_assert (this_target_optabs == &default_target_optabs); + + struct target_optabs *tmp_optabs = (struct target_optabs *) + ggc_alloc_atomic (sizeof (struct target_optabs)); + tree optnode = DECL_FUNCTION_SPECIFIC_OPTIMIZATION (fndecl); + + /* Generate a new set of optabs into tmp_optabs. */ + init_all_optabs (tmp_optabs); + + /* If the optabs changed, record it. */ + if (memcmp (tmp_optabs, this_target_optabs, sizeof (struct target_optabs))) + { + if (TREE_OPTIMIZATION_OPTABS (optnode)) + ggc_free (TREE_OPTIMIZATION_OPTABS (optnode)); + + TREE_OPTIMIZATION_OPTABS (optnode) = (unsigned char *) tmp_optabs; + } + else + { + TREE_OPTIMIZATION_OPTABS (optnode) = NULL; + ggc_free (tmp_optabs); + } +} + /* A helper function for init_sync_libfuncs. Using the basename BASE, install libfuncs into TAB for BASE_N for 1 <= N <= MAX. */ diff --git a/gcc/optabs.h b/gcc/optabs.h index c08adcf..4de4409 100644 --- a/gcc/optabs.h +++ b/gcc/optabs.h @@ -76,6 +76,7 @@ struct target_optabs { }; extern struct target_optabs default_target_optabs; +extern struct target_optabs *this_fn_optabs; #if SWITCHABLE_TARGET extern struct target_optabs *this_target_optabs; #else diff --git a/gcc/testsuite/gcc.c-torture/compile/pr52555.c b/gcc/testsuite/gcc.c-torture/compile/pr52555.c new file mode 100644 index 0000000..7016834 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr52555.c @@ -0,0 +1,10 @@ +/* { dg-options "-ffast-math" } */ + +float farg; +unsigned val; + +void __attribute__((optimize("O"))) +test() +{ + val = __builtin_ceilf(farg); +} diff --git a/gcc/tree.h b/gcc/tree.h index c3c814c..740d438 100644 --- a/gcc/tree.h +++ b/gcc/tree.h @@ -3586,14 +3586,25 @@ struct GTY(()) tree_optimization_option { /* The optimization options used by the user. */ struct cl_optimization opts; + + /* Target optabs for this set of optimization options. This is of + type `struct target_optabs *'. */ + unsigned char *GTY ((atomic)) target_optabs; }; #define TREE_OPTIMIZATION(NODE) \ (&OPTIMIZATION_NODE_CHECK (NODE)->optimization.opts) +#define TREE_OPTIMIZATION_OPTABS(NODE) \ + (OPTIMIZATION_NODE_CHECK (NODE)->optimization.target_optabs) + /* Return a tree node that encapsulates the current optimization options. */ extern tree build_optimization_node (void); +/* Save a new set of target_optabs in a TREE_OPTIMIZATION node if the + current set of optabs has changed. */ +extern void save_optabs_if_changed (tree); + /* Target options used by a function. */ struct GTY(()) tree_target_option {