Skip to content

Commit

Permalink
[llvm-profgen] Update total samples by accumulating all its body samples
Browse files Browse the repository at this point in the history 
Like probe-based profile, the total samples is the sum of all its body samples. This patch fix it by a post-processing update for the line-number based profile. Tested it on our internal services, results showed no performance change.

Reviewed By: hoy, wenlei

Differential Revision: https://reviews.llvm.org/D112672
  • Loading branch information
@wlei-llvm
wlei-llvm committed Oct 29, 2021
1 parent 8314a04 commit f553764
Show file tree
Hide file tree
Showing 17 changed files with 119 additions and 93 deletions.
14 changes: 14 additions & 0 deletions llvm/include/llvm/ProfileData/SampleProf.h
View file
Expand Up @@ -731,6 +731,20 @@ class FunctionSamples {
return BodySamples[LineLocation(Index, 0)].merge(S, Weight);
}

// Accumulate all body samples to set total samples.
void updateTotalSamples() {
setTotalSamples(0);
for (const auto &I : BodySamples)
addTotalSamples(I.second.getSamples());

for (auto &I : CallsiteSamples) {
for (auto &CS : I.second) {
CS.second.updateTotalSamples();
addTotalSamples(CS.second.getTotalSamples());
}
}
}

/// Return the number of samples collected at the given location.
/// Each location is specified by \p LineOffset and \p Discriminator.
/// If the location is not found in profile, return error.
Expand Down
2 changes: 1 addition & 1 deletion llvm/test/tools/llvm-profgen/coroutine.test
View file
Expand Up @@ -2,7 +2,7 @@
; RUN: FileCheck %s --input-file %t --check-prefix=CHECK

; Check that the head sample count for ticker is 0.
; CHECK: _Z6tickeri:353:0
; CHECK: _Z6tickeri:67:0
; CHECK-NOT: _Z6tickeri.resume


Expand Down
8 changes: 4 additions & 4 deletions llvm/test/tools/llvm-profgen/cs-interrupt.test
View file
Expand Up @@ -6,14 +6,14 @@
>>>>>>> 02ea7084c370 ([llvm-profgen] Support LBR only perf script)
; RUN: FileCheck %s --input-file %t

; CHECK:[main:1 @ foo]:88:0
; CHECK: 2: 5
; CHECK: 3: 5 bar:5
; CHECK:[main:1 @ foo:3 @ bar]:74:5
; CHECK:[main:1 @ foo:3 @ bar]:17:5
; CHECK: 0: 5
; CHECK: 1: 5
; CHECK: 2: 3
; CHECK: 5: 4
; CHECK:[main:1 @ foo]:10:0
; CHECK: 2: 5
; CHECK: 3: 5 bar:5

; CHECK-UNWINDER: [main:1 @ foo]
; CHECK-UNWINDER-NEXT: 3
Expand Down
16 changes: 8 additions & 8 deletions llvm/test/tools/llvm-profgen/cs-preinline.test
View file
Expand Up @@ -15,37 +15,37 @@

; RUN: FileCheck %s --input-file %t --check-prefix=CHECK-TRIM

; CHECK-DEFAULT: [main:1 @ foo]:225:0
; CHECK-DEFAULT: [main:1 @ foo]:44:0
; CHECK-DEFAULT-NEXT: 2.1: 14
; CHECK-DEFAULT-NEXT: 3: 15
; CHECK-DEFAULT-NEXT: 3.1: 14 bar:14
; CHECK-DEFAULT-NEXT: 3.2: 1
; CHECK-DEFAULT-NEXT: !Attributes: 1
; CHECK-DEFAULT-NEXT:[main:1 @ foo:3.1 @ bar]:84:0
; CHECK-DEFAULT-NEXT:[main:1 @ foo:3.1 @ bar]:14:0
; CHECK-DEFAULT-NEXT: 1: 14
; CHECK-DEFAULT-NEXT: !Attributes: 1

