[i386] : Modernize FP compares using mode attributes, part 2

Message ID	CAFULd4Yg=Nx9HJsQ+jZ+ocGHAY2GfF=oSr3fOYuzxL511KVNLg@mail.gmail.com
State	New
Headers	show Return-Path: <gcc-patches-return-332571-incoming=patchwork.ozlabs.org@gcc.gnu.org> Comment: DKIM? See http://www.dkim.org Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:MIME-Version:Received:Received:Date:Message-ID:Subject:From:To:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=uwdfKcErnQx3VdcIaC9vcrdWWcUA9gsqimUYCDkE1F1BzKZT72PfgikSAjkxbG SAFwqu9xMXJZcnQ+Y6hZagW69z/yg98dG7xmlD1ZilucC5e0pszdV3Vke4UFZCHz 9kTQSiUzV74BTcOK5p5OVbYZdjQhUOgw3XTx+VVZwYOXo=; MIME-Version: 1.0 Date: Thu, 22 Nov 2012 22:17:08 +0100 Message-ID: <CAFULd4Yg=Nx9HJsQ+jZ+ocGHAY2GfF=oSr3fOYuzxL511KVNLg@mail.gmail.com> Subject: [PATCH, i386]: Modernize FP compares using mode attributes, part 2 From: Uros Bizjak <ubizjak@gmail.com> To: gcc-patches@gcc.gnu.org Content-Type: multipart/mixed; boundary=047d7b15ae8d5b64be04cf1bfd0d Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk Sender: gcc-patches-owner@gcc.gnu.org

