From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by sourceware.org (Postfix) with ESMTPS id 4E1D03858C39 for ; Wed, 30 Aug 2023 10:14:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4E1D03858C39 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=vrull.eu Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=vrull.eu Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-500a398cda5so8621259e87.0 for ; Wed, 30 Aug 2023 03:14:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vrull.eu; s=google; t=1693390463; x=1693995263; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VhckYUyuVVDE3glB/lB+PDOKLZuFHiqeALfsEidKqLo=; b=Myjnpc1GaEnsiqhUFbewzyKwgPgdS4GBICFB5G04qB7IqkvEwDBPTm/Cj+esKjvbF2 F4wFHJEG6UvXliY2WNSxftuwSpaMdad0mlQp0qjZPOyWbznGBQ1KBrJZqKCkli/gZmxU KrgSC5Fe4NEjPm/OTD/5R+zfwmWGTkWsjPea6wH4pU+VsRJtuuTiI2Xn+viFVN4Ci93D 5WC9zPLHHLt/JjQQQFQDbkbBdxf4ikcmspoXpPTXGlx20WnE3zmEqPpWWWgcKbAZxrd0 VHmzXPV4zTgUihLTWgzu25305duCc/uxv7HEowl366X0vMHrC3NXIlXLw+ggAv/b40Gc D4mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693390463; x=1693995263; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VhckYUyuVVDE3glB/lB+PDOKLZuFHiqeALfsEidKqLo=; b=BOWyRVxnu0mJZd5jjafth/0ezclca5klHYA5xftRCWXd1V8W+2MVpPOMm7nSOeSSRy 818PHcIZUGu3vHtXz5vSsmMxzF3rpfD/dAAwz7mipsCz2KwBf5bnS2aGnXdsp0gHbJl9 6EeghexbSDdHBCxxn4Xr30t2OYLXglgfCtK9167Ew4Ywtgxv8zQltsz7KJh1SW2IiwBd mQ3vH/2V7U5w9nnoKuxHxY0n+TN9GMFRu3+5/fBkHtnEew+MDfy2yuUyQhbD/7/Jbbjs L6nhpM8Msk6/gOE8u1/p5gQi+TIujZqDkwNDisPX7yA3dh1szO1G/No/UeQ0TRyVtGKB 1DJw== X-Gm-Message-State: AOJu0Yxud21gCSIt2SsvzOIwJv/XjVQdSDNllUMJhvZBHkgcqYxEO+pp nKq1xuu+iHl9A5RahlB12Yi4pnwzgtw9ch9fw+AK9w== X-Google-Smtp-Source: AGHT+IEcyOky+/PB0MS6BOU3jSByMD2rficn2AB+nSCdaOmX+Bs64iz9KDucX96Mf3ppvgvW8BMMNw== X-Received: by 2002:ac2:4ec7:0:b0:4f8:631b:bf77 with SMTP id p7-20020ac24ec7000000b004f8631bbf77mr1087419lfr.22.1693390463331; Wed, 30 Aug 2023 03:14:23 -0700 (PDT) Received: from helsinki-03.engr ([2a01:4f9:6b:2a47::2]) by smtp.gmail.com with ESMTPSA id w7-20020a19c507000000b004fe36e673b8sm2327579lfe.178.2023.08.30.03.14.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Aug 2023 03:14:22 -0700 (PDT) From: Manolis Tsamis To: gcc-patches@gcc.gnu.org Cc: Philipp Tomsich , Robin Dapp , Jakub Jelinek , Richard Sandiford , Manolis Tsamis Subject: [PATCH v3 1/4] ifcvt: handle sequences that clobber flags in noce_convert_multiple_sets Date: Wed, 30 Aug 2023 12:13:57 +0200 Message-Id: <20230830101400.1539313-2-manolis.tsamis@vrull.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230830101400.1539313-1-manolis.tsamis@vrull.eu> References: <20230830101400.1539313-1-manolis.tsamis@vrull.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,JMQ_SPF_NEUTRAL,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,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 List-Id: This is an extension of what was done in PR106590. Currently if a sequence generated in noce_convert_multiple_sets clobbers the condition rtx (cc_cmp or rev_cc_cmp) then only seq1 is used afterwards (sequences that emit the comparison itself). Since this applies only from the next iteration it assumes that the sequences generated (in particular seq2) doesn't clobber the condition rtx itself before using it in the if_then_else, which is only true in specific cases (currently only register/subregister moves are allowed). This patch changes this so it also tests if seq2 clobbers cc_cmp/rev_cc_cmp in the current iteration. This makes it possible to include arithmetic operations in noce_convert_multiple_sets. gcc/ChangeLog: * ifcvt.cc (check_for_cc_cmp_clobbers): Use modified_in_p instead. (noce_convert_multiple_sets_1): Don't use seq2 if it clobbers cc_cmp. Signed-off-by: Manolis Tsamis --- (no changes since v1) gcc/ifcvt.cc | 49 +++++++++++++++++++------------------------------ 1 file changed, 19 insertions(+), 30 deletions(-) diff --git a/gcc/ifcvt.cc b/gcc/ifcvt.cc index a0af553b9ff..3273aeca125 100644 --- a/gcc/ifcvt.cc +++ b/gcc/ifcvt.cc @@ -3375,20 +3375,6 @@ noce_convert_multiple_sets (struct noce_if_info *if_info) return true; } -/* Helper function for noce_convert_multiple_sets_1. If store to - DEST can affect P[0] or P[1], clear P[0]. Called via note_stores. */ - -static void -check_for_cc_cmp_clobbers (rtx dest, const_rtx, void *p0) -{ - rtx *p = (rtx *) p0; - if (p[0] == NULL_RTX) - return; - if (reg_overlap_mentioned_p (dest, p[0]) - || (p[1] && reg_overlap_mentioned_p (dest, p[1]))) - p[0] = NULL_RTX; -} - /* This goes through all relevant insns of IF_INFO->then_bb and tries to create conditional moves. In case a simple move sufficis the insn should be listed in NEED_NO_CMOV. The rewired-src cases should be @@ -3552,9 +3538,17 @@ noce_convert_multiple_sets_1 (struct noce_if_info *if_info, creating an additional compare for each. If successful, costing is easier and this sequence is usually preferred. */ if (cc_cmp) - seq2 = try_emit_cmove_seq (if_info, temp, cond, - new_val, old_val, need_cmov, - &cost2, &temp_dest2, cc_cmp, rev_cc_cmp); + { + seq2 = try_emit_cmove_seq (if_info, temp, cond, + new_val, old_val, need_cmov, + &cost2, &temp_dest2, cc_cmp, rev_cc_cmp); + + /* The if_then_else in SEQ2 may be affected when cc_cmp/rev_cc_cmp is + clobbered. We can't safely use the sequence in this case. */ + if (seq2 && (modified_in_p (cc_cmp, seq2) + || (rev_cc_cmp && modified_in_p (rev_cc_cmp, seq2)))) + seq2 = NULL; + } /* The backend might have created a sequence that uses the condition. Check this. */ @@ -3609,21 +3603,16 @@ noce_convert_multiple_sets_1 (struct noce_if_info *if_info, return false; } - if (cc_cmp) + if (cc_cmp && seq == seq1) { - /* Check if SEQ can clobber registers mentioned in - cc_cmp and/or rev_cc_cmp. If yes, we need to use - only seq1 from that point on. */ - rtx cc_cmp_pair[2] = { cc_cmp, rev_cc_cmp }; - for (walk = seq; walk; walk = NEXT_INSN (walk)) + /* Check if SEQ can clobber registers mentioned in cc_cmp/rev_cc_cmp. + If yes, we need to use only seq1 from that point on. + Only check when we use seq1 since we have already tested seq2. */ + if (modified_in_p (cc_cmp, seq) + || (rev_cc_cmp && modified_in_p (rev_cc_cmp, seq))) { - note_stores (walk, check_for_cc_cmp_clobbers, cc_cmp_pair); - if (cc_cmp_pair[0] == NULL_RTX) - { - cc_cmp = NULL_RTX; - rev_cc_cmp = NULL_RTX; - break; - } + cc_cmp = NULL_RTX; + rev_cc_cmp = NULL_RTX; } } -- 2.34.1