thumb2.md (thumb2_smaxsi3,thumb2_sminsi3): Convert define_insn to define_insn_and_split.

2013-05-01  Greta Yorsh  <Greta.Yorsh@arm.com>

	* config/arm/thumb2.md (thumb2_smaxsi3,thumb2_sminsi3): Convert
	define_insn to define_insn_and_split.
	(thumb32_umaxsi3,thumb2_uminsi3): Likewise.
	(thumb2_negdi2,thumb2_abssi2,thumb2_neg_abssi2): Likewise.
	(thumb2_mov_scc,thumb2_mov_negscc,thumb2_mov_notscc): Likewise.
	(thumb2_movsicc_insn,thumb2_and_scc,thumb2_ior_scc): Likewise.
	(thumb2_negscc): Likewise.

From-SVN: r198489
This commit is contained in:
Greta Yorsh 2013-05-01 11:25:28 +01:00 committed by Greta Yorsh
parent 57c16a5eb6
commit 0a7dbb7661
2 changed files with 338 additions and 62 deletions

View File

@ -1,3 +1,13 @@
2013-05-01 Greta Yorsh <Greta.Yorsh@arm.com>
* config/arm/thumb2.md (thumb2_smaxsi3,thumb2_sminsi3): Convert
define_insn to define_insn_and_split.
(thumb32_umaxsi3,thumb2_uminsi3): Likewise.
(thumb2_negdi2,thumb2_abssi2,thumb2_neg_abssi2): Likewise.
(thumb2_mov_scc,thumb2_mov_negscc,thumb2_mov_notscc): Likewise.
(thumb2_movsicc_insn,thumb2_and_scc,thumb2_ior_scc): Likewise.
(thumb2_negscc): Likewise.
2013-04-30 Greta Yorsh <Greta.Yorsh@arm.com>
* config/arm/thumb2.md (thumb2_incscc, thumb2_decscc): Delete.

View File

