diff options
| author | Andrew Pinski <apinski@marvell.com> | 2023-05-12 16:33:44 -0700 |
|---|---|---|
| committer | Andrew Pinski <apinski@marvell.com> | 2023-05-12 20:10:19 -0700 |
| commit | 99488a6048745a7b999c22f46e5814d02ebf88d9 (patch) | |
| tree | 70c4e859f73f651d4c204359ef2c1b587f44a5c2 | |
| parent | 20ca33db817cecb11661caad4a90c0aeced9130b (diff) | |
| download | gcc-99488a6048745a7b999c22f46e5814d02ebf88d9.zip gcc-99488a6048745a7b999c22f46e5814d02ebf88d9.tar.gz gcc-99488a6048745a7b999c22f46e5814d02ebf88d9.tar.bz2 | |
MATCH: Fix PR 109834, ICE with popcount combined with bswap
After r14-673-gc0dd80e4c4c3, there was a check in the match
patterns which was checking the type is unsigned but
instead of using the type, the patch used the expression.
This adds the needed TREE_TYPE so get the correct answer and don't ICE.
Committed as obvious after a bootstrap/test on x86_64-linux-gnu.
PR tree-optimization/109834
gcc/ChangeLog:
* match.pd (popcount(bswap(x))->popcount(x)): Fix up unsigned type checking.
(popcount(rotate(x,y))->popcount(x)): Likewise.
gcc/testsuite/ChangeLog:
* gcc.c-torture/compile/pr109834-1.c: New test.
* gcc.dg/tree-ssa/pr109834-1.c: New test.
| -rw-r--r-- | gcc/match.pd | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/compile/pr109834-1.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/tree-ssa/pr109834-1.c | 11 |
3 files changed, 17 insertions, 2 deletions
diff --git a/gcc/match.pd b/gcc/match.pd index 2e46e07..2639588 100644 --- a/gcc/match.pd +++ b/gcc/match.pd @@ -7849,7 +7849,7 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) && INTEGRAL_TYPE_P (TREE_TYPE (@1))) (with { unsigned int prec0 = TYPE_PRECISION (TREE_TYPE (@0)); unsigned int prec1 = TYPE_PRECISION (TREE_TYPE (@1)); } - (if (prec0 == prec1 || (prec0 > prec1 && TYPE_UNSIGNED (@1))) + (if (prec0 == prec1 || (prec0 > prec1 && TYPE_UNSIGNED (TREE_TYPE (@1)))) (popcount @2))))))) /* popcount(rotate(X Y)) is popcount(X). */ @@ -7862,7 +7862,7 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) && (GIMPLE || !TREE_SIDE_EFFECTS (@3))) (with { unsigned int prec0 = TYPE_PRECISION (TREE_TYPE (@0)); unsigned int prec1 = TYPE_PRECISION (TREE_TYPE (@1)); } - (if (prec0 == prec1 || (prec0 > prec1 && TYPE_UNSIGNED (@1))) + (if (prec0 == prec1 || (prec0 > prec1 && TYPE_UNSIGNED (TREE_TYPE (@1)))) (popcount @2))))))) /* Canonicalize POPCOUNT(x)&1 as PARITY(X). */ diff --git a/gcc/testsuite/gcc.c-torture/compile/pr109834-1.c b/gcc/testsuite/gcc.c-torture/compile/pr109834-1.c new file mode 100644 index 0000000..e6c0152 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr109834-1.c @@ -0,0 +1,4 @@ +int f (char v) +{ + return __builtin_popcount((int)__builtin_bswap16(v)); +} diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr109834-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr109834-1.c new file mode 100644 index 0000000..f2af18b --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr109834-1.c @@ -0,0 +1,11 @@ +/* { dg-do compile } */ +/* { dg-options "-O1 -fdump-tree-optimized" } */ + +int f (char v) +{ + return __builtin_popcount((int)__builtin_bswap16(v)); +} + +/* We should be able to remove the bswap here as it does not matter + for the popcount. */ +/* { dg-final { scan-tree-dump-not "bswap" "optimized"} } */ |