Skip to content

[PGO][test] Enable continuous mode PGO tests on AIX #115987

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 4 commits into from
Nov 15, 2024
Merged

[PGO][test] Enable continuous mode PGO tests on AIX #115987

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96d0411
[PGO][test] Enable continuous mode PGO tests on AIX
Nov 12, 2024
185013d
code review
Nov 13, 2024
d27b627
add comment and format ContinuousSyncMode/basic.c
Nov 14, 2024
d5d036b
follow the suggested python formatting
Nov 14, 2024
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
10 changes: 7 additions & 3 deletions compiler-rt/test/profile/ContinuousSyncMode/basic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
// REQUIRES: darwin
// REQUIRES: target={{.*(darwin|aix).*}}

// RUN: %clang -fprofile-instr-generate -fcoverage-mapping -o %t.exe %s
// RUN: %clang_profgen_cont -fcoverage-mapping -o %t.exe %s
// RUN: echo "garbage" > %t.profraw
// RUN: env LLVM_PROFILE_FILE="%c%t.profraw" %run %t.exe
// RUN: llvm-profdata show --counts --all-functions %t.profraw | FileCheck %s -check-prefix=CHECK-COUNTS
// RUN: llvm-profdata merge -o %t.profdata %t.profraw
// RUN: llvm-cov report %t.exe -instr-profile %t.profdata | FileCheck %s -check-prefix=CHECK-COVERAGE
//
// COM: The "report" and "show" commands of llvm-cov are not supported on AIX.
// RUN: %if !target={{.*aix.*}} %{ \
// RUN: llvm-cov report %t.exe -instr-profile %t.profdata | FileCheck %s -check-prefix=CHECK-COVERAGE \
// RUN: %}

// CHECK-COUNTS: Counters:
// CHECK-COUNTS-NEXT: main:
Expand Down
4 changes: 2 additions & 2 deletions compiler-rt/test/profile/ContinuousSyncMode/get-filename.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// REQUIRES: darwin
// REQUIRES: target={{.*(darwin|aix).*}}

// RUN: %clang_pgogen -o %t.exe %s
// RUN: %clang_pgogen_cont -o %t.exe %s
// RUN: env LLVM_PROFILE_FILE="%c%t.profraw" %run %t.exe %t.profraw
// RUN: env LLVM_PROFILE_FILE="%t%c.profraw" %run %t.exe %t.profraw
// RUN: env LLVM_PROFILE_FILE="%t.profraw%c" %run %t.exe %t.profraw
Expand Down
4 changes: 2 additions & 2 deletions compiler-rt/test/profile/ContinuousSyncMode/image-with-mcdc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// REQUIRES: darwin
// REQUIRES: target={{.*(darwin|aix).*}}

// RUN: %clang_profgen -fcoverage-mapping -fcoverage-mcdc -O3 -o %t.exe %s
// RUN: %clang_profgen_cont -fcoverage-mapping -fcoverage-mcdc -O3 -o %t.exe %s
// RUN: env LLVM_PROFILE_FILE="%c%t.profraw" %run %t.exe 3 3
// RUN: llvm-profdata show --text --all-functions %t.profraw | FileCheck %s

Expand Down
6 changes: 3 additions & 3 deletions compiler-rt/test/profile/ContinuousSyncMode/image-with-no-counters.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// REQUIRES: darwin
// REQUIRES: target={{.*(darwin|aix).*}}

// RUN: echo "static void dead_code(void) {}" > %t.dso.c
// RUN: %clang_profgen -fcoverage-mapping -O3 -dynamiclib -o %t.dso.dylib %t.dso.c
// RUN: %clang_profgen -fcoverage-mapping -O3 -o %t.exe %s %t.dso.dylib
// RUN: %clang_profgen_cont -fcoverage-mapping -O3 %shared_lib_flag -o %t.dso.dylib %t.dso.c
// RUN: %clang_profgen_cont -fcoverage-mapping -O3 -o %t.exe %s %t.dso.dylib
Comment on lines +4 to +5
Copy link
Contributor

@chapuni chapuni Dec 28, 2024

Choose a reason for hiding this comment

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

I tried enabling this on Linux but couldn't. As far as I investigated, looks like bias var has a few issues. Does this really work on AIX?

Copy link
Contributor Author

@w2yehia w2yehia Dec 29, 2024

Choose a reason for hiding this comment

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

it passes on AIX according to the latest buildbot, (check-all output)

Copy link
Contributor

@chapuni chapuni Dec 29, 2024

Choose a reason for hiding this comment

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

Thanks. Let me know if you met any issues re. bias var.

Copy link
Contributor Author

@w2yehia w2yehia Dec 30, 2024

Choose a reason for hiding this comment

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

what problem are you encountering on linux with this testcase?

Copy link
Contributor

@chapuni chapuni Dec 30, 2024

Choose a reason for hiding this comment

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

bias is not emitted if no instrumentations are emitted. libprofile complains if no bias var is found with continuous mode at runtime.

d2f77eb#diff-71a5c7472b215c25675c554f2ee1f3bbc84f29aa47ba2d30543246ad79aeffc0R654-R657

Copy link
Contributor Author

@w2yehia w2yehia Dec 30, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I see. Yes, the test is passing by accident on AIX: the dynamic library is not being linked in (because it has no reachable code).

