[ARM] PR25722 Fixup tests to take into account mov translation

[peter.smith]

Summary

Alter instances in the test-suite that use immediates that can be represented in the immediate field of a MOV. The reason for doing this is that when the LDR rt,=imm transformation to MOV rt, imm the existing tests do not need to be modified.

[t.p.northover]

This looks like a good idea to go with the others.

[rengolin]

Committed in r269353

test/CodeGen/ARM/inlineasm-ldr-pseudo.ll

 ; PR18354
 ; We actually need to use -filetype=obj in this test because if we output
 ; assembly, the current code path will bypass the parser and just write the
 ; raw text out to the Streamer. We need to actually parse the inlineasm to
 ; demonstrate the bug. Going the asm->obj route does not show the issue.
 ; RUN: llc -mtriple=arm-none-linux   < %s -filetype=obj | llvm-objdump -d - | FileCheck %s
 ; RUN: llc -mtriple=arm-apple-darwin < %s -filetype=obj | llvm-objdump -d - | FileCheck %s
 ; CHECK-LABEL: foo:
 ; CHECK: 0:       00 00 9f e5                                     ldr     r0, [pc]
 ; CHECK: 4:       0e f0 a0 e1                                     mov     pc, lr
 ; Make sure the constant pool entry comes after the return
-; CHECK: 8:       01 00 00 00
+; CHECK: 8:       78 56 34 12
 define i32 @foo() nounwind {
 entry:
-  %0 = tail call i32 asm sideeffect "ldr $0,=1", "=r"() nounwind
+  %0 = tail call i32 asm sideeffect "ldr $0,=0x12345678", "=r"() nounwind
   ret i32 %0
 }

test/MC/ARM/ldr-pseudo-darwin.s

 
 @
 @ Check that large constants are converted to ldr from constant pool
 @
 @ simple test
 .section __TEXT,b,regular,pure_instructions
 @ CHECK-LABEL: f3:
 f3:
-  ldr r0, =0x10001
+  ldr r0, =0x10002
 @ CHECK: ldr r0, Ltmp0
 
 @ loading multiple constants
 .section __TEXT,c,regular,pure_instructions
 @ CHECK-LABEL: f4:
 f4:
-  ldr r0, =0x10002
+  ldr r0, =0x10003
 @ CHECK: ldr r0, Ltmp1
   adds r0, r0, #1
   adds r0, r0, #1
   adds r0, r0, #1
   adds r0, r0, #1
-  ldr r0, =0x10003
+  ldr r0, =0x10004
 @ CHECK: ldr r0, Ltmp2
   adds r0, r0, #1
   adds r0, r0, #1
 
 @ TODO: the same constants should have the same constant pool location
 .section __TEXT,d,regular,pure_instructions
 @ CHECK-LABEL: f5:
 f5:
-  ldr r0, =0x10004
+  ldr r0, =0x10005
 @ CHECK: ldr r0, Ltmp3
   adds r0, r0, #1
   adds r0, r0, #1
   adds r0, r0, #1
   adds r0, r0, #1
   adds r0, r0, #1
   adds r0, r0, #1
   adds r0, r0, #1
-  ldr r0, =0x10004
+  ldr r0, =0x10005
 @ CHECK: ldr r0, Ltmp4
   adds r0, r0, #1
   adds r0, r0, #1
   adds r0, r0, #1
   adds r0, r0, #1
   adds r0, r0, #1
   adds r0, r0, #1
 
f12:
   adds r0, r0, #1
 
 .section __TEXT,j,regular,pure_instructions
 @ mix of symbols and constants
 @ CHECK-LABEL: f13:
 f13:
   adds r0, r0, #1
   adds r0, r0, #1
-  ldr r0, =0x101
+  ldr r0, =0x10008
 @ CHECK: ldr r0, Ltmp10
   adds r0, r0, #1
   adds r0, r0, #1
   ldr r0, =bar
 @ CHECK: ldr r0, Ltmp11
   adds r0, r0, #1
   adds r0, r0, #1
 @
 @ Check for correct usage in other contexts
 @
 
 @ usage in macro
 .macro useit_in_a_macro
