re PR other/58578 (mpfr tasinh test doesn't terminate when built with trunk for ARM)

2013-10-01  Kugan Vivekanandarajah  <kuganv@linaro.org>

	gcc/
	PR target/58578
	Revert
	2013-04-05  Greta Yorsh  <Greta.Yorsh@arm.com>
	* config/arm/arm.md (arm_ashldi3_1bit):  define_insn into
	define_insn_and_split.
	(arm_ashrdi3_1bit,arm_lshrdi3_1bit): Likewise.
	(shiftsi3_compare): New pattern.
	(rrx): New pattern.
	* config/arm/unspecs.md (UNSPEC_RRX): New.

	gcc/testsuite
	PR target/58578
	* gcc.target/arm/pr58578.c: New test.

From-SVN: r203059
This commit is contained in:
Kugan Vivekanandarajah 2013-10-01 13:19:31 +00:00 committed by Christophe Lyon
parent 4523e44dcc
commit 3a323a3846
4 changed files with 23 additions and 75 deletions

View File

@ -1,3 +1,15 @@
2013-10-01 Kugan Vivekanandarajah <kuganv@linaro.org>
PR target/58578
Revert
2013-04-05 Greta Yorsh <Greta.Yorsh@arm.com>
* config/arm/arm.md (arm_ashldi3_1bit): define_insn into
define_insn_and_split.
(arm_ashrdi3_1bit,arm_lshrdi3_1bit): Likewise.
(shiftsi3_compare): New pattern.
(rrx): New pattern.
* config/arm/unspecs.md (UNSPEC_RRX): New.
2013-10-01 Alan Modra <amodra@gmail.com> 2013-10-01 Alan Modra <amodra@gmail.com>
* stmt.c (expand_asm_operands): Revert part of 2013-09-24 special * stmt.c (expand_asm_operands): Revert part of 2013-09-24 special

View File

@ -3867,26 +3867,13 @@
" "
) )
(define_insn_and_split "arm_ashldi3_1bit" (define_insn "arm_ashldi3_1bit"
[(set (match_operand:DI 0 "s_register_operand" "=r,&r") [(set (match_operand:DI 0 "s_register_operand" "=r,&r")
(ashift:DI (match_operand:DI 1 "s_register_operand" "0,r") (ashift:DI (match_operand:DI 1 "s_register_operand" "0,r")
(const_int 1))) (const_int 1)))
(clobber (reg:CC CC_REGNUM))] (clobber (reg:CC CC_REGNUM))]
"TARGET_32BIT" "TARGET_32BIT"
"#" ; "movs\\t%Q0, %Q1, asl #1\;adc\\t%R0, %R1, %R1" "movs\\t%Q0, %Q1, asl #1\;adc\\t%R0, %R1, %R1"
"&& reload_completed"
[(parallel [(set (reg:CC CC_REGNUM)
(compare:CC (ashift:SI (match_dup 1) (const_int 1))
(const_int 0)))
(set (match_dup 0) (ashift:SI (match_dup 1) (const_int 1)))])
(set (match_dup 2) (plus:SI (plus:SI (match_dup 3) (match_dup 3))
(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 "conds" "clob")
(set_attr "length" "8") (set_attr "length" "8")
(set_attr "type" "multiple")] (set_attr "type" "multiple")]
@ -3964,43 +3951,18 @@
" "
) )
(define_insn_and_split "arm_ashrdi3_1bit" (define_insn "arm_ashrdi3_1bit"
[(set (match_operand:DI 0 "s_register_operand" "=r,&r") [(set (match_operand:DI 0 "s_register_operand" "=r,&r")
(ashiftrt:DI (match_operand:DI 1 "s_register_operand" "0,r") (ashiftrt:DI (match_operand:DI 1 "s_register_operand" "0,r")
(const_int 1))) (const_int 1)))
(clobber (reg:CC CC_REGNUM))] (clobber (reg:CC CC_REGNUM))]
"TARGET_32BIT" "TARGET_32BIT"
"#" ; "movs\\t%R0, %R1, asr #1\;mov\\t%Q0, %Q1, rrx" "movs\\t%R0, %R1, asr #1\;mov\\t%Q0, %Q1, rrx"
"&& reload_completed"
[(parallel [(set (reg:CC CC_REGNUM)
(compare:CC (ashiftrt:SI (match_dup 3) (const_int 1))
(const_int 0)))
(set (match_dup 2) (ashiftrt:SI (match_dup 3) (const_int 1)))])
(set (match_dup 0) (unspec:SI [(match_dup 1)
(reg:CC_C CC_REGNUM)]
UNSPEC_RRX))]
{
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 "conds" "clob")
(set_attr "length" "8") (set_attr "length" "8")
(set_attr "type" "multiple")] (set_attr "type" "multiple")]
) )
(define_insn "*rrx"
[(set (match_operand:SI 0 "s_register_operand" "=r")
(unspec:SI [(match_operand:SI 1 "s_register_operand" "r")
(reg:CC_C CC_REGNUM)]
UNSPEC_RRX))]
"TARGET_32BIT"
"mov\\t%0, %1, rrx"
[(set_attr "conds" "use")
(set_attr "type" "mov_shift")]
)
(define_expand "ashrsi3" (define_expand "ashrsi3"
[(set (match_operand:SI 0 "s_register_operand" "") [(set (match_operand:SI 0 "s_register_operand" "")
(ashiftrt:SI (match_operand:SI 1 "s_register_operand" "") (ashiftrt:SI (match_operand:SI 1 "s_register_operand" "")
@ -4070,27 +4032,13 @@
" "
) )
(define_insn_and_split "arm_lshrdi3_1bit" (define_insn "arm_lshrdi3_1bit"
[(set (match_operand:DI 0 "s_register_operand" "=r,&r") [(set (match_operand:DI 0 "s_register_operand" "=r,&r")
(lshiftrt:DI (match_operand:DI 1 "s_register_operand" "0,r") (lshiftrt:DI (match_operand:DI 1 "s_register_operand" "0,r")
(const_int 1))) (const_int 1)))
(clobber (reg:CC CC_REGNUM))] (clobber (reg:CC CC_REGNUM))]
"TARGET_32BIT" "TARGET_32BIT"
"#" ; "movs\\t%R0, %R1, lsr #1\;mov\\t%Q0, %Q1, rrx" "movs\\t%R0, %R1, lsr #1\;mov\\t%Q0, %Q1, rrx"
"&& reload_completed"
[(parallel [(set (reg:CC CC_REGNUM)
(compare:CC (lshiftrt:SI (match_dup 3) (const_int 1))
(const_int 0)))
(set (match_dup 2) (lshiftrt:SI (match_dup 3) (const_int 1)))])
(set (match_dup 0) (unspec:SI [(match_dup 1)
(reg:CC_C CC_REGNUM)]
UNSPEC_RRX))]
{
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 "conds" "clob")
(set_attr "length" "8") (set_attr "length" "8")
(set_attr "type" "multiple")] (set_attr "type" "multiple")]
@ -4183,21 +4131,6 @@
(set_attr "type" "alu_shift_reg,alu_shift_imm,alu_shift_imm,alu_shift_reg")] (set_attr "type" "alu_shift_reg,alu_shift_imm,alu_shift_imm,alu_shift_reg")]
) )
(define_insn "*shiftsi3_compare"
[(set (reg:CC CC_REGNUM)
(compare:CC (match_operator:SI 3 "shift_operator"
[(match_operand:SI 1 "s_register_operand" "r,r")
(match_operand:SI 2 "arm_rhs_operand" "M,r")])
(const_int 0)))
(set (match_operand:SI 0 "s_register_operand" "=r,r")
(match_op_dup 3 [(match_dup 1) (match_dup 2)]))]
"TARGET_32BIT"
"* return arm_output_shift(operands, 1);"
[(set_attr "conds" "set")
(set_attr "shift" "1")
(set_attr "type" "alus_shift_imm,alus_shift_reg")]
)
(define_insn "*shiftsi3_compare0" (define_insn "*shiftsi3_compare0"
[(set (reg:CC_NOOV CC_REGNUM) [(set (reg:CC_NOOV CC_REGNUM)
(compare:CC_NOOV (match_operator:SI 3 "shift_operator" (compare:CC_NOOV (match_operator:SI 3 "shift_operator"

View File

@ -83,8 +83,6 @@
; FPSCR rounding mode and signal inexactness. ; FPSCR rounding mode and signal inexactness.
UNSPEC_VRINTA ; Represent a float to integral float rounding UNSPEC_VRINTA ; Represent a float to integral float rounding
; towards nearest, ties away from zero. ; towards nearest, ties away from zero.
UNSPEC_RRX ; Rotate Right with Extend shifts register right
; by one place, with Carry flag shifted into bit[31].
]) ])
(define_c_enum "unspec" [ (define_c_enum "unspec" [

View File

@ -1,3 +1,8 @@
2013-10-01 Kugan Vivekanandarajah <kuganv@linaro.org>
PR Target/58578
* gcc.target/arm/pr58578.c: New test.
2013-10-01 Kyrylo Tkachov <kyrylo.tkachov@arm.com> 2013-10-01 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
PR tree-optimization/58556 PR tree-optimization/58556