[PATCH][ARM] Adjust thumb2_movhi_insn patter

[PATCH][ARM] Adjust thumb2_movhi_insn patter

[Kyrill Tkachov]

[-- Attachment #1: Type: text/plain, Size: 524 bytes --]

Hi all,

This patch updates the thumb2_movhi_insn pattern for the -mrestrict-it rules. I 
had somehow missed it when doing the -mrestrict-it work last year, and it is 
possible to generate a deprecated IT block form in ARMv8 Thumb2 codegen without 
this patch.

Tested arm-none-eabi and bootstrapped on arm-none-linux-gnueabihf.

Ok for trunk?

Thanks,
Kyrill

2014-02-03  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>

     * config/arm/thumb2.md (*thumb2_movhi_insn): Add alternatives for
     arm_restrict_it.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: movhi.patch --]
[-- Type: text/x-patch; name=movhi.patch, Size: 1420 bytes --]

diff --git a/gcc/config/arm/thumb2.md b/gcc/config/arm/thumb2.md
index 4f247f8..d84938f 100644
--- a/gcc/config/arm/thumb2.md
+++ b/gcc/config/arm/thumb2.md
@@ -317,20 +317,24 @@
 ;; Thumb-2 always has load/store halfword instructions, so we can avoid a lot
 ;; of the messiness associated with the ARM patterns.
 (define_insn "*thumb2_movhi_insn"
-  [(set (match_operand:HI 0 "nonimmediate_operand" "=r,r,m,r")
-	(match_operand:HI 1 "general_operand"      "rI,n,r,m"))]
+  [(set (match_operand:HI 0 "nonimmediate_operand" "=r,r,l,r,m,r")
+	(match_operand:HI 1 "general_operand"      "r,I,Py,n,r,m"))]
   "TARGET_THUMB2
   && (register_operand (operands[0], HImode)
      || register_operand (operands[1], HImode))"
   "@
    mov%?\\t%0, %1\\t%@ movhi
+   mov%?\\t%0, %1\\t%@ movhi
+   mov%?\\t%0, %1\\t%@ movhi
    movw%?\\t%0, %L1\\t%@ movhi
    str%(h%)\\t%1, %0\\t%@ movhi
    ldr%(h%)\\t%0, %1\\t%@ movhi"
-  [(set_attr "type" "mov_imm,mov_reg,store1,load1")
+  [(set_attr "type" "mov_reg,mov_imm,mov_imm,mov_reg,store1,load1")
    (set_attr "predicable" "yes")
-   (set_attr "pool_range" "*,*,*,4094")
-   (set_attr "neg_pool_range" "*,*,*,250")]
+   (set_attr "predicable_short_it" "yes,no,yes,no,no,no")
+   (set_attr "length" "2,4,2,4,4,4")
+   (set_attr "pool_range" "*,*,*,*,*,4094")
+   (set_attr "neg_pool_range" "*,*,*,*,*,250")]
 )
 
 (define_insn "*thumb2_storewb_pairsi"

Re: [PATCH][ARM] Adjust thumb2_movhi_insn patter

[Ramana Radhakrishnan]

On Mon, Feb 3, 2014 at 11:39 AM, Kyrill Tkachov <kyrylo.tkachov@arm.com> wrote:
> Hi all,
>
> This patch updates the thumb2_movhi_insn pattern for the -mrestrict-it
> rules. I had somehow missed it when doing the -mrestrict-it work last year,
> and it is possible to generate a deprecated IT block form in ARMv8 Thumb2
> codegen without this patch.
>
> Tested arm-none-eabi and bootstrapped on arm-none-linux-gnueabihf.
>
> Ok for trunk?

Ok if release managers don't object in 24 hours.

regards
Ramana

>
> Thanks,
> Kyrill
>
> 2014-02-03  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
>
>     * config/arm/thumb2.md (*thumb2_movhi_insn): Add alternatives for
>     arm_restrict_it.