[ARM] make execute only long call test checks more robust

[dmgreen]

llvm/test/CodeGen/Thumb/thumb-execute-only-long-calls.ll

1

I would remove the -arm- vendor from the triple instead. Hopefully removing the vendor triple would remove any downstream changes, if that is what you are running into?

[stuij]

address review comments

[olista01]

One comment which would improve the robustness a bit more, other than that LGTM.

llvm/test/CodeGen/Thumb/thumb-execute-only-long-calls.ll

6

I'd suggest removing the "0_0" here (and on line 8) so that it gets included by the regex, and the test won't fail if the label numbering changes.

[stuij]

address review comment

llvm/test/CodeGen/Thumb/thumb-execute-only-long-calls.ll

-; RUN: llc < %s -mtriple=thumbv6m-arm-none-eabi -relocation-model=static | FileCheck %s -check-prefixes=CHECK
+; RUN: llc < %s -mtriple=thumbv6m-none-eabi -relocation-model=static | FileCheck %s -check-prefixes=CHECK
 
 define void @fn() #0 {
 entry:
 ; CHECK-LABEL: fn:
-; CHECK:       ldr [[REG:r[0-9]+]], .LCPI0_0
+; CHECK:       ldr [[REG:r[0-9]+]], [[LABEL:[^\s]+]]
 ; CHECK-NEXT:  blx [[REG]]
-; CHECK:       .LCPI0_0:
+; CHECK:       [[LABEL]]:
 ; CHECK-NEXT:  .long   bar
   call void @bar()
   ret void
 }
 
 define void @execute_only_fn() #1 {
 ; CHECK-LABEL: execute_only_fn:
 ; CHECK:       movs    [[REG0:r[0-9]+]], :upper8_15:bar
-; CHECK-NEXT:  lsls    [[REG0]], r0, #8
+; CHECK-NEXT:  lsls    [[REG0]], [[REG0]], #8
 ; CHECK-NEXT:  adds    [[REG0]], :upper0_7:bar
-; CHECK-NEXT:  lsls    [[REG0]], r0, #8
+; CHECK-NEXT:  lsls    [[REG0]], [[REG0]], #8
 ; CHECK-NEXT:  adds    [[REG0]], :lower8_15:bar
-; CHECK-NEXT:  lsls    [[REG0]], r0, #8
+; CHECK-NEXT:  lsls    [[REG0]], [[REG0]], #8
 ; CHECK-NEXT:  adds    [[REG0]], :lower0_7:bar
 ; CHECK-NEXT:  blx     [[REG0]]
-; CHECK-NOT:   .LCPI1_0:
+; CHECK-NOT:   ldr
 
 entry:
   call void @bar()
   ret void
 }
 
 attributes #0 = { noinline optnone "target-features"="+thumb-mode,+long-calls" }
 attributes #1 = { noinline optnone "target-features"="+execute-only,+thumb-mode,+long-calls" }
 
 declare dso_local void @bar()