; CHECK-PREINL: [foo]:225:0
; CHECK-PREINL: [foo]:44:0
; CHECK-PREINL-NEXT: 2.1: 14
; CHECK-PREINL-NEXT: 3: 15
; CHECK-PREINL-NEXT: 3.1: 14 bar:14
; CHECK-PREINL-NEXT: 3.2: 1
; CHECK-PREINL-NEXT: !Attributes: 1
; CHECK-PREINL-NEXT:[foo:3.1 @ bar]:84:0
; CHECK-PREINL-NEXT:[foo:3.1 @ bar]:14:0
; CHECK-PREINL-NEXT: 1: 14
; CHECK-PREINL-NEXT: !Attributes: 3

; CHECK-NO-PREINL: [foo]:225:0
; CHECK-NO-PREINL: [foo]:44:0
; CHECK-NO-PREINL-NEXT: 2.1: 14
; CHECK-NO-PREINL-NEXT: 3: 15
; CHECK-NO-PREINL-NEXT: 3.1: 14 bar:14
; CHECK-NO-PREINL-NEXT: 3.2: 1
; CHECK-NO-PREINL-NEXT: !Attributes: 1
; CHECK-NO-PREINL-NEXT:[bar]:84:0
; CHECK-NO-PREINL-NEXT:[bar]:14:0
; CHECK-NO-PREINL-NEXT: 1: 14
; CHECK-NO-PREINL-NEXT: !Attributes: 1

; CHECK-TRIM-NOT: [foo]:225:0
; CHECK-TRIM:[foo:3.1 @ bar]:84:0
; CHECK-TRIM-NOT: [foo]
; CHECK-TRIM:[foo:3.1 @ bar]:14:0
; CHECK-TRIM-NEXT: 1: 14
; CHECK-TRIM-NEXT: !Attributes: 3
4 changes: 2 additions & 2 deletions llvm/test/tools/llvm-profgen/fname-canonicalization.test
View file
Expand Up @@ -2,10 +2,10 @@
; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/unique-linkage-name-dwarf.perfscript --binary=%S/Inputs/unique-linkage-name-dwarf.perfbin --output=%t --profile-summary-cold-count=0
; RUN: FileCheck %s --input-file %t --check-prefix=CHECK-DWARF-FNAME

; CHECK-DWARF-FNAME:[main:1 @ foo]:225:0
; CHECK-DWARF-FNAME:[main:1 @ foo]:43:0
; CHECK-DWARF-FNAME: 2: 14
; CHECK-DWARF-FNAME: 3: 29 bar.__uniq.26267048767521081047744692097241227776:14
; CHECK-DWARF-FNAME:[main:1 @ foo:3 @ bar.__uniq.26267048767521081047744692097241227776]:84:0
; CHECK-DWARF-FNAME:[main:1 @ foo:3 @ bar.__uniq.26267048767521081047744692097241227776]:14:0
; CHECK-DWARF-FNAME: 1: 14


Expand Down
8 changes: 4 additions & 4 deletions llvm/test/tools/llvm-profgen/func-split.test
View file
Expand Up @@ -3,26 +3,26 @@
; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/func-split.perfscript --binary=%S/Inputs/func-split.perfbin --output=%t --ignore-stack-samples
; RUN: FileCheck %s --input-file %t --check-prefix=CHECK-STRIP-CTX

;CHECK: [foo]:408:0
;CHECK: [foo]:82:0
;CHECK: 2.1: 27
;CHECK: 3: 27
;CHECK: 3.1: 2 bar:2
;CHECK: 3.2: 26
;CHECK: [foo:3.1 @ bar]:8:0
;CHECK: [foo:3.1 @ bar]:2:0
;CHECK: 1: 1
;CHECK: 5: 1
;CHECK: [bar]:0:1

;CHECK-NOT: foo.cold

