[lld][test] filecheck typo fixes #93471
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-lld-wasm @llvm/pr-subscribers-lld-macho Author: klensy (klensy) ChangesFew more fixes Still left ones: Full diff: https://github.com/llvm/llvm-project/pull/93471.diff 8 Files Affected:
diff --git a/lld/test/COFF/duplicate.test b/lld/test/COFF/duplicate.test
index 76c88b070ff37..3e97cbe318ea6 100644
--- a/lld/test/COFF/duplicate.test
+++ b/lld/test/COFF/duplicate.test
@@ -6,7 +6,7 @@ RUN: not lld-link /out:beta.dll /dll alpha.obj beta.obj alpha.lib 2>&1 | FileChe
CHECK-ALPHA: error: duplicate symbol: f
CHECK-ALPHA: defined at {{.*}}alpha.obj
-CHECK-APLHA: defined at alpha.dll
+CHECK-ALPHA: defined at alpha.dll
RUN: llc -mtriple x86_64-windows-msvc -filetype obj -o gamma.obj %S/Inputs/gamma.ll
RUN: not lld-link /out:gamma.exe /subsystem:console /entry:mainCRTStartup gamma.obj alpha.lib 2>&1 | FileCheck %s -check-prefix CHECK-GAMMA
diff --git a/lld/test/COFF/pdb-local-constants.test b/lld/test/COFF/pdb-local-constants.test
index 3a9538252ed80..4e8e8c0ee865b 100644
--- a/lld/test/COFF/pdb-local-constants.test
+++ b/lld/test/COFF/pdb-local-constants.test
@@ -18,4 +18,4 @@ CHECK-NEXT: type = 0x1002 (const int), value = 321
CHECK: Symbols
CHECK: 220 | S_CONSTANT [size = 12] `i`
-CHECK-NEXT type = 0x0074 (int), value = 123
\ No newline at end of file
+CHECK-NEXT: type = 0x0074 (int), value = 123
\ No newline at end of file
diff --git a/lld/test/ELF/arm-gotoff.s b/lld/test/ELF/arm-gotoff.s
index 0a6ea3ab0dad9..989f9d5c4714e 100644
--- a/lld/test/ELF/arm-gotoff.s
+++ b/lld/test/ELF/arm-gotoff.s
@@ -54,14 +54,14 @@
// DISASM: Disassembly of section .text:
// DISASM-EMPTY:
-// DISASM-NEXT :_start:
-// DISASM-NEXT 11114: 1e ff 2f e1 bx lr
+// DISASM-NEXT: _start:
+// DISASM-NEXT: 11114: 1e ff 2f e1 bx lr
// Offset 0 from .got = bar
-// DISASM 11118: 00 10 00 00
+// DISASM: 11118: 00 10 00 00
// Offset 10 from .got = obj
-// DISASM-NEXT 1111c: 0a 10 00 00
+// DISASM-NEXT: 1111c: 0a 10 00 00
// Offset 15 from .got = obj +5
-// DISASM-NEXT 11120: 0f 10 00 00
+// DISASM-NEXT: 11120: 0f 10 00 00
.syntax unified
.globl _start
_start:
diff --git a/lld/test/ELF/lto/sparcv9.ll b/lld/test/ELF/lto/sparcv9.ll
index a4cdc6eafa403..9ffdd988b6964 100644
--- a/lld/test/ELF/lto/sparcv9.ll
+++ b/lld/test/ELF/lto/sparcv9.ll
@@ -5,7 +5,7 @@
; RUN: ld.lld %t.bc -o %t
; RUN: llvm-readobj -h %t | FileCheck %s
-; CHECK Class: 64-bit
+; CHECK: Class: 64-bit
; CHECK: DataEncoding: BigEndian
; CHECK: Machine: EM_SPARCV9
diff --git a/lld/test/MachO/compact-unwind-foldings.s b/lld/test/MachO/compact-unwind-foldings.s
index 18511da772144..0e97e708cf139 100644
--- a/lld/test/MachO/compact-unwind-foldings.s
+++ b/lld/test/MachO/compact-unwind-foldings.s
@@ -23,8 +23,8 @@
## Check that [1] offset starts at c's address + 3 (its length).
# CHECK-LABEL: Contents of __unwind_info section:
# CHECK: Top level indices: (count = 2)
-# CHECK-NEXT : [0]: function offset=[[#%#.7x,MAIN_ADDR]]
-# CHECK-NEXT : [1]: function offset=[[#%#.7x,C_ADDR + 3]]
+# CHECK-NEXT: [0]: function offset=[[#%#.7x,MAIN_ADDR]]
+# CHECK-NEXT: [1]: function offset=[[#%#.7x,C_ADDR + 3]]
#--- fold-tail.s
.text
diff --git a/lld/test/MachO/eh-frame.s b/lld/test/MachO/eh-frame.s
index 64fd364c87a59..70c04d2cec2d4 100644
--- a/lld/test/MachO/eh-frame.s
+++ b/lld/test/MachO/eh-frame.s
@@ -66,8 +66,8 @@
# CHECK: [2]: function offset=0x[[#%.8x,H - BASE]], LSDA offset=0x[[#%.8x,EXCEPT2 - BASE]]
# CHECK: Second level indices:
# CHECK: Second level index[0]:
-# CHECK [0]: function offset=0x[[#%.8x,F - BASE]], encoding[{{.*}}]=0x52{{.*}}
-# CHECK [1]: function offset=0x[[#%.8x,NO_UNWIND - BASE]], encoding[{{.*}}]=0x00000000
+# CHECK: [0]: function offset=0x[[#%.8x,F - BASE]], encoding[{{.*}}]=0x52{{.*}}
+# CHECK: [1]: function offset=0x[[#%.8x,NO_UNWIND - BASE]], encoding[{{.*}}]=0x00000000
# CHECK: [2]: function offset=0x[[#%.8x,G - BASE]], encoding[{{.*}}]=0x0[[#%x,DWARF_ENC]][[#%.6x, G_DWARF_OFF:]]
# CHECK: [3]: function offset=0x[[#%.8x,H - BASE]], encoding[{{.*}}]=0x0[[#%x,DWARF_ENC]][[#%.6x, H_DWARF_OFF:]]
# CHECK: [4]: function offset=0x[[#%.8x,MY_PERSONALITY - BASE]], encoding[{{.*}}]=0x00000000
diff --git a/lld/test/MachO/invalid/undef-debug.s b/lld/test/MachO/invalid/undef-debug.s
index 7cf75fa898274..0990687d19750 100644
--- a/lld/test/MachO/invalid/undef-debug.s
+++ b/lld/test/MachO/invalid/undef-debug.s
@@ -6,7 +6,7 @@
# CHECK-NEXT: >>> referenced by test.c:3
# CHECK-NEXT: >>> {{.*}}.o:(symbol _main+0x0)
# CHECK-NEXT: >>> referenced by test.c:2
-# CHECK-NEXT >>> {{.*}}.o:(symbol _ptr+0x0)
+# CHECK-NEXT: >>> {{.*}}.o:(symbol _ptr+0x0)
## This is the output of `clang -g2 -O2 -fdebug-compilation-dir=. -fno-ident` called on the following file, with the
## Apple DWARF tables removed:
diff --git a/lld/test/wasm/tag-section.ll b/lld/test/wasm/tag-section.ll
index 4decdb58f952a..c85c798ff5e53 100644
--- a/lld/test/wasm/tag-section.ll
+++ b/lld/test/wasm/tag-section.ll
@@ -44,7 +44,7 @@ define void @_start() {
; NOPIC: - Type: GLOBAL
; NOPIC-EXPORT-ALL: - Type: EXPORT
-; NOPIC-EXPORT-ALL-NEXT Exports:
+; NOPIC-EXPORT-ALL-NEXT: Exports:
; NOPIC-EXPORT-ALL: - Name: __cpp_exception
; NOPIC-EXPORT-ALL: Kind: TAG
; NOPIC-EXPORT-ALL: Index: 0
|
|
tests with filecheck directives, but without |
MaskRay
reviewed
May 27, 2024
| @@ -23,8 +23,8 @@ | |||
| ## Check that [1] offset starts at c's address + 3 (its length). | |||
| # CHECK-LABEL: Contents of __unwind_info section: | |||
| # CHECK: Top level indices: (count = 2) | |||
| # CHECK-NEXT : [0]: function offset=[[#%#.7x,MAIN_ADDR]] | |||
| # CHECK-NEXT : [1]: function offset=[[#%#.7x,C_ADDR + 3]] | |||
| # CHECK-NEXT: [0]: function offset=[[#%#.7x,MAIN_ADDR]] | |||
There was a problem hiding this comment.
Sorry, I'm not sure I understand this change. Why is line 27 being deleted? From the PR's description seems to say it's only fixing typo ....
There was a problem hiding this comment.
There was a problem hiding this comment.
Ah, i see - feel free to revert this file (or temporarily disable the test), I'll have a look and fix it later this week. Thanks!
There was a problem hiding this comment.
Output is:
SYMBOL TABLE:
0000000100000380 l F __TEXT,__text _a
0000000100000390 l F __TEXT,__text _b
00000001000003a0 l F __TEXT,__text _c
00000001000003a1 l F __TEXT,__text _d
0000000100000370 g F __TEXT,__text _main
0000000100000000 g F __TEXT,__text __mh_execute_header
0000000000000000 *UND* dyld_stub_binder
Contents of __unwind_info section:
Version: 0x1
Common encodings array section offset: 0x1c
Number of common encodings in array: 0x5
Personality function array section offset: 0x30
Number of personality functions in array: 0x0
Index array section offset: 0x30
Number of indices in array: 0x2
Common encodings: (count = 5)
encoding[0]: 0x04000078
encoding[1]: 0x04000058
encoding[2]: 0x04000038
encoding[3]: 0x04000018
encoding[4]: 0x00000000
Personality functions: (count = 0)
Top level indices: (count = 2)
[0]: function offset=0x00000370, 2nd level page offset=0x00000048, LSDA offset=0x00000048
[1]: function offset=0x000003a1, 2nd level page offset=0x00000000, LSDA offset=0x00000048
LSDA descriptors:
Second level indices:
Second level index[0]: offset in section=0x00000048, base function offset=0x00000370
[0]: function offset=0x00000370, encoding[3]=0x04000018
[1]: function offset=0x00000380, encoding[2]=0x04000038
[2]: function offset=0x00000390, encoding[1]=0x04000058
[3]: function offset=0x000003a0, encoding[0]=0x04000078
[4]: function offset=0x000003a1, encoding[4]=0x00000000
So filecheck fails to match 0x100000370 with 0x00000370 (and next line will fail too)
klensy
force-pushed
the
filecheck-lld2
branch
2 times, most recently
from
22dbaf5 to
d6f25c7
Compare
klensy
commented
Jun 7, 2024
klensy
force-pushed
the
filecheck-lld2
branch
from
5532cfc to
cb54662
Compare
|
Current:
|
I can help with ELF/aarch64* and ELF/arm* if you need it? Depending on how big the update is, it may be better for me to submit a separate PR rather than post what needs to change. |
Ok, this will be faster, i guess. |
|
The arm-thumb-branch-rangethunk.s needs a couple of updates:
Feel free to add this to your patch. It should be: |
|
A diff (apologies can't upload as a file) for Are you OK to incorporate these into your patch? |
klensy
force-pushed
the
filecheck-lld2
branch
from
f788a83 to
bcc530c
Compare
|
Applied fixes, thanks. |
klensy
force-pushed
the
filecheck-lld2
branch
from
13e68a0 to
bde5026
Compare
MaskRay
reviewed
Feb 8, 2025
| CHECK-NEXT: type = 0x0074 (int), value = 123 |
There was a problem hiding this comment.
ensure the file ends with \n while updating this line
MaskRay
approved these changes
Feb 8, 2025
added 6 commits
February 8, 2025 11:59
…t fix in lld/test/MachO/compact-unwind-foldings.s
klensy
force-pushed
the
filecheck-lld2
branch
from
bde5026 to
b33420d
Compare
|
Rebased, added newline for |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Few more fixes
Still left ones:
lld/test/ELF/arm-thumb-blx.s was changed in 2d37bf8 but left CHECK-NEXT-ARM and CHECK-NEXT-THUMB unmerged (they should be CHECK-ARM-NEXT and CHECK-THUMB-NEXT before that)