Index: config/i386/i386.md =================================================================== --- config/i386/i386.md (revision 193731) +++ config/i386/i386.md (working copy) @@ -10948,89 +10948,110 @@ ;; Define combination compare-and-branch fp compare instructions to help ;; combine. -(define_insn "*fp_jcc_1_387" +(define_insn "*jcc<mode>_0_i387" [(set (pc) - (if_then_else (match_operator 0 "ix86_fp_comparison_operator" - [(match_operand 1 "register_operand" "f") - (match_operand 2 "nonimmediate_operand" "fm")]) + (if_then_else (match_operator:CCFP 0 "ix86_fp_comparison_operator" + [(match_operand:X87MODEF 1 "register_operand" "f") + (match_operand:X87MODEF 2 "const0_operand")]) (label_ref (match_operand 3)) (pc))) (clobber (reg:CCFP FPSR_REG)) (clobber (reg:CCFP FLAGS_REG)) (clobber (match_scratch:HI 4 "=a"))] - "TARGET_80387 - && (GET_MODE (operands[1]) == SFmode || GET_MODE (operands[1]) == DFmode) - && GET_MODE (operands[1]) == GET_MODE (operands[2]) - && SELECT_CC_MODE (GET_CODE (operands[0]), - operands[1], operands[2]) == CCFPmode - && !TARGET_CMOVE" + "TARGET_80387 && !TARGET_CMOVE" "#") -(define_insn "*fp_jcc_1r_387" +(define_insn "*jcc<mode>_0_r_i387" [(set (pc) - (if_then_else (match_operator 0 "ix86_fp_comparison_operator" - [(match_operand 1 "register_operand" "f") - (match_operand 2 "nonimmediate_operand" "fm")]) + (if_then_else (match_operator:CCFP 0 "ix86_fp_comparison_operator" + [(match_operand:X87MODEF 1 "register_operand" "f") + (match_operand:X87MODEF 2 "const0_operand")]) (pc) (label_ref (match_operand 3)))) (clobber (reg:CCFP FPSR_REG)) (clobber (reg:CCFP FLAGS_REG)) (clobber (match_scratch:HI 4 "=a"))] - "TARGET_80387 - && (GET_MODE (operands[1]) == SFmode || GET_MODE (operands[1]) == DFmode) - && GET_MODE (operands[1]) == GET_MODE (operands[2]) - && SELECT_CC_MODE (GET_CODE (operands[0]), - operands[1], operands[2]) == CCFPmode - && !TARGET_CMOVE" + "TARGET_80387 && !TARGET_CMOVE" "#") -(define_insn "*fp_jcc_2_387" +(define_insn "*jccxf_i387" [(set (pc) - (if_then_else (match_operator 0 "ix86_fp_comparison_operator" - [(match_operand 1 "register_operand" "f") - (match_operand 2 "register_operand" "f")]) + (if_then_else (match_operator:CCFP 0 "ix86_fp_comparison_operator" + [(match_operand:XF 1 "register_operand" "f") + (match_operand:XF 2 "register_operand" "f")]) (label_ref (match_operand 3)) (pc))) (clobber (reg:CCFP FPSR_REG)) (clobber (reg:CCFP FLAGS_REG)) (clobber (match_scratch:HI 4 "=a"))] - "X87_FLOAT_MODE_P (GET_MODE (operands[1])) - && GET_MODE (operands[1]) == GET_MODE (operands[2]) - && !TARGET_CMOVE" + "TARGET_80387 && !TARGET_CMOVE" "#") -(define_insn "*fp_jcc_2r_387" +(define_insn "*jccxf_r_i387" [(set (pc) - (if_then_else (match_operator 0 "ix86_fp_comparison_operator" - [(match_operand 1 "register_operand" "f") - (match_operand 2 "register_operand" "f")]) + (if_then_else (match_operator:CCFP 0 "ix86_fp_comparison_operator" + [(match_operand:XF 1 "register_operand" "f") + (match_operand:XF 2 "register_operand" "f")]) (pc) (label_ref (match_operand 3)))) (clobber (reg:CCFP FPSR_REG)) (clobber (reg:CCFP FLAGS_REG)) (clobber (match_scratch:HI 4 "=a"))] - "X87_FLOAT_MODE_P (GET_MODE (operands[1])) - && GET_MODE (operands[1]) == GET_MODE (operands[2]) - && !TARGET_CMOVE" + "TARGET_80387 && !TARGET_CMOVE" "#") -(define_insn "*fp_jcc_3_387" +(define_insn "*jcc<mode>_i387" [(set (pc) - (if_then_else (match_operator 0 "ix86_fp_comparison_operator" - [(match_operand 1 "register_operand" "f") - (match_operand 2 "const0_operand")]) + (if_then_else (match_operator:CCFP 0 "ix86_fp_comparison_operator" + [(match_operand:MODEF 1 "register_operand" "f") + (match_operand:MODEF 2 "nonimmediate_operand" "fm")]) (label_ref (match_operand 3)) (pc))) (clobber (reg:CCFP FPSR_REG)) (clobber (reg:CCFP FLAGS_REG)) (clobber (match_scratch:HI 4 "=a"))] - "X87_FLOAT_MODE_P (GET_MODE (operands[1])) - && GET_MODE (operands[1]) == GET_MODE (operands[2]) - && SELECT_CC_MODE (GET_CODE (operands[0]), - operands[1], operands[2]) == CCFPmode - && !TARGET_CMOVE" + "TARGET_80387 && !TARGET_CMOVE" "#") +(define_insn "*jcc<mode>_r_i387" + [(set (pc) + (if_then_else (match_operator:CCFP 0 "ix86_fp_comparison_operator" + [(match_operand:MODEF 1 "register_operand" "f") + (match_operand:MODEF 2 "nonimmediate_operand" "fm")]) + (pc) + (label_ref (match_operand 3)))) + (clobber (reg:CCFP FPSR_REG)) + (clobber (reg:CCFP FLAGS_REG)) + (clobber (match_scratch:HI 4 "=a"))] + "TARGET_80387 && !TARGET_CMOVE" + "#") + +(define_insn "*jccu<mode>_i387" + [(set (pc) + (if_then_else (match_operator:CCFPU 0 "ix86_fp_comparison_operator" + [(match_operand:X87MODEF 1 "register_operand" "f") + (match_operand:X87MODEF 2 "register_operand" "f")]) + (label_ref (match_operand 3)) + (pc))) + (clobber (reg:CCFP FPSR_REG)) + (clobber (reg:CCFP FLAGS_REG)) + (clobber (match_scratch:HI 4 "=a"))] + "TARGET_80387 && !TARGET_CMOVE" + "#") + +(define_insn "*jccu<mode>_r_i387" + [(set (pc) + (if_then_else (match_operator:CCFPU 0 "ix86_fp_comparison_operator" + [(match_operand:X87MODEF 1 "register_operand" "f") + (match_operand:X87MODEF 2 "register_operand" "f")]) + (pc) + (label_ref (match_operand 3)))) + (clobber (reg:CCFP FPSR_REG)) + (clobber (reg:CCFP FLAGS_REG)) + (clobber (match_scratch:HI 4 "=a"))] + "TARGET_80387 && !TARGET_CMOVE" + "#") + (define_split [(set (pc) (if_then_else (match_operator 0 "ix86_fp_comparison_operator" @@ -11040,7 +11061,8 @@ (match_operand 4))) (clobber (reg:CCFP FPSR_REG)) (clobber (reg:CCFP FLAGS_REG))] - "reload_completed" + "TARGET_80387 && !TARGET_CMOVE + && reload_completed" [(const_int 0)] { ix86_split_fp_branch (GET_CODE (operands[0]), operands[1], operands[2], @@ -11051,14 +11073,15 @@ (define_split [(set (pc) (if_then_else (match_operator 0 "ix86_fp_comparison_operator" - [(match_operand 1 "register_operand") - (match_operand 2 "general_operand")]) + [(match_operand:X87MODEF 1 "register_operand") + (match_operand:X87MODEF 2 "general_operand")]) (match_operand 3) (match_operand 4))) (clobber (reg:CCFP FPSR_REG)) (clobber (reg:CCFP FLAGS_REG)) - (clobber (match_scratch:HI 5 "=a"))] - "reload_completed" + (clobber (match_scratch:HI 5))] + "TARGET_80387 && !TARGET_CMOVE + && reload_completed" [(const_int 0)] { ix86_split_fp_branch (GET_CODE (operands[0]), operands[1], operands[2], @@ -11066,49 +11089,63 @@ DONE; }) -;; The order of operands in *fp_jcc_4_387 is forced by combine in +;; The order of operands in *jcc<fp>_<int>_i387 is forced by combine in ;; simplify_comparison () function. Float operator is treated as RTX_OBJ ;; with a precedence over other operators and is always put in the first ;; place. Swap condition and operands to match ficom instruction. -(define_insn "*fp_jcc_4_<mode>_387" +(define_insn "*jcc<X87MODEF:mode>_<SWI24:mode>_i387" [(set (pc) (if_then_else - (match_operator 0 "ix86_swapped_fp_comparison_operator" - [(match_operator 1 "float_operator" + (match_operator:CCFP 0 "ix86_swapped_fp_comparison_operator" + [(match_operator:X87MODEF 1 "float_operator" [(match_operand:SWI24 2 "nonimmediate_operand" "m,?r")]) - (match_operand 3 "register_operand" "f,f")]) + (match_operand:X87MODEF 3 "register_operand" "f,f")]) (label_ref (match_operand 4)) (pc))) (clobber (reg:CCFP FPSR_REG)) (clobber (reg:CCFP FLAGS_REG)) (clobber (match_scratch:HI 5 "=a,a"))] - "X87_FLOAT_MODE_P (GET_MODE (operands[3])) - && (TARGET_USE_<MODE>MODE_FIOP || optimize_function_for_size_p (cfun)) - && GET_MODE (operands[1]) == GET_MODE (operands[3]) - && ix86_fp_compare_mode (swap_condition (GET_CODE (operands[0]))) == CCFPmode - && !TARGET_CMOVE" + "TARGET_80387 && !TARGET_CMOVE + && (TARGET_USE_<SWI24:MODE>MODE_FIOP + || optimize_function_for_size_p (cfun))" "#") +(define_insn "*jcc<X87MODEF:mode>_<SWI24:mode>_r_i387" + [(set (pc) + (if_then_else + (match_operator:CCFP 0 "ix86_swapped_fp_comparison_operator" + [(match_operator:X87MODEF 1 "float_operator" + [(match_operand:SWI24 2 "nonimmediate_operand" "m,?r")]) + (match_operand:X87MODEF 3 "register_operand" "f,f")]) + (pc) + (label_ref (match_operand 4)))) + (clobber (reg:CCFP FPSR_REG)) + (clobber (reg:CCFP FLAGS_REG)) + (clobber (match_scratch:HI 5 "=a,a"))] + "TARGET_80387 && !TARGET_CMOVE + && (TARGET_USE_<SWI24:MODE>MODE_FIOP + || optimize_function_for_size_p (cfun))" + "#") + (define_split [(set (pc) (if_then_else - (match_operator 0 "ix86_swapped_fp_comparison_operator" - [(match_operator 1 "float_operator" + (match_operator:CCFP 0 "ix86_swapped_fp_comparison_operator" + [(match_operator:X87MODEF 1 "float_operator" [(match_operand:SWI24 2 "memory_operand")]) - (match_operand 3 "register_operand")]) + (match_operand:X87MODEF 3 "register_operand")]) (match_operand 4) (match_operand 5))) (clobber (reg:CCFP FPSR_REG)) (clobber (reg:CCFP FLAGS_REG)) - (clobber (match_scratch:HI 6 "=a"))] - "reload_completed" + (clobber (match_scratch:HI 6))] + "TARGET_80387 && !TARGET_CMOVE + && reload_completed" [(const_int 0)] { - operands[7] = gen_rtx_FLOAT (GET_MODE (operands[1]), operands[2]); - - ix86_split_fp_branch (swap_condition (GET_CODE (operands[0])), - operands[3], operands[7], + ix86_split_fp_branch (swap_condition (GET_CODE (operands[0])), operands[3], + gen_rtx_FLOAT (GET_MODE (operands[1]), operands[2]), operands[4], operands[5], operands[6], NULL_RTX); DONE; }) @@ -11117,23 +11154,23 @@ (define_split [(set (pc) (if_then_else - (match_operator 0 "ix86_swapped_fp_comparison_operator" - [(match_operator 1 "float_operator" + (match_operator:CCFP 0 "ix86_swapped_fp_comparison_operator" + [(match_operator:X87MODEF 1 "float_operator" [(match_operand:SWI24 2 "register_operand")]) - (match_operand 3 "register_operand")]) + (match_operand:X87MODEF 3 "register_operand")]) (match_operand 4) (match_operand 5))) (clobber (reg:CCFP FPSR_REG)) (clobber (reg:CCFP FLAGS_REG)) - (clobber (match_scratch:HI 6 "=a"))] - "reload_completed" + (clobber (match_scratch:HI 6))] + "TARGET_80387 && !TARGET_CMOVE + && reload_completed" [(const_int 0)] { - operands[7] = ix86_force_to_memory (GET_MODE (operands[2]), operands[2]); - operands[7] = gen_rtx_FLOAT (GET_MODE (operands[1]), operands[7]); + rtx tmp = ix86_force_to_memory (GET_MODE (operands[2]), operands[2]); - ix86_split_fp_branch (swap_condition (GET_CODE (operands[0])), - operands[3], operands[7], + ix86_split_fp_branch (swap_condition (GET_CODE (operands[0])), operands[3], + gen_rtx_FLOAT (GET_MODE (operands[1]), tmp), operands[4], operands[5], operands[6], operands[2]); DONE; }) Index: config/i386/predicates.md =================================================================== --- config/i386/predicates.md (revision 193728) +++ config/i386/predicates.md (working copy) @@ -1110,7 +1110,7 @@ (match_operand 0 "comparison_operator") (match_operand 0 "ix86_trivial_fp_comparison_operator"))) -;; Same as above, but for swapped comparison used in fp_jcc_4_387. +;; Same as above, but for swapped comparison used in *jcc<fp>_<int>_i387. (define_predicate "ix86_swapped_fp_comparison_operator" (match_operand 0 "comparison_operator") {

[i386] : Modernize FP compares using mode attributes, part 2

Commit Message

Patch