[AArch64][ARM][X86] Split XRay tests for Linux/macOS

[ilammy]

Summary

XRay instrumentation works for macOS running on Apple Silicon, but
codegen is untested there. I'm going to make changes affecting this
target, get the XRay tests running on AArch64.

Data sections are going to become slightly different on x86_64 soon.
I do want the tests to be specific about symbol names, so instead of
having test check the common step, bifurcate tests a bit and check
the full symbol names.

As for ARM, XRay is not really supported on iOS at the moment, though
ARM is also really used there with modern phones. Nevertheless, codegen
tests exist and the output is going to change a little, make it easier
to write the special case for iOS.

[ilammy]

You know what, let's update all architectures at once.

I'm new to LLVM contribution, I don't know how fine-grained patches should be. I prepped them as individual commits, but this is probably not appropriate in this case.

[MaskRay]

llvm/test/CodeGen/AArch64/xray-attribute-instrumentation.ll

31

For labels, prefer :

This applies all files you are going to update.

[ilammy]

@MaskRay:

For labels, prefer :

This applies all files you are going to update.

Done. Updated all new checks to consistently use colons after labels.

Also, updated checks for section names (xray_instr_map) so that they check for .section there as well. Slightly differently for Mach-O.

[MaskRay]

llvm/test/CodeGen/AArch64/xray-attribute-instrumentation.ll

30–40

Ensure that you include the flags and type parts in .section xray_instr_map,"....",....

[ilammy]

@MaskRay:

Ensure that you include the flags and type parts in .section xray_instr_map,"....",....

Now quoting the exact section attributes, with {{$}} at the end to ensure that no unexpected stuff is appended later.

[ilammy]

• Rebasing on newer LLVM trunk
• No substantial changes since previous revision

I don't have push access. Could someone land this for me please?

[MaskRay]

llvm/test/CodeGen/ARM/xray-armv6-attribute-instrumentation.ll

37 ↗