-  ldr r0, =0x10008
+  ldr r0, =0x10009
   ldr r0, =baz
 .endm
 .section __TEXT,k,regular,pure_instructions
 @ CHECK-LABEL: f14:
 f14:
   useit_in_a_macro
 @ CHECK: ldr r0, Ltmp12
 @ CHECK: ldr r0, Ltmp13
 
 @ usage with expressions
 .section __TEXT,l,regular,pure_instructions
 @ CHECK-LABEL: f15:
 f15:
-  ldr r0, =0x10001+8
+  ldr r0, =0x10001+9
 @ CHECK: ldr r0, Ltmp14
   adds r0, r0, #1
   ldr r0, =bar+4
 @ CHECK: ldr r0, Ltmp15
   adds r0, r0, #1
 
 @
 @ Constant Pools
 @
 @ CHECK: .section __TEXT,b,regular,pure_instructions
 @ CHECK: .data_region
 @ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp0:
-@ CHECK: .long 65537
+@ CHECK: .long 65538
 @ CHECK: .end_data_region
 
 @ CHECK: .section __TEXT,c,regular,pure_instructions
 @ CHECK: .data_region
 @ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp1:
-@ CHECK: .long 65538
+@ CHECK: .long 65539
 @ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp2:
-@ CHECK: .long 65539
+@ CHECK: .long 65540
 @ CHECK: .end_data_region
 
 @ CHECK: .section __TEXT,d,regular,pure_instructions
 @ CHECK: .data_region
 @ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp3:
-@ CHECK: .long 65540
+@ CHECK: .long 65541
 @ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp4:
-@ CHECK: .long 65540
+@ CHECK: .long 65541
 @ CHECK: .end_data_region
 
 @ CHECK: .section __TEXT,e,regular,pure_instructions
 @ CHECK: .data_region
 @ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp5:
 @ CHECK: .long 65542
 @ CHECK: .p2align 2

 @ CHECK-LABEL: Ltmp9:
 @ CHECK: .long f12
 @ CHECK: .end_data_region
 
 @ CHECK: .section __TEXT,j,regular,pure_instructions
 @ CHECK: .data_region
 @ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp10:
-@ CHECK: .long 257
+@ CHECK: .long 65544
 @ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp11:
 @ CHECK: .long bar
 @ CHECK: .end_data_region
 
 @ CHECK: .section __TEXT,k,regular,pure_instructions
 @ CHECK: .data_region
 @ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp12:
-@ CHECK: .long 65544
+@ CHECK: .long 65545
 @ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp13:
 @ CHECK: .long baz
 @ CHECK: .end_data_region
 
 @ CHECK: .section __TEXT,l,regular,pure_instructions
 @ CHECK: .data_region
 @ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp14:
-@ CHECK: .long 65545
+@ CHECK: .long 65546
 @ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp15:
 @ CHECK: .long bar+4
 @ CHECK: .end_data_region

test/MC/ARM/ldr-pseudo-obj-errors.s

 @RUN: not llvm-mc -triple=armv7-unknown-linux-gnueabi -filetype=obj %s -o %t1 2> %t2
 @RUN: cat %t2 | FileCheck %s
 @RUN: not llvm-mc -triple=armv7-darwin-apple -filetype=obj %s -o %t1_darwin 2> %t2_darwin
 @RUN: cat %t2_darwin | FileCheck %s
 
 @These tests look for errors that should be reported for invalid object layout
 @with the ldr pseudo. They are tested separately from parse errors because they
 @only trigger when the file has successfully parsed and the object file is about
 @to be written out.
 
 .text
 foo:
-  ldr r0, =0x101
+  ldr r0, =0x12345678
   .space 8000
 @ CHECK: error: out of range pc-relative fixup value
-@ CHECK: ldr r0, =0x101
+@ CHECK: ldr r0, =0x12345678
 @ CHECK: ^

test/MC/ARM/ldr-pseudo.s

 
 @
 @ Check that large constants are converted to ldr from constant pool
 @
 @ simple test
 .section b,"ax",%progbits
 @ CHECK-LABEL: f3:
 f3:
-  ldr r0, =0x10001
+  ldr r0, =0x10002
 @ CHECK: ldr r0, .Ltmp[[TMP0:[0-9]+]]
 
 @ loading multiple constants
 .section c,"ax",%progbits
 @ CHECK-LABEL: f4:
 f4:
-  ldr r0, =0x10002
+  ldr r0, =0x10003
 @ CHECK: ldr r0, .Ltmp[[TMP1:[0-9]+]]
   adds r0, r0, #1
   adds r0, r0, #1
   adds r0, r0, #1
   adds r0, r0, #1
