From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by sourceware.org (Postfix) with ESMTPS id 0429D3858CDB for ; Thu, 13 Jul 2023 14:09:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0429D3858CDB 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-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2b72161c6e9so25844131fa.0 for ; Thu, 13 Jul 2023 07:09:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vrull.eu; s=google; t=1689257358; x=1691849358; 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=QzQ1BfI6ze5w/Rr2wLWMy4FPXtzoNPel5P722e+dy0UNs8oO1zPhxYMouk+576P1dg eYRl8OZ7G3KD5NbvI3Zixngr0oaIRrglxlialX/4/lHPE1njEyUN6zZQ61nZbv6Cb2qM erYbOU5bFvz0xVDzHB3KpuXt+uP8HO2fuSUEvqtNqZ7ApJhnwcv9q9n4Ouha6hbWmNlZ PmnmvSdvgwJT23GDo9QxdRyDVRNVqDBtmQKgzP9O/E7rw6rOlWT0sXrBKyLEJiFuxbEV DHx7dpgZRbH5gMhvLbEU6UgFrrht/4O8g9KXAp5gKjaqUlFKFTgNEOw+TyCrDqYzfKol oDjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689257358; x=1691849358; 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=VmNjBesEwyKYkVXQWzplhYyXvYYIJmxNUt0tB9YngKDmkW2LP9w5QpRI7AoSLDMGuU rofSR78sYqUPZ4ftNudwitc6G4M/6U+5HS6ccASxfbiytOj5KHZWTL9JSoZkJXPr9QBp Uar1Dkuw5j+SX1tNQ9DZyhIFBwcLgYE/QfWmycfBcSaX0CsOSAJxEkE5hdD8vkPyqqDg ui6E7iUgvKLJPnj/W2y0W2JALt57cc9DPxAkt6m2O/1t4+ajRb5Git+1Llei4FLS2OEi boEPX75/wxIDYfzDmdmDOF4/c7Zf9LadA9egnyBhF4xUe6l97AMu5PihlrIW+PlrSwzH Dtnw== X-Gm-Message-State: ABy/qLaMw8t+EMTmf4Q6i1Pz9vMCfNK3KlDkBB3fln29Za+xjqOmdrdM ySRvc/URPupL+f6/6C2iyigVv4TygWeFX0D4gsrQlw== X-Google-Smtp-Source: APBJJlEBQu2CF+31qGqbv9IvwIxYVzAqZ4s8b6ZnOmVE7V84tbYKnJDAULyggbvjJSQmSCjZUJh0XQ== X-Received: by 2002:a05:651c:49b:b0:2b6:ffa4:d6ec with SMTP id s27-20020a05651c049b00b002b6ffa4d6ecmr1987733ljc.4.1689257357755; Thu, 13 Jul 2023 07:09:17 -0700 (PDT) Received: from helsinki-03.engr ([2a01:4f9:6b:2a47::2]) by smtp.gmail.com with ESMTPSA id d9-20020a2e8909000000b002b6e3337fd5sm1528181lji.7.2023.07.13.07.09.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jul 2023 07:09:17 -0700 (PDT) From: Manolis Tsamis To: gcc-patches@gcc.gnu.org Cc: Philipp Tomsich , Jakub Jelinek , Andrew Pinski , Robin Dapp , Manolis Tsamis Subject: [PATCH v2 1/2] ifcvt: handle sequences that clobber flags in noce_convert_multiple_sets Date: Thu, 13 Jul 2023 16:09:03 +0200 Message-Id: <20230713140904.3274306-2-manolis.tsamis@vrull.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230713140904.3274306-1-manolis.tsamis@vrull.eu> References: <20230713140904.3274306-1-manolis.tsamis@vrull.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.3 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,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 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