If I add reachable code and compile without PGO but link in the PGO library, then I get, at runtime, the following
LLVM Profile Error: Neither __llvm_profile_counter_bias nor __llvm_profile_bitmap_bias is defined

// RUN: env LLVM_PROFILE_FILE="%c%t.profraw" %run %t.exe 2>&1 | count 0
// RUN: llvm-profdata show --counts --all-functions %t.profraw | FileCheck %s

Expand Down
8 changes: 4 additions & 4 deletions compiler-rt/test/profile/ContinuousSyncMode/online-merging.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// REQUIRES: darwin
// REQUIRES: target={{.*(darwin|aix).*}}

// Test the online merging mode (%m) along with continuous mode (%c).
//
Expand All @@ -8,9 +8,9 @@
// Create two DSOs and a driver program that uses them.
// RUN: echo "void dso1(void) {}" > dso1.c
// RUN: echo "void dso2(void) {}" > dso2.c
// RUN: %clang_pgogen -dynamiclib -o %t.dir/dso1.dylib dso1.c -mllvm -instrprof-atomic-counter-update-all=1
// RUN: %clang_pgogen -dynamiclib -o %t.dir/dso2.dylib dso2.c -mllvm -instrprof-atomic-counter-update-all=1
// RUN: %clang_pgogen -o main.exe %s %t.dir/dso1.dylib %t.dir/dso2.dylib -mllvm -instrprof-atomic-counter-update-all=1
// RUN: %clang_pgogen_cont %shared_lib_flag -o %t.dir/dso1.dylib dso1.c -mllvm -instrprof-atomic-counter-update-all=1
// RUN: %clang_pgogen_cont %shared_lib_flag -o %t.dir/dso2.dylib dso2.c -mllvm -instrprof-atomic-counter-update-all=1
// RUN: %clang_pgogen_cont -o main.exe %s %t.dir/dso1.dylib %t.dir/dso2.dylib -mllvm -instrprof-atomic-counter-update-all=1
//
// === Round 1 ===
// Test merging+continuous mode without any file contention.
Expand Down
4 changes: 2 additions & 2 deletions compiler-rt/test/profile/ContinuousSyncMode/pid-substitution.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// REQUIRES: darwin
// REQUIRES: target={{.*(darwin|aix).*}}

// RUN: rm -rf %t.dir && mkdir -p %t.dir
// RUN: %clang_pgogen -o %t.exe %s
// RUN: %clang_pgogen_cont -o %t.exe %s
//
// Note: %%p is needed here, not %p, because of lit's path substitution.
// RUN: env LLVM_PROFILE_FILE="%t.dir/%c-%%p" %run %t.exe
Expand Down
2 changes: 1 addition & 1 deletion compiler-rt/test/profile/ContinuousSyncMode/reset-default-profile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// REQUIRES: darwin || linux
// REQUIRES: target={{.*(darwin|linux|aix).*}}

// Test when LLVM_PROFILE_FILE is set incorrectly, it should fall backs to use default.profraw without runtime error.

Expand Down
4 changes: 2 additions & 2 deletions compiler-rt/test/profile/ContinuousSyncMode/set-filename.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// REQUIRES: darwin
// REQUIRES: target={{.*(darwin|aix).*}}

// RUN: %clang_pgogen -o %t.exe %s
// RUN: %clang_pgogen_cont -o %t.exe %s
// RUN: env LLVM_PROFILE_FILE="%c%t.profraw" %run %t.exe %t.profraw %t.bad

#include <string.h>
Expand Down
15 changes: 15 additions & 0 deletions compiler-rt/test/profile/lit.cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ def get_required_attr(config, attr_name):

target_is_msvc = bool(re.match(r".*-windows-msvc$", config.target_triple))

# Whether continous profile collection (%c) requires runtime counter relocation on this platform
runtime_reloc = bool(config.host_os in ["AIX"])

if config.host_os in ["Linux"]:
extra_link_flags = ["-ldl"]
elif target_is_msvc:
Expand Down Expand Up @@ -94,6 +97,10 @@ def exclude_unsupported_files_for_aix(dirname):
config.substitutions.append(
("%clang_profgen=", build_invocation(clang_cflags) + " -fprofile-instr-generate=")
)
config.substitutions.append(
("%clang_profgen_cont ", build_invocation(clang_cflags) + " -fprofile-instr-generate " +
("-mllvm -runtime-counter-relocation " if runtime_reloc else ""))
)
config.substitutions.append(
(
"%clangxx_profgen ",
Expand All @@ -113,6 +120,10 @@ def exclude_unsupported_files_for_aix(dirname):
config.substitutions.append(
("%clang_pgogen=", build_invocation(clang_cflags) + " -fprofile-generate=")
)
config.substitutions.append(
("%clang_pgogen_cont ", build_invocation(clang_cflags) + " -fprofile-generate " +
("-mllvm -runtime-counter-relocation " if runtime_reloc else ""))
)
config.substitutions.append(
("%clangxx_pgogen ", build_invocation(clang_cxxflags) + " -fprofile-generate ")
)
Expand Down Expand Up @@ -166,6 +177,10 @@ def exclude_unsupported_files_for_aix(dirname):
]:
config.unsupported = True

config.substitutions.append(
("%shared_lib_flag", "-dynamiclib" if (config.host_os == "Darwin") else "-shared")
)

if config.host_os in ["AIX"]:
config.available_features.add("system-aix")
exclude_unsupported_files_for_aix(config.test_source_root)
Expand Down
Loading