-  ldr r0, =0x10003
+  ldr r0, =0x10004
 @ CHECK: ldr r0, .Ltmp[[TMP2:[0-9]+]]
   adds r0, r0, #1
   adds r0, r0, #1
 
 @ TODO: the same constants should have the same constant pool location
 .section d,"ax",%progbits
 @ CHECK-LABEL: f5:
 f5:
-  ldr r0, =0x10004
+  ldr r0, =0x10005
 @ CHECK: ldr r0, .Ltmp[[TMP3:[0-9]+]]
   adds r0, r0, #1
   adds r0, r0, #1
   adds r0, r0, #1
   adds r0, r0, #1
   adds r0, r0, #1
   adds r0, r0, #1
   adds r0, r0, #1
-  ldr r0, =0x10004
+  ldr r0, =0x10005
 @ CHECK: ldr r0, .Ltmp[[TMP4:[0-9]+]]
   adds r0, r0, #1
   adds r0, r0, #1
   adds r0, r0, #1
   adds r0, r0, #1
   adds r0, r0, #1
   adds r0, r0, #1
 
f12:
   adds r0, r0, #1
 
 .section j,"ax",%progbits
 @ mix of symbols and constants
 @ CHECK-LABEL: f13:
 f13:
   adds r0, r0, #1
   adds r0, r0, #1
-  ldr r0, =0x101
+  ldr r0, =0x10008
 @ CHECK: ldr r0, .Ltmp[[TMP10:[0-9]+]]
   adds r0, r0, #1
   adds r0, r0, #1
   ldr r0, =bar
 @ CHECK: ldr r0, .Ltmp[[TMP11:[0-9]+]]
   adds r0, r0, #1
   adds r0, r0, #1
 @
 @ Check for correct usage in other contexts
 @
 
 @ usage in macro
 .macro useit_in_a_macro
-  ldr r0, =0x10008
+  ldr r0, =0x10009
   ldr r0, =baz
 .endm
 .section k,"ax",%progbits
 @ CHECK-LABEL: f14:
 f14:
   useit_in_a_macro
 @ CHECK: ldr r0, .Ltmp[[TMP12:[0-9]+]]
 @ CHECK: ldr r0, .Ltmp[[TMP13:[0-9]+]]
 
 @ usage with expressions
 .section l, "ax", %progbits
 @ CHECK-LABEL: f15:
 f15:
-  ldr r0, =0x10001+8
+  ldr r0, =0x10001+9
 @ CHECK: ldr r0, .Ltmp[[TMP14:[0-9]+]]
   adds r0, r0, #1
   ldr r0, =bar+4
 @ CHECK: ldr r0, .Ltmp[[TMP15:[0-9]+]]
   adds r0, r0, #1
 
 @
 @ Constant Pools
 @
 @ CHECK: .section b,"ax",%progbits
 @ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP0]]
-@ CHECK: .long 65537
+@ CHECK: .long 65538
 
 @ CHECK: .section c,"ax",%progbits
 @ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP1]]
-@ CHECK: .long 65538
-@ CHECK: .Ltmp[[TMP2]]
 @ CHECK: .long 65539
+@ CHECK: .Ltmp[[TMP2]]
+@ CHECK: .long 65540
 
 @ CHECK: .section d,"ax",%progbits
 @ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP3]]
-@ CHECK: .long 65540
+@ CHECK: .long 65541
 @ CHECK: .Ltmp[[TMP4]]
-@ CHECK: .long 65540
+@ CHECK: .long 65541
 
 @ CHECK: .section e,"ax",%progbits
 @ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP5]]
 @ CHECK: .long 65542
 @ CHECK: .Ltmp[[TMP6]]
 @ CHECK: .long 65543
 

 @ CHECK: .section i,"ax",%progbits
 @ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP9]]
 @ CHECK: .long f12
 
 @ CHECK: .section j,"ax",%progbits
 @ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP10]]
-@ CHECK: .long 257
+@ CHECK: .long 65544
 @ CHECK: .Ltmp[[TMP11]]
 @ CHECK: .long bar
 
 @ CHECK: .section k,"ax",%progbits
 @ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP12]]
-@ CHECK: .long 65544
+@ CHECK: .long 65545
 @ CHECK: .Ltmp[[TMP13]]
 @ CHECK: .long baz
 
 @ CHECK: .section l,"ax",%progbits
 @ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP14]]
