Skip to content

[compiler-rt] Fix binary-id-offset.c test to not require shell. #157954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 11, 2025
+12 −10
Merged

[compiler-rt] Fix binary-id-offset.c test to not require shell. #157954

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd22baa
[compiler-rt] Fix binary-id-offset.c test to not require shell.
cmtice Sep 10, 2025
173ee3a
Write to temporary file and redirect that to FileCheck (actually
cmtice Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions compiler-rt/test/profile/Linux/binary-id-offset.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,30 @@
// (The DYN case would also apply to libraries, not explicitly tested here.)

// DEFINE: %{cflags} =
// DEFINE: %{check} = ( \
// DEFINE: %clang_profgen -fuse-ld=lld -Wl,--build-id -o %t %s %{cflags} && \
// DEFINE: env LLVM_PROFILE_FILE=%t.profraw %run %t && \
// DEFINE: llvm-readelf --notes %t && \
// DEFINE: llvm-profdata show --binary-ids %t.profraw \
// DEFINE: ) | FileCheck %s

// REDEFINE: %{cflags} = -no-pie
// RUN: %{check}
// RUN: %clang_profgen -fuse-ld=lld -Wl,--build-id -o %t %s %{cflags}
// RUN: env LLVM_PROFILE_FILE=%t.profraw %run %t
// RUN: llvm-readelf --notes %t && llvm-profdata show --binary-ids %t.profraw > FileCheck
Copy link
Contributor

@boomanaiden154 boomanaiden154 Sep 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are now just writing to a file called FileCheck instead of invoking the FileCheck command?

Copy link
Contributor Author

@cmtice cmtice Sep 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was trying to get FileCheck to check the output of these commands (stdout). But maybe you're right?

Copy link
Contributor Author

@cmtice cmtice Sep 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried updating line 12 to be:

RUN: llvm-readelf --notes %t > %t2 && llvm-profdata show --binary-ids %t.pr\ofraw >> %t2 | FileCheck %t2

When I do that and try running the test I get an error:

error: no check strings found with prefix 'CHECK:'

:-(

Copy link
Member

@cuviper cuviper Sep 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this lit internal shell still do grouping? It would need something like (llvm-readelf ... && llvm-profdata ...) | FileCheck %s for the current CHECK lines to work. If not, you could split them into separate --check-prefix commands.

Copy link
Member

@cuviper cuviper Sep 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RUN: llvm-readelf --notes %t > %t2 && llvm-profdata show --binary-ids %t.pr\ofraw >> %t2 | FileCheck %t2

Try ... && FileCheck %s <%t2? It needs the current file (%s) for the CHECK lines, and the test output on stdin.

Copy link
Contributor

@boomanaiden154 boomanaiden154 Sep 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this lit internal shell still do grouping?

It doesn't support subshells. The way we have been handling this is to have multiple commands write out to a file and then pass that to FileCheck using --input-file.

Copy link
Contributor Author

@cmtice cmtice Sep 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RUN: llvm-readelf --notes %t > %t2 && llvm-profdata show --binary-ids %t.pr\ofraw >> %t2 | FileCheck %t2

Try ... && FileCheck %s <%t2? It needs the current file (%s) for the CHECK lines, and the test output on stdin.

This seems to work! Thank you!


// REDEFINE: %{cflags} = -pie -fPIE
// RUN: %{check}
// RUN: %clang_profgen -fuse-ld=lld -Wl,--build-id -o %t %s %{cflags}
// RUN: env LLVM_PROFILE_FILE=%t.profraw %run %t
// RUN: llvm-readelf --notes %t && llvm-profdata show --binary-ids %t.profraw > FileCheck

// Moving the note after .bss also gives it extra LOAD segment padding,
// making its memory offset different than its file offset.
// RUN: echo "SECTIONS { .note.gnu.build-id : {} } INSERT AFTER .bss;" >%t.script

// REDEFINE: %{cflags} = -no-pie -Wl,--script=%t.script
// RUN: %{check}
// RUN: %clang_profgen -fuse-ld=lld -Wl,--build-id -o %t %s %{cflags}
// RUN: env LLVM_PROFILE_FILE=%t.profraw %run %t
// RUN: llvm-readelf --notes %t && llvm-profdata show --binary-ids %t.profraw > FileCheck

// REDEFINE: %{cflags} = -pie -fPIE -Wl,--script=%t.script
// RUN: %{check}
// RUN: %clang_profgen -fuse-ld=lld -Wl,--build-id -o %t %s %{cflags}
// RUN: env LLVM_PROFILE_FILE=%t.profraw %run %t
// RUN: llvm-readelf --notes %t && llvm-profdata show --binary-ids %t.profraw > FileCheck

// CHECK-LABEL{LITERAL}: .note.gnu.build-id
// CHECK: Build ID: [[ID:[0-9a-f]+]]
Expand Down