From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 34319158042 for ; Fri, 1 Nov 2024 08:24:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 83046E08D0; Fri, 1 Nov 2024 08:24:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B7E32E08F3 for ; Fri, 1 Nov 2024 08:24:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 52D9A343016 for ; Fri, 1 Nov 2024 08:24:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B5F2D198C for ; Fri, 1 Nov 2024 08:24:18 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1730449446.5c6f5f3e37e314c90dc54d7e04483378df7a558e.sam@gentoo> Subject: [gentoo-commits] proj/gcc-patches:master commit in: 15.0.0/gentoo/ X-VCS-Repository: proj/gcc-patches X-VCS-Files: 15.0.0/gentoo/72_all_PR117363-revert.patch X-VCS-Directories: 15.0.0/gentoo/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5c6f5f3e37e314c90dc54d7e04483378df7a558e X-VCS-Branch: master Date: Fri, 1 Nov 2024 08:24:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 999a18d6-c4b3-4a32-b117-94b8e79bb865 X-Archives-Hash: 8874287078ab1f3e347e0edb3b6a9159 commit: 5c6f5f3e37e314c90dc54d7e04483378df7a558e Author: Sam James gentoo org> AuthorDate: Fri Nov 1 08:23:59 2024 +0000 Commit: Sam James gentoo org> CommitDate: Fri Nov 1 08:24:06 2024 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=5c6f5f3e Revert "15.0.0: respin patchset 2 to drop 72 revert patch" This reverts commit 1da292bbeff6151ecb983ee5552d6ab8305bb4e7. Still needed for live. Already spun 21 so we can onw put this back. Signed-off-by: Sam James gentoo.org> 15.0.0/gentoo/72_all_PR117363-revert.patch | 106 +++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/15.0.0/gentoo/72_all_PR117363-revert.patch b/15.0.0/gentoo/72_all_PR117363-revert.patch new file mode 100644 index 0000000..3e5be35 --- /dev/null +++ b/15.0.0/gentoo/72_all_PR117363-revert.patch @@ -0,0 +1,106 @@ +From a7df875788d7303639123771af1f4238e207f442 Mon Sep 17 00:00:00 2001 +Message-ID: +From: Sam James +Date: Wed, 30 Oct 2024 15:59:01 +0000 +Subject: [PATCH] Revert "Match: Simplify (x != 0 ? x + ~0 : 0) to (x - x != + 0)." + +This reverts commit 4af8db3eca12b2db3753ce4b098cbd0ae32b4796. + +Bug: https://gcc.gnu.org/PR117363 +--- + gcc/match.pd | 10 --------- + gcc/testsuite/gcc.dg/tree-ssa/phi-opt-44.c | 26 ---------------------- + gcc/testsuite/gcc.dg/tree-ssa/phi-opt-45.c | 26 ---------------------- + 3 files changed, 62 deletions(-) + delete mode 100644 gcc/testsuite/gcc.dg/tree-ssa/phi-opt-44.c + delete mode 100644 gcc/testsuite/gcc.dg/tree-ssa/phi-opt-45.c + +diff --git a/gcc/match.pd b/gcc/match.pd +index c851ac56e37c..809c717bc862 100644 +--- a/gcc/match.pd ++++ b/gcc/match.pd +@@ -3391,16 +3391,6 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) + } + (if (wi::eq_p (sum, wi::uhwi (0, precision))))))) + +-/* The boundary condition for case 10: IMM = 1: +- SAT_U_SUB = X >= IMM ? (X - IMM) : 0. +- simplify (X != 0 ? X + ~0 : 0) to (X - X != 0). */ +-(simplify +- (cond (ne@1 @0 integer_zerop) +- (nop_convert? (plus (nop_convert? @0) integer_all_onesp)) +- integer_zerop) +- (if (INTEGRAL_TYPE_P (type)) +- (minus @0 (convert @1)))) +- + /* Signed saturation sub, case 1: + T minus = (T)((UT)X - (UT)Y); + SAT_S_SUB = (X ^ Y) & (X ^ minus) < 0 ? (-(T)(X < 0) ^ MAX) : minus; +diff --git a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-44.c b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-44.c +deleted file mode 100644 +index 962bf0954f62..000000000000 +--- a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-44.c ++++ /dev/null +@@ -1,26 +0,0 @@ +-/* { dg-do compile } */ +-/* { dg-options "-O2 -fdump-tree-phiopt1" } */ +- +-#include +- +-uint8_t f1 (uint8_t x) +-{ +- return x >= (uint8_t)1 ? x - (uint8_t)1 : 0; +-} +- +-uint16_t f2 (uint16_t x) +-{ +- return x >= (uint16_t)1 ? x - (uint16_t)1 : 0; +-} +- +-uint32_t f3 (uint32_t x) +-{ +- return x >= (uint32_t)1 ? x - (uint32_t)1 : 0; +-} +- +-uint64_t f4 (uint64_t x) +-{ +- return x >= (uint64_t)1 ? x - (uint64_t)1 : 0; +-} +- +-/* { dg-final { scan-tree-dump-not "goto" "phiopt1" } } */ +diff --git a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-45.c b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-45.c +deleted file mode 100644 +index 62a2ab631846..000000000000 +--- a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-45.c ++++ /dev/null +@@ -1,26 +0,0 @@ +-/* { dg-do compile } */ +-/* { dg-options "-O2 -fdump-tree-phiopt1" } */ +- +-#include +- +-int8_t f1 (int8_t x) +-{ +- return x != 0 ? x - (int8_t)1 : 0; +-} +- +-int16_t f2 (int16_t x) +-{ +- return x != 0 ? x - (int16_t)1 : 0; +-} +- +-int32_t f3 (int32_t x) +-{ +- return x != 0 ? x - (int32_t)1 : 0; +-} +- +-int64_t f4 (int64_t x) +-{ +- return x != 0 ? x - (int64_t)1 : 0; +-} +- +-/* { dg-final { scan-tree-dump-not "goto" "phiopt1" } } */ +-- +2.47.0 +