From 39c5110537e47412968e6e6fd4d39532cace47e6 Mon Sep 17 00:00:00 2001 From: yroux Date: Thu, 12 Jun 2014 10:38:46 +0000 Subject: [PATCH] gcc/ 2014-05-23 Yvan Roux Backport from trunk r209613. 2014-04-22 Ian Bolton * config/arm/thumb2.md (*iordi_notdi_di): New pattern. (*iordi_notzesidi_di): Likewise. (*iordi_notsesidi_di): Likewise. gcc/testsuite/ 2014-05-23 Yvan Roux Backport from trunk r209613. 2014-04-22 Ian Bolton * gcc.target/arm/iordi_notdi-1.c: New test. git-svn-id: svn://gcc.gnu.org/svn/gcc/branches/linaro/gcc-4_9-branch@211506 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog.linaro | 9 ++++ gcc/config/arm/thumb2.md | 73 ++++++++++++++++++++++++++++ gcc/testsuite/ChangeLog.linaro | 7 +++ gcc/testsuite/gcc.target/arm/iordi_notdi-1.c | 54 ++++++++++++++++++++ 4 files changed, 143 insertions(+) create mode 100644 gcc/testsuite/gcc.target/arm/iordi_notdi-1.c diff --git a/gcc/ChangeLog.linaro b/gcc/ChangeLog.linaro index 295a149..f2937f2 100644 --- a/gcc/ChangeLog.linaro +++ b/gcc/ChangeLog.linaro @@ -1,5 +1,14 @@ 2014-05-23 Yvan Roux + Backport from trunk r209613. + 2014-04-22 Ian Bolton + + * config/arm/thumb2.md (*iordi_notdi_di): New pattern. + (*iordi_notzesidi_di): Likewise. + (*iordi_notsesidi_di): Likewise. + +2014-05-23 Yvan Roux + Backport from trunk r209561. 2014-04-22 Ian Bolton diff --git a/gcc/config/arm/thumb2.md b/gcc/config/arm/thumb2.md index d84938f..467c619 100644 --- a/gcc/config/arm/thumb2.md +++ b/gcc/config/arm/thumb2.md @@ -1370,6 +1370,79 @@ (set_attr "type" "alu_reg")] ) +; Constants for op 2 will never be given to these patterns. +(define_insn_and_split "*iordi_notdi_di" + [(set (match_operand:DI 0 "s_register_operand" "=&r,&r") + (ior:DI (not:DI (match_operand:DI 1 "s_register_operand" "0,r")) + (match_operand:DI 2 "s_register_operand" "r,0")))] + "TARGET_THUMB2" + "#" + "TARGET_THUMB2 && reload_completed" + [(set (match_dup 0) (ior:SI (not:SI (match_dup 1)) (match_dup 2))) + (set (match_dup 3) (ior:SI (not:SI (match_dup 4)) (match_dup 5)))] + " + { + operands[3] = gen_highpart (SImode, operands[0]); + operands[0] = gen_lowpart (SImode, operands[0]); + operands[4] = gen_highpart (SImode, operands[1]); + operands[1] = gen_lowpart (SImode, operands[1]); + operands[5] = gen_highpart (SImode, operands[2]); + operands[2] = gen_lowpart (SImode, operands[2]); + }" + [(set_attr "length" "8") + (set_attr "predicable" "yes") + (set_attr "predicable_short_it" "no") + (set_attr "type" "multiple")] +) + +(define_insn_and_split "*iordi_notzesidi_di" + [(set (match_operand:DI 0 "s_register_operand" "=&r,&r") + (ior:DI (not:DI (zero_extend:DI + (match_operand:SI 2 "s_register_operand" "r,r"))) + (match_operand:DI 1 "s_register_operand" "0,?r")))] + "TARGET_THUMB2" + "#" + ; (not (zero_extend...)) means operand0 will always be 0xffffffff + "TARGET_THUMB2 && reload_completed" + [(set (match_dup 0) (ior:SI (not:SI (match_dup 2)) (match_dup 1))) + (set (match_dup 3) (const_int -1))] + " + { + operands[3] = gen_highpart (SImode, operands[0]); + operands[0] = gen_lowpart (SImode, operands[0]); + operands[1] = gen_lowpart (SImode, operands[1]); + }" + [(set_attr "length" "4,8") + (set_attr "predicable" "yes") + (set_attr "predicable_short_it" "no") + (set_attr "type" "multiple")] +) + +(define_insn_and_split "*iordi_notsesidi_di" + [(set (match_operand:DI 0 "s_register_operand" "=&r,&r") + (ior:DI (not:DI (sign_extend:DI + (match_operand:SI 2 "s_register_operand" "r,r"))) + (match_operand:DI 1 "s_register_operand" "0,r")))] + "TARGET_THUMB2" + "#" + "TARGET_THUMB2 && reload_completed" + [(set (match_dup 0) (ior:SI (not:SI (match_dup 2)) (match_dup 1))) + (set (match_dup 3) (ior:SI (not:SI + (ashiftrt:SI (match_dup 2) (const_int 31))) + (match_dup 4)))] + " + { + operands[3] = gen_highpart (SImode, operands[0]); + operands[0] = gen_lowpart (SImode, operands[0]); + operands[4] = gen_highpart (SImode, operands[1]); + operands[1] = gen_lowpart (SImode, operands[1]); + }" + [(set_attr "length" "8") + (set_attr "predicable" "yes") + (set_attr "predicable_short_it" "no") + (set_attr "type" "multiple")] +) + (define_insn "*orsi_notsi_si" [(set (match_operand:SI 0 "s_register_operand" "=r") (ior:SI (not:SI (match_operand:SI 2 "s_register_operand" "r")) diff --git a/gcc/testsuite/ChangeLog.linaro b/gcc/testsuite/ChangeLog.linaro index 6703d74..8d7e9f2 100644 --- a/gcc/testsuite/ChangeLog.linaro +++ b/gcc/testsuite/ChangeLog.linaro @@ -1,5 +1,12 @@ 2014-05-23 Yvan Roux + Backport from trunk r209613. + 2014-04-22 Ian Bolton + + * gcc.target/arm/iordi_notdi-1.c: New test. + +2014-05-23 Yvan Roux + Backport from trunk r209559. 2014-04-22 Alex Velenko diff --git a/gcc/testsuite/gcc.target/arm/iordi_notdi-1.c b/gcc/testsuite/gcc.target/arm/iordi_notdi-1.c new file mode 100644 index 0000000..cda9c0e --- /dev/null +++ b/gcc/testsuite/gcc.target/arm/iordi_notdi-1.c @@ -0,0 +1,54 @@ +/* { dg-do run } */ +/* { dg-options "-O2 -fno-inline --save-temps" } */ + +extern void abort (void); + +typedef long long s64int; +typedef int s32int; +typedef unsigned long long u64int; +typedef unsigned int u32int; + +s64int +iordi_notdi (s64int a, s64int b) +{ + return (a | ~b); +} + +s64int +iordi_notzesidi (s64int a, u32int b) +{ + return (a | ~(u64int) b); +} + +s64int +iordi_notsesidi (s64int a, s32int b) +{ + return (a | ~(s64int) b); +} + +int main () +{ + s64int a64 = 0xdeadbeef00000000ll; + s64int b64 = 0x000000004f4f0112ll; + + u32int c32 = 0x01124f4f; + s32int d32 = 0xabbaface; + + s64int z = iordi_notdi (a64, b64); + if (z != 0xffffffffb0b0feedll) + abort (); + + z = iordi_notzesidi (a64, c32); + if (z != 0xfffffffffeedb0b0ll) + abort (); + + z = iordi_notsesidi (a64, d32); + if (z != 0xdeadbeef54450531ll) + abort (); + + return 0; +} + +/* { dg-final { scan-assembler-times "orn\t" 5 { target arm_thumb2 } } } */ + +/* { dg-final { cleanup-saved-temps } } */ -- 2.7.4