@@ -58,27 +58,28 @@ CHECK-BOLT-BAT-NEXT: CFI State : 0
5858CHECK-BOLT-BAT-NEXT: Input offset: 0xcd
5959
6060# Confirm addresses
61- RUN: llvm-nm -n %t.exe | FileCheck %s -check-prefix=CHECK-NM
62- CHECK-NM : 0000000000c01340 t bn_mul4x_mont
63- CHECK-NM : 0000000000c09900 T __memcpy_evex_unaligned_erms
64- CHECK-NM- NEXT: 0000000000c09900 T __memmove_evex_unaligned_erms
65- CHECK-NM : 0000000000c26200 T BN_BLINDING_convert_ex
61+ RUN: llvm-nm -n %t.exe > %t.log
62+ CHECK: 0000000000[[#%x,bn_mul4x_mont:]] t bn_mul4x_mont{{$}}
63+ CHECK: 0000000000[[#%x,memcpy:]] T __memcpy_evex_unaligned_erms
64+ CHECK-NEXT: 0000000000[[#%x,memcpy]] T __memmove_evex_unaligned_erms
65+ CHECK: 0000000000[[#%x,BN_BLINDING_convert_ex:]] T BN_BLINDING_convert_ex
6666
6767# Verify that BAT contains multiple entry points
68- RUN: llvm-bat-dump %t.exe --dump-all | FileCheck %s -check-prefix=CHECK-BAT-DUMP
69- CHECK-BAT-DUMP: Function Address: 0xc01340, hash: 0x64eb7c6c1513da6c
70- CHECK-BAT-DUMP-NEXT: BB mappings:
71- CHECK-BAT-DUMP-NEXT: 0x0 -> 0x0 hash: 0xe2009bcb77a90000
72- CHECK-BAT-DUMP-NEXT: 0x3 -> 0x3 (branch)
73- CHECK-BAT-DUMP-NEXT: 0x6 -> 0x6 hash: 0x32cdb7e92d280006
74- CHECK-BAT-DUMP: 1 secondary entry points:
75- CHECK-BAT-DUMP-NEXT: 0x6
68+ RUN: llvm-bat-dump %t.exe --dump-all >> %t.log
69+ RUN: FileCheck %s -input-file %t.log
70+ CHECK: Function Address: 0x[[#bn_mul4x_mont]], hash: 0x64eb7c6c1513da6c
71+ CHECK-NEXT: BB mappings:
72+ CHECK-NEXT: 0x0 -> 0x0 hash: 0xe2009bcb77a90000
73+ CHECK-NEXT: 0x3 -> 0x3 (branch)
74+ CHECK-NEXT: 0x6 -> 0x6 hash: 0x32cdb7e92d280006
75+ CHECK: 1 secondary entry points:
76+ CHECK-NEXT: 0x6
7677
77- CHECK-BAT-DUMP : Function Address: 0xc09900 , hash: 0xcfce38fb253cf652
78- CHECK-BAT-DUMP : 3 secondary entry points:
79- CHECK-BAT-DUMP- NEXT: 0x7
80- CHECK-BAT-DUMP- NEXT: 0x40
81- CHECK-BAT-DUMP- NEXT: 0xcd
78+ CHECK: Function Address: 0x[[#memcpy]] , hash: 0xcfce38fb253cf652
79+ CHECK: 3 secondary entry points:
80+ CHECK-NEXT: 0x7
81+ CHECK-NEXT: 0x40
82+ CHECK-NEXT: 0xcd
8283
83- CHECK-BAT-DUMP : Function Address: 0xc26200
84- CHECK-BAT-DUMP : NumBlocks: 15
84+ CHECK: Function Address: 0x[[#BN_BLINDING_convert_ex]]
85+ CHECK: NumBlocks: 15
0 commit comments