;CHECK-STRIP-CTX: foo:408:0
;CHECK-STRIP-CTX: foo:81:0
;CHECK-STRIP-CTX: 0: 0
;CHECK-STRIP-CTX: 2.1: 27
;CHECK-STRIP-CTX: 3: 27
;CHECK-STRIP-CTX: 3.1: 1 bar:1
;CHECK-STRIP-CTX: 3.2: 26
;CHECK-STRIP-CTX: 4: 0
;CHECK-STRIP-CTX: bar:8:1
;CHECK-STRIP-CTX: bar:2:1
;CHECK-STRIP-CTX: 1: 1
;CHECK-STRIP-CTX: 5: 1

Expand Down
10 changes: 5 additions & 5 deletions llvm/test/tools/llvm-profgen/inline-cs-noprobe.test
View file
Expand Up @@ -13,12 +13,12 @@
; CHECK-SYM-LIST: foo
; CHECK-SYM-LIST: main

; CHECK:[main:1 @ foo]:225:0
; CHECK:[main:1 @ foo]:44:0
; CHECK: 2.1: 14
; CHECK: 3: 15
; CHECK: 3.1: 14 bar:14
; CHECK: 3.2: 1
; CHECK:[main:1 @ foo:3.1 @ bar]:84:0
; CHECK:[main:1 @ foo:3.1 @ bar]:14:0
; CHECK: 1: 14

; CHECK-UNWINDER: [main:1 @ foo]
Expand All @@ -34,16 +34,16 @@
; CHECK-UNWINDER: 6af-6bb:14
; CHECK-UNWINDER: 0

; CHECK-STRIP-CTX: main:295:0
; CHECK-STRIP-CTX: main:44:0
; CHECK-STRIP-CTX: 0: 0
; CHECK-STRIP-CTX: 2: 0
; CHECK-STRIP-CTX: 1: foo:295
; CHECK-STRIP-CTX: 1: foo:44
; CHECK-STRIP-CTX: 2.1: 14
; CHECK-STRIP-CTX: 3: 15
; CHECK-STRIP-CTX: 3.2: 1
; CHECK-STRIP-CTX: 4: 0
; CHECK-STRIP-CTX: 7: 0
; CHECK-STRIP-CTX: 3.1: bar:84
; CHECK-STRIP-CTX: 3.1: bar:14
; CHECK-STRIP-CTX: 1: 14

; original code:
Expand Down
6 changes: 3 additions & 3 deletions llvm/test/tools/llvm-profgen/inline-force-dwarf.test
View file
@@ -1,14 +1,14 @@
; RUN: llvm-profgen --format=text --ignore-stack-samples --use-dwarf-correlation --perfscript=%S/Inputs/inline-cs-pseudoprobe.perfscript --binary=%S/Inputs/inline-cs-pseudoprobe.perfbin --output=%t --profile-summary-cold-count=0
; RUN: FileCheck %s --input-file %t

; CHECK: main:295:0
; CHECK: main:43:0
; CHECK-NEXT: 0: 0
; CHECK-NEXT: 2: 0
; CHECK-NEXT: 1: foo:295
; CHECK-NEXT: 1: foo:43
; CHECK-NEXT: 2: 14
; CHECK-NEXT: 3: 15
; CHECK-NEXT: 4: 0
; CHECK-NEXT: 3: bar:84
; CHECK-NEXT: 3: bar:14
; CHECK-NEXT: 1: 14


Expand Down
8 changes: 4 additions & 4 deletions llvm/test/tools/llvm-profgen/inline-noprobe.test
View file
Expand Up @@ -7,17 +7,17 @@
; RUN: llvm-profgen --format=text --use-dwarf-correlation --perfscript=%S/Inputs/inline-noprobe.perfscript --binary=%S/Inputs/inline-noprobe.perfbin --output=%t
; RUN: FileCheck %s --input-file %t --check-prefix=CHECK