@ -38,81 +38,167 @@
(set_attr "type" "alu_shift")]
)
(define_insn "*thumb2_smaxsi3"
(define_insn_and_split "*thumb2_smaxsi3"
[(set (match_operand:SI 0 "s_register_operand" "=r,r,r")
(smax:SI (match_operand:SI 1 "s_register_operand" "0,r,?r")
(match_operand:SI 2 "arm_rhs_operand" "rI,0,rI")))
(clobber (reg:CC CC_REGNUM))]
"TARGET_THUMB2"
"@
cmp\\t%1, %2\;it\\tlt\;movlt\\t%0, %2
cmp\\t%1, %2\;it\\tge\;movge\\t%0, %1
cmp\\t%1, %2\;ite\\tge\;movge\\t%0, %1\;movlt\\t%0, %2"
"#"
; cmp\\t%1, %2\;it\\tlt\;movlt\\t%0, %2
; cmp\\t%1, %2\;it\\tge\;movge\\t%0, %1
; cmp\\t%1, %2\;ite\\tge\;movge\\t%0, %1\;movlt\\t%0, %2
"TARGET_THUMB2"
[(set (reg:CC CC_REGNUM)
(compare:CC (match_dup 1) (match_dup 2)))
(set (match_dup 0)
(if_then_else:SI (ge:SI (reg:CC CC_REGNUM) (const_int 0))
(match_dup 1)
(match_dup 2)))]
""
[(set_attr "conds" "clob")
(set_attr "length" "10,10,14")]
)
(define_insn "*thumb2_sminsi3"
(define_insn_and_split "*thumb2_sminsi3"
[(set (match_operand:SI 0 "s_register_operand" "=r,r,r")
(smin:SI (match_operand:SI 1 "s_register_operand" "0,r,?r")
(match_operand:SI 2 "arm_rhs_operand" "rI,0,rI")))
(clobber (reg:CC CC_REGNUM))]
"TARGET_THUMB2"
"@
cmp\\t%1, %2\;it\\tge\;movge\\t%0, %2
cmp\\t%1, %2\;it\\tlt\;movlt\\t%0, %1
cmp\\t%1, %2\;ite\\tlt\;movlt\\t%0, %1\;movge\\t%0, %2"
"#"
; cmp\\t%1, %2\;it\\tge\;movge\\t%0, %2
; cmp\\t%1, %2\;it\\tlt\;movlt\\t%0, %1
; cmp\\t%1, %2\;ite\\tlt\;movlt\\t%0, %1\;movge\\t%0, %2"
"TARGET_THUMB2"
[(set (reg:CC CC_REGNUM)
(compare:CC (match_dup 1) (match_dup 2)))
(set (match_dup 0)
(if_then_else:SI (lt:SI (reg:CC CC_REGNUM) (const_int 0))
(match_dup 1)
(match_dup 2)))]
""
[(set_attr "conds" "clob")
(set_attr "length" "10,10,14")]
)
(define_insn "*thumb32_umaxsi3"
(define_insn_and_split "*thumb32_umaxsi3"
[(set (match_operand:SI 0 "s_register_operand" "=r,r,r")
(umax:SI (match_operand:SI 1 "s_register_operand" "0,r,?r")
(match_operand:SI 2 "arm_rhs_operand" "rI,0,rI")))
(clobber (reg:CC CC_REGNUM))]
"TARGET_THUMB2"
"@
cmp\\t%1, %2\;it\\tcc\;movcc\\t%0, %2
cmp\\t%1, %2\;it\\tcs\;movcs\\t%0, %1
cmp\\t%1, %2\;ite\\tcs\;movcs\\t%0, %1\;movcc\\t%0, %2"
"#"
; cmp\\t%1, %2\;it\\tcc\;movcc\\t%0, %2
; cmp\\t%1, %2\;it\\tcs\;movcs\\t%0, %1
; cmp\\t%1, %2\;ite\\tcs\;movcs\\t%0, %1\;movcc\\t%0, %2"
"TARGET_THUMB2"
[(set (reg:CC CC_REGNUM)
(compare:CC (match_dup 1) (match_dup 2)))
(set (match_dup 0)
(if_then_else:SI (geu:SI (reg:CC CC_REGNUM) (const_int 0))
(match_dup 1)
(match_dup 2)))]
""
[(set_attr "conds" "clob")
(set_attr "length" "10,10,14")]
)
(define_insn "*thumb2_uminsi3"
(define_insn_and_split "*thumb2_uminsi3"
[(set (match_operand:SI 0 "s_register_operand" "=r,r,r")
(umin:SI (match_operand:SI 1 "s_register_operand" "0,r,?r")
(match_operand:SI 2 "arm_rhs_operand" "rI,0,rI")))
(clobber (reg:CC CC_REGNUM))]
"TARGET_THUMB2"
"@
cmp\\t%1, %2\;it\\tcs\;movcs\\t%0, %2
cmp\\t%1, %2\;it\\tcc\;movcc\\t%0, %1
cmp\\t%1, %2\;ite\\tcc\;movcc\\t%0, %1\;movcs\\t%0, %2"
"#"
; cmp\\t%1, %2\;it\\tcs\;movcs\\t%0, %2
; cmp\\t%1, %2\;it\\tcc\;movcc\\t%0, %1
; cmp\\t%1, %2\;ite\\tcc\;movcc\\t%0, %1\;movcs\\t%0, %2"
"TARGET_THUMB2"
[(set (reg:CC CC_REGNUM)
(compare:CC (match_dup 1) (match_dup 2)))
(set (match_dup 0)
(if_then_else:SI (ltu:SI (reg:CC CC_REGNUM) (const_int 0))
(match_dup 1)
(match_dup 2)))]
""
[(set_attr "conds" "clob")
(set_attr "length" "10,10,14")]
)
;; Thumb-2 does not have rsc, so use a clever trick with shifter operands.
(define_insn "*thumb2_negdi2"
(define_insn_and_split "*thumb2_negdi2"
[(set (match_operand:DI 0 "s_register_operand" "=&r,r")
(neg:DI (match_operand:DI 1 "s_register_operand" "?r,0")))
(clobber (reg:CC CC_REGNUM))]
"TARGET_THUMB2"
"negs\\t%Q0, %Q1\;sbc\\t%R0, %R1, %R1, lsl #1"
"#" ; negs\\t%Q0, %Q1\;sbc\\t%R0, %R1, %R1, lsl #1
"&& reload_completed"
[(parallel [(set (reg:CC CC_REGNUM)
(compare:CC (const_int 0) (match_dup 1)))
(set (match_dup 0) (minus:SI (const_int 0) (match_dup 1)))])
(set (match_dup 2) (minus:SI (minus:SI (match_dup 3)
(ashift:SI (match_dup 3)
(const_int 1)))
(ltu:SI (reg:CC_C CC_REGNUM) (const_int 0))))]
{
operands[2] = gen_highpart (SImode, operands[0]);
operands[0] = gen_lowpart (SImode, operands[0]);
operands[3] = gen_highpart (SImode, operands[1]);
operands[1] = gen_lowpart (SImode, operands[1]);
}
[(set_attr "conds" "clob")
(set_attr "length" "8")]
)
(define_insn "*thumb2_abssi2"
(define_insn_and_split "*thumb2_abssi2"
[(set (match_operand:SI 0 "s_register_operand" "=r,&r")
(abs:SI (match_operand:SI 1 "s_register_operand" "0,r")))
(clobber (reg:CC CC_REGNUM))]
"TARGET_THUMB2"
"@
cmp\\t%0, #0\;it\tlt\;rsblt\\t%0, %0, #0
eor%?\\t%0, %1, %1, asr #31\;sub%?\\t%0, %0, %1, asr #31"
"#"
; cmp\\t%0, #0\;it\tlt\;rsblt\\t%0, %0, #0
; eor%?\\t%0, %1, %1, asr #31\;sub%?\\t%0, %0, %1, asr #31
"&& reload_completed"
[(const_int 0)]
{
/* if (which_alternative == 0) */
if (REGNO(operands[0]) == REGNO(operands[1]))
{
rtx cc_reg = gen_rtx_REG (CCmode, CC_REGNUM);
emit_insn (gen_rtx_SET (VOIDmode,
cc_reg,
gen_rtx_COMPARE (CCmode, operands[0], const0_rtx)));
emit_insn (gen_rtx_COND_EXEC (VOIDmode,
(gen_rtx_LT (SImode,
cc_reg,
const0_rtx)),
(gen_rtx_SET (VOIDmode,
operands[0],
(gen_rtx_MINUS (SImode,
const0_rtx,
operands[1]))))));
}
else
{
emit_insn (gen_rtx_SET (VOIDmode,
operands[0],
gen_rtx_XOR (SImode,
gen_rtx_ASHIFTRT (SImode,
operands[1],
GEN_INT (31)),
operands[1])));
emit_insn (gen_rtx_SET (VOIDmode,
operands[0],
gen_rtx_MINUS (SImode,
operands[0],
gen_rtx_ASHIFTRT (SImode,
operands[1],
GEN_INT (31)))));
}
DONE;
}
[(set_attr "conds" "clob,*")
(set_attr "shift" "1")
(set_attr "predicable" "no, yes")
@ -120,14 +206,54 @@
(set_attr "length" "10,8")]
)
(define_insn "*thumb2_neg_abssi2"
(define_insn_and_split "*thumb2_neg_abssi2"
[(set (match_operand:SI 0 "s_register_operand" "=r,&r")
(neg:SI (abs:SI (match_operand:SI 1 "s_register_operand" "0,r"))))
(clobber (reg:CC CC_REGNUM))]
"TARGET_THUMB2"
"@
cmp\\t%0, #0\;it\\tgt\;rsbgt\\t%0, %0, #0
eor%?\\t%0, %1, %1, asr #31\;rsb%?\\t%0, %0, %1, asr #31"
"#"
; cmp\\t%0, #0\;it\\tgt\;rsbgt\\t%0, %0, #0
; eor%?\\t%0, %1, %1, asr #31\;rsb%?\\t%0, %0, %1, asr #31"
"&& reload_completed"
[(const_int 0)]
{
/* if (which_alternative == 0) */
if (REGNO(operands[0]) == REGNO(operands[1]))
{
rtx cc_reg = gen_rtx_REG (CCmode, CC_REGNUM);
emit_insn (gen_rtx_SET (VOIDmode,
cc_reg,
gen_rtx_COMPARE (CCmode, operands[0], const0_rtx)));
emit_insn (gen_rtx_COND_EXEC (VOIDmode,
(gen_rtx_GT (SImode,
cc_reg,
const0_rtx)),
(gen_rtx_SET (VOIDmode,
operands[0],
(gen_rtx_MINUS (SImode,
const0_rtx,
operands[1]))))));
}
else
{
emit_insn (gen_rtx_SET (VOIDmode,
operands[0],
gen_rtx_XOR (SImode,
gen_rtx_ASHIFTRT (SImode,
operands[1],
GEN_INT (31)),
operands[1])));
emit_insn (gen_rtx_SET (VOIDmode,
operands[0],
gen_rtx_MINUS (SImode,
gen_rtx_ASHIFTRT (SImode,
operands[1],
GEN_INT (31)),
operands[0])));
}
DONE;
}
[(set_attr "conds" "clob,*")
(set_attr "shift" "1")
(set_attr "predicable" "no, yes")
@ -210,37 +336,60 @@
(set_attr "type" "alu_shift")]
)
(define_insn "*thumb2_mov_scc"
(define_insn_and_split "*thumb2_mov_scc"
[(set (match_operand:SI 0 "s_register_operand" "=r")
(match_operator:SI 1 "arm_comparison_operator"
[(match_operand 2 "cc_register" "") (const_int 0)]))]
"TARGET_THUMB2"
"ite\\t%D1\;mov%D1\\t%0, #0\;mov%d1\\t%0, #1"
"#" ; "ite\\t%D1\;mov%D1\\t%0, #0\;mov%d1\\t%0, #1"
"TARGET_THUMB2"
[(set (match_dup 0)
(if_then_else:SI (match_dup 1)
(const_int 1)
(const_int 0)))]
""
[(set_attr "conds" "use")
(set_attr "length" "10")]
)
(define_insn "*thumb2_mov_negscc"
(define_insn_and_split "*thumb2_mov_negscc"
[(set (match_operand:SI 0 "s_register_operand" "=r")
(neg:SI (match_operator:SI 1 "arm_comparison_operator"
[(match_operand 2 "cc_register" "") (const_int 0)])))]
"TARGET_THUMB2"
"ite\\t%D1\;mov%D1\\t%0, #0\;mvn%d1\\t%0, #0"
"#" ; "ite\\t%D1\;mov%D1\\t%0, #0\;mvn%d1\\t%0, #0"
"TARGET_THUMB2"
[(set (match_dup 0)
(if_then_else:SI (match_dup 1)
(match_dup 3)
(const_int 0)))]
{
operands[3] = GEN_INT (~0);
}
[(set_attr "conds" "use")
(set_attr "length" "10")]
)
(define_insn "*thumb2_mov_notscc"
(define_insn_and_split "*thumb2_mov_notscc"
[(set (match_operand:SI 0 "s_register_operand" "=r")
(not:SI (match_operator:SI 1 "arm_comparison_operator"
[(match_operand 2 "cc_register" "") (const_int 0)])))]
"TARGET_THUMB2"
"ite\\t%D1\;mvn%D1\\t%0, #0\;mvn%d1\\t%0, #1"
"#" ; "ite\\t%D1\;mvn%D1\\t%0, #0\;mvn%d1\\t%0, #1"
"TARGET_THUMB2"
[(set (match_dup 0)
(if_then_else:SI (match_dup 1)
(match_dup 3)
(match_dup 4)))]
{
operands[3] = GEN_INT (~1);
operands[4] = GEN_INT (~0);
}
[(set_attr "conds" "use")
(set_attr "length" "10")]
)
(define_insn "*thumb2_movsicc_insn"
(define_insn_and_split "*thumb2_movsicc_insn"
[(set (match_operand:SI 0 "s_register_operand" "=r,r,r,r,r,r,r,r")
(if_then_else:SI
(match_operator 3 "arm_comparison_operator"
@ -253,10 +402,44 @@
it\\t%D3\;mvn%D3\\t%0, #%B2
it\\t%d3\;mov%d3\\t%0, %1
it\\t%d3\;mvn%d3\\t%0, #%B1
ite\\t%d3\;mov%d3\\t%0, %1\;mov%D3\\t%0, %2
ite\\t%d3\;mov%d3\\t%0, %1\;mvn%D3\\t%0, #%B2
ite\\t%d3\;mvn%d3\\t%0, #%B1\;mov%D3\\t%0, %2
ite\\t%d3\;mvn%d3\\t%0, #%B1\;mvn%D3\\t%0, #%B2"
#
#
#
#"
; alt 4: ite\\t%d3\;mov%d3\\t%0, %1\;mov%D3\\t%0, %2
; alt 5: ite\\t%d3\;mov%d3\\t%0, %1\;mvn%D3\\t%0, #%B2
; alt 6: ite\\t%d3\;mvn%d3\\t%0, #%B1\;mov%D3\\t%0, %2
; alt 7: ite\\t%d3\;mvn%d3\\t%0, #%B1\;mvn%D3\\t%0, #%B2"
"&& reload_completed"
[(const_int 0)]
{
enum rtx_code rev_code;
enum machine_mode mode;
rtx rev_cond;
emit_insn (gen_rtx_COND_EXEC (VOIDmode,
operands[3],
gen_rtx_SET (VOIDmode,
operands[0],
operands[1])));
rev_code = GET_CODE (operands[3]);
mode = GET_MODE (operands[4]);
if (mode == CCFPmode || mode == CCFPEmode)
rev_code = reverse_condition_maybe_unordered (rev_code);
else
rev_code = reverse_condition (rev_code);
rev_cond = gen_rtx_fmt_ee (rev_code,
VOIDmode,
gen_rtx_REG (mode, CC_REGNUM),
const0_rtx);
emit_insn (gen_rtx_COND_EXEC (VOIDmode,
rev_cond,
gen_rtx_SET (VOIDmode,
operands[0],
operands[2])));
DONE;
}
[(set_attr "length" "6,6,6,6,10,10,10,10")
(set_attr "conds" "use")]
)
@ -307,26 +490,58 @@
;; addresses will have the thumb bit set correctly.
(define_insn "*thumb2_and_scc"
(define_insn_and_split "*thumb2_and_scc"
[(set (match_operand:SI 0 "s_register_operand" "=r")
(and:SI (match_operator:SI 1 "arm_comparison_operator"
[(match_operand 3 "cc_register" "") (const_int 0)])
(match_operand:SI 2 "s_register_operand" "r")))]
[(match_operand 2 "cc_register" "") (const_int 0)])
(match_operand:SI 3 "s_register_operand" "r")))]
"TARGET_THUMB2"
"ite\\t%D1\;mov%D1\\t%0, #0\;and%d1\\t%0, %2, #1"
"#" ; "ite\\t%D1\;mov%D1\\t%0, #0\;and%d1\\t%0, %3, #1"
"&& reload_completed"
[(cond_exec (match_dup 5) (set (match_dup 0) (const_int 0)))
(cond_exec (match_dup 4) (set (match_dup 0)
(and:SI (match_dup 3) (const_int 1))))]
{
enum machine_mode mode = GET_MODE (operands[2]);
enum rtx_code rc = GET_CODE (operands[1]);
operands[4] = gen_rtx_fmt_ee (rc, VOIDmode, operands[2], const0_rtx);
if (mode == CCFPmode || mode == CCFPEmode)
rc = reverse_condition_maybe_unordered (rc);
else
rc = reverse_condition (rc);
operands[5] = gen_rtx_fmt_ee (rc, VOIDmode, operands[2], const0_rtx);
}
[(set_attr "conds" "use")
(set_attr "length" "10")]
)
(define_insn "*thumb2_ior_scc"
(define_insn_and_split "*thumb2_ior_scc"
[(set (match_operand:SI 0 "s_register_operand" "=r,r")
(ior:SI (match_operator:SI 2 "arm_comparison_operator"
[(match_operand 3 "cc_register" "") (const_int 0)])
(match_operand:SI 1 "s_register_operand" "0,?r")))]
(ior:SI (match_operator:SI 1 "arm_comparison_operator"
[(match_operand 2 "cc_register" "") (const_int 0)])
(match_operand:SI 3 "s_register_operand" "0,?r")))]
"TARGET_THUMB2"
"@
it\\t%d2\;orr%d2\\t%0, %1, #1
ite\\t%D2\;mov%D2\\t%0, %1\;orr%d2\\t%0, %1, #1"
it\\t%d1\;orr%d1\\t%0, %3, #1
#"
; alt 1: ite\\t%D1\;mov%D1\\t%0, %3\;orr%d1\\t%0, %3, #1
"&& reload_completed
&& REGNO (operands [0]) != REGNO (operands[3])"
[(cond_exec (match_dup 5) (set (match_dup 0) (match_dup 3)))
(cond_exec (match_dup 4) (set (match_dup 0)
(ior:SI (match_dup 3) (const_int 1))))]
{
enum machine_mode mode = GET_MODE (operands[2]);
enum rtx_code rc = GET_CODE (operands[1]);
operands[4] = gen_rtx_fmt_ee (rc, VOIDmode, operands[2], const0_rtx);
if (mode == CCFPmode || mode == CCFPEmode)
rc = reverse_condition_maybe_unordered (rc);
else
rc = reverse_condition (rc);
operands[5] = gen_rtx_fmt_ee (rc, VOIDmode, operands[2], const0_rtx);
}
[(set_attr "conds" "use")
(set_attr "length" "6,10")]
)
@ -433,25 +648,76 @@
(set_attr "length" "10,14")]
)
(define_insn "*thumb2_negscc"
(define_insn_and_split "*thumb2_negscc"
[(set (match_operand:SI 0 "s_register_operand" "=r")
(neg:SI (match_operator 3 "arm_comparison_operator"
[(match_operand:SI 1 "s_register_operand" "r")
(match_operand:SI 2 "arm_rhs_operand" "rI")])))
(clobber (reg:CC CC_REGNUM))]
"TARGET_THUMB2"
"*
if (GET_CODE (operands[3]) == LT && operands[2] == const0_rtx)
return \"asr\\t%0, %1, #31\";
"#"
"&& reload_completed"
[(const_int 0)]
{
rtx cc_reg = gen_rtx_REG (CCmode, CC_REGNUM);
if (GET_CODE (operands[3]) == NE)
return \"subs\\t%0, %1, %2\;it\\tne\;mvnne\\t%0, #0\";
if (GET_CODE (operands[3]) == LT && operands[2] == const0_rtx)
{
/* Emit asr\\t%0, %1, #31 */
emit_insn (gen_rtx_SET (VOIDmode,
operands[0],
gen_rtx_ASHIFTRT (SImode,
operands[1],
GEN_INT (31))));
DONE;
}
else if (GET_CODE (operands[3]) == NE)
{
/* Emit subs\\t%0, %1, %2\;it\\tne\;mvnne\\t%0, #0 */
if (CONST_INT_P (operands[2]))
emit_insn (gen_cmpsi2_addneg (operands[0], operands[1], operands[2],
GEN_INT (- INTVAL (operands[2]))));
else
emit_insn (gen_subsi3_compare (operands[0], operands[1], operands[2]));
output_asm_insn (\"cmp\\t%1, %2\", operands);
output_asm_insn (\"ite\\t%D3\", operands);
output_asm_insn (\"mov%D3\\t%0, #0\", operands);
return \"mvn%d3\\t%0, #0\";
"
emit_insn (gen_rtx_COND_EXEC (VOIDmode,
gen_rtx_NE (SImode,
cc_reg,
const0_rtx),
gen_rtx_SET (SImode,
operands[0],
GEN_INT (~0))));
DONE;
}
else
{
/* Emit: cmp\\t%1, %2\;ite\\t%D3\;mov%D3\\t%0, #0\;mvn%d3\\t%0, #0 */
enum rtx_code rc = reverse_condition (GET_CODE (operands[3]));
enum machine_mode mode = SELECT_CC_MODE (rc, operands[1], operands[2]);
rtx tmp1 = gen_rtx_REG (mode, CC_REGNUM);
emit_insn (gen_rtx_SET (VOIDmode,
cc_reg,
gen_rtx_COMPARE (CCmode, operands[1], operands[2])));
emit_insn (gen_rtx_COND_EXEC (VOIDmode,
gen_rtx_fmt_ee (rc,
VOIDmode,
tmp1,
const0_rtx),
gen_rtx_SET (VOIDmode, operands[0], const0_rtx)));
rc = GET_CODE (operands[3]);
emit_insn (gen_rtx_COND_EXEC (VOIDmode,
gen_rtx_fmt_ee (rc,
VOIDmode,
tmp1,
const0_rtx),
gen_rtx_SET (VOIDmode,
operands[0],
GEN_INT (~0))));
DONE;
}
FAIL;
}
[(set_attr "conds" "clob")
(set_attr "length" "14")]
)