Skip to content

R
riscv-gcc-1
Commit 148413a4 by Ramana Radhakrishnan Committed by Greta Yorsh
Options

For attribute named "type", subdivide "alu" into "alu_reg" and "simple_alu_imm". 

Set type attribute as appropriate in RTL patterns with immediate operands.
Update pipeline descriptions to use the new values of type attribute.

gcc/

2012-11-30  Ramana Radhakrishnan <Ramana.Radhakrishnan@arm.com>
            Greta Yorsh  <Greta.Yorsh@arm.com>

        * config/arm/arm.md (type): Subdivide "alu" into "alu_reg"
        and "simple_alu_imm".
        (core_cycles): Use new names.
        (arm_addsi3): Set type of patterns to use to alu_reg and simple_alu_imm.
        (addsi3_compare0, addsi3_compare0_scratch): Likewise.
        (addsi3_compare_op1, addsi3_compare_op2, compare_addsi2_op0): Likewise.
        (compare_addsi2_op1, arm_subsi3_insn, subsi3_compare0): Likewise.
        (subsi3_compare, arm_decscc,arm_andsi3_insn): Likewise.
        (thumb1_andsi3_insn, andsi3_compare0_scratch): Likewise.
        (zeroextractsi_compare0_scratch,iorsi3_insn,iorsi3_compare0): Likewise.
        (iorsi3_compare0_scratch, arm_xorsi3, thumb1_xorsi3_insn): Likewise.
        (xorsi3_compare0, xorsi3_compare0_scratch): Likewise.
        (thumb1_zero_extendhisi2,arm_zero_extendhisi2_v6): Likewise.
        (thumb1_zero_extendqisi2_v, arm_zero_extendqisi2_v6): Likewise.
	(thumb1_extendhisi2, arm_extendqisi_v6): Likewise.
	(thumb1_extendqisi2, arm_movsi_insn): Likewise.
        (movsi_compare0, movhi_insn_arch4, movhi_bytes): Likewise.
        (arm_movqi_insn, thumb1_movqi_insn, arm_cmpsi_insn): Likewise.
        (movsicc_insn, if_plus_move, if_move_plus): Likewise.
        * config/arm/neon.md (neon_mov<mode>/VDX): Likewise.
        (neon_mov<mode>/VQXMOV): Likewise.
        * config/arm/arm1020e.md (1020alu_op): Likewise.
        * config/arm/fmp626.md (mp626_alu_op): Likewise.
        * config/arm/fa726te.md (726te_alu_op): Likewise.
        * config/arm/fa626te.md (626te_alu_op): Likewise.
        * config/arm/fa606te.md (606te_alu_op): Likewise.
        * config/arm/fa526.md (526_alu_op): Likewise.
        * config/arm/cortex-r4.md (cortex_r4_alu, cortex_r4_mov): Likewise.
        * config/arm/cortex-m4.md (cortex_m4_alu): Likewise.
        * config/arm/cortex-a9.md (cprtex_a9_dp): Likewise.
        * config/arm/cortex-a8.md (cortex_a8_alu, cortex_a8_mov): Likewise.
        * config/arm/cortex-a5.md (cortex_a5_alu): Likewise.
        * config/arm/cortex-a15.md (cortex_a15_alu): Likewise.
        * config/arm/arm926ejs.md (9_alu_op): Likewise.
        * config/arm/arm1136jfs.md (11_alu_op): Likewise.
        * config/arm/arm1026ejs.md (alu_op): Likewise.


Co-Authored-By: Greta Yorsh <greta.yorsh@arm.com>