CHECK: main:669:0
CHECK: main:188:0
CHECK: 0: 0
CHECK: 2: 0
CHECK: 1: foo:669
CHECK: 1: foo:188
CHECK: 2.1: 42
CHECK: 3: 62
CHECK: 3.2: 21
CHECK: 4: 0
CHECK: 3.1: bar:210
CHECK: 3.1: bar:42
CHECK: 1: 42
CHECK: 3.2: bar:63
CHECK: 3.2: bar:21
CHECK: 1: 21

CHECK-RAW-PROFILE: 3
Expand Down
16 changes: 8 additions & 8 deletions llvm/test/tools/llvm-profgen/inline-noprobe2.test
View file
Expand Up @@ -27,7 +27,7 @@
;CHECK-RAW-PROFILE-NOT: 7f7448e889e4
;CHECK-RAW-PROFILE-NOT: 7f7448e88826

;CHECK: partition_pivot_first:1045:5
;CHECK: partition_pivot_first:367:5
;CHECK-NEXT: 0: 5
;CHECK-NEXT: 1: 5
;CHECK-NEXT: 2: 5
Expand All @@ -39,15 +39,15 @@
;CHECK-NEXT: 4.3: 26
;CHECK-NEXT: 5: 6
;CHECK-NEXT: 6: 6
;CHECK-NEXT: 4.2: swap:100
;CHECK-NEXT: 4.2: swap:75
;CHECK-NEXT: 1: 25
;CHECK-NEXT: 2: 25
;CHECK-NEXT: 3: 25
;CHECK-NEXT: 5: swap:24
;CHECK-NEXT: 5: swap:18
;CHECK-NEXT: 1: 6
;CHECK-NEXT: 2: 6
;CHECK-NEXT: 3: 6
;CHECK-NEXT: partition_pivot_last:389:7
;CHECK-NEXT: partition_pivot_last:225:7
;CHECK-NEXT: 1: 6
;CHECK-NEXT: 2: 6
;CHECK-NEXT: 3: 6
Expand All @@ -63,7 +63,7 @@

;CHECK-NEXT: 6: 5
;CHECK-NEXT: 7: 5
;CHECK-NEXT: 5: swap:61
;CHECK-NEXT: 5: swap:54

;w/o duplication factor : 1: 9
;w/o duplication factor : 2: 9
Expand All @@ -72,17 +72,17 @@
;CHECK-NEXT: 2: 18
;CHECK-NEXT: 3: 18

;CHECK-NEXT: 6: swap:20
;CHECK-NEXT: 6: swap:15
;CHECK-NEXT: 1: 5
;CHECK-NEXT: 2: 5
;CHECK-NEXT: 3: 5
;CHECK-NEXT: quick_sort:318:25
;CHECK-NEXT: quick_sort:83:25
;CHECK-NEXT: 1: 24
;CHECK-NEXT: 2: 12 partition_pivot_last:7 partition_pivot_first:5
;CHECK-NEXT: 3: 11 quick_sort:12
;CHECK-NEXT: 4: 12 quick_sort:12
;CHECK-NEXT: 6: 24
;CHECK-NEXT: main:213:0
;CHECK-NEXT: main:52:0
;CHECK-NEXT: 0: 0
;CHECK-NEXT: 3: 0
;CHECK-NEXT: 4.1: 0
Expand Down
2 changes: 1 addition & 1 deletion llvm/test/tools/llvm-profgen/multi-load-segs.test
View file
Expand Up @@ -9,7 +9,7 @@
;; LOAD 0x000e10 0x0000000000203e10 0x0000000000203e10 0x000040 0x000058 RW 0x1000
;; LOAD 0x200000 0x0000000000400000 0x0000000000400000 0x0005e8 0x0005e8 R E 0x200000

; CHECK: [main:2 @ _Z10sort_arrayv:6 @ _Z11bubble_sortPii]:434:0
; CHECK: [main:2 @ _Z10sort_arrayv:6 @ _Z11bubble_sortPii]:124:0
; CHECK-NEXT: 4: 31
; CHECK-NEXT: 5: 31
; CHECK-NEXT: 7: 31
Expand Down
31 changes: 16 additions & 15 deletions llvm/test/tools/llvm-profgen/noinline-cs-noprobe.test
View file
Expand Up @@ -19,15 +19,16 @@
; RUN: diff -b %t.summary %t2.summary


