From: Wilco Dijkstra Date: Tue, 19 Jan 2016 14:09:49 +0000 (+0000) Subject: [PATCH 2/4] Add support for float CCMP X-Git-Tag: basepoints/gcc-7~1498 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=786e3c064c93b9283ff6a1a990d3caeb993b7ec4;p=thirdparty%2Fgcc.git [PATCH 2/4] Add support for float CCMP 2015-01-19 Wilco Dijkstra gcc/ * ccmp.c (ccmp_candidate_p): Remove integer-only restriction. * config/aarch64/aarch64.md (fccmp): New pattern. (fccmpe): Likewise. (fcmp): Rename to fcmp and globalize pattern. (fcmpe): Likewise. * config/aarch64/aarch64.c (aarch64_gen_ccmp_first): Add FP support. (aarch64_gen_ccmp_next): Add FP support. gcc/testsuite/ * gcc.target/aarch64/ccmp_1.c: New testcase. From-SVN: r232563 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 93cb42a92a6c..319bb92b2b89 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,15 @@ 2016-01-19 Wilco Dijkstra + * ccmp.c (ccmp_candidate_p): Remove integer-only restriction. + * config/aarch64/aarch64.md (fccmp): New pattern. + (fccmpe): Likewise. + (fcmp): Rename to fcmp and globalize pattern. + (fcmpe): Likewise. + * config/aarch64/aarch64.c (aarch64_gen_ccmp_first): Add FP support. + (aarch64_gen_ccmp_next): Add FP support. + +2015-01-19 Wilco Dijkstra + * target.def (gen_ccmp_first): Update documentation. (gen_ccmp_next): Likewise. * doc/tm.texi (gen_ccmp_first): Update documentation. diff --git a/gcc/ccmp.c b/gcc/ccmp.c index 28fe189c67f6..a393d3546f3b 100644 --- a/gcc/ccmp.c +++ b/gcc/ccmp.c @@ -96,12 +96,6 @@ ccmp_candidate_p (gimple *g) || gimple_bb (gs0) != gimple_bb (g)) return false; - if (!(INTEGRAL_TYPE_P (TREE_TYPE (gimple_assign_rhs1 (gs0))) - || POINTER_TYPE_P (TREE_TYPE (gimple_assign_rhs1 (gs0)))) - || !(INTEGRAL_TYPE_P (TREE_TYPE (gimple_assign_rhs1 (gs1))) - || POINTER_TYPE_P (TREE_TYPE (gimple_assign_rhs1 (gs1))))) - return false; - tcode0 = gimple_assign_rhs_code (gs0); tcode1 = gimple_assign_rhs_code (gs1); if (TREE_CODE_CLASS (tcode0) == tcc_comparison diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index 041e642b1a0e..9e9b42462216 100644 --- a/gcc/config/aarch64/aarch64.c +++ b/gcc/config/aarch64/aarch64.c @@ -12964,6 +12964,18 @@ aarch64_gen_ccmp_first (rtx *prep_seq, rtx *gen_seq, icode = CODE_FOR_cmpdi; break; + case SFmode: + cmp_mode = SFmode; + cc_mode = aarch64_select_cc_mode ((rtx_code) code, op0, op1); + icode = cc_mode == CCFPEmode ? CODE_FOR_fcmpesf : CODE_FOR_fcmpsf; + break; + + case DFmode: + cmp_mode = DFmode; + cc_mode = aarch64_select_cc_mode ((rtx_code) code, op0, op1); + icode = cc_mode == CCFPEmode ? CODE_FOR_fcmpedf : CODE_FOR_fcmpdf; + break; + default: end_sequence (); return NULL_RTX; @@ -13027,6 +13039,18 @@ aarch64_gen_ccmp_next (rtx *prep_seq, rtx *gen_seq, rtx prev, int cmp_code, icode = CODE_FOR_ccmpdi; break; + case SFmode: + cmp_mode = SFmode; + cc_mode = aarch64_select_cc_mode ((rtx_code) cmp_code, op0, op1); + icode = cc_mode == CCFPEmode ? CODE_FOR_fccmpesf : CODE_FOR_fccmpsf; + break; + + case DFmode: + cmp_mode = DFmode; + cc_mode = aarch64_select_cc_mode ((rtx_code) cmp_code, op0, op1); + icode = cc_mode == CCFPEmode ? CODE_FOR_fccmpedf : CODE_FOR_fccmpdf; + break; + default: end_sequence (); return NULL_RTX; diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md index d8ae8e86cb7b..2f543aab9676 100644 --- a/gcc/config/aarch64/aarch64.md +++ b/gcc/config/aarch64/aarch64.md @@ -289,6 +289,36 @@ [(set_attr "type" "alus_sreg,alus_imm,alus_imm")] ) +(define_insn "fccmp" + [(set (match_operand:CCFP 1 "cc_register" "") + (if_then_else:CCFP + (match_operator 4 "aarch64_comparison_operator" + [(match_operand 0 "cc_register" "") + (const_int 0)]) + (compare:CCFP + (match_operand:GPF 2 "register_operand" "w") + (match_operand:GPF 3 "register_operand" "w")) + (match_operand 5 "immediate_operand")))] + "TARGET_FLOAT" + "fccmp\\t%2, %3, %k5, %m4" + [(set_attr "type" "fcmp")] +) + +(define_insn "fccmpe" + [(set (match_operand:CCFPE 1 "cc_register" "") + (if_then_else:CCFPE + (match_operator 4 "aarch64_comparison_operator" + [(match_operand 0 "cc_register" "") + (const_int 0)]) + (compare:CCFPE + (match_operand:GPF 2 "register_operand" "w") + (match_operand:GPF 3 "register_operand" "w")) + (match_operand 5 "immediate_operand")))] + "TARGET_FLOAT" + "fccmpe\\t%2, %3, %k5, %m4" + [(set_attr "type" "fcmp")] +) + ;; Expansion of signed mod by a power of 2 using CSNEG. ;; For x0 % n where n is a power of 2 produce: ;; negs x1, x0 @@ -2852,7 +2882,7 @@ [(set_attr "type" "alus_sreg,alus_imm,alus_imm")] ) -(define_insn "*cmp" +(define_insn "fcmp" [(set (reg:CCFP CC_REGNUM) (compare:CCFP (match_operand:GPF 0 "register_operand" "w,w") (match_operand:GPF 1 "aarch64_fp_compare_operand" "Y,w")))] @@ -2863,7 +2893,7 @@ [(set_attr "type" "fcmp")] ) -(define_insn "*cmpe" +(define_insn "fcmpe" [(set (reg:CCFPE CC_REGNUM) (compare:CCFPE (match_operand:GPF 0 "register_operand" "w,w") (match_operand:GPF 1 "aarch64_fp_compare_operand" "Y,w")))] diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7aaebb007dc2..cd38389af8e0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2015-01-19 Wilco Dijkstra + + * gcc.target/aarch64/ccmp_1.c: New testcase. + 2016-01-19 Marek Polacek PR c++/68586 diff --git a/gcc/testsuite/gcc.target/aarch64/ccmp_1.c b/gcc/testsuite/gcc.target/aarch64/ccmp_1.c new file mode 100644 index 000000000000..ef077e0f711b --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/ccmp_1.c @@ -0,0 +1,84 @@ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ + +int +f1 (int a) +{ + return a == 17 || a == 32; +} + +int +f2 (int a) +{ + return a == 33 || a == 18; +} + +int +f3 (int a, int b) +{ + return a == 19 && b == 34; +} + +int +f4 (int a, int b) +{ + return a == 35 && b == 20; +} + +int +f5 (int a) +{ + return a == 0 || a == 5; +} + +int +f6 (int a) +{ + return a == 6 || a == 0; +} + +int +f7 (int a, int b) +{ + return a == 0 && b == 7; +} + +int +f8 (int a, int b) +{ + return a == 9 && b == 0; +} + +int +f9 (float a, float b) +{ + return a < 0.0f && a > b; +} + +int +f10 (float a, float b) +{ + return a == b || b == 0.0f; +} + +int +f11 (double a, int b) +{ + return a < 0.0f && b == 30; +} + +int +f12 (double a, int b) +{ + return b == 31 || a == 0.0f; +} + +int +f13 (int a, int b) +{ + a += b; + return a == 3 || a == 0; +} + +/* { dg-final { scan-assembler "fccmp\t" } } */ +/* { dg-final { scan-assembler "fccmpe\t" } } */