Skip to content

[PGO][Offload] Use %profdata in PGO tests #135015

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.

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 1 commit into from
Apr 9, 2025

Conversation

jdenny-ornl
Copy link
Collaborator

So that the wrong llvm-profdata is not picked up from PATH.

So that the wrong llvm-profdata is not picked up from PATH.
@llvmbot
Copy link
Member

llvmbot commented Apr 9, 2025

@llvm/pr-subscribers-offload

Author: Joel E. Denny (jdenny-ornl)

Changes

So that the wrong llvm-profdata is not picked up from PATH.


Full diff: https://github.com/llvm/llvm-project/pull/135015.diff

2 Files Affected:

  • (modified) offload/test/offloading/gpupgo/pgo1.c (+2-2)
  • (modified) offload/test/offloading/gpupgo/pgo2.c (+9-9)
diff --git a/offload/test/offloading/gpupgo/pgo1.c b/offload/test/offloading/gpupgo/pgo1.c
index af6d8e806cd37..1159858c51218 100644
--- a/offload/test/offloading/gpupgo/pgo1.c
+++ b/offload/test/offloading/gpupgo/pgo1.c
@@ -2,7 +2,7 @@
 // RUN:     -Xarch_device -fprofile-generate
 // RUN: env LLVM_PROFILE_FILE=%basename_t.llvm.profraw \
 // RUN:     %libomptarget-run-generic 2>&1
-// RUN: llvm-profdata show --all-functions --counts \
+// RUN: %profdata show --all-functions --counts \
 // RUN:     %target_triple.%basename_t.llvm.profraw | \
 // RUN:     %fcheck-generic --check-prefix="LLVM-PGO"
 
@@ -10,7 +10,7 @@
 // RUN:     -Xarch_device -fprofile-instr-generate
 // RUN: env LLVM_PROFILE_FILE=%basename_t.clang.profraw \
 // RUN:     %libomptarget-run-generic 2>&1
-// RUN: llvm-profdata show --all-functions --counts \
+// RUN: %profdata show --all-functions --counts \
 // RUN:     %target_triple.%basename_t.clang.profraw | \
 // RUN:     %fcheck-generic --check-prefix="CLANG-PGO"
 
diff --git a/offload/test/offloading/gpupgo/pgo2.c b/offload/test/offloading/gpupgo/pgo2.c
index b67a63bc8fc3d..af3ad9e4a6c19 100644
--- a/offload/test/offloading/gpupgo/pgo2.c
+++ b/offload/test/offloading/gpupgo/pgo2.c
@@ -1,27 +1,27 @@
 // RUN: %libomptarget-compile-generic -fprofile-generate
 // RUN: env LLVM_PROFILE_FILE=%basename_t.llvm.profraw \
 // RUN:     %libomptarget-run-generic 2>&1
-// RUN: llvm-profdata show --all-functions --counts \
+// RUN: %profdata show --all-functions --counts \
 // RUN:     %basename_t.llvm.profraw | %fcheck-generic \
 // RUN:     --check-prefix="LLVM-HOST"
-// RUN: llvm-profdata show --all-functions --counts \
+// RUN: %profdata show --all-functions --counts \
 // RUN:     %target_triple.%basename_t.llvm.profraw \
 // RUN:     | %fcheck-generic --check-prefix="LLVM-DEVICE"
 
 // RUN: %libomptarget-compile-generic -fprofile-instr-generate
 // RUN: env LLVM_PROFILE_FILE=%basename_t.clang.profraw \
 // RUN:     %libomptarget-run-generic 2>&1
-// RUN: llvm-profdata show --all-functions --counts \
+// RUN: %profdata show --all-functions --counts \
 // RUN:     %basename_t.clang.profraw | %fcheck-generic \
 // RUN:     --check-prefix="CLANG-HOST"
-// RUN: llvm-profdata show --all-functions --counts \
+// RUN: %profdata show --all-functions --counts \
 // RUN:     %target_triple.%basename_t.clang.profraw | \
 // RUN:     %fcheck-generic --check-prefix="CLANG-DEV"
 
 // RUN: %libomptarget-compile-generic -Xarch_host -fprofile-generate
 // RUN: env LLVM_PROFILE_FILE=%basename_t.nogpu.profraw \
 // RUN:     %libomptarget-run-generic 2>&1
-// RUN: llvm-profdata show --all-functions --counts \
+// RUN: %profdata show --all-functions --counts \
 // RUN:     %basename_t.nogpu.profraw | %fcheck-generic \
 // RUN:     --check-prefix="LLVM-HOST"
 // RUN: not test -e %target_triple.%basename_t.nogpu.profraw
@@ -30,10 +30,10 @@
 // RUN:     -Xarch_device -fprofile-instr-generate
 // RUN: env LLVM_PROFILE_FILE=%basename_t.hidf.profraw \
 // RUN:     %libomptarget-run-generic 2>&1
-// RUN: llvm-profdata show --all-functions --counts \
+// RUN: %profdata show --all-functions --counts \
 // RUN:     %basename_t.hidf.profraw | %fcheck-generic \
 // RUN:     --check-prefix="LLVM-HOST"
-// RUN: llvm-profdata show --all-functions --counts \
+// RUN: %profdata show --all-functions --counts \
 // RUN:     %target_triple.%basename_t.hidf.profraw \
 // RUN:     | %fcheck-generic --check-prefix="CLANG-DEV"
 
@@ -41,10 +41,10 @@
 // RUN:     -Xarch_host -fprofile-instr-generate
 // RUN: env LLVM_PROFILE_FILE=%basename_t.hfdi.profraw \
 // RUN:     %libomptarget-run-generic 2>&1
-// RUN: llvm-profdata show --all-functions --counts \
+// RUN: %profdata show --all-functions --counts \
 // RUN:     %basename_t.hfdi.profraw | %fcheck-generic \
 // RUN:     --check-prefix="CLANG-HOST"
-// RUN: llvm-profdata show --all-functions --counts \
+// RUN: %profdata show --all-functions --counts \
 // RUN:     %target_triple.%basename_t.hfdi.profraw \
 // RUN:     | %fcheck-generic --check-prefix="LLVM-DEVICE"
 

@jdenny-ornl jdenny-ornl merged commit ad9f6d3 into llvm:main Apr 9, 2025
11 checks passed
AllinLeeYL pushed a commit to AllinLeeYL/llvm-project that referenced this pull request Apr 10, 2025
So that the wrong llvm-profdata is not picked up from PATH.
var-const pushed a commit to ldionne/llvm-project that referenced this pull request Apr 17, 2025
So that the wrong llvm-profdata is not picked up from PATH.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants