diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2004-11-18 12:09:43 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2004-11-18 12:09:43 +0000 |
| commit | b8610a53763f72f32f5c1c79840d96ba147d93d6 (patch) | |
| tree | 54f09d5690e3341c8eee2198c97fb7486b990db6 | |
| parent | 14492f0b1e71aeb385d252cb202ea39dee37b3c0 (diff) | |
| download | gcc-b8610a53763f72f32f5c1c79840d96ba147d93d6.zip gcc-b8610a53763f72f32f5c1c79840d96ba147d93d6.tar.gz gcc-b8610a53763f72f32f5c1c79840d96ba147d93d6.tar.bz2 | |
re PR rtl-optimization/17107 (Opportunity to improve code generated for complex logical expression)
PR target/17107
* fold-const.c (RANGE_TEST_NON_SHORT_CIRCUIT): Rename to ...
(LOGICAL_OP_NON_SHORT_CIRCUIT): ... here.
(fold_range_test): Adjust.
(fold_truthop): Use it.
* config/rs6000/rs6000.h (RANGE_TEST_NON_SHORT_CIRCUIT): Rename to ...
(LOGICAL_OP_NON_SHORT_CIRCUIT): ... here.
From-SVN: r90857
| -rw-r--r-- | gcc/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/config/rs6000/rs6000.h | 4 | ||||
| -rw-r--r-- | gcc/fold-const.c | 9 |
3 files changed, 17 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index fdde9c2..4766d4a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2004-11-18 Nathan Sidwell <nathan@codesourcery.com> + + PR target/17107 + * fold-const.c (RANGE_TEST_NON_SHORT_CIRCUIT): Rename to ... + (LOGICAL_OP_NON_SHORT_CIRCUIT): ... here. + (fold_range_test): Adjust. + (fold_truthop): Use it. + * config/rs6000/rs6000.h (RANGE_TEST_NON_SHORT_CIRCUIT): Rename to ... + (LOGICAL_OP_NON_SHORT_CIRCUIT): ... here. + 2004-11-18 Uros Bizjak <uros@kss-loka.si> * configure/i386/i386.md (*fix_trunch_1): Add "&& 1" to diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h index 1b74db8..912f40e 100644 --- a/gcc/config/rs6000/rs6000.h +++ b/gcc/config/rs6000/rs6000.h @@ -1096,9 +1096,9 @@ extern const char *rs6000_warn_altivec_long_switch; #define BRANCH_COST 3 /* Override BRANCH_COST heuristic which empirically produces worse - performance for fold_range_test(). */ + performance for removing short circuiting from the logical ops. */ -#define RANGE_TEST_NON_SHORT_CIRCUIT 0 +#define LOGICAL_OP_NON_SHORT_CIRCUIT 0 /* A fixed register used at prologue and epilogue generation to fix addressing modes. The SPE needs heavy addressing fixes at the last diff --git a/gcc/fold-const.c b/gcc/fold-const.c index 0d2e407..0c1a3d5 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -4392,8 +4392,8 @@ fold_cond_expr_with_comparison (tree type, tree arg0, tree arg1, tree arg2) -#ifndef RANGE_TEST_NON_SHORT_CIRCUIT -#define RANGE_TEST_NON_SHORT_CIRCUIT (BRANCH_COST >= 2) +#ifndef LOGICAL_OP_NON_SHORT_CIRCUIT +#define LOGICAL_OP_NON_SHORT_CIRCUIT (BRANCH_COST >= 2) #endif /* EXP is some logical combination of boolean tests. See if we can @@ -4431,7 +4431,7 @@ fold_range_test (tree exp) /* On machines where the branch cost is expensive, if this is a short-circuited branch and the underlying object on both sides is the same, make a non-short-circuit operation. */ - else if (RANGE_TEST_NON_SHORT_CIRCUIT + else if (LOGICAL_OP_NON_SHORT_CIRCUIT && lhs != 0 && rhs != 0 && (TREE_CODE (exp) == TRUTH_ANDIF_EXPR || TREE_CODE (exp) == TRUTH_ORIF_EXPR) @@ -4653,7 +4653,8 @@ fold_truthop (enum tree_code code, tree truth_type, tree lhs, tree rhs) ll_arg, rl_arg), fold_convert (TREE_TYPE (ll_arg), integer_zero_node)); - return build2 (code, truth_type, lhs, rhs); + if (LOGICAL_OP_NON_SHORT_CIRCUIT) + return build2 (code, truth_type, lhs, rhs); } /* See if the comparisons can be merged. Then get all the parameters for |