commit: 5c6f5f3e37e314c90dc54d7e04483378df7a558e Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Nov 1 08:23:59 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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: <a7df875788d7303639123771af1f4238e207f442.1730304104.git....@gentoo.org> +From: Sam James <[email protected]> +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 <stdint.h> +- +-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 <stdint.h> +- +-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 +