-@ CHECK: .long 65545
+@ CHECK: .long 65546
 @ CHECK: .Ltmp[[TMP15]]
 @ CHECK: .long bar+4

test/MC/ARM/ltorg-darwin.s

 @ This test has a partner (ltorg.s) that contains matching
 @ tests for the .ltorg on linux targets. We need separate files
 @ because the syntax for switching sections and temporary labels differs
 @ between darwin and linux. Any tests added here should have a matching
 @ test added there.
 
 @RUN: llvm-mc -triple   armv7-apple-darwin %s | FileCheck %s
 @RUN: llvm-mc -triple thumbv5-apple-darwin %s | FileCheck %s
 @RUN: llvm-mc -triple thumbv7-apple-darwin %s | FileCheck %s
 
 @ check that ltorg dumps the constant pool at the current location
 .section __TEXT,a,regular,pure_instructions
 @ CHECK-LABEL: f2:
 f2:
-  ldr r0, =0x10001
+  ldr r0, =0x10002
 @ CHECK: ldr r0, Ltmp0
   adds r0, r0, #1
   adds r0, r0, #1
   b f3
 .ltorg
 @ constant pool
 @ CHECK: .data_region
 @ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp0:
-@ CHECK: .long 65537
+@ CHECK: .long 65538
 @ CHECK: .end_data_region
 
 @ CHECK-LABEL: f3:
 f3:
   adds r0, r0, #1
   adds r0, r0, #1
 
 @ check that ltorg clears the constant pool after dumping it
 .section __TEXT,b,regular,pure_instructions
 @ CHECK-LABEL: f4:
 f4:
-  ldr r0, =0x10002
+  ldr r0, =0x10003
 @ CHECK: ldr r0, Ltmp1
   adds r0, r0, #1
   adds r0, r0, #1
   b f5
 .ltorg
 @ constant pool
 @ CHECK: .data_region
 @ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp1:
-@ CHECK: .long 65538
+@ CHECK: .long 65539
 @ CHECK: .end_data_region
 
 @ CHECK-LABEL: f5:
 f5:
   adds r0, r0, #1
   adds r0, r0, #1
-  ldr r0, =0x10003
+  ldr r0, =0x10004
 @ CHECK: ldr r0, Ltmp2
   adds r0, r0, #1
   b f6
 .ltorg
 @ constant pool
 @ CHECK: .data_region
 @ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp2:
-@ CHECK: .long 65539
+@ CHECK: .long 65540
 @ CHECK: .end_data_region
 
 @ CHECK-LABEL: f6:
 f6:
   adds r0, r0, #1
   adds r0, r0, #1
 
 @ check that ltorg does not issue an error if there is no constant pool
f10:
   adds r0, r0, #1
 
 @ check that use of ltorg does not prevent dumping non-empty constant pools at end of section
 .section __TEXT,e,regular,pure_instructions
 @ CHECK-LABEL: f11:
 f11:
   adds r0, r0, #1
   adds r0, r0, #1
-  ldr r0, =0x10004
+  ldr r0, =0x10005
 @ CHECK: ldr r0, Ltmp4
   b f12
   .ltorg
 @ constant pool
 @ CHECK: .data_region
 @ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp4:
-@ CHECK: .long 65540
+@ CHECK: .long 65541
 @ CHECK: .end_data_region
 
 @ CHECK-LABEL: f12:
 f12:
   adds r0, r0, #1
-  ldr r0, =0x10005
+  ldr r0, =0x10006
 @ CHECK: ldr r0, Ltmp5
 
 .section __TEXT,f,regular,pure_instructions
 @ CHECK-LABEL: f13
 f13:
   adds r0, r0, #1
   adds r0, r0, #1
 
 @ should not have a constant pool at end of section with empty constant pools
 @ CHECK-NOT: .section __TEXT,a,regular,pure_instructions
 @ CHECK-NOT: .section __TEXT,b,regular,pure_instructions
 @ CHECK-NOT: .section __TEXT,c,regular,pure_instructions
 @ CHECK-NOT: .section __TEXT,d,regular,pure_instructions
 
 @ should have a non-empty constant pool at end of this section
 @ CHECK: .section __TEXT,e,regular,pure_instructions
 @ constant pool
 @ CHECK: .data_region
 @ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp5:
