From patchwork Mon Jul 8 16:55:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andi Kleen X-Patchwork-Id: 1958056 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=cPGWvcNM; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WHr5x1y0qz1xpP for ; Tue, 9 Jul 2024 03:02:45 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7E0193864816 for ; Mon, 8 Jul 2024 17:02:43 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by sourceware.org (Postfix) with ESMTPS id 1FA60385C6D2 for ; Mon, 8 Jul 2024 17:00:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1FA60385C6D2 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.intel.com Authentication-Results: sourceware.org; spf=none smtp.mailfrom=linux.intel.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1FA60385C6D2 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720458051; cv=none; b=Sd0N59hHBPDdwwyDtllaQWgcJG00PoYComXSddktzyXGJIn+cS0kX1/Cra6Covi2jxKa7OnnNwliMkB52VqZP6XM32TA5Nxoh0XLOkhweJ6E4AR4FQrMfC3Z7q3Il4UmjiJZiZnZK166Hj6j3ll3TQlB/p4Lm7QZxe3+9pMQbrs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720458051; c=relaxed/simple; bh=E1YIWS6tT9/dkiL3kVwo8TIwtDjiyXCn5kgTQMJpiek=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=TTisUoH4IOlp9ddqCKX27XEEjELGCmK3nwkn/0vyKDeRWZ1ORH7eRuSxZLj5Fl9Hd1OVRD6gmV4n/E2VpqhwhQ4301Xlp4tv9kzzBy1q+RMOrUD/k0SN+wL/v9o6pTD3F2IWTdnuO5djFelUUzBTT35phryx9eFl5eHLmndvc5c= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720458050; x=1751994050; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=E1YIWS6tT9/dkiL3kVwo8TIwtDjiyXCn5kgTQMJpiek=; b=cPGWvcNMWtNAPFgHwuwLYzYGj+CsLwQkjZCKdT00v6YpeZpWO0IRNqUE g9h4YP9VsuICJto4IJ7Acao6fFUgJHRlWQR780sBjHl18G+USV7IH5iOn JSTaNvq0Z+/6989omLDe983yJV+5/NikwljWdYPTbhnHuNSaYo/5nHtLe nzNJ6OR7jBkvRKoEamje0azRAWgxvGJnn6TPr2nTPDMIAfnOl2WA5LgHQ yfnpP/IVBCAbW6BTeZWlom4556KigvKm2jfoZ4o5IDvcgPlfhRFRahbd1 i2fzNEaCU/0/CSU7E+Md8W0NUn7TEnR/iIzhXjctoDmBH6G51BH9dqjvQ A==; X-CSE-ConnectionGUID: YZllFWWWSYKAmAO14ZSqVg== X-CSE-MsgGUID: pxmQJEKLTM+z2KZI0MXPVw== X-IronPort-AV: E=McAfee;i="6700,10204,11127"; a="28279669" X-IronPort-AV: E=Sophos;i="6.09,192,1716274800"; d="scan'208";a="28279669" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2024 10:00:37 -0700 X-CSE-ConnectionGUID: hpO4Xz2/ToqS0nUInHHAhg== X-CSE-MsgGUID: Xq92J16uSQOKLcEk57AhQQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,192,1716274800"; d="scan'208";a="47486293" Received: from tassilo.jf.intel.com ([10.54.38.190]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2024 10:00:37 -0700 From: Andi Kleen To: gcc-patches@gcc.gnu.org Cc: richard.guenther@gmail.com, josmyers@redhat.com, polacek@redhat.com, jakub@redhat.com, Andi Kleen Subject: [PATCH v9 01/10] Improve must tail in RTL backend Date: Mon, 8 Jul 2024 09:55:53 -0700 Message-ID: <20240708170031.1621184-2-ak@linux.intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240708170031.1621184-1-ak@linux.intel.com> References: <20240708170031.1621184-1-ak@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org - Give error messages for all causes of non sibling call generation - When giving error messages clear the musttail flag to avoid ICEs - Error out when tree-tailcall failed to mark a must-tail call sibcall. In this case it doesn't know the true reason and only gives a vague message. PR83324 gcc/ChangeLog: * calls.cc (maybe_complain_about_tail_call): Clear must tail flag on error. (expand_call): Give error messages for all musttail failures. --- gcc/calls.cc | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/gcc/calls.cc b/gcc/calls.cc index 21d78f9779fe..883eb9971257 100644 --- a/gcc/calls.cc +++ b/gcc/calls.cc @@ -1249,6 +1249,7 @@ maybe_complain_about_tail_call (tree call_expr, const char *reason) return; error_at (EXPR_LOCATION (call_expr), "cannot tail-call: %s", reason); + CALL_EXPR_MUST_TAIL_CALL (call_expr) = 0; } /* Fill in ARGS_SIZE and ARGS array based on the parameters found in @@ -2650,7 +2651,13 @@ expand_call (tree exp, rtx target, int ignore) /* The type of the function being called. */ tree fntype; bool try_tail_call = CALL_EXPR_TAILCALL (exp); - bool must_tail_call = CALL_EXPR_MUST_TAIL_CALL (exp); + /* tree-tailcall decided not to do tail calls. Error for the musttail case, + unfortunately we don't know the reason so it's fairly vague. + When tree-tailcall reported an error it already cleared the flag, + so this shouldn't really happen unless the + the musttail pass gave up walking before finding the call. */ + if (!try_tail_call) + maybe_complain_about_tail_call (exp, "other reasons"); int pass; /* Register in which non-BLKmode value will be returned, @@ -3022,10 +3029,21 @@ expand_call (tree exp, rtx target, int ignore) pushed these optimizations into -O2. Don't try if we're already expanding a call, as that means we're an argument. Don't try if there's cleanups, as we know there's code to follow the call. */ - if (currently_expanding_call++ != 0 - || (!flag_optimize_sibling_calls && !CALL_FROM_THUNK_P (exp)) - || args_size.var - || dbg_cnt (tail_call) == false) + if (currently_expanding_call++ != 0) + { + maybe_complain_about_tail_call (exp, "inside another call"); + try_tail_call = 0; + } + if (!flag_optimize_sibling_calls + && !CALL_FROM_THUNK_P (exp) + && !CALL_EXPR_MUST_TAIL_CALL (exp)) + try_tail_call = 0; + if (args_size.var) + { + maybe_complain_about_tail_call (exp, "variable size arguments"); + try_tail_call = 0; + } + if (dbg_cnt (tail_call) == false) try_tail_call = 0; /* Workaround buggy C/C++ wrappers around Fortran routines with @@ -3046,13 +3064,15 @@ expand_call (tree exp, rtx target, int ignore) if (MEM_P (*iter)) { try_tail_call = 0; + maybe_complain_about_tail_call (exp, + "hidden string length argument passed on stack"); break; } } /* If the user has marked the function as requiring tail-call optimization, attempt it. */ - if (must_tail_call) + if (CALL_EXPR_MUST_TAIL_CALL (exp)) try_tail_call = 1; /* Rest of purposes for tail call optimizations to fail. */ From patchwork Mon Jul 8 16:55:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andi Kleen X-Patchwork-Id: 1958052 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=eZEEJe75; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WHr4N1lckz1xrP for ; Tue, 9 Jul 2024 03:01:22 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2BBD93831E14 for ; Mon, 8 Jul 2024 17:01:21 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by sourceware.org (Postfix) with ESMTPS id A4BD8384CB94 for ; Mon, 8 Jul 2024 17:00:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A4BD8384CB94 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.intel.com Authentication-Results: sourceware.org; spf=none smtp.mailfrom=linux.intel.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A4BD8384CB94 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720458053; cv=none; b=CMfOrRQ6lTf12tGW/sTIeu13Mif0XblQaMelgbkOelozE22n5WPHKzNAALsL5F9RM7AwQ36DCwbCqLW67+cYqpSNju/L16b7E0/EYTdcdIYzsizEPD9uywbZw4HXioC+gDasWKJgpst6FUV2xtyma8u1lRlHwFvUfIN3n1xEYX4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720458053; c=relaxed/simple; bh=kZchPkuxr3JSRsRtOc6qRPj0Tj865h7sKEYPXan6Z5k=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=LXXCve9Kt/NqQt/InCZ5GuAbIVsxx7K46Tl0s9ttHTt+PSaw2CHKZaUlxnrpuc2Euyoru2Y5GtXnmQC4R5Kt9oIicoXcKpq1iz8Klxd5oUFcY4EH46Pvv43lwERVwYM2ilBHI3CSIrYnCdEAohZrbSKuyA46XXvT3FWOIbySH5U= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720458052; x=1751994052; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kZchPkuxr3JSRsRtOc6qRPj0Tj865h7sKEYPXan6Z5k=; b=eZEEJe75yCF8eAUiIyvmEcjE59TOWSLUjIps0Rj8D5D7XmVuLmg18eGC zP0q8YolvEv0Q8E82YEvjMj/tmuARyk3iAFelbT88nGyT8rl5t6mLjdq0 6SKBdIhqXDB6Epp55cAdKeasQolWJA8mbNS4mxbFz39q99cuDtolrQj5g nuH7YYhjRwyHZNBb0RphrT7tcY2oFU7+yuifDvsJjfjECubenpQCagFLu yqyresqLAlw5VZE4Rkt3tectsNqmPVzVzk1ecwQrwhpsrFJPzgGVpyPij TKqF9rI4y6D55aQI74ZD52WOU+WR921vtC9v0K5cAbG3uNZEG2N4O/jNd Q==; X-CSE-ConnectionGUID: /+u94Y9YR2mpArBX3x+Udw== X-CSE-MsgGUID: uSJ0ETNpTnmhLg8filia3Q== X-IronPort-AV: E=McAfee;i="6700,10204,11127"; a="28279672" X-IronPort-AV: E=Sophos;i="6.09,192,1716274800"; d="scan'208";a="28279672" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2024 10:00:37 -0700 X-CSE-ConnectionGUID: q/4fcwflQtWXuiFrowuSqw== X-CSE-MsgGUID: 8SAm1xDZRMaKDCYuPUDtPA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,192,1716274800"; d="scan'208";a="47486294" Received: from tassilo.jf.intel.com ([10.54.38.190]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2024 10:00:37 -0700 From: Andi Kleen To: gcc-patches@gcc.gnu.org Cc: richard.guenther@gmail.com, josmyers@redhat.com, polacek@redhat.com, jakub@redhat.com, Andi Kleen Subject: [PATCH v9 02/10] Fix pro_and_epilogue for sibcalls at -O0 (PR115255) Date: Mon, 8 Jul 2024 09:55:54 -0700 Message-ID: <20240708170031.1621184-3-ak@linux.intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240708170031.1621184-1-ak@linux.intel.com> References: <20240708170031.1621184-1-ak@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org Some of the cfg fixups in pro_and_epilogue for sibcalls were dependent on "optimize". Make them check cfun->tail_call_marked instead to handle the -O0 musttail case. This fixes the musttail test cases on arm targets. gcc/ChangeLog: PR target/115255 * function.cc (thread_prologue_and_epilogue_insns): Check cfun->tail_call_marked for sibcalls too. (rest_of_handle_thread_prologue_and_epilogue): Dito. --- gcc/function.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gcc/function.cc b/gcc/function.cc index 4edd4da12474..a6f6de349420 100644 --- a/gcc/function.cc +++ b/gcc/function.cc @@ -2231,6 +2231,7 @@ use_register_for_decl (const_tree decl) /* We don't set DECL_IGNORED_P for the function_result_decl. */ if (optimize) return true; + /* Needed for [[musttail]] which can operate even at -O0 */ if (cfun->tail_call_marked) return true; /* We don't set DECL_REGISTER for the function_result_decl. */ @@ -6259,8 +6260,11 @@ thread_prologue_and_epilogue_insns (void) } /* Threading the prologue and epilogue changes the artificial refs in the - entry and exit blocks, and may invalidate DF info for tail calls. */ + entry and exit blocks, and may invalidate DF info for tail calls. + This is also needed for [[musttail]] conversion even when not + optimizing. */ if (optimize + || cfun->tail_call_marked || flag_optimize_sibling_calls || flag_ipa_icf_functions || in_lto_p) @@ -6557,7 +6561,7 @@ rest_of_handle_thread_prologue_and_epilogue (function *fun) { /* prepare_shrink_wrap is sensitive to the block structure of the control flow graph, so clean it up first. */ - if (optimize) + if (cfun->tail_call_marked || optimize) cleanup_cfg (0); /* On some machines, the prologue and epilogue code, or parts thereof, From patchwork Mon Jul 8 16:55:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andi Kleen X-Patchwork-Id: 1958053 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=SyWzdeCk; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WHr4W6XWFz1xpP for ; Tue, 9 Jul 2024 03:01:31 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2273A384A46F for ; Mon, 8 Jul 2024 17:01:30 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by sourceware.org (Postfix) with ESMTPS id 3FD413858C3A for ; Mon, 8 Jul 2024 17:00:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3FD413858C3A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.intel.com Authentication-Results: sourceware.org; spf=none smtp.mailfrom=linux.intel.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3FD413858C3A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720458054; cv=none; b=Ct2JZpgEkljEsqUW07p5vlOkMeF4lEWAMgLR5/S5yRhyfLyzr+x0WGiqlfXCofk3Q/ec24LTHZSaNJrjjdjevbpo5hq425MS6ng76IbUx3I1D5YzFk1TUp95pku5GpuAmUIteUyhzr3nLETPaskYz6NA5+tv8mWrFGTdACBLWUw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720458054; c=relaxed/simple; bh=RT7E4A4VRnUq+VoEN8JX2A1iBfZ6XhS2Bz7HxIK8uUw=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=NE8ldLcx6jrmrJ7VH3lXaTSIsTC+Arz8dgSsUXo0r9H6lwjTZqJDyxE1BF+JnJ0OasnI0vi5umGMiRQ8sdvjuTjn1R4uLTHW+POzJxKEiwtZkMk7X4+zn9ffUnM6izG8JdOYHPulEtEHIA+swQ1eRs0inKH/rXup/l5p5I2gTBM= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720458052; x=1751994052; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RT7E4A4VRnUq+VoEN8JX2A1iBfZ6XhS2Bz7HxIK8uUw=; b=SyWzdeCkvk3Cf7Ryk22HbRDfD3VugqHWWfqSGwdAHhFQqrqA3DG3iNaB owYhmAl5e5ksH7eGhVRdkSjyengvXjhNLj/Syq0yI2+Zje96lIFjoA5Q9 DlOEDZrEIKanUjg/zBv/JPIQr7q05gbv1RFCqJXMvV9/7ZCB/pi20hkwJ g4gS+1nIE/m+k3G7DD7L3RSPrbYSevA2ToB0/D7JcBlU863cTT6s9/htq Hieb6mFO06jtMfvUCaUa+8lOBxztpDUm5LcnXKA6oCN/ik6io7fJ+tjfj HAFyqZ2iVGnFoDxFuTthJlUQEvfkbW0fFrbwwCJktLkDgJJII5euEWNoJ Q==; X-CSE-ConnectionGUID: f3rgvquOTdadVnvBnI7xcA== X-CSE-MsgGUID: Dq0aku0KRtmpbBBv1YvK3g== X-IronPort-AV: E=McAfee;i="6700,10204,11127"; a="28279676" X-IronPort-AV: E=Sophos;i="6.09,192,1716274800"; d="scan'208";a="28279676" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2024 10:00:37 -0700 X-CSE-ConnectionGUID: qcuz5nqBTda/8P6pif7MJA== X-CSE-MsgGUID: 18qRtZecQyim/JfdIpSuNw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,192,1716274800"; d="scan'208";a="47486295" Received: from tassilo.jf.intel.com ([10.54.38.190]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2024 10:00:37 -0700 From: Andi Kleen To: gcc-patches@gcc.gnu.org Cc: richard.guenther@gmail.com, josmyers@redhat.com, polacek@redhat.com, jakub@redhat.com, Andi Kleen Subject: [PATCH v9 03/10] Add a musttail generic attribute to the c-attribs table Date: Mon, 8 Jul 2024 09:55:55 -0700 Message-ID: <20240708170031.1621184-4-ak@linux.intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240708170031.1621184-1-ak@linux.intel.com> References: <20240708170031.1621184-1-ak@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org The actual handling is directly in the parser since the generic mechanism doesn't support statement attributes, but this gives basic error checking/detection on the attribute. gcc/c-family/ChangeLog: PR83324 * c-attribs.cc (handle_musttail_attribute): Add. * c-common.h (handle_musttail_attribute): Add. --- gcc/c-family/c-attribs.cc | 15 +++++++++++++++ gcc/c-family/c-common.h | 1 + 2 files changed, 16 insertions(+) diff --git a/gcc/c-family/c-attribs.cc b/gcc/c-family/c-attribs.cc index f9b229aba7fc..5adc7b775eaf 100644 --- a/gcc/c-family/c-attribs.cc +++ b/gcc/c-family/c-attribs.cc @@ -340,6 +340,8 @@ const struct attribute_spec c_common_gnu_attributes[] = { "common", 0, 0, true, false, false, false, handle_common_attribute, attr_common_exclusions }, + { "musttail", 0, 0, false, false, false, + false, handle_musttail_attribute, NULL }, /* FIXME: logically, noreturn attributes should be listed as "false, true, true" and apply to function types. But implementing this would require all the places in the compiler that use TREE_THIS_VOLATILE @@ -1222,6 +1224,19 @@ handle_common_attribute (tree *node, tree name, tree ARG_UNUSED (args), return NULL_TREE; } +/* Handle a "musttail" attribute; arguments as in + struct attribute_spec.handler. */ + +tree +handle_musttail_attribute (tree ARG_UNUSED (*node), tree name, tree ARG_UNUSED (args), + int ARG_UNUSED (flags), bool *no_add_attrs) +{ + /* Currently only a statement attribute, handled directly in parser. */ + warning (OPT_Wattributes, "%qE attribute ignored", name); + *no_add_attrs = true; + return NULL_TREE; +} + /* Handle a "noreturn" attribute; arguments as in struct attribute_spec.handler. */ diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h index 48c89b603bcd..e84c9c47513b 100644 --- a/gcc/c-family/c-common.h +++ b/gcc/c-family/c-common.h @@ -1643,6 +1643,7 @@ extern tree find_tm_attribute (tree); extern const struct attribute_spec::exclusions attr_cold_hot_exclusions[]; extern const struct attribute_spec::exclusions attr_noreturn_exclusions[]; extern tree handle_noreturn_attribute (tree *, tree, tree, int, bool *); +extern tree handle_musttail_attribute (tree *, tree, tree, int, bool *); extern bool has_attribute (location_t, tree, tree, tree (*)(tree)); extern tree build_attr_access_from_parms (tree, bool); From patchwork Mon Jul 8 16:55:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andi Kleen X-Patchwork-Id: 1958054 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=L1tQRssR; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WHr4c0mtcz1xpP for ; Tue, 9 Jul 2024 03:01:36 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B3C58384A44C for ; Mon, 8 Jul 2024 17:01:32 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by sourceware.org (Postfix) with ESMTPS id 7101838654B3 for ; Mon, 8 Jul 2024 17:00:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7101838654B3 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.intel.com Authentication-Results: sourceware.org; spf=none smtp.mailfrom=linux.intel.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7101838654B3 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720458054; cv=none; b=lnsl7Bkq7ZkzjOIwEDDqt5iTx+fk2trLrsz5kylrai8bizrK0H4W0YCHZHXJsgStnXrOLMMW8wF3oNcoli5vWOD8mIdKqx0jjeK0k0d7iUtboMnSqzeKnHzErMhD7+AMeQE+D7pQngP4bB/5J0JIHDClrtIckG2BzFfA9r4x6KY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720458054; c=relaxed/simple; bh=Iu7l8MlUQ+0dH8fcYqf95eHCydtDphQRGVYw4/gVats=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=X/w4H86ERSo7ol7A1Ckq0c/d0rlkuLwUd3mRxAVj59J3p0YdcEK0eLyAL1p4Hah1QiwjW8ic2cj/9ox07Ka+BFCuMZe/L1w3Plg8BLWJuO8Lin8WdNbvmvTP6gniQZ+CpVKuzVGm6ey+JfOM4pqxuwnh3t8QhHvwlUBT0UqFpZM= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720458052; x=1751994052; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Iu7l8MlUQ+0dH8fcYqf95eHCydtDphQRGVYw4/gVats=; b=L1tQRssR57t6xJmCqPmTl07bGBpWy0FMW6vSnilrOf+xETfuRwR60xGc Em+t06AQKHNucra2mqGnIhokO+fHx/vvETQmQnBXjO9+xFpqaNZh4qoQo y0olVQLcPKU8tC6UPx8yA1LfHT2urDmJzbqA9Vi26Dz6HlVngQThDzb3p e+vqOYzMIsFMoqS6y2SerxdwJaldzuVFzHgw6ERJRlr8ACUTwBL5ZO+B1 h42SANvZJSwYSjqaCzR0AN2dhClMR6RqfwCapVTXVWcGCNstfSV4rbq6f nmMjnuEQ0sNtBSD1iCMe6LMTQ9p6WV2fBOEZi7dLyZpTDtFSIYKyi5ZQn w==; X-CSE-ConnectionGUID: CvaluzVsRHm43Y3AfS2qkw== X-CSE-MsgGUID: VOsO1/GMSpmFo/bVKMGZMg== X-IronPort-AV: E=McAfee;i="6700,10204,11127"; a="28279678" X-IronPort-AV: E=Sophos;i="6.09,192,1716274800"; d="scan'208";a="28279678" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2024 10:00:37 -0700 X-CSE-ConnectionGUID: jgqNzEdnSmiTsoWBDO76mw== X-CSE-MsgGUID: mAA9HHSbRoWM2E5M7fMQAg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,192,1716274800"; d="scan'208";a="47486296" Received: from tassilo.jf.intel.com ([10.54.38.190]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2024 10:00:37 -0700 From: Andi Kleen To: gcc-patches@gcc.gnu.org Cc: richard.guenther@gmail.com, josmyers@redhat.com, polacek@redhat.com, jakub@redhat.com, Andi Kleen Subject: [PATCH v9 04/10] C++: Support clang compatible [[musttail]] (PR83324) Date: Mon, 8 Jul 2024 09:55:56 -0700 Message-ID: <20240708170031.1621184-5-ak@linux.intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240708170031.1621184-1-ak@linux.intel.com> References: <20240708170031.1621184-1-ak@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org This patch implements a clang compatible [[musttail]] attribute for returns. musttail is useful as an alternative to computed goto for interpreters. With computed goto the interpreter function usually ends up very big which causes problems with register allocation and other per function optimizations not scaling. With musttail the interpreter can be instead written as a sequence of smaller functions that call each other. To avoid unbounded stack growth this requires forcing a sibling call, which this attribute does. It guarantees an error if the call cannot be tail called which allows the programmer to fix it instead of risking a stack overflow. Unlike computed goto it is also type-safe. It turns out that David Malcolm had already implemented middle/backend support for a musttail attribute back in 2016, but it wasn't exposed to any frontend other than a special plugin. This patch adds a [[gnu::musttail]] attribute for C++ that can be added to return statements. The return statement must be a direct call (it does not follow dependencies), which is similar to what clang implements. It then uses the existing must tail infrastructure. For compatibility it also detects clang::musttail Passes bootstrap and full test gcc/cp/ChangeLog: PR c/83324 * parser.cc (cp_parser_statement): Handle musttail. (cp_parser_jump_statement): Dito. * pt.cc (tsubst_expr): Copy CALL_EXPR_MUST_TAIL_CALL. --- gcc/cp/parser.cc | 34 +++++++++++++++++++++++++++++++--- gcc/cp/pt.cc | 7 ++++++- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 31ae9c2fb54d..c8ed88f7a91b 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -2467,7 +2467,7 @@ static tree cp_parser_perform_range_for_lookup static tree cp_parser_range_for_member_function (tree, tree); static tree cp_parser_jump_statement - (cp_parser *); + (cp_parser *, tree &); static void cp_parser_declaration_statement (cp_parser *); @@ -12756,7 +12756,7 @@ cp_parser_statement (cp_parser* parser, tree in_statement_expr, case RID_CO_RETURN: case RID_GOTO: std_attrs = process_stmt_hotness_attribute (std_attrs, attrs_loc); - statement = cp_parser_jump_statement (parser); + statement = cp_parser_jump_statement (parser, std_attrs); break; /* Objective-C++ exception-handling constructs. */ @@ -14844,10 +14844,11 @@ cp_parser_init_statement (cp_parser *parser, tree *decl) jump-statement: goto * expression ; + STD_ATTRS are the statement attributes. They can be modified. Returns the new BREAK_STMT, CONTINUE_STMT, RETURN_EXPR, or GOTO_EXPR. */ static tree -cp_parser_jump_statement (cp_parser* parser) +cp_parser_jump_statement (cp_parser* parser, tree &std_attrs) { tree statement = error_mark_node; cp_token *token; @@ -14924,6 +14925,33 @@ cp_parser_jump_statement (cp_parser* parser) /* If the next token is a `;', then there is no expression. */ expr = NULL_TREE; + + if (keyword == RID_RETURN && expr) + { + bool musttail_p = false; + if (lookup_attribute ("gnu", "musttail", std_attrs)) + { + musttail_p = true; + std_attrs = remove_attribute ("gnu", "musttail", std_attrs); + } + /* Support this for compatibility. */ + if (lookup_attribute ("clang", "musttail", std_attrs)) + { + musttail_p = true; + std_attrs = remove_attribute ("clang", "musttail", std_attrs); + } + if (musttail_p) + { + tree t = expr; + if (t && TREE_CODE (t) == TARGET_EXPR) + t = TARGET_EXPR_INITIAL (t); + if (t && TREE_CODE (t) != CALL_EXPR) + error_at (token->location, "cannot tail-call: return value must be a call"); + else + CALL_EXPR_MUST_TAIL_CALL (t) = 1; + } + } + /* Build the return-statement, check co-return first, since type deduction is not valid there. */ if (keyword == RID_CO_RETURN) diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index d1316483e245..3b914089a6e2 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -21113,12 +21113,17 @@ tsubst_expr (tree t, tree args, tsubst_flags_t complain, tree in_decl) bool op = CALL_EXPR_OPERATOR_SYNTAX (t); bool ord = CALL_EXPR_ORDERED_ARGS (t); bool rev = CALL_EXPR_REVERSE_ARGS (t); - if (op || ord || rev) + bool mtc = false; + if (TREE_CODE (t) == CALL_EXPR) + mtc = CALL_EXPR_MUST_TAIL_CALL (t); + if (op || ord || rev || mtc) if (tree call = extract_call_expr (ret)) { CALL_EXPR_OPERATOR_SYNTAX (call) = op; CALL_EXPR_ORDERED_ARGS (call) = ord; CALL_EXPR_REVERSE_ARGS (call) = rev; + if (TREE_CODE (call) == CALL_EXPR) + CALL_EXPR_MUST_TAIL_CALL (call) = mtc; } if (warning_suppressed_p (t, OPT_Wpessimizing_move)) /* This also suppresses -Wredundant-move. */ From patchwork Mon Jul 8 16:55:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andi Kleen X-Patchwork-Id: 1958060 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=iVd+iuUS; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WHr7Q42nHz1xpP for ; Tue, 9 Jul 2024 03:04:02 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CC396384A45B for ; Mon, 8 Jul 2024 17:04:00 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by sourceware.org (Postfix) with ESMTPS id 89346384B046 for ; Mon, 8 Jul 2024 17:00:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 89346384B046 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.intel.com Authentication-Results: sourceware.org; spf=none smtp.mailfrom=linux.intel.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 89346384B046 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720458057; cv=none; b=TfxKEOseeufRdAFhJAoX7bK46maUP699LmaIWqHQ4hjJVA54BZPPVwaXR0v/40NLlc1JuCQDtwZE+TnRTnmP+AuHJ9dLvprBIhwkG3evRnOk7KRUkge172ut4SRTmL9R7eB0MhBlaN5tUUXJTf67Ah+F0rHPIKBHBc5ectp93BU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720458057; c=relaxed/simple; bh=MT7psRUeS899C1HxDSoTsI+xsqfMBPeAwtyms/F5AUk=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=B52to3TkKTLhjq8d6m3926NlOx8T5U5zOmkgWT2gzU/62emG9ZQuqp2Mvsjwf0HgBND5vcXu2zQN3jtzrx0pn5TScD6uV2FME4b7oy6lhN/e/6whc2LNNBefaMv0GmRNwR0EBTPnXljElho+3/QbNUht28FJu9yVr0C6PsqMx/Y= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720458053; x=1751994053; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MT7psRUeS899C1HxDSoTsI+xsqfMBPeAwtyms/F5AUk=; b=iVd+iuUS6WZIomQjM4uKx1eeXKmoP3GRiBM9Pmaok/2k7MsG2SIkAxWl ZPw6+qQPG813bINizPxPTwpgTikyCiYtxsoEA1lp3uEduVS3rWtH1QpHH TMKTjN+pyvjuvB615xql1YmY0qeaAKiB5vtC6G6cTo77AAJtByQmFszUR 8yH+BZObf3bzPepaFsbIuHzn7+tdhywojRkr8iYH/EPhrsRFETQtlqdah YJkP/xi+N323OuXthbxu5BbHIIahRd5N861TUIutP9AOIWa8+2XJPpZOZ avavF2OHGom+ul9KWLJOlL+WgLzIf25cAYe+iBFynJUGkKfqapQZuEOF/ w==; X-CSE-ConnectionGUID: 4d/o91ajQWq5n61Za/OoKg== X-CSE-MsgGUID: iANGEdP2Qiqb2qvfXlEGaA== X-IronPort-AV: E=McAfee;i="6700,10204,11127"; a="28279681" X-IronPort-AV: E=Sophos;i="6.09,192,1716274800"; d="scan'208";a="28279681" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2024 10:00:37 -0700 X-CSE-ConnectionGUID: UxUKdXo0TXGzjQq8/RMxOQ== X-CSE-MsgGUID: wmZv5VRUR7qOOTxlDcQTBg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,192,1716274800"; d="scan'208";a="47486297" Received: from tassilo.jf.intel.com ([10.54.38.190]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2024 10:00:37 -0700 From: Andi Kleen To: gcc-patches@gcc.gnu.org Cc: richard.guenther@gmail.com, josmyers@redhat.com, polacek@redhat.com, jakub@redhat.com, Andi Kleen Subject: [PATCH v9 05/10] C: Implement musttail attribute for returns Date: Mon, 8 Jul 2024 09:55:57 -0700 Message-ID: <20240708170031.1621184-6-ak@linux.intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240708170031.1621184-1-ak@linux.intel.com> References: <20240708170031.1621184-1-ak@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org Implement a C23 clang compatible musttail attribute similar to the earlier C++ implementation in the C parser. PR83324 gcc/c/ChangeLog: * c-parser.cc (struct attr_state): Define with musttail_p. (c_parser_statement_after_labels): Handle [[musttail]] (c_parser_std_attribute): Dito. (c_parser_handle_musttail): Dito. (c_parser_compound_statement_nostart): Dito. (c_parser_all_labels): Dito. (c_parser_statement): Dito. * c-tree.h (c_finish_return): Add musttail_p flag. * c-typeck.cc (c_finish_return): Handle musttail_p flag. --- gcc/c/c-parser.cc | 59 +++++++++++++++++++++++++++++++++++++---------- gcc/c/c-tree.h | 2 +- gcc/c/c-typeck.cc | 15 ++++++++++-- 3 files changed, 61 insertions(+), 15 deletions(-) diff --git a/gcc/c/c-parser.cc b/gcc/c/c-parser.cc index 8c4e697a4e10..ce1c2c2be835 100644 --- a/gcc/c/c-parser.cc +++ b/gcc/c/c-parser.cc @@ -1621,6 +1621,11 @@ struct omp_for_parse_data { bool fail : 1; }; +struct attr_state +{ + bool musttail_p; // parsed a musttail for return +}; + static bool c_parser_nth_token_starts_std_attributes (c_parser *, unsigned int); static tree c_parser_std_attribute_specifier_sequence (c_parser *); @@ -1665,7 +1670,7 @@ static location_t c_parser_compound_statement_nostart (c_parser *); static void c_parser_label (c_parser *, tree); static void c_parser_statement (c_parser *, bool *, location_t * = NULL); static void c_parser_statement_after_labels (c_parser *, bool *, - vec * = NULL); + vec * = NULL, attr_state = {}); static tree c_parser_c99_block_statement (c_parser *, bool *, location_t * = NULL); static void c_parser_if_statement (c_parser *, bool *, vec *); @@ -6982,6 +6987,28 @@ c_parser_handle_directive_omp_attributes (tree &attrs, } } +/* Check if STD_ATTR contains a musttail attribute and handle it + PARSER is the parser and A is the output attr_state. */ + +static tree +c_parser_handle_musttail (c_parser *parser, tree std_attrs, attr_state &a) +{ + if (c_parser_next_token_is_keyword (parser, RID_RETURN)) + { + if (lookup_attribute ("gnu", "musttail", std_attrs)) + { + std_attrs = remove_attribute ("gnu", "musttail", std_attrs); + a.musttail_p = true; + } + if (lookup_attribute ("clang", "musttail", std_attrs)) + { + std_attrs = remove_attribute ("clang", "musttail", std_attrs); + a.musttail_p = true; + } + } + return std_attrs; +} + /* Parse a compound statement except for the opening brace. This is used for parsing both compound statements and statement expressions (which follow different paths to handling the opening). */ @@ -6998,6 +7025,7 @@ c_parser_compound_statement_nostart (c_parser *parser) bool in_omp_loop_block = omp_for_parse_state ? omp_for_parse_state->want_nested_loop : false; tree sl = NULL_TREE; + attr_state a = {}; if (c_parser_next_token_is (parser, CPP_CLOSE_BRACE)) { @@ -7138,7 +7166,10 @@ c_parser_compound_statement_nostart (c_parser *parser) = c_parser_nth_token_starts_std_attributes (parser, 1); tree std_attrs = NULL_TREE; if (have_std_attrs) - std_attrs = c_parser_std_attribute_specifier_sequence (parser); + { + std_attrs = c_parser_std_attribute_specifier_sequence (parser); + std_attrs = c_parser_handle_musttail (parser, std_attrs, a); + } if (c_parser_next_token_is_keyword (parser, RID_CASE) || c_parser_next_token_is_keyword (parser, RID_DEFAULT) || (c_parser_next_token_is (parser, CPP_NAME) @@ -7286,7 +7317,7 @@ c_parser_compound_statement_nostart (c_parser *parser) last_stmt = true; mark_valid_location_for_stdc_pragma (false); if (!omp_for_parse_state) - c_parser_statement_after_labels (parser, NULL); + c_parser_statement_after_labels (parser, NULL, NULL, a); else { /* In canonical loop nest form, nested loops can only appear @@ -7328,15 +7359,18 @@ c_parser_compound_statement_nostart (c_parser *parser) /* Parse all consecutive labels, possibly preceded by standard attributes. In this context, a statement is required, not a declaration, so attributes must be followed by a statement that is - not just a semicolon. */ + not just a semicolon. Returns an attr_state. */ -static void +static attr_state c_parser_all_labels (c_parser *parser) { + attr_state a = {}; bool have_std_attrs; tree std_attrs = NULL; if ((have_std_attrs = c_parser_nth_token_starts_std_attributes (parser, 1))) - std_attrs = c_parser_std_attribute_specifier_sequence (parser); + std_attrs = c_parser_handle_musttail (parser, + c_parser_std_attribute_specifier_sequence (parser), a); + while (c_parser_next_token_is_keyword (parser, RID_CASE) || c_parser_next_token_is_keyword (parser, RID_DEFAULT) || (c_parser_next_token_is (parser, CPP_NAME) @@ -7358,6 +7392,7 @@ c_parser_all_labels (c_parser *parser) } else if (have_std_attrs && c_parser_next_token_is (parser, CPP_SEMICOLON)) c_parser_error (parser, "expected statement"); + return a; } /* Parse a label (C90 6.6.1, C99 6.8.1, C11 6.8.1). @@ -7601,11 +7636,11 @@ c_parser_label (c_parser *parser, tree std_attrs) static void c_parser_statement (c_parser *parser, bool *if_p, location_t *loc_after_labels) { - c_parser_all_labels (parser); + attr_state a = c_parser_all_labels (parser); if (loc_after_labels) *loc_after_labels = c_parser_peek_token (parser)->location; parser->omp_attrs_forbidden_p = false; - c_parser_statement_after_labels (parser, if_p, NULL); + c_parser_statement_after_labels (parser, if_p, NULL, a); } /* Parse a statement, other than a labeled statement. CHAIN is a vector @@ -7614,11 +7649,11 @@ c_parser_statement (c_parser *parser, bool *if_p, location_t *loc_after_labels) IF_P is used to track whether there's a (possibly labeled) if statement which is not enclosed in braces and has an else clause. This is used to - implement -Wparentheses. */ + implement -Wparentheses. A has an earlier parsed attribute state. */ static void c_parser_statement_after_labels (c_parser *parser, bool *if_p, - vec *chain) + vec *chain, attr_state a) { location_t loc = c_parser_peek_token (parser)->location; tree stmt = NULL_TREE; @@ -7686,7 +7721,7 @@ c_parser_statement_after_labels (c_parser *parser, bool *if_p, c_parser_consume_token (parser); if (c_parser_next_token_is (parser, CPP_SEMICOLON)) { - stmt = c_finish_return (loc, NULL_TREE, NULL_TREE); + stmt = c_finish_return (loc, NULL_TREE, NULL_TREE, a.musttail_p); c_parser_consume_token (parser); } else @@ -7695,7 +7730,7 @@ c_parser_statement_after_labels (c_parser *parser, bool *if_p, struct c_expr expr = c_parser_expression_conv (parser); mark_exp_read (expr.value); stmt = c_finish_return (EXPR_LOC_OR_LOC (expr.value, xloc), - expr.value, expr.original_type); + expr.value, expr.original_type, a.musttail_p); goto expect_semicolon; } break; diff --git a/gcc/c/c-tree.h b/gcc/c/c-tree.h index 15da875a0290..3dc6338bf061 100644 --- a/gcc/c/c-tree.h +++ b/gcc/c/c-tree.h @@ -827,7 +827,7 @@ extern tree c_begin_stmt_expr (void); extern tree c_finish_stmt_expr (location_t, tree); extern tree c_process_expr_stmt (location_t, tree); extern tree c_finish_expr_stmt (location_t, tree); -extern tree c_finish_return (location_t, tree, tree); +extern tree c_finish_return (location_t, tree, tree, bool = false); extern tree c_finish_bc_stmt (location_t, tree, bool); extern tree c_finish_goto_label (location_t, tree); extern tree c_finish_goto_ptr (location_t, c_expr val); diff --git a/gcc/c/c-typeck.cc b/gcc/c/c-typeck.cc index ffcab7df4d3b..e47b10befd90 100644 --- a/gcc/c/c-typeck.cc +++ b/gcc/c/c-typeck.cc @@ -11693,10 +11693,10 @@ c_finish_goto_ptr (location_t loc, c_expr val) to return, or a null pointer for `return;' with no value. LOC is the location of the return statement, or the location of the expression, if the statement has any. If ORIGTYPE is not NULL_TREE, it - is the original type of RETVAL. */ + is the original type of RETVAL. MUSTTAIL_P indicates a musttail attribute. */ tree -c_finish_return (location_t loc, tree retval, tree origtype) +c_finish_return (location_t loc, tree retval, tree origtype, bool musttail_p) { tree valtype = TREE_TYPE (TREE_TYPE (current_function_decl)), ret_stmt; bool no_warning = false; @@ -11710,6 +11710,17 @@ c_finish_return (location_t loc, tree retval, tree origtype) warning_at (xloc, 0, "function declared % has a % statement"); + if (retval && musttail_p) + { + tree t = retval; + if (TREE_CODE (t) == TARGET_EXPR) + t = TARGET_EXPR_INITIAL (t); + if (TREE_CODE (t) != CALL_EXPR) + error_at (xloc, "cannot tail-call: return value must be call"); + else + CALL_EXPR_MUST_TAIL_CALL (t) = 1; + } + if (retval) { tree semantic_type = NULL_TREE; From patchwork Mon Jul 8 16:55:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andi Kleen X-Patchwork-Id: 1958055 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=Fp1MAKES; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WHr4r47PHz1xpP for ; Tue, 9 Jul 2024 03:01:48 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DD149384A459 for ; Mon, 8 Jul 2024 17:01:46 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by sourceware.org (Postfix) with ESMTPS id 5B1B1384A4A8 for ; Mon, 8 Jul 2024 17:00:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5B1B1384A4A8 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.intel.com Authentication-Results: sourceware.org; spf=none smtp.mailfrom=linux.intel.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5B1B1384A4A8 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720458057; cv=none; b=ZPeXEV8YTo1UgUauz+q2XfVF5B7rlxGZYumZZhcVtJjIlL6E15rO/WMAGq5KCyMfYNLLAsgzpaxdXlUH9DFVWl40TDw0IfbG/XL9V9ZdiQipB+WElNTyXekc0u5ioDDLPRdescQSDLHfVlYBChh8Kx6WUa1saHHshrSQrIGMkDE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720458057; c=relaxed/simple; bh=XjLO5Y+ROUJYE4A4iZy8ZKoyroVGGoc4md1nGHJH5M8=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=cP4rpXnp/TARZRGDUeWdrLQCYXh7V2zU4FjvaeJVEOTRKlnt0dytGBHao+y3aIQuO8vl5jTbixEMq9sKQ31+WNbVGbpEWhgdzenJorOS5FWFiAlVZ47YmEfZMjAt0Tfh0h1UtWwRkeDX92FGBgPSdZJTyKoy5HIekBKSmDUXxaA= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720458054; x=1751994054; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XjLO5Y+ROUJYE4A4iZy8ZKoyroVGGoc4md1nGHJH5M8=; b=Fp1MAKES5f1/krfzwTFycJ0JRAFW/PhsBdpNGHICq+u+U94/18q5lz/S JiXvtTzjAFaK1A9VKJpf+cLHgZma0uPmVyJBGScGR5+OBH1mTAh2sC2NK fXaeam6v1fZK3jJQU1oLHy+7eaOqjuas3PjyCBRjV4d7mjMZaGaMBOFkO gOT7tKiW4Ac6B83iRjTLys4QmJ742YBr7jcsq5kAedT7FIbRikv44z2Sq 31NpaEvya2WuA5dTUvxeok2Io04RAJ4jgFPSmR1j332Kk1FQjmQ0LxrcX 4XoscVD9WiqrNtO0qUvzrANM/vmXwossj60fDWBw+uAaMdR9zTbcrIvgh Q==; X-CSE-ConnectionGUID: m6rSM2+eQuag9Yy5ydw++A== X-CSE-MsgGUID: epKiDEo6RSCnSESPXRFszg== X-IronPort-AV: E=McAfee;i="6700,10204,11127"; a="28279685" X-IronPort-AV: E=Sophos;i="6.09,192,1716274800"; d="scan'208";a="28279685" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2024 10:00:37 -0700 X-CSE-ConnectionGUID: 4oHY8ycUQj+ZwSVHQu0l5w== X-CSE-MsgGUID: 7JRmFBxwTw+GQu1La8/iOQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,192,1716274800"; d="scan'208";a="47486298" Received: from tassilo.jf.intel.com ([10.54.38.190]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2024 10:00:37 -0700 From: Andi Kleen To: gcc-patches@gcc.gnu.org Cc: richard.guenther@gmail.com, josmyers@redhat.com, polacek@redhat.com, jakub@redhat.com, Andi Kleen Subject: [PATCH v9 06/10] Enable musttail tail conversion even when not optimizing Date: Mon, 8 Jul 2024 09:55:58 -0700 Message-ID: <20240708170031.1621184-7-ak@linux.intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240708170031.1621184-1-ak@linux.intel.com> References: <20240708170031.1621184-1-ak@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org Enable the tailcall optimization for non optimizing builds, but in this case only checks calls that have the musttail attribute set. This makes musttail work without optimization. This is done with a new late musttail pass that is only active when not optimizing. The new pass relies on tree-cfg to discover musttails. This avoids a ~0.8% compiler run time penalty at -O0. gcc/ChangeLog: PR83324 * function.h (struct function): Add has_musttail. * lto-streamer-in.cc (input_struct_function_base): Stream has_musttail. * lto-streamer-out.cc (output_struct_function_base): Dito. * passes.def (pass_musttail): Add. * tree-cfg.cc (notice_special_calls): Record has_musttail. (clear_special_calls): Clear has_musttail. * tree-pass.h (make_pass_musttail): Add. * tree-tailcall.cc (find_tail_calls): Handle only_musttail argument. (tree_optimize_tail_calls_1): Pass on only_musttail. (execute_tail_calls): Pass only_musttail as false. (class pass_musttail): Add. (make_pass_musttail): Add. --- gcc/function.h | 3 ++ gcc/lto-streamer-in.cc | 1 + gcc/lto-streamer-out.cc | 1 + gcc/passes.def | 1 + gcc/tree-cfg.cc | 3 ++ gcc/tree-pass.h | 1 + gcc/tree-tailcall.cc | 68 +++++++++++++++++++++++++++++++++++------ 7 files changed, 69 insertions(+), 9 deletions(-) diff --git a/gcc/function.h b/gcc/function.h index c0ba6cc1531a..fbeadeaf4104 100644 --- a/gcc/function.h +++ b/gcc/function.h @@ -430,6 +430,9 @@ struct GTY(()) function { /* Nonzero when the tail call has been identified. */ unsigned int tail_call_marked : 1; + /* Has musttail marked calls. */ + unsigned int has_musttail : 1; + /* Nonzero if the current function contains a #pragma GCC unroll. */ unsigned int has_unroll : 1; diff --git a/gcc/lto-streamer-in.cc b/gcc/lto-streamer-in.cc index ad0ca24007a0..2e592be80823 100644 --- a/gcc/lto-streamer-in.cc +++ b/gcc/lto-streamer-in.cc @@ -1325,6 +1325,7 @@ input_struct_function_base (struct function *fn, class data_in *data_in, fn->calls_eh_return = bp_unpack_value (&bp, 1); fn->has_force_vectorize_loops = bp_unpack_value (&bp, 1); fn->has_simduid_loops = bp_unpack_value (&bp, 1); + fn->has_musttail = bp_unpack_value (&bp, 1); fn->assume_function = bp_unpack_value (&bp, 1); fn->va_list_fpr_size = bp_unpack_value (&bp, 8); fn->va_list_gpr_size = bp_unpack_value (&bp, 8); diff --git a/gcc/lto-streamer-out.cc b/gcc/lto-streamer-out.cc index d4f728094ed5..0be381abbd96 100644 --- a/gcc/lto-streamer-out.cc +++ b/gcc/lto-streamer-out.cc @@ -2290,6 +2290,7 @@ output_struct_function_base (struct output_block *ob, struct function *fn) bp_pack_value (&bp, fn->calls_eh_return, 1); bp_pack_value (&bp, fn->has_force_vectorize_loops, 1); bp_pack_value (&bp, fn->has_simduid_loops, 1); + bp_pack_value (&bp, fn->has_musttail, 1); bp_pack_value (&bp, fn->assume_function, 1); bp_pack_value (&bp, fn->va_list_fpr_size, 8); bp_pack_value (&bp, fn->va_list_gpr_size, 8); diff --git a/gcc/passes.def b/gcc/passes.def index b8c21b1e4351..49ab89387552 100644 --- a/gcc/passes.def +++ b/gcc/passes.def @@ -444,6 +444,7 @@ along with GCC; see the file COPYING3. If not see NEXT_PASS (pass_tsan_O0); NEXT_PASS (pass_sanopt); NEXT_PASS (pass_cleanup_eh); + NEXT_PASS (pass_musttail); NEXT_PASS (pass_lower_resx); NEXT_PASS (pass_nrv); NEXT_PASS (pass_gimple_isel); diff --git a/gcc/tree-cfg.cc b/gcc/tree-cfg.cc index 7fb7b92966be..e6fd1294b958 100644 --- a/gcc/tree-cfg.cc +++ b/gcc/tree-cfg.cc @@ -2290,6 +2290,8 @@ notice_special_calls (gcall *call) cfun->calls_alloca = true; if (flags & ECF_RETURNS_TWICE) cfun->calls_setjmp = true; + if (gimple_call_must_tail_p (call)) + cfun->has_musttail = true; } @@ -2301,6 +2303,7 @@ clear_special_calls (void) { cfun->calls_alloca = false; cfun->calls_setjmp = false; + cfun->has_musttail = false; } /* Remove PHI nodes associated with basic block BB and all edges out of BB. */ diff --git a/gcc/tree-pass.h b/gcc/tree-pass.h index 9843d189d27d..8093b363bf14 100644 --- a/gcc/tree-pass.h +++ b/gcc/tree-pass.h @@ -368,6 +368,7 @@ extern gimple_opt_pass *make_pass_sra (gcc::context *ctxt); extern gimple_opt_pass *make_pass_sra_early (gcc::context *ctxt); extern gimple_opt_pass *make_pass_tail_recursion (gcc::context *ctxt); extern gimple_opt_pass *make_pass_tail_calls (gcc::context *ctxt); +extern gimple_opt_pass *make_pass_musttail (gcc::context *ctxt); extern gimple_opt_pass *make_pass_fix_loops (gcc::context *ctxt); extern gimple_opt_pass *make_pass_tree_loop (gcc::context *ctxt); extern gimple_opt_pass *make_pass_tree_no_loop (gcc::context *ctxt); diff --git a/gcc/tree-tailcall.cc b/gcc/tree-tailcall.cc index e9f7f8a12b3a..43e8c25215cb 100644 --- a/gcc/tree-tailcall.cc +++ b/gcc/tree-tailcall.cc @@ -408,10 +408,10 @@ static live_vars_map *live_vars; static vec live_vars_vec; /* Finds tailcalls falling into basic block BB. The list of found tailcalls is - added to the start of RET. */ + added to the start of RET. When ONLY_MUSTTAIL is set only handle musttail. */ static void -find_tail_calls (basic_block bb, struct tailcall **ret) +find_tail_calls (basic_block bb, struct tailcall **ret, bool only_musttail) { tree ass_var = NULL_TREE, ret_var, func, param; gimple *stmt; @@ -445,6 +445,9 @@ find_tail_calls (basic_block bb, struct tailcall **ret) if (is_gimple_call (stmt)) { call = as_a (stmt); + /* Handle only musttail calls when not optimizing. */ + if (only_musttail && !gimple_call_must_tail_p (call)) + return; ass_var = gimple_call_lhs (call); break; } @@ -467,7 +470,7 @@ find_tail_calls (basic_block bb, struct tailcall **ret) edge_iterator ei; /* Recurse to the predecessors. */ FOR_EACH_EDGE (e, ei, bb->preds) - find_tail_calls (e->src, ret); + find_tail_calls (e->src, ret, only_musttail); return; } @@ -528,7 +531,8 @@ find_tail_calls (basic_block bb, struct tailcall **ret) func = gimple_call_fndecl (call); if (func && !fndecl_built_in_p (func) - && recursive_call_p (current_function_decl, func)) + && recursive_call_p (current_function_decl, func) + && !only_musttail) { tree arg; @@ -1094,10 +1098,11 @@ create_tailcall_accumulator (const char *label, basic_block bb, tree init) } /* Optimizes tail calls in the function, turning the tail recursion - into iteration. */ + into iteration. When ONLY_MUSTCALL is true only optimize mustcall + marked calls. */ static unsigned int -tree_optimize_tail_calls_1 (bool opt_tailcalls) +tree_optimize_tail_calls_1 (bool opt_tailcalls, bool only_mustcall) { edge e; bool phis_constructed = false; @@ -1117,7 +1122,7 @@ tree_optimize_tail_calls_1 (bool opt_tailcalls) /* Only traverse the normal exits, i.e. those that end with return statement. */ if (safe_is_a (*gsi_last_bb (e->src))) - find_tail_calls (e->src, &tailcalls); + find_tail_calls (e->src, &tailcalls, only_mustcall); } if (live_vars) @@ -1228,7 +1233,7 @@ gate_tail_calls (void) static unsigned int execute_tail_calls (void) { - return tree_optimize_tail_calls_1 (true); + return tree_optimize_tail_calls_1 (true, false); } namespace { @@ -1261,7 +1266,7 @@ public: bool gate (function *) final override { return gate_tail_calls (); } unsigned int execute (function *) final override { - return tree_optimize_tail_calls_1 (false); + return tree_optimize_tail_calls_1 (false, false); } }; // class pass_tail_recursion @@ -1312,3 +1317,48 @@ make_pass_tail_calls (gcc::context *ctxt) { return new pass_tail_calls (ctxt); } + +namespace { + +const pass_data pass_data_musttail = +{ + GIMPLE_PASS, /* type */ + "musttail", /* name */ + OPTGROUP_NONE, /* optinfo_flags */ + TV_NONE, /* tv_id */ + ( PROP_cfg | PROP_ssa ), /* properties_required */ + 0, /* properties_provided */ + 0, /* properties_destroyed */ + 0, /* todo_flags_start */ + 0, /* todo_flags_finish */ +}; + +class pass_musttail : public gimple_opt_pass +{ +public: + pass_musttail (gcc::context *ctxt) + : gimple_opt_pass (pass_data_musttail, ctxt) + {} + + /* opt_pass methods: */ + /* This pass is only used when the other tail call pass + doesn't run to make [[musttail]] still work. But only + run it when there is actually a musttail in the function. */ + bool gate (function *f) final override + { + return !flag_optimize_sibling_calls && f->has_musttail; + } + unsigned int execute (function *) final override + { + return tree_optimize_tail_calls_1 (true, true); + } + +}; // class pass_musttail + +} // anon namespace + +gimple_opt_pass * +make_pass_musttail (gcc::context *ctxt) +{ + return new pass_musttail (ctxt); +} From patchwork Mon Jul 8 16:55:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andi Kleen X-Patchwork-Id: 1958057 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=R7OhVpfM; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WHr5z4vmFz1xpP for ; Tue, 9 Jul 2024 03:02:47 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E2AC9384A413 for ; Mon, 8 Jul 2024 17:02:45 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by sourceware.org (Postfix) with ESMTPS id 9F18F384A80F for ; Mon, 8 Jul 2024 17:00:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9F18F384A80F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.intel.com Authentication-Results: sourceware.org; spf=none smtp.mailfrom=linux.intel.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 9F18F384A80F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720458057; cv=none; b=Bo/7/yiUuMEN9/fW2dmfH7kMsb7v3rV5tOD2+llZzfTqN51siaOFqy1q76urunUPyIGWOwSXp/tYCgZ/n+ZPZ0mTx6Q99kP8EQQ9mKMjiXWOg2HUoM5iuH/f8qzrevdb80eArWsjV8KpR3u7s0om8wXu/npDnBLFuOB5OoHJhqI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720458057; c=relaxed/simple; bh=pAli+CHxR8EPM/fh8vbVqwVqICpbsoF7KbtvtxyQoeo=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=xKzmCxGatq1WdvG/ZXEnUdvLFvJd10X0bwJcoHqBbp0ocC9yhL9OgFrONDjJSOiqlQ6OTRyF63XLp8g6+AJH4VcgK7bp2pwd2eLKyDq0ySKdYAJsxl9j8KzcHRudcI23Q3dbNDK2+QxuJUj3JR4hZICQf36LDtG+vIVs884P4gA= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720458055; x=1751994055; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pAli+CHxR8EPM/fh8vbVqwVqICpbsoF7KbtvtxyQoeo=; b=R7OhVpfMsDQkvMnneRI9sbWpfAWushutEQvAGwnuNRftfh0AJ8s7ofBh 60hJa9Q4E9zqg9pSkk4zT8r20CCYIg/A3DKCBXVQddu28p0xMJEENoIUm 85beh9O8Dzp9+f97ipu/LT8yiHvbOqtDAl28Y6mFF/Ww6eRqcicJHRxUp dTjoP2zT+3mtCAfd3Rnm0TV0IyWozrOMdmg9wN+go7R9SgxFXQAmSEwg6 img0MQQ+skwL1Obby7JzK6YRYNsl+r6Gq8XemU3Rne4TKLYzWo84nQR8G tA4WWHSTvmcVbCbpfB67BJ6mXV11HaykBRXtaR/MgSkoeYv/ZZyV1e9XI g==; X-CSE-ConnectionGUID: ErId0WT4SXaZzrZVUsz8YA== X-CSE-MsgGUID: p7lF4F3UQcCXYkvpnF5qLQ== X-IronPort-AV: E=McAfee;i="6700,10204,11127"; a="28279687" X-IronPort-AV: E=Sophos;i="6.09,192,1716274800"; d="scan'208";a="28279687" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2024 10:00:37 -0700 X-CSE-ConnectionGUID: 4cE1YC8bTgqiwOj75rQB4w== X-CSE-MsgGUID: eSX+qDVZQIiwalTivG05Mw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,192,1716274800"; d="scan'208";a="47486299" Received: from tassilo.jf.intel.com ([10.54.38.190]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2024 10:00:37 -0700 From: Andi Kleen To: gcc-patches@gcc.gnu.org Cc: richard.guenther@gmail.com, josmyers@redhat.com, polacek@redhat.com, jakub@redhat.com, Andi Kleen Subject: [PATCH v9 07/10] Give better error messages for musttail Date: Mon, 8 Jul 2024 09:55:59 -0700 Message-ID: <20240708170031.1621184-8-ak@linux.intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240708170031.1621184-1-ak@linux.intel.com> References: <20240708170031.1621184-1-ak@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org When musttail is set, make tree-tailcall give error messages when it cannot handle a call. This avoids vague "other reasons" error messages later at expand time when it sees a musttail function not marked tail call. In various cases this requires delaying the error until the call is discovered. Also print more information on the failure to the dump file. gcc/ChangeLog: PR83324 * tree-tailcall.cc (maybe_error_musttail): New function. (suitable_for_tail_opt_p): Report error reason. (suitable_for_tail_call_opt_p): Report error reason. (find_tail_calls): Accept basic blocks with abnormal edges. Delay reporting of errors until the call is discovered. Move top level suitability checks to here. (tree_optimize_tail_calls_1): Remove top level checks. --- gcc/tree-tailcall.cc | 187 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 154 insertions(+), 33 deletions(-) diff --git a/gcc/tree-tailcall.cc b/gcc/tree-tailcall.cc index 43e8c25215cb..a68079d4f507 100644 --- a/gcc/tree-tailcall.cc +++ b/gcc/tree-tailcall.cc @@ -40,9 +40,11 @@ along with GCC; see the file COPYING3. If not see #include "tree-eh.h" #include "dbgcnt.h" #include "cfgloop.h" +#include "intl.h" #include "common/common-target.h" #include "ipa-utils.h" #include "tree-ssa-live.h" +#include "diagnostic-core.h" /* The file implements the tail recursion elimination. It is also used to analyze the tail calls in general, passing the results to the rtl level @@ -131,14 +133,20 @@ static tree m_acc, a_acc; static bitmap tailr_arg_needs_copy; +static void maybe_error_musttail (gcall *call, const char *err); + /* Returns false when the function is not suitable for tail call optimization - from some reason (e.g. if it takes variable number of arguments). */ + from some reason (e.g. if it takes variable number of arguments). CALL + is call to report for. */ static bool -suitable_for_tail_opt_p (void) +suitable_for_tail_opt_p (gcall *call) { if (cfun->stdarg) - return false; + { + maybe_error_musttail (call, _("caller uses stdargs")); + return false; + } return true; } @@ -146,35 +154,47 @@ suitable_for_tail_opt_p (void) /* Returns false when the function is not suitable for tail call optimization for some reason (e.g. if it takes variable number of arguments). This test must pass in addition to suitable_for_tail_opt_p in order to make - tail call discovery happen. */ + tail call discovery happen. CALL is call to report error for. */ static bool -suitable_for_tail_call_opt_p (void) +suitable_for_tail_call_opt_p (gcall *call) { tree param; /* alloca (until we have stack slot life analysis) inhibits sibling call optimizations, but not tail recursion. */ if (cfun->calls_alloca) - return false; + { + maybe_error_musttail (call, _("caller uses alloca")); + return false; + } /* If we are using sjlj exceptions, we may need to add a call to _Unwind_SjLj_Unregister at exit of the function. Which means that we cannot do any sibcall transformations. */ if (targetm_common.except_unwind_info (&global_options) == UI_SJLJ && current_function_has_exception_handlers ()) - return false; + { + maybe_error_musttail (call, _("caller uses sjlj exceptions")); + return false; + } /* Any function that calls setjmp might have longjmp called from any called function. ??? We really should represent this properly in the CFG so that this needn't be special cased. */ if (cfun->calls_setjmp) - return false; + { + maybe_error_musttail (call, _("caller uses setjmp")); + return false; + } /* Various targets don't handle tail calls correctly in functions that call __builtin_eh_return. */ if (cfun->calls_eh_return) - return false; + { + maybe_error_musttail (call, _("caller uses __builtin_eh_return")); + return false; + } /* ??? It is OK if the argument of a function is taken in some cases, but not in all cases. See PR15387 and PR19616. Revisit for 4.1. */ @@ -182,7 +202,10 @@ suitable_for_tail_call_opt_p (void) param; param = DECL_CHAIN (param)) if (TREE_ADDRESSABLE (param)) - return false; + { + maybe_error_musttail (call, _("address of caller arguments taken")); + return false; + } return true; } @@ -402,16 +425,42 @@ propagate_through_phis (tree var, edge e) return var; } +/* Report an error for failing to tail convert must call CALL + with error message ERR. Also clear the flag to prevent further + errors. */ + +static void +maybe_error_musttail (gcall *call, const char *err) +{ + if (gimple_call_must_tail_p (call)) + { + error_at (call->location, "cannot tail-call: %s", err); + /* Avoid another error. ??? If there are multiple reasons why tail + calls fail it might be useful to report them all to avoid + whack-a-mole for the user. But currently there is too much + redundancy in the reporting, so keep it simple. */ + gimple_call_set_must_tail (call, false); /* Avoid another error. */ + gimple_call_set_tail (call, false); + } + if (dump_file) + { + print_gimple_stmt (dump_file, call, 0, TDF_SLIM); + fprintf (dump_file, "Cannot convert: %s\n", err); + } +} + /* Argument for compute_live_vars/live_vars_at_stmt and what compute_live_vars returns. Computed lazily, but just once for the function. */ static live_vars_map *live_vars; static vec live_vars_vec; /* Finds tailcalls falling into basic block BB. The list of found tailcalls is - added to the start of RET. When ONLY_MUSTTAIL is set only handle musttail. */ + added to the start of RET. When ONLY_MUSTTAIL is set only handle musttail. + Update OPT_TAILCALLS as output parameter. */ static void -find_tail_calls (basic_block bb, struct tailcall **ret, bool only_musttail) +find_tail_calls (basic_block bb, struct tailcall **ret, bool only_musttail, + bool &opt_tailcalls) { tree ass_var = NULL_TREE, ret_var, func, param; gimple *stmt; @@ -426,8 +475,23 @@ find_tail_calls (basic_block bb, struct tailcall **ret, bool only_musttail) tree var; if (!single_succ_p (bb)) - return; + { + /* If there is an abnormal edge assume it's the only extra one. + Tolerate that case so that we can give better error messages + for musttail later. */ + if (!has_abnormal_or_eh_outgoing_edge_p (bb)) + { + if (dump_file) + fprintf (dump_file, "Basic block %d has extra exit edges\n", + bb->index); + return; + } + if (!cfun->has_musttail) + return; + } + bool bad_stmt = false; + gimple *last_stmt = nullptr; for (gsi = gsi_last_bb (bb); !gsi_end_p (gsi); gsi_prev (&gsi)) { stmt = gsi_stmt (gsi); @@ -441,6 +505,8 @@ find_tail_calls (basic_block bb, struct tailcall **ret, bool only_musttail) || is_gimple_debug (stmt)) continue; + if (!last_stmt) + last_stmt = stmt; /* Check for a call. */ if (is_gimple_call (stmt)) { @@ -448,6 +514,12 @@ find_tail_calls (basic_block bb, struct tailcall **ret, bool only_musttail) /* Handle only musttail calls when not optimizing. */ if (only_musttail && !gimple_call_must_tail_p (call)) return; + if (bad_stmt) + { + maybe_error_musttail (call, + _("memory reference or volatile after call")); + return; + } ass_var = gimple_call_lhs (call); break; } @@ -462,19 +534,37 @@ find_tail_calls (basic_block bb, struct tailcall **ret, bool only_musttail) /* If the statement references memory or volatile operands, fail. */ if (gimple_references_memory_p (stmt) || gimple_has_volatile_ops (stmt)) - return; + { + if (dump_file) + { + fprintf (dump_file, "Cannot handle "); + print_gimple_stmt (dump_file, stmt, 0); + } + bad_stmt = true; + if (!cfun->has_musttail) + break; + } } + if (bad_stmt) + return; + if (gsi_end_p (gsi)) { edge_iterator ei; /* Recurse to the predecessors. */ FOR_EACH_EDGE (e, ei, bb->preds) - find_tail_calls (e->src, ret, only_musttail); + find_tail_calls (e->src, ret, only_musttail, opt_tailcalls); return; } + if (!suitable_for_tail_opt_p (call)) + return; + + if (!suitable_for_tail_call_opt_p (call)) + opt_tailcalls = false; + /* If the LHS of our call is not just a simple register or local variable, we can't transform this into a tail or sibling call. This situation happens, in (e.g.) "*p = foo()" where foo returns a @@ -489,13 +579,30 @@ find_tail_calls (basic_block bb, struct tailcall **ret, bool only_musttail) if (ass_var && !is_gimple_reg (ass_var) && !auto_var_in_fn_p (ass_var, cfun->decl)) - return; + { + maybe_error_musttail (call, _("return value in memory")); + return; + } + + if (cfun->calls_setjmp) + { + maybe_error_musttail (call, _("caller uses setjmp")); + return; + } /* If the call might throw an exception that wouldn't propagate out of cfun, we can't transform to a tail or sibling call (82081). */ - if (stmt_could_throw_p (cfun, stmt) - && !stmt_can_throw_external (cfun, stmt)) + if ((stmt_could_throw_p (cfun, stmt) + && !stmt_can_throw_external (cfun, stmt)) || !single_succ_p (bb)) + { + if (stmt == last_stmt) + maybe_error_musttail (call, + _("call may throw exception that does not propagate")); + else + maybe_error_musttail (call, + _("code between call and return")); return; + } /* If the function returns a value, then at present, the tail call must return the same type of value. There is conceptually a copy @@ -524,7 +631,10 @@ find_tail_calls (basic_block bb, struct tailcall **ret, bool only_musttail) if (result_decl && may_be_aliased (result_decl) && ref_maybe_used_by_stmt_p (call, result_decl, false)) - return; + { + maybe_error_musttail (call, _("tail call must be same type")); + return; + } /* We found the call, check whether it is suitable. */ tail_recursion = false; @@ -605,6 +715,7 @@ find_tail_calls (basic_block bb, struct tailcall **ret, bool only_musttail) { if (local_live_vars) BITMAP_FREE (local_live_vars); + maybe_error_musttail (call, _("call invocation refers to locals")); return; } else @@ -613,6 +724,7 @@ find_tail_calls (basic_block bb, struct tailcall **ret, bool only_musttail) if (bitmap_bit_p (local_live_vars, *v)) { BITMAP_FREE (local_live_vars); + maybe_error_musttail (call, _("call invocation refers to locals")); return; } } @@ -658,17 +770,21 @@ find_tail_calls (basic_block bb, struct tailcall **ret, bool only_musttail) continue; if (gimple_code (stmt) != GIMPLE_ASSIGN) - return; + { + maybe_error_musttail (call, _("unhandled code after call")); + return; + } /* This is a gimple assign. */ par ret = process_assignment (as_a (stmt), gsi, &tmp_m, &tmp_a, &ass_var, to_move_defs); - if (ret == FAIL) - return; + if (ret == FAIL || (ret == TRY_MOVE && !tail_recursion)) + { + maybe_error_musttail (call, _("return value changed after call")); + return; + } else if (ret == TRY_MOVE) { - if (! tail_recursion) - return; /* Do not deal with checking dominance, the real fix is to do path isolation for the transform phase anyway, removing the need to compute the accumulators with new stmts. */ @@ -716,16 +832,26 @@ find_tail_calls (basic_block bb, struct tailcall **ret, bool only_musttail) if (ret_var && (ret_var != ass_var && !(is_empty_type (TREE_TYPE (ret_var)) && !ass_var))) - return; + { + maybe_error_musttail (call, _("call uses return slot")); + return; + } /* If this is not a tail recursive call, we cannot handle addends or multiplicands. */ if (!tail_recursion && (m || a)) - return; + { + maybe_error_musttail (call, _("operations after non tail recursive call")); + return; + } /* For pointers only allow additions. */ if (m && POINTER_TYPE_P (TREE_TYPE (DECL_RESULT (current_function_decl)))) - return; + { + maybe_error_musttail (call, + _("tail recursion with pointers can only use additions")); + return; + } /* Move queued defs. */ if (tail_recursion) @@ -1112,17 +1238,12 @@ tree_optimize_tail_calls_1 (bool opt_tailcalls, bool only_mustcall) tree param; edge_iterator ei; - if (!suitable_for_tail_opt_p ()) - return 0; - if (opt_tailcalls) - opt_tailcalls = suitable_for_tail_call_opt_p (); - FOR_EACH_EDGE (e, ei, EXIT_BLOCK_PTR_FOR_FN (cfun)->preds) { /* Only traverse the normal exits, i.e. those that end with return statement. */ if (safe_is_a (*gsi_last_bb (e->src))) - find_tail_calls (e->src, &tailcalls, only_mustcall); + find_tail_calls (e->src, &tailcalls, only_mustcall, opt_tailcalls); } if (live_vars) From patchwork Mon Jul 8 16:56:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andi Kleen X-Patchwork-Id: 1958059 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=AUMe24ud; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WHr7F3pM3z1xpP for ; Tue, 9 Jul 2024 03:03:53 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D215D384B046 for ; Mon, 8 Jul 2024 17:03:51 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by sourceware.org (Postfix) with ESMTPS id 9E72F384A447 for ; Mon, 8 Jul 2024 17:00:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9E72F384A447 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.intel.com Authentication-Results: sourceware.org; spf=none smtp.mailfrom=linux.intel.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 9E72F384A447 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720458062; cv=none; b=X2fk02B//CA5FbPLalUISTWsiN68n5ZyKps20/i3e1JyrTar2EgQESNFXFTTehiobCH99huwRNNFR3YrIfQJfI7UQzbGnKUuRT1c8Ha3Z/4Of/RtiRoNfBmEPHJudS95TGgZ+HST859V7rmTskdjELFteOcDCmT2JWBa0KLUZuc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720458062; c=relaxed/simple; bh=XDJKBFcEILnXUzFvGR9Os3YIjiErzpy99Yh7UD1TAp0=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=X6TX7xLAxBl7wZG5ZEY2CwisGyZCayTJUZ92BCWltZlKU0f329eP5eGzMZWiOd8OCOIfpi6Y6tly74nSy2x98ONkXh6Twd064hd9HfeYChqcD8frDYOZFQTHFEDn/VvOanAr+ZSCuRfUX9XSrfOSGiWZAJN3I8301FlmLZ0hqrs= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720458058; x=1751994058; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XDJKBFcEILnXUzFvGR9Os3YIjiErzpy99Yh7UD1TAp0=; b=AUMe24ud70JVFOWsc74CEf04dokjY95cyCmwVSPthY0jfITjoFPobyVn 1uAFsrNQcmDixsskQVUbOX7WcxkAcUCtvFupvvPS2bSRgRLQNb3GWfaxH I5Wog2oiYXie+Vo5h5SwQOjv5D5B/d19FaV8B+3O3srJ26BnDH5Uv05lD NawFqwmIts4WRwLFWU42Zck6X3LYc2Y/fvMlvYnNeLol19rKUFjAyauVr 8XZV53rXPnwkNQ4UUEcIWKilqEhQ2AfrjG0BpwXAqreTLPfHvL8jQPbJF cinq4XmgErysJWj3QYVU8hyrcGbHjTq0E0f9hAGYmAudYsILNDnikyjrT Q==; X-CSE-ConnectionGUID: x3JGVOZ1RjC1/X1TvlKsGQ== X-CSE-MsgGUID: Xj2iQIr7RG+vZEcORoMFCQ== X-IronPort-AV: E=McAfee;i="6700,10204,11127"; a="28279690" X-IronPort-AV: E=Sophos;i="6.09,192,1716274800"; d="scan'208";a="28279690" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2024 10:00:37 -0700 X-CSE-ConnectionGUID: NepcKcykSW+c2rH/uLswbA== X-CSE-MsgGUID: LXRzZO3aSSCsTdChgNuaeQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,192,1716274800"; d="scan'208";a="47486300" Received: from tassilo.jf.intel.com ([10.54.38.190]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2024 10:00:38 -0700 From: Andi Kleen To: gcc-patches@gcc.gnu.org Cc: richard.guenther@gmail.com, josmyers@redhat.com, polacek@redhat.com, jakub@redhat.com, Andi Kleen Subject: [PATCH v9 08/10] Add tests for C/C++ musttail attributes Date: Mon, 8 Jul 2024 09:56:00 -0700 Message-ID: <20240708170031.1621184-9-ak@linux.intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240708170031.1621184-1-ak@linux.intel.com> References: <20240708170031.1621184-1-ak@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_NONE, TXREP, UNWANTED_LANGUAGE_BODY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org Some adopted from the existing C musttail plugin tests. gcc/testsuite/ChangeLog: * c-c++-common/musttail1.c: New test. * c-c++-common/musttail2.c: New test. * c-c++-common/musttail3.c: New test. * c-c++-common/musttail4.c: New test. * c-c++-common/musttail7.c: New test. * c-c++-common/musttail8.c: New test. * g++.dg/musttail6.C: New test. * g++.dg/musttail9.C: New test. * g++.dg/musttail10.C: New test. --- gcc/testsuite/c-c++-common/musttail1.c | 14 ++++++ gcc/testsuite/c-c++-common/musttail2.c | 33 ++++++++++++++ gcc/testsuite/c-c++-common/musttail3.c | 29 ++++++++++++ gcc/testsuite/c-c++-common/musttail4.c | 17 +++++++ gcc/testsuite/c-c++-common/musttail5.c | 28 ++++++++++++ gcc/testsuite/c-c++-common/musttail7.c | 14 ++++++ gcc/testsuite/c-c++-common/musttail8.c | 17 +++++++ gcc/testsuite/g++.dg/musttail10.C | 34 ++++++++++++++ gcc/testsuite/g++.dg/musttail6.C | 61 ++++++++++++++++++++++++++ gcc/testsuite/g++.dg/musttail9.C | 10 +++++ 10 files changed, 257 insertions(+) create mode 100644 gcc/testsuite/c-c++-common/musttail1.c create mode 100644 gcc/testsuite/c-c++-common/musttail2.c create mode 100644 gcc/testsuite/c-c++-common/musttail3.c create mode 100644 gcc/testsuite/c-c++-common/musttail4.c create mode 100644 gcc/testsuite/c-c++-common/musttail5.c create mode 100644 gcc/testsuite/c-c++-common/musttail7.c create mode 100644 gcc/testsuite/c-c++-common/musttail8.c create mode 100644 gcc/testsuite/g++.dg/musttail10.C create mode 100644 gcc/testsuite/g++.dg/musttail6.C create mode 100644 gcc/testsuite/g++.dg/musttail9.C diff --git a/gcc/testsuite/c-c++-common/musttail1.c b/gcc/testsuite/c-c++-common/musttail1.c new file mode 100644 index 000000000000..74efcc2a0bc6 --- /dev/null +++ b/gcc/testsuite/c-c++-common/musttail1.c @@ -0,0 +1,14 @@ +/* { dg-do compile { target { tail_call && { c || c++11 } } } } */ +/* { dg-additional-options "-fdelayed-branch" { target sparc*-*-* } } */ + +int __attribute__((noinline,noclone,noipa)) +callee (int i) +{ + return i * i; +} + +int __attribute__((noinline,noclone,noipa)) +caller (int i) +{ + [[gnu::musttail]] return callee (i + 1); +} diff --git a/gcc/testsuite/c-c++-common/musttail2.c b/gcc/testsuite/c-c++-common/musttail2.c new file mode 100644 index 000000000000..86f2c3d77404 --- /dev/null +++ b/gcc/testsuite/c-c++-common/musttail2.c @@ -0,0 +1,33 @@ +/* { dg-do compile { target { tail_call && { c || c++11 } } } } */ + +struct box { char field[256]; int i; }; + +int __attribute__((noinline,noclone,noipa)) +test_2_callee (int i, struct box b) +{ + if (b.field[0]) + return 5; + return i * i; +} + +int __attribute__((noinline,noclone,noipa)) +test_2_caller (int i) +{ + struct box b; + [[gnu::musttail]] return test_2_callee (i + 1, b); /* { dg-error "cannot tail-call: " } */ +} + +extern void setjmp (void); +void +test_3 (void) +{ + [[gnu::musttail]] return setjmp (); /* { dg-error "cannot tail-call: " } */ +} + +extern float f7(void); + +int +test_6 (void) +{ + [[gnu::musttail]] return f7(); /* { dg-error "cannot tail-call: " } */ +} diff --git a/gcc/testsuite/c-c++-common/musttail3.c b/gcc/testsuite/c-c++-common/musttail3.c new file mode 100644 index 000000000000..ea9589c59ef2 --- /dev/null +++ b/gcc/testsuite/c-c++-common/musttail3.c @@ -0,0 +1,29 @@ +/* { dg-do compile { target { tail_call && { c || c++11 } } } } */ + +extern int foo2 (int x, ...); + +struct str +{ + int a, b; +}; + +struct str +cstruct (int x) +{ + if (x < 10) + [[clang::musttail]] return cstruct (x + 1); + return ((struct str){ x, 0 }); +} + +int +foo (int x) +{ + if (x < 10) + [[clang::musttail]] return foo2 (x, 29); + if (x < 100) + { + int k = foo (x + 1); + [[clang::musttail]] return k; /* { dg-error "cannot tail-call: " } */ + } + return x; +} diff --git a/gcc/testsuite/c-c++-common/musttail4.c b/gcc/testsuite/c-c++-common/musttail4.c new file mode 100644 index 000000000000..23f4b5e1cd68 --- /dev/null +++ b/gcc/testsuite/c-c++-common/musttail4.c @@ -0,0 +1,17 @@ +/* { dg-do compile { target { tail_call && { c || c++11 } } } } */ + +struct box { char field[64]; int i; }; + +struct box __attribute__((noinline,noclone,noipa)) +returns_struct (int i) +{ + struct box b; + b.i = i * i; + return b; +} + +int __attribute__((noinline,noclone)) +test_1 (int i) +{ + [[gnu::musttail]] return returns_struct (i * 5).i; /* { dg-error "cannot tail-call: " } */ +} diff --git a/gcc/testsuite/c-c++-common/musttail5.c b/gcc/testsuite/c-c++-common/musttail5.c new file mode 100644 index 000000000000..234da0d3f2a9 --- /dev/null +++ b/gcc/testsuite/c-c++-common/musttail5.c @@ -0,0 +1,28 @@ +/* { dg-do compile } */ +/* { dg-options "-std=c23" { target c } } */ +/* { dg-options "-std=gnu++11" { target c++ } } */ + +[[musttail]] int j; /* { dg-warning "attribute" } */ +__attribute__((musttail)) int k; /* { dg-warning "attribute" } */ + +void foo(void) +{ + [[gnu::musttail]] j++; /* { dg-warning "attribute" } */ + [[gnu::musttail]] if (k > 0) /* { dg-warning "attribute" } */ + [[gnu::musttail]] k++; /* { dg-warning "attribute" } */ +} + +int foo2(int p) +{ + [[gnu::musttail(1)]] return foo2(p + 1); /* { dg-error "\(before numeric constant|attribute\)" } */ +} + +int i; + +int foo3(void) +{ + [[musttail]] i++; /* { dg-warning "attribute" } */ + [[musttail]] if (i > 10) /* { dg-warning "attribute" } */ + [[musttail]] return foo2(i); /* { dg-warning "attribute" } */ + return 0; +} diff --git a/gcc/testsuite/c-c++-common/musttail7.c b/gcc/testsuite/c-c++-common/musttail7.c new file mode 100644 index 000000000000..c753a3fe9b2a --- /dev/null +++ b/gcc/testsuite/c-c++-common/musttail7.c @@ -0,0 +1,14 @@ +/* { dg-do compile { target { tail_call && { c || c++11 } } } } */ +/* { dg-additional-options "-fdelayed-branch" { target sparc*-*-* } } */ + +void __attribute__((noipa)) f() {} + +void f2() +{ + [[gnu::musttail]] return f2(); +} + +void f3() +{ + [[gnu::musttail]] return f(); +} diff --git a/gcc/testsuite/c-c++-common/musttail8.c b/gcc/testsuite/c-c++-common/musttail8.c new file mode 100644 index 000000000000..9fa10e0b54c4 --- /dev/null +++ b/gcc/testsuite/c-c++-common/musttail8.c @@ -0,0 +1,17 @@ +/* { dg-do compile { target { tail_call && { c || c++11 } } } } */ + +float f1(void); + +int f2(void) +{ + [[gnu::musttail]] return f1 (); /* { dg-error "changed after call" } */ +} + + +int f3(int *); + +int f4(void) +{ + int x; + [[gnu::musttail]] return f3(&x); /* { dg-error "\(refers to locals|other reasons\)" } */ +} diff --git a/gcc/testsuite/g++.dg/musttail10.C b/gcc/testsuite/g++.dg/musttail10.C new file mode 100644 index 000000000000..9b7043b8a306 --- /dev/null +++ b/gcc/testsuite/g++.dg/musttail10.C @@ -0,0 +1,34 @@ +/* { dg-do compile { target { tail_call } } } */ +/* { dg-options "-std=gnu++11" } */ +/* { dg-additional-options "-fdelayed-branch" { target sparc*-*-* } } */ + +int f(); + +double h() { [[gnu::musttail]] return f(); } /* { dg-error "cannot tail-call" } */ + +template +__attribute__((noinline, noclone, noipa)) +T g1() { [[gnu::musttail]] return f(); } /* { dg-error "target is not able" "" { target powerpc*-*-* } } */ + +template +__attribute__((noinline, noclone, noipa)) +T g2() { [[gnu::musttail]] return f(); } /* { dg-error "cannot tail-call" } */ + +template +__attribute__((noinline, noclone, noipa)) +T g3() { [[gnu::musttail]] return f(); } /* { dg-error "cannot tail-call" } */ + +class C +{ + double x; +public: + C(double x) : x(x) {} + ~C() { asm("":::"memory"); } +}; + +int main() +{ + g1(); + g2(); + g3(); +} diff --git a/gcc/testsuite/g++.dg/musttail6.C b/gcc/testsuite/g++.dg/musttail6.C new file mode 100644 index 000000000000..7b5d623af553 --- /dev/null +++ b/gcc/testsuite/g++.dg/musttail6.C @@ -0,0 +1,61 @@ +/* { dg-do compile { target { tail_call } } } */ +/* { dg-skip-if "powerpc does not support sibcall to templates" { powerpc*-*-* } } */ +/* May affect more architectures: */ +/* { dg-skip-if "PR115606, PR115607" { "arm*-*-*" "aarch*-*-*" } } */ +/* { dg-options "-std=gnu++11" } */ +/* { dg-additional-options "-fdelayed-branch" { target sparc*-*-* } } */ + +class Foo { +public: + int a, b; + Foo(int a, int b) : a(a), b(b) {} +}; + +Foo __attribute__((noinline,noclone,noipa)) +callee (int i) +{ + return Foo(i, i+1); +} + +Foo __attribute__((noinline,noclone,noipa)) +caller (int i) +{ + [[gnu::musttail]] return callee (i + 1); +} + +template +T __attribute__((noinline,noclone,noipa)) foo (T i) +{ + return i + 1; +} + +int +caller2 (int k) +{ + [[gnu::musttail]] return foo(1); +} + +template +T caller3 (T v) +{ + [[gnu::musttail]] return foo(v); +} + +int call3(int i) +{ + [[gnu::musttail]] return caller3(i + 1); +} + +struct Bar { + int a; + Bar(int a) : a(a) {} + Bar operator+(Bar o) { return Bar(a + o.a); } +}; + +#if __OPTIMIZE__ >= 1 +Bar +caller4 (Bar k) +{ + [[gnu::musttail]] return caller3(Bar(99)); +} +#endif diff --git a/gcc/testsuite/g++.dg/musttail9.C b/gcc/testsuite/g++.dg/musttail9.C new file mode 100644 index 000000000000..fb0262e751be --- /dev/null +++ b/gcc/testsuite/g++.dg/musttail9.C @@ -0,0 +1,10 @@ +/* { dg-do compile { target { tail_call } } } */ +/* { dg-options "-std=gnu++11" } */ +/* { dg-additional-options "-fdelayed-branch" { target sparc*-*-* } } */ + +extern void foo(); + +void f() noexcept +{ + [[gnu::musttail]] return foo(); /* { dg-error "call may throw exception that does not propagate" } */ +} From patchwork Mon Jul 8 16:56:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andi Kleen X-Patchwork-Id: 1958058 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=RR6ZlrDa; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WHr6N1VL0z1xpP for ; Tue, 9 Jul 2024 03:03:08 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 581D2384A458 for ; Mon, 8 Jul 2024 17:03:06 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by sourceware.org (Postfix) with ESMTPS id 26DBA384A49D for ; Mon, 8 Jul 2024 17:00:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 26DBA384A49D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.intel.com Authentication-Results: sourceware.org; spf=none smtp.mailfrom=linux.intel.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 26DBA384A49D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720458063; cv=none; b=v1t76RCU3xTvDNy6UPmGf5uFUfjgT2DLomzIYwDJ8BnedyBWxKPlq2RKHvz8kVrgFKcUOoftSKVR/ICftpJjIXeCTIwtAv8LVb9YMMZDEM9wnlvYFFrRCvOa8GXJILZDZtD46EpghyE4j9G9xEjgGiz515cR6rcqDIsTOuauMqI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720458063; c=relaxed/simple; bh=R9yVboVF86B0rSLj1zmi+nzq36+W/lhqf312uJAHf6s=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=m3+IuJpRq0GfuRosO6RdQP3aPfuRKTdk9w3QYhFSKx/swnbSVupk/pkD6B7DHz8b5ChnY+u6BX0GdNYulVmmMohQdmNIRZYb2noaY/bgNgIzdD6tTNnue6wCy9diZmu2rQlXR/GIkIm9L/l+DYgJytP4khiw5dcPO2VvCycBqV4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720458058; x=1751994058; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=R9yVboVF86B0rSLj1zmi+nzq36+W/lhqf312uJAHf6s=; b=RR6ZlrDaiAEWx9NX2clHvr3xBPlI9IyXZtlKzt6fk71ydOhb/K/id+G7 u/WSKCAqolsWxe4OKMlMeGBG+hAy4tileYT9S80WbXwMIrJdhigAfTaU+ Ib/9v3mYNkBGSBPWdfCfoIyovtfrZWyWR1K7PfBMcqhPnjD7bybl4D8kc is2lxit5VIP54bbCeB0tAlk1mIs3oPu/EyzWsBhuVitb6zfJP3rn62PjL KFGWWmEbibRpyAqYW+AFqzgwxJrZkYXefqJgSvsZ0GGaPm7zzo1OPIJkK Jta3ivG3PdiQrxOt66d3JkZ/zSh3nJYeD1IilfsH1tIYgr5kG6n8pp1Wa g==; X-CSE-ConnectionGUID: b1MF8TQ5TP2FZ1Cd8B+Gpw== X-CSE-MsgGUID: RmuiGTxaTbWu2RWmRkaTug== X-IronPort-AV: E=McAfee;i="6700,10204,11127"; a="28279693" X-IronPort-AV: E=Sophos;i="6.09,192,1716274800"; d="scan'208";a="28279693" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2024 10:00:37 -0700 X-CSE-ConnectionGUID: d+MT5l9+SH62/CvavJxcVQ== X-CSE-MsgGUID: dyp8IPb7TgiTKcXvhcJwFg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,192,1716274800"; d="scan'208";a="47486301" Received: from tassilo.jf.intel.com ([10.54.38.190]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2024 10:00:38 -0700 From: Andi Kleen To: gcc-patches@gcc.gnu.org Cc: richard.guenther@gmail.com, josmyers@redhat.com, polacek@redhat.com, jakub@redhat.com, Andi Kleen Subject: [PATCH v9 09/10] Add documentation for musttail attribute Date: Mon, 8 Jul 2024 09:56:01 -0700 Message-ID: <20240708170031.1621184-10-ak@linux.intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240708170031.1621184-1-ak@linux.intel.com> References: <20240708170031.1621184-1-ak@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org gcc/ChangeLog: PR83324 * doc/extend.texi: Document [[musttail]] --- gcc/doc/extend.texi | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi index b2e41a581dd1..f83e643da19c 100644 --- a/gcc/doc/extend.texi +++ b/gcc/doc/extend.texi @@ -9921,7 +9921,7 @@ same manner as the @code{deprecated} attribute. @section Statement Attributes @cindex Statement Attributes -GCC allows attributes to be set on null statements. @xref{Attribute Syntax}, +GCC allows attributes to be set on statements. @xref{Attribute Syntax}, for details of the exact syntax for using attributes. Other attributes are available for functions (@pxref{Function Attributes}), variables (@pxref{Variable Attributes}), labels (@pxref{Label Attributes}), enumerators @@ -9978,6 +9978,25 @@ foo (int x, int y) @code{y} is not actually incremented and the compiler can but does not have to optimize it to just @code{return 42 + 42;}. +@cindex @code{musttail} statement attribute +@item musttail + +The @code{gnu::musttail} or @code{clang::musttail} attribute +can be applied to a @code{return} statement with a return-value expression +that is a function call. It asserts that the call must be a tail call that +does not allocate extra stack space, so it is safe to use tail recursion +to implement long running loops. + +@smallexample +[[gnu::musttail]] return foo(); +@end smallexample + +If the compiler cannot generate a @code{musttail} tail call it will report +an error. On some targets tail calls may never be supported. +Tail calls cannot reference locals in memory, which may affect +builds without optimization when passing small structures, or passing +or returning large structures. Enabling -O1 or -O2 can improve +the success of tail calls. @end table @node Attribute Syntax @@ -10101,7 +10120,9 @@ the constant expression, if present. @subsubheading Statement Attributes In GNU C, an attribute specifier list may appear as part of a null -statement. The attribute goes before the semicolon. +statement. The attribute goes before the semicolon. +Some attributes in new style syntax are also supported +on non-null statements. @subsubheading Type Attributes From patchwork Mon Jul 8 16:56:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andi Kleen X-Patchwork-Id: 1958061 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=dl+dk7gh; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WHr8Z2Vl1z1xpP for ; Tue, 9 Jul 2024 03:05:02 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9AB6E384A4A3 for ; Mon, 8 Jul 2024 17:05:00 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by sourceware.org (Postfix) with ESMTPS id A414A384A44D for ; Mon, 8 Jul 2024 17:00:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A414A384A44D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.intel.com Authentication-Results: sourceware.org; spf=none smtp.mailfrom=linux.intel.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A414A384A44D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720458062; cv=none; b=tUUzsYN11tMBi5w1SUW33tW11s5UrW3YtVD0dAblW5acQMZ+x2MsaGIG6iqg2D/rY4473+SnFNXJRImpi4aL6fy4Dsrm0FRxwXdThNrvEZGcVppO3nrRrIrsx5I1uCxekxNxaA/FtgFCOGg1KS93wYbTeQIi7fZprJoxY36Z5ME= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720458062; c=relaxed/simple; bh=zUv5eLAp6HYmT/Ip8UJJ3DMDd9mjiu7T27I9R7jsoJY=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=JuBz5sg/DXlQGYr9oVJFfgMbrW9eEnY8O+C5RNtYg+TUVBhYRJe5sI8gwmUP8iuSjATN7ZyQCMzI3LcemRj+B8vTh05IgbQv0qhbI89Wg+TE4saIU02g6YhYji7rkfURD6cllcLjFyxuDAHVe4ob7TunjsvW12fbulhHJ12MTCU= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720458058; x=1751994058; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zUv5eLAp6HYmT/Ip8UJJ3DMDd9mjiu7T27I9R7jsoJY=; b=dl+dk7gh3o0YN1jfF/7x1nufDDjSh0OS24ROnN7kGUhZDHfqqXlz4Sa7 p0Od6DhScuJDAtoWbRVb4lsDEuQnzKsMuypvv4IyfY5jozyIDX2hvb8+g BxNvkJwogyrTbY/+gIAXN0RXUjA2bYHCy+Hk3CZzVSAsdN1fVPEtyUsUo u8/CSBIBd3kslFmFjLNcCWsJZDC989codwy2P3IJJgZVvLax6KI3KwStS ksY0SGWgpttxwN8diYE5/DhaRYLQfWYlq8NqLpLODP8qAXLpchhTvBtWY MTYgwxRpezkMrfvpRCkn3OMBcqDEUCMoz2iHHt4Rb2c/T6u4o+HFku5dg w==; X-CSE-ConnectionGUID: 2cfGT0wNTjGAqnExKpWksA== X-CSE-MsgGUID: pxNbtIgDTIKKEFzcOKEUNA== X-IronPort-AV: E=McAfee;i="6700,10204,11127"; a="28279696" X-IronPort-AV: E=Sophos;i="6.09,192,1716274800"; d="scan'208";a="28279696" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2024 10:00:38 -0700 X-CSE-ConnectionGUID: AJAG3y67QtG8eoJcWF3/Pg== X-CSE-MsgGUID: hQc4+MBTSo2Bz2+J0bajAQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,192,1716274800"; d="scan'208";a="47486302" Received: from tassilo.jf.intel.com ([10.54.38.190]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2024 10:00:38 -0700 From: Andi Kleen To: gcc-patches@gcc.gnu.org Cc: richard.guenther@gmail.com, josmyers@redhat.com, polacek@redhat.com, jakub@redhat.com, Andi Kleen Subject: [PATCH v9 10/10] Mark expand musttail error messages for translation Date: Mon, 8 Jul 2024 09:56:02 -0700 Message-ID: <20240708170031.1621184-11-ak@linux.intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240708170031.1621184-1-ak@linux.intel.com> References: <20240708170031.1621184-1-ak@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org The musttail error messages are reported to the user, so must be translated. gcc/ChangeLog: PR83324 * calls.cc (initialize_argument_information): Mark messages for translation. (can_implement_as_sibling_call_p): Dito. (expand_call): Dito. --- gcc/calls.cc | 56 ++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/gcc/calls.cc b/gcc/calls.cc index 883eb9971257..f28c58217fdf 100644 --- a/gcc/calls.cc +++ b/gcc/calls.cc @@ -1420,9 +1420,9 @@ initialize_argument_information (int num_actuals ATTRIBUTE_UNUSED, { *may_tailcall = false; maybe_complain_about_tail_call (exp, - "a callee-copied argument is" - " stored in the current" - " function's frame"); + _("a callee-copied argument is" + " stored in the current" + " function's frame")); } args[i].tree_value = build_fold_addr_expr_loc (loc, @@ -1489,8 +1489,8 @@ initialize_argument_information (int num_actuals ATTRIBUTE_UNUSED, type = TREE_TYPE (args[i].tree_value); *may_tailcall = false; maybe_complain_about_tail_call (exp, - "argument must be passed" - " by copying"); + _("argument must be passed" + " by copying")); } arg.pass_by_reference = true; } @@ -2508,8 +2508,8 @@ can_implement_as_sibling_call_p (tree exp, { maybe_complain_about_tail_call (exp, - "machine description does not have" - " a sibcall_epilogue instruction pattern"); + _("machine description does not have" + " a sibcall_epilogue instruction pattern")); return false; } @@ -2519,7 +2519,7 @@ can_implement_as_sibling_call_p (tree exp, sibling calls will return a structure. */ if (structure_value_addr != NULL_RTX) { - maybe_complain_about_tail_call (exp, "callee returns a structure"); + maybe_complain_about_tail_call (exp, _("callee returns a structure")); return false; } @@ -2528,8 +2528,8 @@ can_implement_as_sibling_call_p (tree exp, if (!targetm.function_ok_for_sibcall (fndecl, exp)) { maybe_complain_about_tail_call (exp, - "target is not able to optimize the" - " call into a sibling call"); + _("target is not able to optimize the" + " call into a sibling call")); return false; } @@ -2537,18 +2537,18 @@ can_implement_as_sibling_call_p (tree exp, optimized. */ if (flags & ECF_RETURNS_TWICE) { - maybe_complain_about_tail_call (exp, "callee returns twice"); + maybe_complain_about_tail_call (exp, _("callee returns twice")); return false; } if (flags & ECF_NORETURN) { - maybe_complain_about_tail_call (exp, "callee does not return"); + maybe_complain_about_tail_call (exp, _("callee does not return")); return false; } if (TYPE_VOLATILE (TREE_TYPE (TREE_TYPE (addr)))) { - maybe_complain_about_tail_call (exp, "volatile function type"); + maybe_complain_about_tail_call (exp, _("volatile function type")); return false; } @@ -2567,7 +2567,7 @@ can_implement_as_sibling_call_p (tree exp, the argument areas are shared. */ if (fndecl && decl_function_context (fndecl) == current_function_decl) { - maybe_complain_about_tail_call (exp, "nested function"); + maybe_complain_about_tail_call (exp, _("nested function")); return false; } @@ -2579,8 +2579,8 @@ can_implement_as_sibling_call_p (tree exp, crtl->args.size - crtl->args.pretend_args_size)) { maybe_complain_about_tail_call (exp, - "callee required more stack slots" - " than the caller"); + _("callee required more stack slots" + " than the caller")); return false; } @@ -2594,15 +2594,15 @@ can_implement_as_sibling_call_p (tree exp, crtl->args.size))) { maybe_complain_about_tail_call (exp, - "inconsistent number of" - " popped arguments"); + _("inconsistent number of" + " popped arguments")); return false; } if (!lang_hooks.decls.ok_for_sibcall (fndecl)) { - maybe_complain_about_tail_call (exp, "frontend does not support" - " sibling call"); + maybe_complain_about_tail_call (exp, _("frontend does not support" + " sibling call")); return false; } @@ -2657,7 +2657,7 @@ expand_call (tree exp, rtx target, int ignore) so this shouldn't really happen unless the the musttail pass gave up walking before finding the call. */ if (!try_tail_call) - maybe_complain_about_tail_call (exp, "other reasons"); + maybe_complain_about_tail_call (exp, _("other reasons")); int pass; /* Register in which non-BLKmode value will be returned, @@ -3031,7 +3031,7 @@ expand_call (tree exp, rtx target, int ignore) there's cleanups, as we know there's code to follow the call. */ if (currently_expanding_call++ != 0) { - maybe_complain_about_tail_call (exp, "inside another call"); + maybe_complain_about_tail_call (exp, _("inside another call")); try_tail_call = 0; } if (!flag_optimize_sibling_calls @@ -3040,7 +3040,7 @@ expand_call (tree exp, rtx target, int ignore) try_tail_call = 0; if (args_size.var) { - maybe_complain_about_tail_call (exp, "variable size arguments"); + maybe_complain_about_tail_call (exp, _("variable size arguments")); try_tail_call = 0; } if (dbg_cnt (tail_call) == false) @@ -3065,7 +3065,7 @@ expand_call (tree exp, rtx target, int ignore) { try_tail_call = 0; maybe_complain_about_tail_call (exp, - "hidden string length argument passed on stack"); + _("hidden string length argument passed on stack")); break; } } @@ -3113,9 +3113,9 @@ expand_call (tree exp, rtx target, int ignore) { try_tail_call = 0; maybe_complain_about_tail_call (exp, - "caller and callee disagree in" - " promotion of function" - " return value"); + _("caller and callee disagree in" + " promotion of function" + " return value")); } } @@ -4025,7 +4025,7 @@ expand_call (tree exp, rtx target, int ignore) if (try_tail_call) /* Ideally we'd emit a message for all of the ways that it could have failed. */ - maybe_complain_about_tail_call (exp, "tail call production failed"); + maybe_complain_about_tail_call (exp, _("tail call production failed")); } currently_expanding_call--;