(On Diff #530327)

I find that these suffixes (original issue) made updating difficult. I landed some fixes (e.g. 49b61ead47c111171c324f94e849534798f69dc2) to make them less sensitive.

llvm/test/CodeGen/AArch64/xray-attribute-instrumentation.ll

-; RUN: llc -mtriple=aarch64-unknown-linux-gnu < %s | FileCheck %s
+; RUN: llc -mtriple=aarch64-unknown-linux-gnu < %s | FileCheck %s -check-prefixes=CHECK,CHECK-LINUX
+; RUN: llc -mtriple=aarch64-apple-darwin      < %s | FileCheck %s -check-prefixes=CHECK,CHECK-MACOS
 
 define i32 @foo() nounwind noinline uwtable "function-instrument"="xray-always" {
 ; CHECK-LABEL: foo:
 ; CHECK-LABEL: Lxray_sled_0:
 ; CHECK-NEXT:  b  #32
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop

 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-LABEL: Ltmp1:
 ; CHECK-NEXT:  ret
 }
 
-; CHECK-LABEL: xray_instr_map
-; CHECK-LABEL: Lxray_sleds_start0
-; CHECK:       .xword .Lxray_sled_0
-; CHECK:       .xword .Lxray_sled_1
-; CHECK-LABEL: Lxray_sleds_end0
+; CHECK-LINUX-LABEL: xray_instr_map
+; CHECK-LINUX-LABEL: Lxray_sleds_start0
+; CHECK-LINUX:         .xword .Lxray_sled_0
+; CHECK-LINUX:         .xword .Lxray_sled_1
+; CHECK-LINUX-LABEL: Lxray_sleds_end0
+
+; CHECK-MACOS-LABEL: xray_instr_map
+; CHECK-MACOS-LABEL: Lxray_sleds_start0
+; CHECK-MACOS:         .quad Lxray_sled_0
+; CHECK-MACOS:         .quad Lxray_sled_1
+; CHECK-MACOS-LABEL: Lxray_sleds_end0
 
 define i32 @bar() nounwind noinline uwtable "function-instrument"="xray-never" "function-instrument"="xray-always" {
 ; CHECK-LABEL: bar:
 ; CHECK-LABEL: Lxray_sled_2:
 ; CHECK-NEXT:  b  #32
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop

 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-LABEL: Ltmp5:
 ; CHECK-NEXT:  ret
 }
 
-; CHECK-LABEL: xray_instr_map
-; CHECK-LABEL: Lxray_sleds_start1
-; CHECK:       .xword .Lxray_sled_2
-; CHECK:       .xword .Lxray_sled_3
-; CHECK-LABEL: Lxray_sleds_end1
+; CHECK-LINUX-LABEL: xray_instr_map
+; CHECK-LINUX-LABEL: Lxray_sleds_start1
+; CHECK-LINUX:         .xword .Lxray_sled_2
+; CHECK-LINUX:         .xword .Lxray_sled_3
+; CHECK-LINUX-LABEL: Lxray_sleds_end1
+
+; CHECK-MACOS-LABEL: xray_instr_map
+; CHECK-MACOS-LABEL: Lxray_sleds_start1
+; CHECK-MACOS:         .quad Lxray_sled_2
+; CHECK-MACOS:         .quad Lxray_sled_3
+; CHECK-MACOS-LABEL: Lxray_sleds_end1
 
 define i32 @instrumented() nounwind noinline uwtable "xray-instruction-threshold"="1" {
 ; CHECK-LABEL: instrumented:
 ; CHECK-LABEL: Lxray_sled_4:
 ; CHECK-NEXT:  b  #32
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop

 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-LABEL: Ltmp9:
 ; CHECK-NEXT:  ret
 }
 
-; CHECK-LABEL: xray_instr_map
-; CHECK-LABEL: Lxray_sleds_start2
-; CHECK:       .xword .Lxray_sled_4
-; CHECK:       .xword .Lxray_sled_5
-; CHECK-LABEL: Lxray_sleds_end2
+; CHECK-LINUX-LABEL: xray_instr_map
+; CHECK-LINUX-LABEL: Lxray_sleds_start2
+; CHECK-LINUX:         .xword .Lxray_sled_4
+; CHECK-LINUX:         .xword .Lxray_sled_5
+; CHECK-LINUX-LABEL: Lxray_sleds_end2
+
+; CHECK-MACOS-LABEL: xray_instr_map
+; CHECK-MACOS-LABEL: Lxray_sleds_start2
+; CHECK-MACOS:         .quad Lxray_sled_4
+; CHECK-MACOS:         .quad Lxray_sled_5
+; CHECK-MACOS-LABEL: Lxray_sleds_end2
 
 define i32 @not_instrumented() nounwind noinline uwtable "xray-instruction-threshold"="1" "function-instrument"="xray-never" {
 ; CHECK-LABEL: not_instrumented
-; CHECK-NOT: .Lxray_sled_6
+; CHECK-NOT: Lxray_sled_6
   ret i32 0
 ; CHECK:  ret
 }

llvm/test/CodeGen/AArch64/xray-omit-function-index.ll

-; RUN: llc -no-xray-index -mtriple=aarch64-unknown-linux-gnu < %s | FileCheck %s
+; RUN: llc -no-xray-index -mtriple=aarch64-unknown-linux-gnu < %s | FileCheck %s --check-prefixes=CHECK,CHECK-LINUX
+; RUN: llc -no-xray-index -mtriple=aarch64-apple-darwin      < %s | FileCheck %s --check-prefixes=CHECK,CHECK-MACOS
 
 define i32 @foo() nounwind noinline uwtable "function-instrument"="xray-always" {
 ; CHECK-LABEL: Lxray_sled_0:
 ; CHECK-NEXT:  b  #32
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop

 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-LABEL: Ltmp1:
 ; CHECK-NEXT:  ret
 }
-; CHECK-LABEL: xray_instr_map
-; CHECK-LABEL: Lxray_sleds_start0
-; CHECK:       .xword .Lxray_sled_0
-; CHECK:       .xword .Lxray_sled_1
-; CHECK-LABEL: Lxray_sleds_end0
+; CHECK-LINUX-LABEL: xray_instr_map
+; CHECK-LINUX-LABEL: Lxray_sleds_start0
+; CHECK-LINUX:         .xword .Lxray_sled_0
+; CHECK-LINUX:         .xword .Lxray_sled_1
+; CHECK-LINUX-LABEL: Lxray_sleds_end0
+
+; CHECK-MACOS-LABEL: xray_instr_map
+; CHECK-MACOS-LABEL: Lxray_sleds_start0
+; CHECK-MACOS:         .quad Lxray_sled_0
+; CHECK-MACOS:         .quad Lxray_sled_1
+; CHECK-MACOS-LABEL: Lxray_sleds_end0
 
 ; CHECK-NOT: xray_fn_idx

llvm/test/CodeGen/AArch64/xray-partial-instrumentation-skip-entry.ll

-; RUN: llc -mtriple=aarch64-unknown-linux-gnu < %s | FileCheck %s
+; RUN: llc -mtriple=aarch64-unknown-linux-gnu < %s | FileCheck %s --check-prefixes=CHECK,CHECK-LINUX
+; RUN: llc -mtriple=aarch64-apple-darwin      < %s | FileCheck %s --check-prefixes=CHECK,CHECK-MACOS
 
 define i32 @foo() nounwind noinline uwtable "function-instrument"="xray-always" "xray-skip-entry" {
 ; CHECK-NOT: Lxray_sled_0:
   ret i32 0
 ; CHECK-LABEL: Lxray_sled_0:
 ; CHECK-NEXT:  b  #32
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-LABEL: Ltmp0:
 ; CHECK-NEXT:  ret
 }
-; CHECK-LABEL: xray_instr_map
-; CHECK-LABEL: Lxray_sleds_start0
-; CHECK:       .xword .Lxray_sled_0
-; CHECK-LABEL: Lxray_sleds_end0
+
+; CHECK-LINUX-LABEL: xray_instr_map
+; CHECK-LINUX-LABEL: Lxray_sleds_start0
+; CHECK-LINUX:         .xword .Lxray_sled_0
+; CHECK-LINUX-LABEL: Lxray_sleds_end0
+
+; CHECK-MACOS-LABEL: xray_instr_map
+; CHECK-MACOS-LABEL: Lxray_sleds_start0
+; CHECK-MACOS:         .quad Lxray_sled_0
+; CHECK-MACOS-LABEL: Lxray_sleds_end0

llvm/test/CodeGen/AArch64/xray-partial-instrumentation-skip-exit.ll

-; RUN: llc -mtriple=aarch64-unknown-linux-gnu < %s | FileCheck %s
+; RUN: llc -mtriple=aarch64-unknown-linux-gnu < %s | FileCheck %s --check-prefixes=CHECK,CHECK-LINUX
+; RUN: llc -mtriple=aarch64-apple-darwin      < %s | FileCheck %s --check-prefixes=CHECK,CHECK-MACOS
 
 define i32 @foo() nounwind noinline uwtable "function-instrument"="xray-always" "xray-skip-exit" {
 ; CHECK-LABEL: Lxray_sled_0:
 ; CHECK-NEXT:  b  #32
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-LABEL: Ltmp0:
   ret i32 0
 ; CHECK-NOT: Lxray_sled_1:
 ; CHECK:  ret
 }
-; CHECK-LABEL: xray_instr_map
-; CHECK-LABEL: Lxray_sleds_start0
-; CHECK:       .xword .Lxray_sled_0
-; CHECK-LABEL: Lxray_sleds_end0
+
+; CHECK-LINUX-LABEL: xray_instr_map
+; CHECK-LINUX-LABEL: Lxray_sleds_start0
+; CHECK-LINUX:         .xword .Lxray_sled_0
+; CHECK-LINUX-LABEL: Lxray_sleds_end0
+
+; CHECK-MACOS-LABEL: xray_instr_map
+; CHECK-MACOS-LABEL: Lxray_sleds_start0
+; CHECK-MACOS:         .quad Lxray_sled_0
+; CHECK-MACOS-LABEL: Lxray_sleds_end0

llvm/test/CodeGen/AArch64/xray-tail-call-sled.ll

-; RUN: llc -mtriple=aarch64-linux-gnu < %s | FileCheck %s
+; RUN: llc -mtriple=aarch64-linux-gnu    < %s | FileCheck %s --check-prefixes=CHECK,CHECK-LINUX
+; RUN: llc -mtriple=aarch64-apple-darwin < %s | FileCheck %s --check-prefixes=CHECK,CHECK-MACOS
 
 define i32 @callee() nounwind noinline uwtable "function-instrument"="xray-always" {
 ; CHECK:       .p2align 2
-; CHECK-LABEL: .Lxray_sled_0:
+; CHECK-LABEL: Lxray_sled_0:
 ; CHECK-NEXT:  b  #32
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
-; CHECK-LABEL: .Ltmp0:
+; CHECK-LABEL: Ltmp0:
   ret i32 0
 ; CHECK-NEXT:  mov  w0, wzr
 ; CHECK-NEXT:  .p2align 2
-; CHECK-LABEL: .Lxray_sled_1:
+; CHECK-LABEL: Lxray_sled_1:
 ; CHECK-NEXT:  b  #32
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
-; CHECK-LABEL: .Ltmp1:
+; CHECK-LABEL: Ltmp1:
 ; CHECK-NEXT:  ret
 }
-; CHECK-LABEL: xray_instr_map
-; CHECK-LABEL: .Lxray_sleds_start0:
-; CHECK-NEXT:  .Ltmp2:
-; CHECK:       .xword .Lxray_sled_0-.Ltmp2
-; CHECK:       .Ltmp3:
-; CHECK-NEXT:  .xword .Lxray_sled_1-.Ltmp3
-; CHECK-LABEL: Lxray_sleds_end0:
-; CHECK-LABEL: xray_fn_idx
-; CHECK:       .xword .Lxray_sleds_start0
-; CHECK-NEXT:  .xword .Lxray_sleds_end0
+
+; CHECK-LINUX-LABEL: xray_instr_map
+; CHECK-LINUX-LABEL: .Lxray_sleds_start0:
+; CHECK-LINUX-NEXT:  .Ltmp2:
+; CHECK-LINUX:         .xword .Lxray_sled_0-.Ltmp2
+; CHECK-LINUX:       .Ltmp3:
+; CHECK-LINUX-NEXT:    .xword .Lxray_sled_1-.Ltmp3
+; CHECK-LINUX-LABEL: Lxray_sleds_end0:
+; CHECK-LINUX-LABEL: xray_fn_idx
+; CHECK-LINUX:         .xword .Lxray_sleds_start0
+; CHECK-LINUX-NEXT:    .xword .Lxray_sleds_end0
+
+; CHECK-MACOS-LABEL: xray_instr_map
+; CHECK-MACOS-LABEL: Lxray_sleds_start0:
+; CHECK-MACOS-NEXT:  Ltmp2:
+; CHECK-MACOS:         .quad Lxray_sled_0-Ltmp2
+; CHECK-MACOS:       Ltmp3:
+; CHECK-MACOS-NEXT:    .quad Lxray_sled_1-Ltmp3
+; CHECK-MACOS-LABEL: Lxray_sleds_end0:
+; CHECK-MACOS-LABEL: xray_fn_idx
+; CHECK-MACOS:         .quad Lxray_sleds_start0
+; CHECK-MACOS-NEXT:    .quad Lxray_sleds_end0
 
 define i32 @caller() nounwind noinline uwtable "function-instrument"="xray-always" {
 ; CHECK:       .p2align 2
 ; CHECK-LABEL: Lxray_sled_2:
 ; CHECK-NEXT:  b  #32
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
-; CHECK-LABEL: .Ltmp4:
+; CHECK-LABEL: Ltmp4:
 ; CHECK:       .p2align 2
 ; CHECK-LABEL: Lxray_sled_3:
 ; CHECK-NEXT:  b  #32
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
 ; CHECK-NEXT:  nop
-; CHECK-LABEL: .Ltmp5:
+; CHECK-LABEL: Ltmp5:
   %retval = tail call i32 @callee()
-; CHECK:       b  callee
+; CHECK-LINUX: b  callee
+; CHECK-MACOS: b  _callee
   ret i32 %retval
 }
-; CHECK-LABEL: xray_instr_map
-; CHECK-LABEL: Lxray_sleds_start1:
-; CHECK:       .xword .Lxray_sled_2
-; CHECK:       .xword .Lxray_sled_3
-; CHECK-LABEL: Lxray_sleds_end1:
-; CHECK:       .section xray_fn_idx,{{.*}}
-; CHECK:       .xword .Lxray_sleds_start1
-; CHECK-NEXT:  .xword .Lxray_sleds_end1
+
+; CHECK-LINUX-LABEL: xray_instr_map
+; CHECK-LINUX-LABEL: Lxray_sleds_start1:
+; CHECK-LINUX:         .xword .Lxray_sled_2
+; CHECK-LINUX:         .xword .Lxray_sled_3
+; CHECK-LINUX-LABEL: Lxray_sleds_end1:
+; CHECK-LINUX:       .section xray_fn_idx,{{.*}}
+; CHECK-LINUX:         .xword .Lxray_sleds_start1
+; CHECK-LINUX-NEXT:    .xword .Lxray_sleds_end1
+
+; CHECK-MACOS-LABEL: xray_instr_map
+; CHECK-MACOS-LABEL: Lxray_sleds_start1:
+; CHECK-MACOS:         .quad Lxray_sled_2
+; CHECK-MACOS:         .quad Lxray_sled_3
+; CHECK-MACOS-LABEL: Lxray_sleds_end1:
+; CHECK-MACOS:       .section __DATA,xray_fn_idx
+; CHECK-MACOS:         .quad Lxray_sleds_start1
+; CHECK-MACOS-NEXT:    .quad Lxray_sleds_end1