-@ CHECK: .long 65541
+@ CHECK: .long 65542
 @ CHECK: .end_data_region
 
 @ should not have a constant pool at end of section with empty constant pools
 @ CHECK-NOT: .section __TEXT,f,regular,pure_instructions

test/MC/ARM/ltorg.s

 @ This test has a partner (ltorg-darwin.s) that contains matching
 @ tests for the .ltorg on darwin targets. We need separate files
 @ because the syntax for switching sections and temporary labels differs
 @ between darwin and linux. Any tests added here should have a matching
 @ test added there.
 
 @RUN: llvm-mc -triple   armv7-unknown-linux-gnueabi %s | FileCheck %s
 @RUN: llvm-mc -triple thumbv5-unknown-linux-gnueabi %s | FileCheck %s
 @RUN: llvm-mc -triple thumbv7-unknown-linux-gnueabi %s | FileCheck %s
 
 @ check that ltorg dumps the constant pool at the current location
 .section a,"ax",%progbits
 @ CHECK-LABEL: f2:
 f2:
-  ldr r0, =0x10001
+  ldr r0, =0x10002
 @ CHECK: ldr r0, .Ltmp[[TMP0:[0-9+]]]
   adds r0, r0, #1
   adds r0, r0, #1
   b f3
 .ltorg
 @ constant pool
 @ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP0]]
-@ CHECK: .long 65537
+@ CHECK: .long 65538
 
 @ CHECK-LABEL: f3:
 f3:
   adds r0, r0, #1
   adds r0, r0, #1
 
 @ check that ltorg clears the constant pool after dumping it
 .section b,"ax",%progbits
 @ CHECK-LABEL: f4:
 f4:
-  ldr r0, =0x10002
+  ldr r0, =0x10003
 @ CHECK: ldr r0, .Ltmp[[TMP1:[0-9+]]]
   adds r0, r0, #1
   adds r0, r0, #1
   b f5
 .ltorg
 @ constant pool
 @ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP1]]
-@ CHECK: .long 65538
+@ CHECK: .long 65539
 
 @ CHECK-LABEL: f5:
 f5:
   adds r0, r0, #1
   adds r0, r0, #1
-  ldr r0, =0x10003
+  ldr r0, =0x10004
 @ CHECK: ldr r0, .Ltmp[[TMP2:[0-9+]]]
   adds r0, r0, #1
   b f6
 .ltorg
 @ constant pool
 @ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP2]]
-@ CHECK: .long 65539
+@ CHECK: .long 65540
 
 @ CHECK-LABEL: f6:
 f6:
   adds r0, r0, #1
   adds r0, r0, #1
 
 @ check that ltorg does not issue an error if there is no constant pool
 .section c,"ax",%progbits
f10:
   adds r0, r0, #1
 
 @ check that use of ltorg does not prevent dumping non-empty constant pools at end of section
 .section e,"ax",%progbits
 @ CHECK-LABEL: f11:
 f11:
   adds r0, r0, #1
   adds r0, r0, #1
-  ldr r0, =0x10004
+  ldr r0, =0x10005
 @ CHECK: ldr r0, .Ltmp[[TMP4:[0-9+]]]
   b f12
   .ltorg
 @ constant pool
 @ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP4]]
-@ CHECK: .long 65540
+@ CHECK: .long 65541
 @ CHECK-LABEL: f12:
 f12:
   adds r0, r0, #1
-  ldr r0, =0x10005
+  ldr r0, =0x10006
 @ CHECK: ldr r0, .Ltmp[[TMP5:[0-9+]]]
 
 .section f,"ax",%progbits
 @ CHECK-LABEL: f13
 f13:
   adds r0, r0, #1
   adds r0, r0, #1
 
 @ should not have a constant pool at end of section with empty constant pools
 @ CHECK-NOT: .section a,"ax",%progbits
 @ CHECK-NOT: .section b,"ax",%progbits
 @ CHECK-NOT: .section c,"ax",%progbits
 @ CHECK-NOT: .section d,"ax",%progbits
 
 @ should have a non-empty constant pool at end of this section
 @ CHECK: .section e,"ax",%progbits
 @ constant pool
 @ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP5]]
-@ CHECK: .long 65541
+@ CHECK: .long 65542
 
 @ should not have a constant pool at end of section with empty constant pools
 @ CHECK-NOT: .section f,"ax",%progbits