Skip to content

[InstrProf][NFC] Refactor profdata trace tests #152550

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 2 commits into from
Aug 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 24 additions & 21 deletions llvm/test/tools/llvm-profdata/merge-traces.proftext
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
# RUN: llvm-profdata merge --temporal-profile-trace-reservoir-size=2 %s -o %t.profdata
# RUN: llvm-profdata show --temporal-profile-traces %t.profdata | FileCheck %s --check-prefixes=SAMPLE1,SEEN1
# RUN: llvm-profdata merge --temporal-profile-trace-reservoir-size=2 %s %t.profdata -o %t.profdata
# RUN: llvm-profdata show --temporal-profile-traces %t.profdata | FileCheck %s --check-prefixes=SAMPLE2,SEEN2
# RUN: llvm-profdata merge --temporal-profile-trace-reservoir-size=2 %s %t.profdata -o %t.profdata
# RUN: llvm-profdata show --temporal-profile-traces %t.profdata | FileCheck %s --check-prefixes=SAMPLE2,SEEN3
# RUN: llvm-profdata merge --temporal-profile-trace-reservoir-size=2 %s %t.profdata -o %t.profdata
# RUN: llvm-profdata show --temporal-profile-traces %t.profdata | FileCheck %s --check-prefixes=SAMPLE2,SEEN4

# SEEN1: Temporal Profile Traces (samples=1 seen=1):
# SEEN2: Temporal Profile Traces (samples=2 seen=2):
# SEEN3: Temporal Profile Traces (samples=2 seen=3):
# SEEN4: Temporal Profile Traces (samples=2 seen=4):
# SAMPLE1: Temporal Profile Trace 0 (weight=1 count=3):
# SAMPLE1: a
# SAMPLE1: b
# SAMPLE1: c
# SAMPLE2: Temporal Profile Trace 1 (weight=1 count=3):
# SAMPLE2: a
# SAMPLE2: b
# SAMPLE2: c
# RUN: llvm-profdata merge --temporal-profile-trace-reservoir-size=2 %s --text | FileCheck %s --check-prefixes=CHECK,SEEN1,SAMPLE1

# Merge %s twice so it has two traces
# RUN: llvm-profdata merge --temporal-profile-trace-reservoir-size=2 %s %s --text | FileCheck %s --check-prefixes=CHECK,SEEN2,SAMPLE2
# RUN: llvm-profdata merge --temporal-profile-trace-reservoir-size=2 %s %s -o %t-2.profdata
Copy link
Contributor

Choose a reason for hiding this comment

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

It was confusing to me to see the %s argument repeated. Maybe a comment to explain the intent might help?


# RUN: llvm-profdata merge --temporal-profile-trace-reservoir-size=2 %s %s %s --text | FileCheck %s --check-prefixes=CHECK,SEEN3,SAMPLE2
# RUN: llvm-profdata merge --temporal-profile-trace-reservoir-size=2 %t-2.profdata %s --text | FileCheck %s --check-prefixes=CHECK,SEEN3,SAMPLE2
# RUN: llvm-profdata merge --temporal-profile-trace-reservoir-size=2 %s %t-2.profdata --text | FileCheck %s --check-prefixes=CHECK,SEEN3,SAMPLE2

# RUN: llvm-profdata merge --temporal-profile-trace-reservoir-size=2 %s %s %s %s --text | FileCheck %s --check-prefixes=CHECK,SEEN4,SAMPLE2
# RUN: llvm-profdata merge --temporal-profile-trace-reservoir-size=2 %t-2.profdata %s %s --text | FileCheck %s --check-prefixes=CHECK,SEEN4,SAMPLE2
# RUN: llvm-profdata merge --temporal-profile-trace-reservoir-size=2 %t-2.profdata %t-2.profdata --text | FileCheck %s --check-prefixes=CHECK,SEEN4,SAMPLE2

# CHECK: :temporal_prof_traces
# CHECK: # Num Temporal Profile Traces:
# SAMPLE1: 1
# SAMPLE2: 2
# CHECK: # Temporal Profile Trace Stream Size:
# SEEN1: 1
# SEEN2: 2
# SEEN3: 3
# SEEN4: 4
# CHECK: a,b,c,

# Header
:ir
Expand Down
21 changes: 9 additions & 12 deletions llvm/test/tools/llvm-profdata/read-traces.proftext
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,16 @@
# RUN: llvm-profdata merge -text %t.2.profdata -o %t.3.proftext
# RUN: diff %t.1.proftext %t.3.proftext

# RUN: llvm-profdata show --temporal-profile-traces %t.1.proftext | FileCheck %s
# RUN: llvm-profdata merge -text %s | FileCheck %s

# CHECK: Temporal Profile Traces (samples=3 seen=3):
# CHECK: Temporal Profile Trace 0 (weight=1 count=3):
# CHECK: foo
# CHECK: bar
# CHECK: goo
# CHECK: Temporal Profile Trace 1 (weight=3 count=3):
# CHECK: foo
# CHECK: goo
# CHECK: bar
# CHECK: Temporal Profile Trace 2 (weight=1 count=1):
# CHECK: goo
# CHECK: :temporal_prof_traces
# CHECK: # Num Temporal Profile Traces:
# CHECK-NEXT: 3
# CHECK: # Temporal Profile Trace Stream Size:
# CHECK-NEXT: 3
# CHECK-DAG: foo,bar,goo,
# CHECK-DAG: foo,goo,bar,
# CHECK-DAG: goo,

# Header
:ir
Expand Down
Loading