diff options
author | Fei Yang <fyang@gcc.gnu.org> | 2015-05-05 15:50:18 +0000 |
---|---|---|
committer | Fei Yang <fyang@gcc.gnu.org> | 2015-05-05 15:50:18 +0000 |
commit | fce35a393f3f06c3df6f97b20714433dd85a6bac (patch) | |
tree | 40374407809886b9e021b11ba41fc4105d0cfad5 | |
parent | 507770395558c475f0c8168cfe803a559a34a968 (diff) |
Backported from mainline
2015-01-19 Jiong Wang <jiong.wang@arm.com>
Andrew Pinski <apinski@cavium.com>
PR target/64304
* config/aarch64/aarch64.md (define_insn "*ashl<mode>3_insn"): Deleted.
(ashl<mode>3): Don't expand if operands[2] is not constant.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@222812 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r-- | gcc/ChangeLog | 10 | ||||
-rw-r--r-- | gcc/config/aarch64/aarch64.md | 11 | ||||
-rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
-rw-r--r-- | gcc/testsuite/gcc.target/aarch64/pr64304.c | 18 |
4 files changed, 37 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d8fe750ee8b..8b0ac3d680e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2015-05-05 Shanyao Chen <chenshanyao@huawei.com> + + Backported from mainline + 2015-01-19 Jiong Wang <jiong.wang@arm.com> + Andrew Pinski <apinski@cavium.com> + + PR target/64304 + * config/aarch64/aarch64.md (define_insn "*ashl<mode>3_insn"): Deleted. + (ashl<mode>3): Don't expand if operands[2] is not constant. + 2015-05-05 Peter Bergner <bergner@vnet.ibm.com> Backport from mainline. diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md index 9c096c2c86a..1085e4df889 100644 --- a/gcc/config/aarch64/aarch64.md +++ b/gcc/config/aarch64/aarch64.md @@ -2719,6 +2719,8 @@ DONE; } } + else + FAIL; } ) @@ -2947,15 +2949,6 @@ [(set_attr "type" "shift_reg")] ) -(define_insn "*ashl<mode>3_insn" - [(set (match_operand:SHORT 0 "register_operand" "=r") - (ashift:SHORT (match_operand:SHORT 1 "register_operand" "r") - (match_operand:QI 2 "aarch64_reg_or_shift_imm_si" "rUss")))] - "" - "lsl\\t%<w>0, %<w>1, %<w>2" - [(set_attr "type" "shift_reg")] -) - (define_insn "*<optab><mode>3_insn" [(set (match_operand:SHORT 0 "register_operand" "=r") (ASHIFT:SHORT (match_operand:SHORT 1 "register_operand" "r") diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7a7034eb312..05689e3b186 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2015-05-05 Shanyao chen <chenshanyao@huawei.com> + + Backported from mainline + 2015-01-19 Jiong Wang <jiong.wang@arm.com> + + * gcc.target/aarch64/pr64304.c: New testcase. + 2015-05-05 Peter Bergner <bergner@vnet.ibm.com> Backport from mainline. diff --git a/gcc/testsuite/gcc.target/aarch64/pr64304.c b/gcc/testsuite/gcc.target/aarch64/pr64304.c new file mode 100644 index 00000000000..721b6b95805 --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/pr64304.c @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 --save-temps" } */ + +unsigned char byte = 0; + +void +set_bit (unsigned int bit, unsigned char value) +{ + unsigned char mask = (unsigned char) (1 << (bit & 7)); + + if (! value) + byte &= (unsigned char)~mask; + else + byte |= mask; + /* { dg-final { scan-assembler "and\tw\[0-9\]+, w\[0-9\]+, 7" } } */ +} + +/* { dg-final { cleanup-saved-temps } } */ |