From 1e9147dd7b41b6e32c25501b50df73e74b75387f Mon Sep 17 00:00:00 2001 From: ktkachov Date: Tue, 5 Jan 2016 16:06:06 +0000 Subject: [PATCH] [combine][v2] Canonicalise (r + r) to (r << 1) to aid recognition PR rtl-optimization/68651 * combine.c (combine_simplify_rtx): Canonicalize x + x into x << 1. * gcc.target/aarch64/pr68651_1.c: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@232077 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/combine.c | 7 +++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.target/aarch64/pr68651_1.c | 16 ++++++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 gcc/testsuite/gcc.target/aarch64/pr68651_1.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ff297bc..98d6fefe 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-01-05 Kyrylo Tkachov + + PR rtl-optimization/68651 + * combine.c (combine_simplify_rtx): Canonicalize x + x into + x << 1. + 2016-01-05 Nathan Sidwell * alias.c (compare_base_decls): Use symtab_node::get. diff --git a/gcc/combine.c b/gcc/combine.c index fd38488..d088031 100644 --- a/gcc/combine.c +++ b/gcc/combine.c @@ -5895,6 +5895,13 @@ combine_simplify_rtx (rtx x, machine_mode op0_mode, int in_dest, || XEXP (temp, 1) != XEXP (x, 0))))) return temp; } + + /* Canonicalize x + x into x << 1. */ + if (GET_MODE_CLASS (mode) == MODE_INT + && rtx_equal_p (XEXP (x, 0), XEXP (x, 1)) + && !side_effects_p (XEXP (x, 0))) + return simplify_gen_binary (ASHIFT, mode, XEXP (x, 0), const1_rtx); + break; case MINUS: diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9ff53ae..4ab864e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-01-05 Kyrylo Tkachov + + PR rtl-optimization/68651 + * gcc.target/aarch64/pr68651_1.c: New test. + 2016-01-05 David Malcolm PR c/69122 diff --git a/gcc/testsuite/gcc.target/aarch64/pr68651_1.c b/gcc/testsuite/gcc.target/aarch64/pr68651_1.c new file mode 100644 index 0000000..ef9456f --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/pr68651_1.c @@ -0,0 +1,16 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -mcpu=cortex-a53" } */ + +int +foo (int x) +{ + return (x * 2) & 65535; +} +/* { dg-final { scan-assembler "ubfiz\tw\[0-9\]*, w\[0-9\]*.*\n" } } */ + +int +bar (int x, int y) +{ + return (x * 2) | y; +} +/* { dg-final { scan-assembler "orr\tw\[0-9\]*, w\[0-9\]*, w\[0-9\]*, lsl 1.*\n" } } */ -- 2.7.4