From-SVN: r193996
parent 5ba5e8ec
Showing with 317 additions and 145 deletions
gcc/ChangeLog
2012-11-30 Ramana Radhakrishnan <Ramana.Radhakrishnan@arm.com>
Greta Yorsh <Greta.Yorsh@arm.com>
* config/arm/arm.md (type): Subdivide "alu" into "alu_reg"
and "simple_alu_imm".
(core_cycles): Use new names.
(arm_addsi3): Set type of patterns to use to alu_reg and simple_alu_imm.
(addsi3_compare0, addsi3_compare0_scratch): Likewise.
(addsi3_compare_op1, addsi3_compare_op2, compare_addsi2_op0): Likewise.
(compare_addsi2_op1, arm_subsi3_insn, subsi3_compare0): Likewise.
(subsi3_compare, arm_decscc,arm_andsi3_insn): Likewise.
(thumb1_andsi3_insn, andsi3_compare0_scratch): Likewise.
(zeroextractsi_compare0_scratch,iorsi3_insn,iorsi3_compare0): Likewise.
(iorsi3_compare0_scratch, arm_xorsi3, thumb1_xorsi3_insn): Likewise.
(xorsi3_compare0, xorsi3_compare0_scratch): Likewise.
(thumb1_zero_extendhisi2,arm_zero_extendhisi2_v6): Likewise.
(thumb1_zero_extendqisi2_v, arm_zero_extendqisi2_v6): Likewise.
(thumb1_extendhisi2, arm_extendqisi_v6): Likewise.
(thumb1_extendqisi2, arm_movsi_insn): Likewise.
(movsi_compare0, movhi_insn_arch4, movhi_bytes): Likewise.
(arm_movqi_insn, thumb1_movqi_insn, arm_cmpsi_insn): Likewise.
(movsicc_insn, if_plus_move, if_move_plus): Likewise.
* config/arm/neon.md (neon_mov<mode>/VDX): Likewise.
(neon_mov<mode>/VQXMOV): Likewise.
* config/arm/arm1020e.md (1020alu_op): Likewise.
* config/arm/fmp626.md (mp626_alu_op): Likewise.
* config/arm/fa726te.md (726te_alu_op): Likewise.
* config/arm/fa626te.md (626te_alu_op): Likewise.
* config/arm/fa606te.md (606te_alu_op): Likewise.
* config/arm/fa526.md (526_alu_op): Likewise.
* config/arm/cortex-r4.md (cortex_r4_alu, cortex_r4_mov): Likewise.
* config/arm/cortex-m4.md (cortex_m4_alu): Likewise.
* config/arm/cortex-a9.md (cprtex_a9_dp): Likewise.
* config/arm/cortex-a8.md (cortex_a8_alu, cortex_a8_mov): Likewise.
* config/arm/cortex-a5.md (cortex_a5_alu): Likewise.
* config/arm/cortex-a15.md (cortex_a15_alu): Likewise.
* config/arm/arm926ejs.md (9_alu_op): Likewise.
* config/arm/arm1136jfs.md (11_alu_op): Likewise.
* config/arm/arm1026ejs.md (alu_op): Likewise.
2012-11-30 Richard Biener <rguenther@suse.de> 2012-11-30 Richard Biener <rguenther@suse.de>
* tree-ssa-pre.c (get_expr_value_id): Do not allocate value-ids * tree-ssa-pre.c (get_expr_value_id): Do not allocate value-ids
gcc/config/arm/arm.md
...@@ -338,8 +338,14 @@ ...@@ -338,8 +338,14 @@
; Classification of each insn ; Classification of each insn
; Note: vfp.md has different meanings for some of these, and some further ; Note: vfp.md has different meanings for some of these, and some further
; types as well. See that file for details. ; types as well. See that file for details.
; alu any alu instruction that doesn't hit memory or fp ; simple_alu_imm a simple alu instruction that doesn't hit memory or fp
; regs or have a shifted source operand ; regs or have a shifted source operand and has an immediate
; operand. This currently only tracks very basic immediate
; alu operations.
; alu_reg any alu instruction that doesn't hit memory or fp
; regs or have a shifted source operand
; and does not have an immediate operand. This is
; also the default
; alu_shift any data instruction that doesn't hit memory or fp ; alu_shift any data instruction that doesn't hit memory or fp
; regs, but has a source operand shifted by a constant ; regs, but has a source operand shifted by a constant
; alu_shift_reg any data instruction that doesn't hit memory or fp ; alu_shift_reg any data instruction that doesn't hit memory or fp
...@@ -369,7 +375,8 @@ ...@@ -369,7 +375,8 @@
; ;
(define_attr "type" (define_attr "type"
"alu,\ "simple_alu_imm,\
alu_reg,\
alu_shift,\ alu_shift,\
alu_shift_reg,\ alu_shift_reg,\
mult,\ mult,\
...@@ -415,7 +422,7 @@ ...@@ -415,7 +422,7 @@
(eq_attr "insn" "smulxy,smlaxy,smlalxy,smulwy,smlawx,mul,muls,mla,mlas,\ (eq_attr "insn" "smulxy,smlaxy,smlalxy,smulwy,smlawx,mul,muls,mla,mlas,\
umull,umulls,umlal,umlals,smull,smulls,smlal,smlals") umull,umulls,umlal,umlals,smull,smulls,smlal,smlals")
(const_string "mult") (const_string "mult")
(const_string "alu"))) (const_string "alu_reg")))
; Is this an (integer side) multiply with a 64-bit result? ; Is this an (integer side) multiply with a 64-bit result?
(define_attr "mul64" "no,yes" (define_attr "mul64" "no,yes"
...@@ -553,7 +560,7 @@ ...@@ -553,7 +560,7 @@
; than one on the main cpu execution unit. ; than one on the main cpu execution unit.
(define_attr "core_cycles" "single,multi" (define_attr "core_cycles" "single,multi"
(if_then_else (eq_attr "type" (if_then_else (eq_attr "type"
"alu,alu_shift,float,fdivd,fdivs") "simple_alu_imm,alu_reg,alu_shift,float,fdivd,fdivs")
(const_string "single") (const_string "single")
(const_string "multi"))) (const_string "multi")))
...@@ -813,7 +820,11 @@ ...@@ -813,7 +820,11 @@
" "
[(set_attr "length" "2,4,4,4,4,4,4,4,4,4,4,16") [(set_attr "length" "2,4,4,4,4,4,4,4,4,4,4,16")
(set_attr "predicable" "yes") (set_attr "predicable" "yes")
(set_attr "arch" "t2,*,*,*,t2,t2,*,*,a,t2,t2,*")] (set_attr "arch" "t2,*,*,*,t2,t2,*,*,a,t2,t2,*")
(set (attr "type") (if_then_else (match_operand 2 "const_int_operand" "")
(const_string "simple_alu_imm")
(const_string "alu_reg")))
]
) )
(define_insn_and_split "*thumb1_addsi3" (define_insn_and_split "*thumb1_addsi3"
...@@ -882,30 +893,35 @@ ...@@ -882,30 +893,35 @@
(define_insn "addsi3_compare0" (define_insn "addsi3_compare0"
[(set (reg:CC_NOOV CC_REGNUM) [(set (reg:CC_NOOV CC_REGNUM)
(compare:CC_NOOV (compare:CC_NOOV
(plus:SI (match_operand:SI 1 "s_register_operand" "r, r") (plus:SI (match_operand:SI 1 "s_register_operand" "r, r,r")
(match_operand:SI 2 "arm_add_operand" "rI,L")) (match_operand:SI 2 "arm_add_operand" "I,L,r"))
(const_int 0))) (const_int 0)))
(set (match_operand:SI 0 "s_register_operand" "=r,r") (set (match_operand:SI 0 "s_register_operand" "=r,r,r")
(plus:SI (match_dup 1) (match_dup 2)))] (plus:SI (match_dup 1) (match_dup 2)))]
"TARGET_ARM" "TARGET_ARM"
"@ "@
add%.\\t%0, %1, %2 add%.\\t%0, %1, %2
sub%.\\t%0, %1, #%n2" sub%.\\t%0, %1, #%n2
[(set_attr "conds" "set")] add%.\\t%0, %1, %2"
[(set_attr "conds" "set")
(set_attr "type" "simple_alu_imm, simple_alu_imm, *")]
) )
(define_insn "*addsi3_compare0_scratch" (define_insn "*addsi3_compare0_scratch"
[(set (reg:CC_NOOV CC_REGNUM) [(set (reg:CC_NOOV CC_REGNUM)
(compare:CC_NOOV (compare:CC_NOOV
(plus:SI (match_operand:SI 0 "s_register_operand" "r, r") (plus:SI (match_operand:SI 0 "s_register_operand" "r, r, r")
(match_operand:SI 1 "arm_add_operand" "rI,L")) (match_operand:SI 1 "arm_add_operand" "I,L, r"))
(const_int 0)))] (const_int 0)))]
"TARGET_ARM" "TARGET_ARM"
"@ "@
cmn%?\\t%0, %1 cmn%?\\t%0, %1
cmp%?\\t%0, #%n1" cmp%?\\t%0, #%n1
cmn%?\\t%0, %1"
[(set_attr "conds" "set") [(set_attr "conds" "set")
(set_attr "predicable" "yes")] (set_attr "predicable" "yes")
(set_attr "type" "simple_alu_imm, simple_alu_imm, *")
]
) )
(define_insn "*compare_negsi_si" (define_insn "*compare_negsi_si"
...@@ -980,59 +996,67 @@ ...@@ -980,59 +996,67 @@
(define_insn "*addsi3_compare_op1" (define_insn "*addsi3_compare_op1"
[(set (reg:CC_C CC_REGNUM) [(set (reg:CC_C CC_REGNUM)
(compare:CC_C (compare:CC_C
(plus:SI (match_operand:SI 1 "s_register_operand" "r,r") (plus:SI (match_operand:SI 1 "s_register_operand" "r,r,r")
(match_operand:SI 2 "arm_add_operand" "rI,L")) (match_operand:SI 2 "arm_add_operand" "I,L,r"))
(match_dup 1))) (match_dup 1)))
(set (match_operand:SI 0 "s_register_operand" "=r,r") (set (match_operand:SI 0 "s_register_operand" "=r,r,r")
(plus:SI (match_dup 1) (match_dup 2)))] (plus:SI (match_dup 1) (match_dup 2)))]
"TARGET_32BIT" "TARGET_32BIT"
"@ "@
add%.\\t%0, %1, %2 add%.\\t%0, %1, %2
sub%.\\t%0, %1, #%n2" sub%.\\t%0, %1, #%n2
[(set_attr "conds" "set")] add%.\\t%0, %1, %2"
[(set_attr "conds" "set")
(set_attr "type" "simple_alu_imm,simple_alu_imm,*")]
) )
(define_insn "*addsi3_compare_op2" (define_insn "*addsi3_compare_op2"
[(set (reg:CC_C CC_REGNUM) [(set (reg:CC_C CC_REGNUM)
(compare:CC_C (compare:CC_C
(plus:SI (match_operand:SI 1 "s_register_operand" "r,r") (plus:SI (match_operand:SI 1 "s_register_operand" "r,r,r")
(match_operand:SI 2 "arm_add_operand" "rI,L")) (match_operand:SI 2 "arm_add_operand" "I,L,r"))
(match_dup 2))) (match_dup 2)))
(set (match_operand:SI 0 "s_register_operand" "=r,r") (set (match_operand:SI 0 "s_register_operand" "=r,r,r")
(plus:SI (match_dup 1) (match_dup 2)))] (plus:SI (match_dup 1) (match_dup 2)))]
"TARGET_32BIT" "TARGET_32BIT"
"@ "@
add%.\\t%0, %1, %2 add%.\\t%0, %1, %2
add%.\\t%0, %1, %2
sub%.\\t%0, %1, #%n2" sub%.\\t%0, %1, #%n2"
[(set_attr "conds" "set")] [(set_attr "conds" "set")
(set_attr "type" "simple_alu_imm,simple_alu_imm,*")]
) )
(define_insn "*compare_addsi2_op0" (define_insn "*compare_addsi2_op0"
[(set (reg:CC_C CC_REGNUM) [(set (reg:CC_C CC_REGNUM)
(compare:CC_C (compare:CC_C
(plus:SI (match_operand:SI 0 "s_register_operand" "r,r") (plus:SI (match_operand:SI 0 "s_register_operand" "r,r,r")
(match_operand:SI 1 "arm_add_operand" "rI,L")) (match_operand:SI 1 "arm_add_operand" "I,L,r"))
(match_dup 0)))] (match_dup 0)))]
"TARGET_32BIT" "TARGET_32BIT"
"@ "@
cmn%?\\t%0, %1 cmn%?\\t%0, %1
cmp%?\\t%0, #%n1" cmp%?\\t%0, #%n1
cmn%?\\t%0, %1"
[(set_attr "conds" "set") [(set_attr "conds" "set")
(set_attr "predicable" "yes")] (set_attr "predicable" "yes")
(set_attr "type" "simple_alu_imm,simple_alu_imm,*")]
) )
(define_insn "*compare_addsi2_op1" (define_insn "*compare_addsi2_op1"
[(set (reg:CC_C CC_REGNUM) [(set (reg:CC_C CC_REGNUM)
(compare:CC_C (compare:CC_C
(plus:SI (match_operand:SI 0 "s_register_operand" "r,r") (plus:SI (match_operand:SI 0 "s_register_operand" "r,r,r")
(match_operand:SI 1 "arm_add_operand" "rI,L")) (match_operand:SI 1 "arm_add_operand" "I,L,r"))
(match_dup 1)))] (match_dup 1)))]
"TARGET_32BIT" "TARGET_32BIT"
"@ "@
cmn%?\\t%0, %1 cmn%?\\t%0, %1
cmp%?\\t%0, #%n1" cmp%?\\t%0, #%n1
cmn%?\\t%0, %1"
[(set_attr "conds" "set") [(set_attr "conds" "set")
(set_attr "predicable" "yes")] (set_attr "predicable" "yes")
(set_attr "type" "simple_alu_imm,simple_alu_imm,*")]
) )
(define_insn "*addsi3_carryin_<optab>" (define_insn "*addsi3_carryin_<optab>"
...@@ -1270,14 +1294,15 @@ ...@@ -1270,14 +1294,15 @@
; ??? Check Thumb-2 split length ; ??? Check Thumb-2 split length
(define_insn_and_split "*arm_subsi3_insn" (define_insn_and_split "*arm_subsi3_insn"
[(set (match_operand:SI 0 "s_register_operand" "=r,r,rk,r") [(set (match_operand:SI 0 "s_register_operand" "=r,r,r,rk,r")
(minus:SI (match_operand:SI 1 "reg_or_int_operand" "rI,r,k,?n") (minus:SI (match_operand:SI 1 "reg_or_int_operand" "rI,r,r,k,?n")
(match_operand:SI 2 "reg_or_int_operand" "r,rI,r, r")))] (match_operand:SI 2 "reg_or_int_operand" "r,I,r,r, r")))]
"TARGET_32BIT" "TARGET_32BIT"
"@ "@
rsb%?\\t%0, %2, %1 rsb%?\\t%0, %2, %1
sub%?\\t%0, %1, %2 sub%?\\t%0, %1, %2
sub%?\\t%0, %1, %2 sub%?\\t%0, %1, %2
sub%?\\t%0, %1, %2
#" #"
"&& (CONST_INT_P (operands[1]) "&& (CONST_INT_P (operands[1])
&& !const_ok_for_arm (INTVAL (operands[1])))" && !const_ok_for_arm (INTVAL (operands[1])))"
...@@ -1287,8 +1312,9 @@ ...@@ -1287,8 +1312,9 @@
INTVAL (operands[1]), operands[0], operands[2], 0); INTVAL (operands[1]), operands[0], operands[2], 0);
DONE; DONE;
" "
[(set_attr "length" "4,4,4,16") [(set_attr "length" "4,4,4,4,16")
(set_attr "predicable" "yes")] (set_attr "predicable" "yes")
(set_attr "type" "*,simple_alu_imm,*,*,*")]
) )
(define_peephole2 (define_peephole2
...@@ -1307,29 +1333,33 @@ ...@@ -1307,29 +1333,33 @@
(define_insn "*subsi3_compare0" (define_insn "*subsi3_compare0"
[(set (reg:CC_NOOV CC_REGNUM) [(set (reg:CC_NOOV CC_REGNUM)
(compare:CC_NOOV (compare:CC_NOOV
(minus:SI (match_operand:SI 1 "arm_rhs_operand" "r,I") (minus:SI (match_operand:SI 1 "arm_rhs_operand" "r,r,I")
(match_operand:SI 2 "arm_rhs_operand" "rI,r")) (match_operand:SI 2 "arm_rhs_operand" "I,r,r"))
(const_int 0))) (const_int 0)))
(set (match_operand:SI 0 "s_register_operand" "=r,r") (set (match_operand:SI 0 "s_register_operand" "=r,r,r")
(minus:SI (match_dup 1) (match_dup 2)))] (minus:SI (match_dup 1) (match_dup 2)))]
"TARGET_32BIT" "TARGET_32BIT"
"@ "@
sub%.\\t%0, %1, %2 sub%.\\t%0, %1, %2
sub%.\\t%0, %1, %2
rsb%.\\t%0, %2, %1" rsb%.\\t%0, %2, %1"
[(set_attr "conds" "set")] [(set_attr "conds" "set")
(set_attr "type" "simple_alu_imm,*,*")]
) )
(define_insn "*subsi3_compare" (define_insn "*subsi3_compare"
[(set (reg:CC CC_REGNUM) [(set (reg:CC CC_REGNUM)
(compare:CC (match_operand:SI 1 "arm_rhs_operand" "r,I") (compare:CC (match_operand:SI 1 "arm_rhs_operand" "r,r,I")
(match_operand:SI 2 "arm_rhs_operand" "rI,r"))) (match_operand:SI 2 "arm_rhs_operand" "I,r,r")))
(set (match_operand:SI 0 "s_register_operand" "=r,r") (set (match_operand:SI 0 "s_register_operand" "=r,r,r")
(minus:SI (match_dup 1) (match_dup 2)))] (minus:SI (match_dup 1) (match_dup 2)))]
"TARGET_32BIT" "TARGET_32BIT"
"@ "@
sub%.\\t%0, %1, %2 sub%.\\t%0, %1, %2
sub%.\\t%0, %1, %2
rsb%.\\t%0, %2, %1" rsb%.\\t%0, %2, %1"
[(set_attr "conds" "set")] [(set_attr "conds" "set")
(set_attr "type" "simple_alu_imm,*,*")]
) )
(define_expand "decscc" (define_expand "decscc"
...@@ -1351,7 +1381,8 @@ ...@@ -1351,7 +1381,8 @@
sub%d2\\t%0, %1, #1 sub%d2\\t%0, %1, #1
mov%D2\\t%0, %1\;sub%d2\\t%0, %1, #1" mov%D2\\t%0, %1\;sub%d2\\t%0, %1, #1"
[(set_attr "conds" "use") [(set_attr "conds" "use")
(set_attr "length" "*,8")] (set_attr "length" "*,8")
(set_attr "type" "simple_alu_imm,*")]
) )
(define_expand "subsf3" (define_expand "subsf3"
...@@ -2207,13 +2238,14 @@ ...@@ -2207,13 +2238,14 @@
; ??? Check split length for Thumb-2 ; ??? Check split length for Thumb-2
(define_insn_and_split "*arm_andsi3_insn" (define_insn_and_split "*arm_andsi3_insn"
[(set (match_operand:SI 0 "s_register_operand" "=r,r,r") [(set (match_operand:SI 0 "s_register_operand" "=r,r,r,r")
(and:SI (match_operand:SI 1 "s_register_operand" "r,r,r") (and:SI (match_operand:SI 1 "s_register_operand" "r,r,r,r")
(match_operand:SI 2 "reg_or_int_operand" "rI,K,?n")))] (match_operand:SI 2 "reg_or_int_operand" "I,K,r,?n")))]
"TARGET_32BIT" "TARGET_32BIT"
"@ "@
and%?\\t%0, %1, %2 and%?\\t%0, %1, %2
bic%?\\t%0, %1, #%B2 bic%?\\t%0, %1, #%B2
and%?\\t%0, %1, %2
#" #"
"TARGET_32BIT "TARGET_32BIT
&& CONST_INT_P (operands[2]) && CONST_INT_P (operands[2])
...@@ -2225,8 +2257,9 @@ ...@@ -2225,8 +2257,9 @@
INTVAL (operands[2]), operands[0], operands[1], 0); INTVAL (operands[2]), operands[0], operands[1], 0);
DONE; DONE;
" "
[(set_attr "length" "4,4,16") [(set_attr "length" "4,4,4,16")
(set_attr "predicable" "yes")] (set_attr "predicable" "yes")
(set_attr "type" "simple_alu_imm,simple_alu_imm,*,simple_alu_imm")]
) )
(define_insn "*thumb1_andsi3_insn" (define_insn "*thumb1_andsi3_insn"
...@@ -2236,35 +2269,40 @@ ...@@ -2236,35 +2269,40 @@
"TARGET_THUMB1" "TARGET_THUMB1"
"and\\t%0, %2" "and\\t%0, %2"
[(set_attr "length" "2") [(set_attr "length" "2")
(set_attr "type" "simple_alu_imm")
(set_attr "conds" "set")]) (set_attr "conds" "set")])
(define_insn "*andsi3_compare0" (define_insn "*andsi3_compare0"
[(set (reg:CC_NOOV CC_REGNUM) [(set (reg:CC_NOOV CC_REGNUM)
(compare:CC_NOOV (compare:CC_NOOV
(and:SI (match_operand:SI 1 "s_register_operand" "r,r") (and:SI (match_operand:SI 1 "s_register_operand" "r,r,r")
(match_operand:SI 2 "arm_not_operand" "rI,K")) (match_operand:SI 2 "arm_not_operand" "I,K,r"))
(const_int 0))) (const_int 0)))
(set (match_operand:SI 0 "s_register_operand" "=r,r") (set (match_operand:SI 0 "s_register_operand" "=r,r,r")
(and:SI (match_dup 1) (match_dup 2)))] (and:SI (match_dup 1) (match_dup 2)))]
"TARGET_32BIT" "TARGET_32BIT"
"@ "@
and%.\\t%0, %1, %2 and%.\\t%0, %1, %2
bic%.\\t%0, %1, #%B2" bic%.\\t%0, %1, #%B2
[(set_attr "conds" "set")] and%.\\t%0, %1, %2"
[(set_attr "conds" "set")
(set_attr "type" "simple_alu_imm,simple_alu_imm,*")]
) )
(define_insn "*andsi3_compare0_scratch" (define_insn "*andsi3_compare0_scratch"
[(set (reg:CC_NOOV CC_REGNUM) [(set (reg:CC_NOOV CC_REGNUM)
(compare:CC_NOOV (compare:CC_NOOV
(and:SI (match_operand:SI 0 "s_register_operand" "r,r") (and:SI (match_operand:SI 0 "s_register_operand" "r,r,r")
(match_operand:SI 1 "arm_not_operand" "rI,K")) (match_operand:SI 1 "arm_not_operand" "I,K,r"))
(const_int 0))) (const_int 0)))
(clobber (match_scratch:SI 2 "=X,r"))] (clobber (match_scratch:SI 2 "=X,r,X"))]
"TARGET_32BIT" "TARGET_32BIT"
"@ "@
tst%?\\t%0, %1 tst%?\\t%0, %1
bic%.\\t%2, %0, #%B1" bic%.\\t%2, %0, #%B1
[(set_attr "conds" "set")] tst%?\\t%0, %1"
[(set_attr "conds" "set")
(set_attr "type" "simple_alu_imm,simple_alu_imm,*")]
) )
(define_insn "*zeroextractsi_compare0_scratch" (define_insn "*zeroextractsi_compare0_scratch"
...@@ -2286,7 +2324,8 @@ ...@@ -2286,7 +2324,8 @@
return \"\"; return \"\";
" "
[(set_attr "conds" "set") [(set_attr "conds" "set")
(set_attr "predicable" "yes")] (set_attr "predicable" "yes")
(set_attr "type" "simple_alu_imm")]
) )
(define_insn_and_split "*ne_zeroextractsi" (define_insn_and_split "*ne_zeroextractsi"
...@@ -2933,13 +2972,14 @@ ...@@ -2933,13 +2972,14 @@
) )
(define_insn_and_split "*iorsi3_insn" (define_insn_and_split "*iorsi3_insn"
[(set (match_operand:SI 0 "s_register_operand" "=r,r,r") [(set (match_operand:SI 0 "s_register_operand" "=r,r,r,r")
(ior:SI (match_operand:SI 1 "s_register_operand" "%r,r,r") (ior:SI (match_operand:SI 1 "s_register_operand" "%r,r,r,r")
(match_operand:SI 2 "reg_or_int_operand" "rI,K,?n")))] (match_operand:SI 2 "reg_or_int_operand" "I,K,r,?n")))]
"TARGET_32BIT" "TARGET_32BIT"
"@ "@
orr%?\\t%0, %1, %2 orr%?\\t%0, %1, %2
orn%?\\t%0, %1, #%B2 orn%?\\t%0, %1, #%B2
orr%?\\t%0, %1, %2
#" #"
"TARGET_32BIT "TARGET_32BIT
&& CONST_INT_P (operands[2]) && CONST_INT_P (operands[2])
...@@ -2951,9 +2991,11 @@ ...@@ -2951,9 +2991,11 @@
INTVAL (operands[2]), operands[0], operands[1], 0); INTVAL (operands[2]), operands[0], operands[1], 0);
DONE; DONE;
} }
[(set_attr "length" "4,4,16") [(set_attr "length" "4,4,4,16")
(set_attr "arch" "32,t2,32") (set_attr "arch" "32,t2,32,32")
(set_attr "predicable" "yes")]) (set_attr "predicable" "yes")
(set_attr "type" "simple_alu_imm,simple_alu_imm,*,*")]
)
(define_insn "*thumb1_iorsi3_insn" (define_insn "*thumb1_iorsi3_insn"
[(set (match_operand:SI 0 "register_operand" "=l") [(set (match_operand:SI 0 "register_operand" "=l")
...@@ -2979,25 +3021,27 @@ ...@@ -2979,25 +3021,27 @@
(define_insn "*iorsi3_compare0" (define_insn "*iorsi3_compare0"
[(set (reg:CC_NOOV CC_REGNUM) [(set (reg:CC_NOOV CC_REGNUM)
(compare:CC_NOOV (ior:SI (match_operand:SI 1 "s_register_operand" "%r") (compare:CC_NOOV (ior:SI (match_operand:SI 1 "s_register_operand" "%r,r")
(match_operand:SI 2 "arm_rhs_operand" "rI")) (match_operand:SI 2 "arm_rhs_operand" "I,r"))
(const_int 0))) (const_int 0)))
(set (match_operand:SI 0 "s_register_operand" "=r") (set (match_operand:SI 0 "s_register_operand" "=r,r")
(ior:SI (match_dup 1) (match_dup 2)))] (ior:SI (match_dup 1) (match_dup 2)))]
"TARGET_32BIT" "TARGET_32BIT"
"orr%.\\t%0, %1, %2" "orr%.\\t%0, %1, %2"
[(set_attr "conds" "set")] [(set_attr "conds" "set")
(set_attr "type" "simple_alu_imm,*")]
) )
(define_insn "*iorsi3_compare0_scratch" (define_insn "*iorsi3_compare0_scratch"
[(set (reg:CC_NOOV CC_REGNUM) [(set (reg:CC_NOOV CC_REGNUM)
(compare:CC_NOOV (ior:SI (match_operand:SI 1 "s_register_operand" "%r") (compare:CC_NOOV (ior:SI (match_operand:SI 1 "s_register_operand" "%r,r")
(match_operand:SI 2 "arm_rhs_operand" "rI")) (match_operand:SI 2 "arm_rhs_operand" "I,r"))
(const_int 0))) (const_int 0)))
(clobber (match_scratch:SI 0 "=r"))] (clobber (match_scratch:SI 0 "=r,r"))]
"TARGET_32BIT" "TARGET_32BIT"
"orr%.\\t%0, %1, %2" "orr%.\\t%0, %1, %2"
[(set_attr "conds" "set")] [(set_attr "conds" "set")
(set_attr "type" "simple_alu_imm, *")]
) )
(define_expand "xordi3" (define_expand "xordi3"
...@@ -3071,12 +3115,13 @@ ...@@ -3071,12 +3115,13 @@
) )
(define_insn_and_split "*arm_xorsi3" (define_insn_and_split "*arm_xorsi3"
[(set (match_operand:SI 0 "s_register_operand" "=r,r") [(set (match_operand:SI 0 "s_register_operand" "=r,r,r")
(xor:SI (match_operand:SI 1 "s_register_operand" "%r,r") (xor:SI (match_operand:SI 1 "s_register_operand" "%r,r,r")
(match_operand:SI 2 "reg_or_int_operand" "rI,?n")))] (match_operand:SI 2 "reg_or_int_operand" "I,r,?n")))]
"TARGET_32BIT" "TARGET_32BIT"
"@ "@
eor%?\\t%0, %1, %2 eor%?\\t%0, %1, %2
eor%?\\t%0, %1, %2
#" #"
"TARGET_32BIT "TARGET_32BIT
&& CONST_INT_P (operands[2]) && CONST_INT_P (operands[2])
...@@ -3087,8 +3132,9 @@ ...@@ -3087,8 +3132,9 @@
INTVAL (operands[2]), operands[0], operands[1], 0); INTVAL (operands[2]), operands[0], operands[1], 0);
DONE; DONE;
} }
[(set_attr "length" "4,16") [(set_attr "length" "4,4,16")
(set_attr "predicable" "yes")] (set_attr "predicable" "yes")
(set_attr "type" "simple_alu_imm,*,*")]
) )
(define_insn "*thumb1_xorsi3_insn" (define_insn "*thumb1_xorsi3_insn"
...@@ -3098,28 +3144,32 @@ ...@@ -3098,28 +3144,32 @@
"TARGET_THUMB1" "TARGET_THUMB1"
"eor\\t%0, %2" "eor\\t%0, %2"
[(set_attr "length" "2") [(set_attr "length" "2")
(set_attr "conds" "set")]) (set_attr "conds" "set")
(set_attr "type" "simple_alu_imm")]
)
(define_insn "*xorsi3_compare0" (define_insn "*xorsi3_compare0"
[(set (reg:CC_NOOV CC_REGNUM) [(set (reg:CC_NOOV CC_REGNUM)
(compare:CC_NOOV (xor:SI (match_operand:SI 1 "s_register_operand" "r") (compare:CC_NOOV (xor:SI (match_operand:SI 1 "s_register_operand" "r,r")
(match_operand:SI 2 "arm_rhs_operand" "rI")) (match_operand:SI 2 "arm_rhs_operand" "I,r"))
(const_int 0))) (const_int 0)))
(set (match_operand:SI 0 "s_register_operand" "=r") (set (match_operand:SI 0 "s_register_operand" "=r,r")
(xor:SI (match_dup 1) (match_dup 2)))] (xor:SI (match_dup 1) (match_dup 2)))]
"TARGET_32BIT" "TARGET_32BIT"
"eor%.\\t%0, %1, %2" "eor%.\\t%0, %1, %2"
[(set_attr "conds" "set")] [(set_attr "conds" "set")
(set_attr "type" "simple_alu_imm,*")]
) )
(define_insn "*xorsi3_compare0_scratch" (define_insn "*xorsi3_compare0_scratch"
[(set (reg:CC_NOOV CC_REGNUM) [(set (reg:CC_NOOV CC_REGNUM)
(compare:CC_NOOV (xor:SI (match_operand:SI 0 "s_register_operand" "r") (compare:CC_NOOV (xor:SI (match_operand:SI 0 "s_register_operand" "r,r")
(match_operand:SI 1 "arm_rhs_operand" "rI")) (match_operand:SI 1 "arm_rhs_operand" "I,r"))
(const_int 0)))] (const_int 0)))]
"TARGET_32BIT" "TARGET_32BIT"
"teq%?\\t%0, %1" "teq%?\\t%0, %1"
[(set_attr "conds" "set")] [(set_attr "conds" "set")
(set_attr "type" "simple_alu_imm, *")]
) )
; By splitting (IOR (AND (NOT A) (NOT B)) C) as D = AND (IOR A B) (NOT C), ; By splitting (IOR (AND (NOT A) (NOT B)) C) as D = AND (IOR A B) (NOT C),
...@@ -4680,7 +4730,11 @@ ...@@ -4680,7 +4730,11 @@
[(if_then_else (eq_attr "is_arch6" "yes") [(if_then_else (eq_attr "is_arch6" "yes")
(const_int 2) (const_int 4)) (const_int 2) (const_int 4))
(const_int 4)]) (const_int 4)])
(set_attr "type" "alu_shift,load_byte")] (set_attr_alternative "type"
[(if_then_else (eq_attr "tune" "cortexa7")
(const_string "simple_alu_imm")
(const_string "alu_shift"))
(const_string "load_byte")])]
) )
(define_insn "*arm_zero_extendhisi2" (define_insn "*arm_zero_extendhisi2"
...@@ -4701,8 +4755,12 @@ ...@@ -4701,8 +4755,12 @@
"@ "@
uxth%?\\t%0, %1 uxth%?\\t%0, %1
ldr%(h%)\\t%0, %1" ldr%(h%)\\t%0, %1"
[(set_attr "type" "alu_shift,load_byte") [(set_attr "predicable" "yes")
(set_attr "predicable" "yes")] (set_attr_alternative "type"
[(if_then_else (eq_attr "tune" "cortexa7")
(const_string "simple_alu_imm")
(const_string "alu_shift"))
(const_string "load_byte")])]
) )
(define_insn "*arm_zero_extendhisi2addsi" (define_insn "*arm_zero_extendhisi2addsi"
...@@ -4772,7 +4830,11 @@ ...@@ -4772,7 +4830,11 @@
uxtb\\t%0, %1 uxtb\\t%0, %1
ldrb\\t%0, %1" ldrb\\t%0, %1"
[(set_attr "length" "2") [(set_attr "length" "2")
(set_attr "type" "alu_shift,load_byte")] (set_attr_alternative "type"
[(if_then_else (eq_attr "tune" "cortexa7")
(const_string "simple_alu_imm")
(const_string "alu_shift"))
(const_string "load_byte")])]
) )
(define_insn "*arm_zero_extendqisi2" (define_insn "*arm_zero_extendqisi2"
...@@ -4794,7 +4856,11 @@ ...@@ -4794,7 +4856,11 @@
"@ "@
uxtb%(%)\\t%0, %1 uxtb%(%)\\t%0, %1
ldr%(b%)\\t%0, %1\\t%@ zero_extendqisi2" ldr%(b%)\\t%0, %1\\t%@ zero_extendqisi2"
[(set_attr "type" "alu_shift,load_byte") [(set_attr_alternative "type"
[(if_then_else (eq_attr "tune" "cortexa7")
(const_string "simple_alu_imm")
(const_string "alu_shift"))
(const_string "load_byte")])
(set_attr "predicable" "yes")] (set_attr "predicable" "yes")]
) )
...@@ -4968,7 +5034,11 @@ ...@@ -4968,7 +5034,11 @@
[(if_then_else (eq_attr "is_arch6" "yes") [(if_then_else (eq_attr "is_arch6" "yes")
(const_int 2) (const_int 4)) (const_int 2) (const_int 4))
(const_int 4)]) (const_int 4)])
(set_attr "type" "alu_shift,load_byte") (set_attr_alternative "type"
[(if_then_else (eq_attr "tune" "cortexa7")
(const_string "simple_alu_imm")
(const_string "alu_shift"))
(const_string "load_byte")])
(set_attr "pool_range" "*,1018")] (set_attr "pool_range" "*,1018")]
) )
...@@ -5041,7 +5111,11 @@ ...@@ -5041,7 +5111,11 @@
"@ "@
sxth%?\\t%0, %1 sxth%?\\t%0, %1
ldr%(sh%)\\t%0, %1" ldr%(sh%)\\t%0, %1"
[(set_attr "type" "alu_shift,load_byte") [(set_attr_alternative "type"
[(if_then_else (eq_attr "tune" "cortexa7")
(const_string "simple_alu_imm")
(const_string "alu_shift"))
(const_string "load_byte")])
(set_attr "predicable" "yes") (set_attr "predicable" "yes")
(set_attr "pool_range" "*,256") (set_attr "pool_range" "*,256")
(set_attr "neg_pool_range" "*,244")] (set_attr "neg_pool_range" "*,244")]
...@@ -5141,7 +5215,11 @@ ...@@ -5141,7 +5215,11 @@
"@ "@
sxtb%?\\t%0, %1 sxtb%?\\t%0, %1
ldr%(sb%)\\t%0, %1" ldr%(sb%)\\t%0, %1"
[(set_attr "type" "alu_shift,load_byte") [(set_attr_alternative "type"
[(if_then_else (eq_attr "tune" "cortexa7")
(const_string "simple_alu_imm")
(const_string "alu_shift"))
(const_string "load_byte")])
(set_attr "predicable" "yes") (set_attr "predicable" "yes")
(set_attr "pool_range" "*,256") (set_attr "pool_range" "*,256")
(set_attr "neg_pool_range" "*,244")] (set_attr "neg_pool_range" "*,244")]
...@@ -5254,7 +5332,12 @@ ...@@ -5254,7 +5332,12 @@
(const_int 2) (const_int 2)
(if_then_else (eq_attr "is_arch6" "yes") (if_then_else (eq_attr "is_arch6" "yes")
(const_int 4) (const_int 6))]) (const_int 4) (const_int 6))])
(set_attr "type" "alu_shift,load_byte,load_byte")] (set_attr_alternative "type"
[(if_then_else (eq_attr "tune" "cortexa7")
(const_string "simple_alu_imm")
(const_string "alu_shift"))
(const_string "load_byte")
(const_string "load_byte")])]
) )
(define_expand "extendsfdf2" (define_expand "extendsfdf2"
...@@ -5628,7 +5711,7 @@ ...@@ -5628,7 +5711,7 @@
movw%?\\t%0, %1 movw%?\\t%0, %1
ldr%?\\t%0, %1 ldr%?\\t%0, %1
str%?\\t%1, %0" str%?\\t%1, %0"
[(set_attr "type" "*,*,*,*,load1,store1") [(set_attr "type" "*,simple_alu_imm,simple_alu_imm,simple_alu_imm,load1,store1")
(set_attr "insn" "mov,mov,mvn,mov,*,*") (set_attr "insn" "mov,mov,mvn,mov,*,*")
(set_attr "predicable" "yes") (set_attr "predicable" "yes")
(set_attr "pool_range" "*,*,*,*,4096,*") (set_attr "pool_range" "*,*,*,*,4096,*")
...@@ -5930,7 +6013,8 @@ ...@@ -5930,7 +6013,8 @@
"@ "@
cmp%?\\t%0, #0 cmp%?\\t%0, #0
sub%.\\t%0, %1, #0" sub%.\\t%0, %1, #0"
[(set_attr "conds" "set")] [(set_attr "conds" "set")
(set_attr "type" "simple_alu_imm,simple_alu_imm")]
) )
;; Subroutine to store a half word from a register into memory. ;; Subroutine to store a half word from a register into memory.
...@@ -6343,22 +6427,30 @@ ...@@ -6343,22 +6427,30 @@
mvn%?\\t%0, #%B1\\t%@ movhi mvn%?\\t%0, #%B1\\t%@ movhi
str%(h%)\\t%1, %0\\t%@ movhi str%(h%)\\t%1, %0\\t%@ movhi
ldr%(h%)\\t%0, %1\\t%@ movhi" ldr%(h%)\\t%0, %1\\t%@ movhi"
[(set_attr "type" "*,*,store1,load1") [(set_attr "predicable" "yes")
(set_attr "predicable" "yes")
(set_attr "insn" "mov,mvn,*,*") (set_attr "insn" "mov,mvn,*,*")
(set_attr "pool_range" "*,*,*,256") (set_attr "pool_range" "*,*,*,256")
(set_attr "neg_pool_range" "*,*,*,244")] (set_attr "neg_pool_range" "*,*,*,244")
(set_attr_alternative "type"
[(if_then_else (match_operand 1 "const_int_operand" "")
(const_string "simple_alu_imm" )
(const_string "*"))
(const_string "simple_alu_imm")
(const_string "store1")
(const_string "load1")])]
) )
(define_insn "*movhi_bytes" (define_insn "*movhi_bytes"
[(set (match_operand:HI 0 "s_register_operand" "=r,r") [(set (match_operand:HI 0 "s_register_operand" "=r,r,r")
(match_operand:HI 1 "arm_rhs_operand" "rI,K"))] (match_operand:HI 1 "arm_rhs_operand" "I,r,K"))]
"TARGET_ARM" "TARGET_ARM"
"@ "@
mov%?\\t%0, %1\\t%@ movhi mov%?\\t%0, %1\\t%@ movhi
mov%?\\t%0, %1\\t%@ movhi
mvn%?\\t%0, #%B1\\t%@ movhi" mvn%?\\t%0, #%B1\\t%@ movhi"
[(set_attr "predicable" "yes") [(set_attr "predicable" "yes")
(set_attr "insn" "mov,mvn")] (set_attr "insn" "mov, mov,mvn")
(set_attr "type" "simple_alu_imm,*,simple_alu_imm")]
) )
(define_expand "thumb_movhi_clobber" (define_expand "thumb_movhi_clobber"
...@@ -6483,23 +6575,24 @@ ...@@ -6483,23 +6575,24 @@
(define_insn "*arm_movqi_insn" (define_insn "*arm_movqi_insn"
[(set (match_operand:QI 0 "nonimmediate_operand" "=r,r,l,Uu,r,m") [(set (match_operand:QI 0 "nonimmediate_operand" "=r,r,r,l,Uu,r,m")
(match_operand:QI 1 "general_operand" "rI,K,Uu,l,m,r"))] (match_operand:QI 1 "general_operand" "r,I,K,Uu,l,m,r"))]
"TARGET_32BIT "TARGET_32BIT
&& ( register_operand (operands[0], QImode) && ( register_operand (operands[0], QImode)
|| register_operand (operands[1], QImode))" || register_operand (operands[1], QImode))"
"@ "@
mov%?\\t%0, %1 mov%?\\t%0, %1
mov%?\\t%0, %1
mvn%?\\t%0, #%B1 mvn%?\\t%0, #%B1
ldr%(b%)\\t%0, %1 ldr%(b%)\\t%0, %1
str%(b%)\\t%1, %0 str%(b%)\\t%1, %0
ldr%(b%)\\t%0, %1 ldr%(b%)\\t%0, %1
str%(b%)\\t%1, %0" str%(b%)\\t%1, %0"
[(set_attr "type" "*,*,load1,store1,load1,store1") [(set_attr "type" "*,simple_alu_imm,simple_alu_imm,load1, store1, load1, store1")
(set_attr "insn" "mov,mvn,*,*,*,*") (set_attr "insn" "mov,mov,mvn,*,*,*,*")
(set_attr "predicable" "yes") (set_attr "predicable" "yes")
(set_attr "arch" "any,any,t2,t2,any,any") (set_attr "arch" "any,any,any,t2,t2,any,any")
(set_attr "length" "4,4,2,2,4,4")] (set_attr "length" "4,4,4,2,2,4,4")]
) )
(define_insn "*thumb1_movqi_insn" (define_insn "*thumb1_movqi_insn"
...@@ -6516,7 +6609,7 @@ ...@@ -6516,7 +6609,7 @@
mov\\t%0, %1 mov\\t%0, %1
mov\\t%0, %1" mov\\t%0, %1"
[(set_attr "length" "2") [(set_attr "length" "2")
(set_attr "type" "*,load1,store1,*,*,*") (set_attr "type" "simple_alu_imm,load1,store1,*,*,simple_alu_imm")
(set_attr "insn" "*,*,*,mov,mov,mov") (set_attr "insn" "*,*,*,mov,mov,mov")
(set_attr "pool_range" "*,32,*,*,*,*") (set_attr "pool_range" "*,32,*,*,*,*")
(set_attr "conds" "clob,nocond,nocond,nocond,nocond,clob")]) (set_attr "conds" "clob,nocond,nocond,nocond,nocond,clob")])
...@@ -7602,7 +7695,8 @@ ...@@ -7602,7 +7695,8 @@
[(set_attr "conds" "set") [(set_attr "conds" "set")
(set_attr "arch" "t2,t2,any,any") (set_attr "arch" "t2,t2,any,any")
(set_attr "length" "2,2,4,4") (set_attr "length" "2,2,4,4")
(set_attr "predicable" "yes")] (set_attr "predicable" "yes")
(set_attr "type" "*,*,*,simple_alu_imm")]
) )
(define_insn "*cmpsi_shiftsi" (define_insn "*cmpsi_shiftsi"
...@@ -8167,7 +8261,20 @@ ...@@ -8167,7 +8261,20 @@
mvn%d3\\t%0, #%B1\;mvn%D3\\t%0, #%B2" mvn%d3\\t%0, #%B1\;mvn%D3\\t%0, #%B2"
[(set_attr "length" "4,4,4,4,8,8,8,8") [(set_attr "length" "4,4,4,4,8,8,8,8")
(set_attr "conds" "use") (set_attr "conds" "use")
(set_attr "insn" "mov,mvn,mov,mvn,mov,mov,mvn,mvn")] (set_attr "insn" "mov,mvn,mov,mvn,mov,mov,mvn,mvn")
(set_attr_alternative "type"
[(if_then_else (match_operand 2 "const_int_operand" "")
(const_string "simple_alu_imm")
(const_string "*"))
(const_string "simple_alu_imm")
(if_then_else (match_operand 1 "const_int_operand" "")
(const_string "simple_alu_imm")
(const_string "*"))
(const_string "simple_alu_imm")
(const_string "*")
(const_string "*")
(const_string "*")
(const_string "*")])]
) )
(define_insn "*movsfcc_soft_insn" (define_insn "*movsfcc_soft_insn"
...@@ -9967,7 +10074,13 @@ ...@@ -9967,7 +10074,13 @@
sub%d4\\t%0, %2, #%n3\;mov%D4\\t%0, %1" sub%d4\\t%0, %2, #%n3\;mov%D4\\t%0, %1"
[(set_attr "conds" "use") [(set_attr "conds" "use")
(set_attr "length" "4,4,8,8") (set_attr "length" "4,4,8,8")
(set_attr "type" "*,*,*,*")] (set_attr_alternative "type"
[(if_then_else (match_operand 3 "const_int_operand" "")
(const_string "simple_alu_imm" )
(const_string "*"))
(const_string "simple_alu_imm")
(const_string "*")
(const_string "*")])]
) )
(define_insn "*ifcompare_move_plus" (define_insn "*ifcompare_move_plus"
...@@ -10003,7 +10116,13 @@ ...@@ -10003,7 +10116,13 @@
sub%D4\\t%0, %2, #%n3\;mov%d4\\t%0, %1" sub%D4\\t%0, %2, #%n3\;mov%d4\\t%0, %1"
[(set_attr "conds" "use") [(set_attr "conds" "use")
(set_attr "length" "4,4,8,8") (set_attr "length" "4,4,8,8")
(set_attr "type" "*,*,*,*")] (set_attr_alternative "type"
[(if_then_else (match_operand 3 "const_int_operand" "")
(const_string "simple_alu_imm" )
(const_string "*"))
(const_string "simple_alu_imm")
(const_string "*")
(const_string "*")])]
) )
(define_insn "*ifcompare_arith_arith" (define_insn "*ifcompare_arith_arith"
......
gcc/config/arm/arm1020e.md
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
;; ALU operations with no shifted operand ;; ALU operations with no shifted operand
(define_insn_reservation "1020alu_op" 1 (define_insn_reservation "1020alu_op" 1
(and (eq_attr "tune" "arm1020e,arm1022e") (and (eq_attr "tune" "arm1020e,arm1022e")
(eq_attr "type" "alu")) (eq_attr "type" "alu_reg,simple_alu_imm"))
"1020a_e,1020a_m,1020a_w") "1020a_e,1020a_m,1020a_w")
;; ALU operations with a shift-by-constant operand ;; ALU operations with a shift-by-constant operand
......
gcc/config/arm/arm1026ejs.md
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
;; ALU operations with no shifted operand ;; ALU operations with no shifted operand
(define_insn_reservation "alu_op" 1 (define_insn_reservation "alu_op" 1
(and (eq_attr "tune" "arm1026ejs") (and (eq_attr "tune" "arm1026ejs")
(eq_attr "type" "alu")) (eq_attr "type" "alu_reg,simple_alu_imm"))
"a_e,a_m,a_w") "a_e,a_m,a_w")
;; ALU operations with a shift-by-constant operand ;; ALU operations with a shift-by-constant operand
......
gcc/config/arm/arm1136jfs.md
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
;; ALU operations with no shifted operand ;; ALU operations with no shifted operand
(define_insn_reservation "11_alu_op" 2 (define_insn_reservation "11_alu_op" 2
(and (eq_attr "tune" "arm1136js,arm1136jfs") (and (eq_attr "tune" "arm1136js,arm1136jfs")
(eq_attr "type" "alu")) (eq_attr "type" "alu_reg,simple_alu_imm"))
"e_1,e_2,e_3,e_wb") "e_1,e_2,e_3,e_wb")
;; ALU operations with a shift-by-constant operand ;; ALU operations with a shift-by-constant operand
......
gcc/config/arm/arm926ejs.md
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
;; ALU operations with no shifted operand ;; ALU operations with no shifted operand
(define_insn_reservation "9_alu_op" 1 (define_insn_reservation "9_alu_op" 1
(and (eq_attr "tune" "arm926ejs") (and (eq_attr "tune" "arm926ejs")
(eq_attr "type" "alu,alu_shift")) (eq_attr "type" "alu_reg,simple_alu_imm,alu_shift"))
"e,m,w") "e,m,w")
;; ALU operations with a shift-by-register operand ;; ALU operations with a shift-by-register operand
......
gcc/config/arm/cortex-a15.md
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
;; Simple ALU without shift ;; Simple ALU without shift
(define_insn_reservation "cortex_a15_alu" 2 (define_insn_reservation "cortex_a15_alu" 2
(and (eq_attr "tune" "cortexa15") (and (eq_attr "tune" "cortexa15")
(and (eq_attr "type" "alu") (and (eq_attr "type" "alu_reg,simple_alu_imm")
(eq_attr "neon_type" "none"))) (eq_attr "neon_type" "none")))
"ca15_issue1,(ca15_sx1,ca15_sx1_alu)|(ca15_sx2,ca15_sx2_alu)") "ca15_issue1,(ca15_sx1,ca15_sx1_alu)|(ca15_sx2,ca15_sx2_alu)")
......
gcc/config/arm/cortex-a5.md
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
(define_insn_reservation "cortex_a5_alu" 2 (define_insn_reservation "cortex_a5_alu" 2
(and (eq_attr "tune" "cortexa5") (and (eq_attr "tune" "cortexa5")
(eq_attr "type" "alu")) (eq_attr "type" "alu_reg,simple_alu_imm"))
"cortex_a5_ex1") "cortex_a5_ex1")
(define_insn_reservation "cortex_a5_alu_shift" 2 (define_insn_reservation "cortex_a5_alu_shift" 2
......
gcc/config/arm/cortex-a8.md
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
;; (source read in E2 and destination available at the end of that cycle). ;; (source read in E2 and destination available at the end of that cycle).
(define_insn_reservation "cortex_a8_alu" 2 (define_insn_reservation "cortex_a8_alu" 2
(and (eq_attr "tune" "cortexa8") (and (eq_attr "tune" "cortexa8")
(ior (and (and (eq_attr "type" "alu") (ior (and (and (eq_attr "type" "alu_reg,simple_alu_imm")
(eq_attr "neon_type" "none")) (eq_attr "neon_type" "none"))
(not (eq_attr "insn" "mov,mvn"))) (not (eq_attr "insn" "mov,mvn")))
(eq_attr "insn" "clz"))) (eq_attr "insn" "clz")))
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
(define_insn_reservation "cortex_a8_mov" 1 (define_insn_reservation "cortex_a8_mov" 1
(and (eq_attr "tune" "cortexa8") (and (eq_attr "tune" "cortexa8")
(and (eq_attr "type" "alu,alu_shift,alu_shift_reg") (and (eq_attr "type" "alu_reg,simple_alu_imm,alu_shift,alu_shift_reg")
(eq_attr "insn" "mov,mvn"))) (eq_attr "insn" "mov,mvn")))
"cortex_a8_default") "cortex_a8_default")
......
gcc/config/arm/cortex-a9.md
...@@ -80,7 +80,7 @@ cortex_a9_p1_e2 + cortex_a9_p0_e1 + cortex_a9_p1_e1") ...@@ -80,7 +80,7 @@ cortex_a9_p1_e2 + cortex_a9_p0_e1 + cortex_a9_p1_e1")
;; which can go down E2 without any problem. ;; which can go down E2 without any problem.
(define_insn_reservation "cortex_a9_dp" 2 (define_insn_reservation "cortex_a9_dp" 2
(and (eq_attr "tune" "cortexa9") (and (eq_attr "tune" "cortexa9")
(ior (and (eq_attr "type" "alu") (ior (and (eq_attr "type" "alu_reg,simple_alu_imm")
(eq_attr "neon_type" "none")) (eq_attr "neon_type" "none"))
(and (and (eq_attr "type" "alu_shift_reg, alu_shift") (and (and (eq_attr "type" "alu_shift_reg, alu_shift")
(eq_attr "insn" "mov")) (eq_attr "insn" "mov"))
......
gcc/config/arm/cortex-m4.md
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
;; ALU and multiply is one cycle. ;; ALU and multiply is one cycle.
(define_insn_reservation "cortex_m4_alu" 1 (define_insn_reservation "cortex_m4_alu" 1
(and (eq_attr "tune" "cortexm4") (and (eq_attr "tune" "cortexm4")
(eq_attr "type" "alu,alu_shift,alu_shift_reg,mult")) (eq_attr "type" "alu_reg,simple_alu_imm,alu_shift,alu_shift_reg,mult"))
"cortex_m4_ex") "cortex_m4_ex")
;; Byte, half-word and word load is two cycles. ;; Byte, half-word and word load is two cycles.
......
gcc/config/arm/cortex-r4.md
...@@ -78,13 +78,13 @@ ...@@ -78,13 +78,13 @@
;; for the purposes of the dual-issue constraints above. ;; for the purposes of the dual-issue constraints above.
(define_insn_reservation "cortex_r4_alu" 2 (define_insn_reservation "cortex_r4_alu" 2
(and (eq_attr "tune_cortexr4" "yes") (and (eq_attr "tune_cortexr4" "yes")
(and (eq_attr "type" "alu") (and (eq_attr "type" "alu_reg,simple_alu_imm")
(not (eq_attr "insn" "mov")))) (not (eq_attr "insn" "mov"))))
"cortex_r4_alu") "cortex_r4_alu")
(define_insn_reservation "cortex_r4_mov" 2 (define_insn_reservation "cortex_r4_mov" 2
(and (eq_attr "tune_cortexr4" "yes") (and (eq_attr "tune_cortexr4" "yes")
(and (eq_attr "type" "alu") (and (eq_attr "type" "alu_reg,simple_alu_imm")
(eq_attr "insn" "mov"))) (eq_attr "insn" "mov")))
"cortex_r4_mov") "cortex_r4_mov")
......
gcc/config/arm/fa526.md
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
;; ALU operations ;; ALU operations
(define_insn_reservation "526_alu_op" 1 (define_insn_reservation "526_alu_op" 1
(and (eq_attr "tune" "fa526") (and (eq_attr "tune" "fa526")
(eq_attr "type" "alu")) (eq_attr "type" "alu_reg,simple_alu_imm"))
"fa526_core") "fa526_core")
(define_insn_reservation "526_alu_shift_op" 2 (define_insn_reservation "526_alu_shift_op" 2
......
gcc/config/arm/fa606te.md
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
;; ALU operations ;; ALU operations
(define_insn_reservation "606te_alu_op" 1 (define_insn_reservation "606te_alu_op" 1
(and (eq_attr "tune" "fa606te") (and (eq_attr "tune" "fa606te")
(eq_attr "type" "alu,alu_shift,alu_shift_reg")) (eq_attr "type" "alu_reg,simple_alu_imm,alu_shift,alu_shift_reg"))
"fa606te_core") "fa606te_core")
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
......
gcc/config/arm/fa626te.md
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
;; ALU operations ;; ALU operations
(define_insn_reservation "626te_alu_op" 1 (define_insn_reservation "626te_alu_op" 1
(and (eq_attr "tune" "fa626,fa626te") (and (eq_attr "tune" "fa626,fa626te")
(eq_attr "type" "alu")) (eq_attr "type" "alu_reg,simple_alu_imm"))
"fa626te_core") "fa626te_core")
(define_insn_reservation "626te_alu_shift_op" 2 (define_insn_reservation "626te_alu_shift_op" 2
......
gcc/config/arm/fa726te.md
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
;; Other ALU instructions 2 cycles. ;; Other ALU instructions 2 cycles.
(define_insn_reservation "726te_alu_op" 1 (define_insn_reservation "726te_alu_op" 1
(and (eq_attr "tune" "fa726te") (and (eq_attr "tune" "fa726te")
(and (eq_attr "type" "alu") (and (eq_attr "type" "alu_reg,simple_alu_imm")
(not (eq_attr "insn" "mov,mvn")))) (not (eq_attr "insn" "mov,mvn"))))
"fa726te_issue+(fa726te_alu0_pipe|fa726te_alu1_pipe)") "fa726te_issue+(fa726te_alu0_pipe|fa726te_alu1_pipe)")
......
gcc/config/arm/fmp626.md
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
;; ALU operations ;; ALU operations
(define_insn_reservation "mp626_alu_op" 1 (define_insn_reservation "mp626_alu_op" 1
(and (eq_attr "tune" "fmp626") (and (eq_attr "tune" "fmp626")
(eq_attr "type" "alu")) (eq_attr "type" "alu_reg,simple_alu_imm"))
"fmp626_core") "fmp626_core")
(define_insn_reservation "mp626_alu_shift_op" 2 (define_insn_reservation "mp626_alu_shift_op" 2
......
gcc/config/arm/neon.md
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
} }
} }
[(set_attr "neon_type" "neon_int_1,*,neon_vmov,*,neon_mrrc,neon_mcr_2_mcrr,*,*,*") [(set_attr "neon_type" "neon_int_1,*,neon_vmov,*,neon_mrrc,neon_mcr_2_mcrr,*,*,*")
(set_attr "type" "*,f_stored,*,f_loadd,*,*,alu,load2,store2") (set_attr "type" "*,f_stored,*,f_loadd,*,*,alu_reg,load2,store2")
(set_attr "insn" "*,*,*,*,*,*,mov,*,*") (set_attr "insn" "*,*,*,*,*,*,mov,*,*")
(set_attr "length" "4,4,4,4,4,4,8,8,8") (set_attr "length" "4,4,4,4,4,4,8,8,8")
(set_attr "arm_pool_range" "*,*,*,1020,*,*,*,1020,*") (set_attr "arm_pool_range" "*,*,*,1020,*,*,*,1020,*")
...@@ -239,7 +239,7 @@ ...@@ -239,7 +239,7 @@
} }
[(set_attr "neon_type" "neon_int_1,neon_stm_2,neon_vmov,neon_ldm_2,\ [(set_attr "neon_type" "neon_int_1,neon_stm_2,neon_vmov,neon_ldm_2,\
neon_mrrc,neon_mcr_2_mcrr,*,*,*") neon_mrrc,neon_mcr_2_mcrr,*,*,*")
(set_attr "type" "*,*,*,*,*,*,alu,load4,store4") (set_attr "type" "*,*,*,*,*,*,alu_reg,load4,store4")
(set_attr "insn" "*,*,*,*,*,*,mov,*,*") (set_attr "insn" "*,*,*,*,*,*,mov,*,*")
(set_attr "length" "4,8,4,8,8,8,16,8,16") (set_attr "length" "4,8,4,8,8,8,16,8,16")
(set_attr "arm_pool_range" "*,*,*,1020,*,*,*,1020,*") (set_attr "arm_pool_range" "*,*,*,1020,*,*,*,1020,*")
......
gcc/config/arm/thumb2.md
;; ARM Thumb-2 Machine Description ;; ARM Thumb-2 Machine Description
;; Copyright (C) 2007, 2008, 2010 Free Software Foundation, Inc. ;; Copyright (C) 2007, 2008, 2010, 2012 Free Software Foundation, Inc.
;; Written by CodeSourcery, LLC. ;; Written by CodeSourcery, LLC.
;; ;;
;; This file is part of GCC. ;; This file is part of GCC.
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
ldr%?\\t%0, %1 ldr%?\\t%0, %1
str%?\\t%1, %0 str%?\\t%1, %0
str%?\\t%1, %0" str%?\\t%1, %0"
[(set_attr "type" "*,*,*,*,load1,load1,store1,store1") [(set_attr "type" "*,*,simple_alu_imm,*,load1,load1,store1,store1")
(set_attr "predicable" "yes") (set_attr "predicable" "yes")
(set_attr "pool_range" "*,*,*,*,1018,4094,*,*") (set_attr "pool_range" "*,*,*,*,1018,4094,*,*")
(set_attr "neg_pool_range" "*,*,*,*,0,0,*,*")] (set_attr "neg_pool_range" "*,*,*,*,0,0,*,*")]
...@@ -568,7 +568,11 @@ ...@@ -568,7 +568,11 @@
"@ "@
sxtb%?\\t%0, %1 sxtb%?\\t%0, %1
ldr%(sb%)\\t%0, %1" ldr%(sb%)\\t%0, %1"
[(set_attr "type" "alu_shift,load_byte") [(set_attr_alternative "type"
[(if_then_else (eq_attr "tune" "cortexa7")
(const_string "simple_alu_imm")
(const_string "alu_shift"))
(const_string "load_byte")])
(set_attr "predicable" "yes") (set_attr "predicable" "yes")
(set_attr "pool_range" "*,4094") (set_attr "pool_range" "*,4094")
(set_attr "neg_pool_range" "*,250")] (set_attr "neg_pool_range" "*,250")]
...@@ -581,7 +585,11 @@ ...@@ -581,7 +585,11 @@
"@ "@
uxth%?\\t%0, %1 uxth%?\\t%0, %1
ldr%(h%)\\t%0, %1" ldr%(h%)\\t%0, %1"
[(set_attr "type" "alu_shift,load_byte") [(set_attr_alternative "type"
[(if_then_else (eq_attr "tune" "cortexa7")
(const_string "simple_alu_imm")
(const_string "alu_shift"))
(const_string "load_byte")])
(set_attr "predicable" "yes") (set_attr "predicable" "yes")
(set_attr "pool_range" "*,4094") (set_attr "pool_range" "*,4094")
(set_attr "neg_pool_range" "*,250")] (set_attr "neg_pool_range" "*,250")]
...@@ -594,7 +602,11 @@ ...@@ -594,7 +602,11 @@
"@ "@
uxtb%(%)\\t%0, %1 uxtb%(%)\\t%0, %1
ldr%(b%)\\t%0, %1\\t%@ zero_extendqisi2" ldr%(b%)\\t%0, %1\\t%@ zero_extendqisi2"
[(set_attr "type" "alu_shift,load_byte") [(set_attr_alternative "type"
[(if_then_else (eq_attr "tune" "cortexa7")
(const_string "simple_alu_imm")
(const_string "alu_shift"))
(const_string "load_byte")])
(set_attr "predicable" "yes") (set_attr "predicable" "yes")
(set_attr "pool_range" "*,4094") (set_attr "pool_range" "*,4094")
(set_attr "neg_pool_range" "*,250")] (set_attr "neg_pool_range" "*,250")]
...@@ -790,8 +802,8 @@ ...@@ -790,8 +802,8 @@
(define_insn "*thumb2_addsi3_compare0_scratch" (define_insn "*thumb2_addsi3_compare0_scratch"
[(set (reg:CC_NOOV CC_REGNUM) [(set (reg:CC_NOOV CC_REGNUM)
(compare:CC_NOOV (compare:CC_NOOV
(plus:SI (match_operand:SI 0 "s_register_operand" "l, r") (plus:SI (match_operand:SI 0 "s_register_operand" "l,l, r,r")
(match_operand:SI 1 "arm_add_operand" "lPv,rIL")) (match_operand:SI 1 "arm_add_operand" "Pv,l,IL,r"))
(const_int 0)))] (const_int 0)))]
"TARGET_THUMB2" "TARGET_THUMB2"
"* "*
...@@ -808,7 +820,8 @@ ...@@ -808,7 +820,8 @@
return \"cmn\\t%0, %1\"; return \"cmn\\t%0, %1\";
" "
[(set_attr "conds" "set") [(set_attr "conds" "set")
(set_attr "length" "2,4")] (set_attr "length" "2,2,4,4")
(set_attr "type" "simple_alu_imm,*,simple_alu_imm,*")]
) )
(define_insn "*thumb2_mulsi_short" (define_insn "*thumb2_mulsi_short"
......
gcc/config/arm/vfp.md
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
} }
" "
[(set_attr "predicable" "yes") [(set_attr "predicable" "yes")
(set_attr "type" "*,*,*,*,load1,store1,r_2_f,f_2_r,fcpys,f_loads,f_stores") (set_attr "type" "*,*,simple_alu_imm,simple_alu_imm,load1,store1,r_2_f,f_2_r,fcpys,f_loads,f_stores")
(set_attr "neon_type" "*,*,*,*,*,*,neon_mcr,neon_mrc,neon_vmov,*,*") (set_attr "neon_type" "*,*,*,*,*,*,neon_mcr,neon_mrc,neon_vmov,*,*")
(set_attr "insn" "mov,mov,mvn,mov,*,*,*,*,*,*,*") (set_attr "insn" "mov,mov,mvn,mov,*,*,*,*,*,*,*")
(set_attr "pool_range" "*,*,*,*,4096,*,*,*,*,1020,*") (set_attr "pool_range" "*,*,*,*,4096,*,*,*,*,1020,*")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment