On Wed, Apr 27, 2016 at 08:58:44AM +0100, Dominik Vogt wrote: > The attached patch provides some improved patterns for "and with > complement" to the s390 machine description. Bootstrapped and > regression tested on s390 and s390x.
Version 2 of the patch, reduced to the bare patterns. Regression tested on s390 and s390x. While there are a few situations that result in worse assembly language code, overall the results are good. Ciao Dominik ^_^ ^_^ -- Dominik Vogt IBM Germany
gcc/ChangeLog * config/s390/s390.md ("*andc_split", "*andc_split2"): New splitters for and with complement. gcc/testsuite/ChangeLog * gcc.target/s390/md/andc-splitter-1.c: New test case. * gcc.target/s390/md/andc-splitter-2.c: Likewise.
>From ac31266ceba7fb69b49d5161f4b2f3c416a4242c Mon Sep 17 00:00:00 2001 From: Dominik Vogt <v...@linux.vnet.ibm.com> Date: Mon, 14 Mar 2016 17:48:17 +0100 Subject: [PATCH] S/390: Add splitter for "and" with complement. Force splitting of logical operator expressions ... with three operands, a register destination and a memory operand because there are no instructions for that and combine results in inefficient code. --- gcc/config/s390/s390.md | 46 ++++++++++++++++ gcc/testsuite/gcc.target/s390/md/andc-splitter-1.c | 61 ++++++++++++++++++++++ gcc/testsuite/gcc.target/s390/md/andc-splitter-2.c | 38 ++++++++++++++ 3 files changed, 145 insertions(+) create mode 100644 gcc/testsuite/gcc.target/s390/md/andc-splitter-1.c create mode 100644 gcc/testsuite/gcc.target/s390/md/andc-splitter-2.c diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md index f8c61a8..aad62a1 100644 --- a/gcc/config/s390/s390.md +++ b/gcc/config/s390/s390.md @@ -7262,6 +7262,52 @@ (set_attr "z10prop" "z10_super_E1,z10_super,*")]) ; +; And with complement +; +; c = ~b & a = (b & a) ^ a + +(define_insn_and_split "*andc_split" + [(set (match_operand:GPR 0 "nonimmediate_operand" "") + (and:GPR (not:GPR (match_operand:GPR 1 "nonimmediate_operand" "")) + (match_operand:GPR 2 "general_operand" ""))) + (clobber (reg:CC CC_REGNUM))] + "TARGET_ZARCH && s390_logical_operator_ok_p (operands)" + "#" + "&& 1" + [ + (parallel + [(set (match_dup 3) (and:GPR (match_dup 1) (match_dup 2))) + (clobber (reg:CC CC_REGNUM))]) + (parallel + [(set (match_dup 0) (xor:GPR (match_dup 3) (match_dup 2))) + (clobber (reg:CC CC_REGNUM))])] +{ + if (reg_overlap_mentioned_p (operands[0], operands[2])) + { + gcc_assert (can_create_pseudo_p ()); + operands[3] = gen_reg_rtx (<MODE>mode); + } + else + operands[3] = operands[0]; +}) + +; Convert "(xor (operand) (-1))" to "(not (operand))" for low optimization +; levels so that "*andc_split" matches. +(define_insn_and_split "*andc_split2" + [(set (match_operand:GPR 0 "nonimmediate_operand" "") + (and:GPR (xor:GPR (match_operand:GPR 1 "nonimmediate_operand" "") + (const_int -1)) + (match_operand:GPR 2 "general_operand" ""))) + (clobber (reg:CC CC_REGNUM))] + "TARGET_ZARCH && s390_logical_operator_ok_p (operands)" + "#" + "&& 1" + [(parallel + [(set (match_dup 0) (and:GPR (not:GPR (match_dup 1)) (match_dup 2))) + (clobber (reg:CC CC_REGNUM))])] +) + +; ; Block and (NC) patterns. ; diff --git a/gcc/testsuite/gcc.target/s390/md/andc-splitter-1.c b/gcc/testsuite/gcc.target/s390/md/andc-splitter-1.c new file mode 100644 index 0000000..ed78921 --- /dev/null +++ b/gcc/testsuite/gcc.target/s390/md/andc-splitter-1.c @@ -0,0 +1,61 @@ +/* Machine description pattern tests. */ + +/* { dg-do run { target { lp64 } } } */ +/* { dg-options "-mzarch -save-temps -dP" } */ +/* Skip test if -O0 is present on the command line: + + { dg-skip-if "" { *-*-* } { "-O0" } { "" } } + + Skip test if the -O option is missing from the command line + { dg-skip-if "" { *-*-* } { "*" } { "-O*" } } +*/ + +__attribute__ ((noinline)) +unsigned long andc_vv(unsigned long a, unsigned long b) +{ return ~b & a; } +/* { dg-final { scan-assembler ":15 .\* \{\\*anddi3\}" } } */ +/* { dg-final { scan-assembler ":15 .\* \{\\*xordi3\}" } } */ + +__attribute__ ((noinline)) +unsigned long andc_pv(unsigned long *a, unsigned long b) +{ return ~b & *a; } +/* { dg-final { scan-assembler ":21 .\* \{\\*anddi3\}" } } */ +/* { dg-final { scan-assembler ":21 .\* \{\\*xordi3\}" } } */ + +__attribute__ ((noinline)) +unsigned long andc_vp(unsigned long a, unsigned long *b) +{ return ~*b & a; } +/* { dg-final { scan-assembler ":27 .\* \{\\*anddi3\}" } } */ +/* { dg-final { scan-assembler ":27 .\* \{\\*xordi3\}" } } */ + +__attribute__ ((noinline)) +unsigned long andc_pp(unsigned long *a, unsigned long *b) +{ return ~*b & *a; } +/* { dg-final { scan-assembler ":33 .\* \{\\*anddi3\}" } } */ +/* { dg-final { scan-assembler ":33 .\* \{\\*xordi3\}" } } */ + +/* { dg-final { scan-assembler-times "\tngr\?k\?\t" 4 } } */ +/* { dg-final { scan-assembler-times "\txgr\?\t" 4 } } */ + +int +main (void) +{ + unsigned long a = 0xc00000000000000cllu; + unsigned long b = 0x500000000000000allu; + unsigned long e = 0x8000000000000004llu; + unsigned long c; + + c = andc_vv (a, b); + if (c != e) + __builtin_abort (); + c = andc_pv (&a, b); + if (c != e) + __builtin_abort (); + c = andc_vp (a, &b); + if (c != e) + __builtin_abort (); + c = andc_pp (&a, &b); + if (c != e) + __builtin_abort (); + return 0; +} diff --git a/gcc/testsuite/gcc.target/s390/md/andc-splitter-2.c b/gcc/testsuite/gcc.target/s390/md/andc-splitter-2.c new file mode 100644 index 0000000..9e78335 --- /dev/null +++ b/gcc/testsuite/gcc.target/s390/md/andc-splitter-2.c @@ -0,0 +1,38 @@ +/* Machine description pattern tests. */ + +/* { dg-do compile } */ +/* { dg-options "-mzarch -save-temps -dP" } */ +/* Skip test if -O0 is present on the command line: + + { dg-skip-if "" { *-*-* } { "-O0" } { "" } } + + Skip test if the -O option is missing from the command line + { dg-skip-if "" { *-*-* } { "*" } { "-O*" } } +*/ + +__attribute__ ((noinline)) +unsigned int andc_vv(unsigned int a, unsigned int b) +{ return ~b & a; } +/* { dg-final { scan-assembler ":15 .\* \{\\*andsi3_zarch\}" } } */ +/* { dg-final { scan-assembler ":15 .\* \{\\*xorsi3\}" } } */ + +__attribute__ ((noinline)) +unsigned int andc_pv(unsigned int *a, unsigned int b) +{ return ~b & *a; } +/* { dg-final { scan-assembler ":21 .\* \{\\*andsi3_zarch\}" } } */ +/* { dg-final { scan-assembler ":21 .\* \{\\*xorsi3\}" } } */ + +__attribute__ ((noinline)) +unsigned int andc_vp(unsigned int a, unsigned int *b) +{ return ~*b & a; } +/* { dg-final { scan-assembler ":27 .\* \{\\*andsi3_zarch\}" } } */ +/* { dg-final { scan-assembler ":27 .\* \{\\*xorsi3\}" } } */ + +__attribute__ ((noinline)) +unsigned int andc_pp(unsigned int *a, unsigned int *b) +{ return ~*b & *a; } +/* { dg-final { scan-assembler ":33 .\* \{\\*andsi3_zarch\}" } } */ +/* { dg-final { scan-assembler ":33 .\* \{\\*xorsi3\}" } } */ + +/* { dg-final { scan-assembler-times "\tnr\?k\?\t" 4 } } */ +/* { dg-final { scan-assembler-times "\txr\?k\?\t" 4 } } */ -- 2.3.0