From patchwork Wed Jun 14 11:47:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 71094 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D54DF3857714 for ; Wed, 14 Jun 2023 11:48:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D54DF3857714 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1686743292; bh=18sNdXDeUxwAP1F9Gmn4qTlEINzVo5+NvXNQlJP4xzE=; h=Date:To:cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=a50N4xdk3AH7K48qE/Qu3pyNF4ZYtPaC/KD2oKOvDBwAo0w+ZEShTPFkB+AOa1Xix tOdzasHA2ZBnl+L0XjPVsgL4+6y5XJ2+hsWYJ2FPrtfUWROemr+lRjyHoAgEQ+eIHj dW5i8uSJaxPTvtUh6i3S+3K5hArGFDRhaQKDBo0E= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 2B0223858422 for ; Wed, 14 Jun 2023 11:47:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2B0223858422 Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 333451FDE8; Wed, 14 Jun 2023 11:47:10 +0000 (UTC) Received: from wotan.suse.de (wotan.suse.de [10.160.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id 21B9F2C141; Wed, 14 Jun 2023 11:47:10 +0000 (UTC) Date: Wed, 14 Jun 2023 11:47:10 +0000 (UTC) To: gcc-patches@gcc.gnu.org cc: richard.sandiford@arm.com Subject: [PATCH 1/3] Inline vect_get_max_nscalars_per_iter User-Agent: Alpine 2.22 (LSU 394 2020-01-19) MIME-Version: 1.0 X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MISSING_MID, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Biener via Gcc-patches From: Richard Biener Reply-To: Richard Biener Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Message-Id: <20230614114812.D54DF3857714@sourceware.org> The function is only meaningful for LOOP_VINFO_MASKS processing so inline it into the single use. Bootstrapped and tested on x86_64-unknown-linux-gnu, OK? * tree-vect-loop.cc (vect_get_max_nscalars_per_iter): Inline into ... (vect_verify_full_masking): ... this. --- gcc/tree-vect-loop.cc | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/gcc/tree-vect-loop.cc b/gcc/tree-vect-loop.cc index ace9e759f5b..a9695e5b25d 100644 --- a/gcc/tree-vect-loop.cc +++ b/gcc/tree-vect-loop.cc @@ -1117,20 +1117,6 @@ can_produce_all_loop_masks_p (loop_vec_info loop_vinfo, tree cmp_type) return true; } -/* Calculate the maximum number of scalars per iteration for every - rgroup in LOOP_VINFO. */ - -static unsigned int -vect_get_max_nscalars_per_iter (loop_vec_info loop_vinfo) -{ - unsigned int res = 1; - unsigned int i; - rgroup_controls *rgm; - FOR_EACH_VEC_ELT (LOOP_VINFO_MASKS (loop_vinfo), i, rgm) - res = MAX (res, rgm->max_nscalars_per_iter); - return res; -} - /* Calculate the minimum precision necessary to represent: MAX_NITERS * FACTOR @@ -1210,8 +1196,6 @@ static bool vect_verify_full_masking (loop_vec_info loop_vinfo) { unsigned int min_ni_width; - unsigned int max_nscalars_per_iter - = vect_get_max_nscalars_per_iter (loop_vinfo); /* Use a normal loop if there are no statements that need masking. This only happens in rare degenerate cases: it means that the loop @@ -1219,6 +1203,12 @@ vect_verify_full_masking (loop_vec_info loop_vinfo) if (LOOP_VINFO_MASKS (loop_vinfo).is_empty ()) return false; + /* Calculate the maximum number of scalars per iteration for every rgroup. */ + unsigned int max_nscalars_per_iter = 1; + for (auto rgm : LOOP_VINFO_MASKS (loop_vinfo)) + max_nscalars_per_iter + = MAX (max_nscalars_per_iter, rgm.max_nscalars_per_iter); + /* Work out how many bits we need to represent the limit. */ min_ni_width = vect_min_prec_for_max_niters (loop_vinfo, max_nscalars_per_iter);