From patchwork Thu Nov 28 17:54:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Hubicka X-Patchwork-Id: 1202253 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-514789-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ucw.cz Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="niLzQoxB"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47P4yx3N0Qz9sPZ for ; Fri, 29 Nov 2019 04:54:31 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=mqAu4KiLuW6pSjqWpZD7MolnuyoOb4tJP+3BsIqagi+5O8fN0W5LZ 5yv4U7iC4KNaQ35/nl1Vz8DmGc9tAns4s+2lgyMP2IgBLQfZV9yv8K3qtox/FgdY 0XF0XM0AH1ayc7YqS5iy6qmD3KSETt9l29gJOd7Tf6JIJ1Ko3GJ2y8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; s= default; bh=G6SmD0g328iL5hNhIyxj2VQVjrg=; b=niLzQoxB8fh7cwncH7B/ JOjPCvnSChfmx6uahWtBBMNq1wzsG0UjtnQEbjtovupM/Y+FMbWDPzQwIJLloNIC qo/g1YBhn2XFWqLChUitM1/3Cakou70vOuNSCQLyioWGrsgmy9dE1cpBIJMCM2hQ NGT0n7sCxVbbvD1MZlsJqsI= Received: (qmail 6768 invoked by alias); 28 Nov 2019 17:54:20 -0000 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 Received: (qmail 6712 invoked by uid 89); 28 Nov 2019 17:54:20 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-10.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy=HX-Languages-Length:1863, 7018, divided X-HELO: nikam.ms.mff.cuni.cz Received: from nikam.ms.mff.cuni.cz (HELO nikam.ms.mff.cuni.cz) (195.113.20.16) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 28 Nov 2019 17:54:18 +0000 Received: by nikam.ms.mff.cuni.cz (Postfix, from userid 16202) id B545E280823; Thu, 28 Nov 2019 18:54:16 +0100 (CET) Date: Thu, 28 Nov 2019 18:54:16 +0100 From: Jan Hubicka To: gcc-patches@gcc.gnu.org Subject: Fix leftover optimize checks Message-ID: <20191128175416.7n5qyohxedddjcpk@kam.mff.cuni.cz> MIME-Version: 1.0 Content-Disposition: inline User-Agent: NeoMutt/20170113 (1.7.2) Hi, these optimize flag checks was forgotten after the params conversion. Comitted as obvious. Honza * ipa-inline.c (want_early_inline_function_p): Remove leftover optimize checks. Index: ipa-inline.c =================================================================== --- ipa-inline.c (revision 278778) +++ ipa-inline.c (working copy) @@ -701,10 +701,8 @@ want_early_inline_function_p (struct cgr if (dump_enabled_p ()) dump_printf_loc (MSG_MISSED_OPTIMIZATION, e->call_stmt, " will not early inline: %C->%C, " - "growth %i exceeds --param early-inlining-insns%s\n", - e->caller, callee, growth, - opt_for_fn (e->caller->decl, optimize) >= 3 - ? "" : "-O2"); + "growth %i exceeds --param early-inlining-insns\n", + e->caller, callee, growth); want_inline = false; } else if ((n = num_calls (callee)) != 0 @@ -713,11 +711,9 @@ want_early_inline_function_p (struct cgr if (dump_enabled_p ()) dump_printf_loc (MSG_MISSED_OPTIMIZATION, e->call_stmt, " will not early inline: %C->%C, " - "growth %i exceeds --param early-inlining-insns%s " + "growth %i exceeds --param early-inlining-insns " "divided by number of calls\n", - e->caller, callee, growth, - opt_for_fn (e->caller->decl, optimize) >= 3 - ? "" : "-O2"); + e->caller, callee, growth); want_inline = false; } } @@ -861,12 +857,9 @@ want_inline_small_function_p (struct cgr - ipa_call_summaries->get (e)->call_stmt_size > inline_insns_single (e->caller, true)) { - if (opt_for_fn (e->caller->decl, optimize) >= 3) - e->inline_failed = (DECL_DECLARED_INLINE_P (callee->decl) - ? CIF_MAX_INLINE_INSNS_SINGLE_LIMIT - : CIF_MAX_INLINE_INSNS_AUTO_LIMIT); - else - e->inline_failed = CIF_MAX_INLINE_INSNS_AUTO_LIMIT; + e->inline_failed = (DECL_DECLARED_INLINE_P (callee->decl) + ? CIF_MAX_INLINE_INSNS_SINGLE_LIMIT + : CIF_MAX_INLINE_INSNS_AUTO_LIMIT); want_inline = false; } else