; CHECK-AGG:[main:1 @ foo]:108:0
; CHECK-AGG: 2: 6
; CHECK-AGG: 3: 6 bar:6
; CHECK-AGG:[main:1 @ foo:3 @ bar]:100:6
; CHECK-AGG:[main:1 @ foo:3 @ bar]:24:6
; CHECK-AGG: 0: 6
; CHECK-AGG: 1: 6
; CHECK-AGG: 2: 4
; CHECK-AGG: 4: 2
; CHECK-AGG: 5: 6
; CHECK-AGG:[main:1 @ foo]:12:0
; CHECK-AGG: 2: 6
; CHECK-AGG: 3: 6 bar:6


; CHECK-AGG-UNWINDER: [main:1 @ foo]
; CHECK-AGG-UNWINDER-NEXT: 3
Expand All @@ -50,29 +51,29 @@
; CHECK-AGG-UNWINDER-NEXT: 5e9->634:6


; CHECK:[main:1 @ foo]:54:0
; CHECK: 2: 3
; CHECK: 3: 3 bar:3
; CHECK:[main:1 @ foo:3 @ bar]:50:3
; CHECK:[main:1 @ foo:3 @ bar]:12:3
; CHECK: 0: 3
; CHECK: 1: 3
; CHECK: 2: 2
; CHECK: 4: 1
; CHECK: 5: 3
; CHECK:[main:1 @ foo]:6:0
; CHECK: 2: 3
; CHECK: 3: 3 bar:3

; CHECK-STRIP-CTX: foo:57:0
; CHECK-STRIP-CTX: bar:12:3
; CHECK-STRIP-CTX: 0: 3
; CHECK-STRIP-CTX: 1: 3
; CHECK-STRIP-CTX: 2: 2
; CHECK-STRIP-CTX: 4: 1
; CHECK-STRIP-CTX: 5: 3
; CHECK-STRIP-CTX: foo:6:0
; CHECK-STRIP-CTX: 0: 0
; CHECK-STRIP-CTX: 1: 0
; CHECK-STRIP-CTX: 2: 3
; CHECK-STRIP-CTX: 3: 3 bar:3
; CHECK-STRIP-CTX: 4: 0
; CHECK-STRIP-CTX: 5: 0
; CHECK-STRIP-CTX: bar:50:3
; CHECK-STRIP-CTX: 0: 3
; CHECK-STRIP-CTX: 1: 3
; CHECK-STRIP-CTX: 2: 2
; CHECK-STRIP-CTX: 4: 1
; CHECK-STRIP-CTX: 5: 3

; CHECK-UNWINDER: [main:1 @ foo]
; CHECK-UNWINDER-NEXT: 3
Expand Down
12 changes: 8 additions & 4 deletions llvm/test/tools/llvm-profgen/noinline-noprobe.test
View file
Expand Up @@ -7,15 +7,19 @@
; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/noprobe.perfscript --binary=%S/Inputs/noprobe.perfbin --output=%t
; RUN: FileCheck %s --input-file %t --check-prefix=CHECK

CHECK: foo:360:0
CHECK: 2: 19
CHECK: 3: 19 bar:21
CHECK: bar:324:21
CHECK: bar:77:21
CHECK: 0: 20
CHECK: 1: 20
CHECK: 2: 13
CHECK: 4: 6
CHECK: 5: 18
CHECK: foo:38:0
CHECK: 0: 0
CHECK: 1: 0
CHECK: 2: 19
CHECK: 3: 19 bar:21
CHECK: 4: 0
CHECK: 5: 0

CHECK-RAW-PROFILE: 7
CHECK-RAW-PROFILE-NEXT: 5b0-5c8:7
Expand Down

0 comments on commit f553764

Please sign in to comment.