diff options
| author | Joern Rennecke <joern.rennecke@riscy-ip.com> | 2019-07-01 21:48:55 +0000 |
|---|---|---|
| committer | Joern Rennecke <amylaar@gcc.gnu.org> | 2019-07-01 22:48:55 +0100 |
| commit | 5cc8cb04de4285bfa85c16073e99185b41c38f85 (patch) | |
| tree | 351370b02de7ff80f730e5838e84ab8722d05fca /gcc | |
| parent | 63c94f4cb0cffa6f3b316d4631092afee734506f (diff) | |
| download | gcc-5cc8cb04de4285bfa85c16073e99185b41c38f85.zip gcc-5cc8cb04de4285bfa85c16073e99185b41c38f85.tar.gz gcc-5cc8cb04de4285bfa85c16073e99185b41c38f85.tar.bz2 | |
re PR tree-optimization/66726 (missed optimization, factor conversion out of COND_EXPR)
PR middle-end/66726
* tree-ssa-phiopt.c (factor_out_conditional_conversion):
Tune heuristic from PR71016 to allow MIN / MAX.
* testsuite/gcc.dg/tree-ssa/pr66726-4.c: New testcase.
From-SVN: r272911
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/tree-ssa/pr66726-4.c | 12 | ||||
| -rw-r--r-- | gcc/tree-ssa-phiopt.c | 19 |
3 files changed, 37 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4e80c34..dad3442 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2019-07-01 Joern Rennecke <joern.rennecke@riscy-ip.com> + + PR middle-end/66726 + * tree-ssa-phiopt.c (factor_out_conditional_conversion): + Tune heuristic from PR71016 to allow MIN / MAX. + * testsuite/gcc.dg/tree-ssa/pr66726-4.c: New testcase. + 2019-07-01 Segher Boessenkool <segher@kernel.crashing.org> * config/rs6000/rs6000.md (ieee_128bit_vsx_abs<mode>2): Make this a diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr66726-4.c b/gcc/testsuite/gcc.dg/tree-ssa/pr66726-4.c new file mode 100644 index 0000000..4e43522 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr66726-4.c @@ -0,0 +1,12 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-phiopt1-details" } */ + +#define SAT(x) (x < 0 ? 0 : (x > 255 ? 255 : x)) + +void +foo (unsigned char *p, int i) +{ + *p = SAT (i); +} + +/* { dg-final { scan-tree-dump-times "COND_EXPR .*and PHI .*converted to straightline code" 1 "phiopt1" } } */ diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c index 90674a2..7088ff9 100644 --- a/gcc/tree-ssa-phiopt.c +++ b/gcc/tree-ssa-phiopt.c @@ -504,7 +504,24 @@ factor_out_conditional_conversion (edge e0, edge e1, gphi *phi, gsi = gsi_for_stmt (arg0_def_stmt); gsi_prev_nondebug (&gsi); if (!gsi_end_p (gsi)) - return NULL; + { + if (gassign *assign + = dyn_cast <gassign *> (gsi_stmt (gsi))) + { + tree lhs = gimple_assign_lhs (assign); + enum tree_code ass_code + = gimple_assign_rhs_code (assign); + if (ass_code != MAX_EXPR && ass_code != MIN_EXPR) + return NULL; + if (lhs != gimple_assign_rhs1 (arg0_def_stmt)) + return NULL; + gsi_prev_nondebug (&gsi); + if (!gsi_end_p (gsi)) + return NULL; + } + else + return NULL; + } gsi = gsi_for_stmt (arg0_def_stmt); gsi_next_nondebug (&gsi); if (!gsi_end_p (gsi)) |