On 07/19/2016 11:37 AM, Dominik Vogt wrote:
> ;
> +; And with complement
> +;
> +; c = ~b & a = (b & a) ^ a
> +
> +(define_insn_and_split "*andc_split"
Please append <mode> here to make the insn name unique.
> + [(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 ());
Is it really safe to assume we will never get here after reload? I don't see
where this is
prevented. Btw. the very same assertion is in gen_reg_rtx anyway so no need to
duplicate it.
> + 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"
<mode> missing
> + [(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.
> ;
>
Looks like these testcase could be merged by putting the lp64 conditions at the
scan-assembler
directives.
> 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 } } */
