[llvm-profgen] Fix total samples related issues

[wlei]

Summary

Since total sample and body sample are used to compute hotness threshold in compiler, we found in some services changing the total samples computation will cause noticeable regression. Hence, here we will revert the changes and just keep all total samples number identical to the old tool.

Three changes in this diff:

1. Revert previous diff(https://reviews.llvm.org/D112672: [llvm-profgen] Update total samples by accumulating all its body samples) and put it under a switch.

2. Keep the negative line number. Although compiler doesn't consume the count but it will be used to compute hot threshold.

3. Change to accumulate total samples per byte instead of per instruction.

[hoy]

llvm/tools/llvm-profgen/ProfileGenerator.cpp

494

This doesn't really makes sense. Wondering how much it matters, compared to other places that affect total samples.

[wlei]

llvm/tools/llvm-profgen/ProfileGenerator.cpp

494

This place caused 0.1% regression(I confirmed it's not noise) on unicorn, no regression on ads. With others together, they caused ~0.5% regression on unicorn.

[hoy]

lgtm, thanks.

llvm/tools/llvm-profgen/ProfileGenerator.cpp

494

Thanks for the update. Looks like we need to keep this. Please add a comment for this.

[wlei]

add comments about changing counts perf byte

[wenlei]

lgtm, thanks.

[thakis]

Looks like this broke check-llvm everywhere:
http://45.33.8.238/linux/62639/step_12.txt
https://lab.llvm.org/buildbot/#/builders/109/builds/27655

Please revert.

[wlei]

In D115013#3180822, @thakis wrote:

Looks like this broke check-llvm everywhere:
http://45.33.8.238/linux/62639/step_12.txt
https://lab.llvm.org/buildbot/#/builders/109/builds/27655

Please revert.

Sorry for that, have a fix in https://reviews.llvm.org/rG5d66113afce3

[thakis]

Thanks for the fix :)

llvm/test/tools/llvm-profgen/cold-profile-trimming.test

 ; RUN: llvm-profgen --format=text --unsymbolized-profile=%S/Inputs/cold-profile-trimming.raw.prof --binary=%S/Inputs/inline-noprobe2.perfbin --output=%t1 --use-offset=0 --trim-cold-profile=0
 ; RUN: FileCheck %s --input-file %t1 --check-prefix=CHECK-NOTRIM
-; RUN: llvm-profgen --format=text --unsymbolized-profile=%S/Inputs/cold-profile-trimming.raw.prof --binary=%S/Inputs/inline-noprobe2.perfbin --output=%t1 --use-offset=0 --trim-cold-profile=1 --profile-summary-cold-count=100
+; RUN: llvm-profgen --format=text --unsymbolized-profile=%S/Inputs/cold-profile-trimming.raw.prof --binary=%S/Inputs/inline-noprobe2.perfbin --output=%t1 --use-offset=0 --trim-cold-profile=1 --profile-summary-cold-count=1000
 ; RUN: FileCheck %s --input-file %t1 --check-prefix=CHECK-TRIM
 
-;CHECK-NOTRIM: partition_pivot_last:1091:7
-;CHECK-NOTRIM: partition_pivot_first:365:5
-;CHECK-NOTRIM: quick_sort:83:25
-;CHECK-NOTRIM: main:52:0
-
-;CHECK-TRIM: partition_pivot_last:1091:7
-;CHECK-TRIM: partition_pivot_first:365:5
-;CHECK-TRIM-NOT: quick_sort:83:25
-;CHECK-TRIM-NOT: main:52:0
+;CHECK-NOTRIM: partition_pivot_last:5187:7
+;CHECK-NOTRIM: partition_pivot_first:3010:5
+;CHECK-NOTRIM: quick_sort:903:25
+;CHECK-NOTRIM: main:820:0
+
+;CHECK-TRIM: partition_pivot_last:5187:7
+;CHECK-TRIM: partition_pivot_first:3010:5
+;CHECK-TRIM-NOT: quick_sort:903:25
+;CHECK-TRIM-NOT: main:820:0
 
 ; original code:
 ; clang -O3 -g -fno-optimize-sibling-calls -fdebug-info-for-profiling qsort.c -o a.out
 #include <stdio.h>
 #include <stdlib.h>
 
 void swap(int *a, int *b) {
   int t = *a;

llvm/test/tools/llvm-profgen/coroutine.test

 ; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/coroutine.perfscript --binary=%S/Inputs/coroutine.perfbin --output=%t
 ; RUN: FileCheck %s --input-file %t --check-prefix=CHECK
 
 ; Check that the head sample count for ticker is 0.
-; CHECK: _Z6tickeri:67:0
+; CHECK: _Z6tickeri:1566:0
 ; CHECK-NOT: _Z6tickeri.resume
 
 
 /*
  * Inputs/coroutine.perfbin is generated by compiling the following source code:
  * clang++ coroutine.cpp -std=c++2a -g2 -o coroutine
  */
 

llvm/test/tools/llvm-profgen/cs-interrupt.test

 ;; The test fails on Windows. Fix it before removing the following requirement.
 ; REQUIRES: x86_64-linux
 ; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/cs-interrupt.perfscript --binary=%S/Inputs/noinline-cs-noprobe.perfbin --output=%t --skip-symbolization --profile-summary-cold-count=0
 ; RUN: FileCheck %s --input-file %t --check-prefix=CHECK-UNWINDER
 ; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/cs-interrupt.perfscript --binary=%S/Inputs/noinline-cs-noprobe.perfbin --output=%t --profile-summary-cold-count=0
 >>>>>>> 02ea7084c370 ([llvm-profgen] Support LBR only perf script)
 ; RUN: FileCheck %s --input-file %t
 
-; CHECK:[main:1 @ foo:3 @ bar]:17:5
+; CHECK:[main:1 @ foo]:88:0
+; CHECK: 2: 5
+; CHECK: 3: 5 bar:5
+; CHECK:[main:1 @ foo:3 @ bar]:74: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
 ; CHECK-UNWINDER-NEXT:   5ff-62f:5
 ; CHECK-UNWINDER-NEXT:   634-637:4
 ; CHECK-UNWINDER-NEXT:   645-645:5
 ; CHECK-UNWINDER-NEXT:   3
 ; CHECK-UNWINDER-NEXT:   62f->5b0:5

llvm/test/tools/llvm-profgen/cs-preinline.test

 ; Test default llvm-profgen with preinline off
 ; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/inline-cs-noprobe.perfscript --binary=%S/Inputs/inline-cs-noprobe.perfbin --output=%t
 ; RUN: FileCheck %s --input-file %t --check-prefix=CHECK-DEFAULT
 
 ; Test llvm-profgen with preinliner on will merge not inlinable profile into base profile.
 ; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/inline-cs-noprobe.perfscript --binary=%S/Inputs/inline-cs-noprobe.perfbin --output=%t --csspgo-preinliner=1
 ; RUN: FileCheck %s --input-file %t --check-prefix=CHECK-PREINL
 
 ; Test preinliner threshold that prevents all possible inlining and merges everything into base profile.
 ; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/inline-cs-noprobe.perfscript --binary=%S/Inputs/inline-cs-noprobe.perfbin --output=%t --csspgo-preinliner=1  -sample-profile-cold-inline-threshold=0
 ; RUN: FileCheck %s --input-file %t --check-prefix=CHECK-NO-PREINL
 
 ; Test cold profile trimming. Only base profiles should be dropped.
-; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/inline-cs-noprobe.perfscript --binary=%S/Inputs/inline-cs-noprobe.perfbin --output=%t --csspgo-preinliner=1  --trim-cold-profile=1 --profile-summary-hot-count=250
+; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/inline-cs-noprobe.perfscript --binary=%S/Inputs/inline-cs-noprobe.perfbin --output=%t --csspgo-preinliner=1  --trim-cold-profile=1 --profile-summary-hot-count=400
 
 ; RUN: FileCheck %s --input-file %t --check-prefix=CHECK-TRIM
 
-; CHECK-DEFAULT:     [main:1 @ foo]:44:0
+; CHECK-DEFAULT:     [main:1 @ foo]:309: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: 65526: 14
 ; CHECK-DEFAULT-NEXT: !Attributes: 1
-; CHECK-DEFAULT-NEXT:[main:1 @ foo:3.1 @ bar]:14:0
+; CHECK-DEFAULT-NEXT:[main:1 @ foo:3.1 @ bar]:84:0
 ; CHECK-DEFAULT-NEXT: 1: 14
 ; CHECK-DEFAULT-NEXT: !Attributes: 1
 
-; CHECK-PREINL:     [foo]:44:0
+; CHECK-PREINL:     [foo]:309: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: 65526: 14
 ; CHECK-PREINL-NEXT: !Attributes: 1
-; CHECK-PREINL-NEXT:[foo:3.1 @ bar]:14:0
+; CHECK-PREINL-NEXT:[foo:3.1 @ bar]:84:0
 ; CHECK-PREINL-NEXT: 1: 14
 ; CHECK-PREINL-NEXT: !Attributes: 3
 
-; CHECK-NO-PREINL:     [foo]:44:0
+; CHECK-NO-PREINL:     [foo]:309: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: 65526: 14
 ; CHECK-NO-PREINL-NEXT: !Attributes: 1
-; CHECK-NO-PREINL-NEXT:[bar]:14:0
+; CHECK-NO-PREINL-NEXT:[bar]:84:0
 ; CHECK-NO-PREINL-NEXT: 1: 14
 ; CHECK-NO-PREINL-NEXT: !Attributes: 1
 
-; CHECK-TRIM-NOT: [foo]
-; CHECK-TRIM:[foo:3.1 @ bar]:14:0
+; CHECK-TRIM-NOT: [foo]:309:0
+; CHECK-TRIM:[foo:3.1 @ bar]:84:0
 ; CHECK-TRIM-NEXT: 1: 14
 ; CHECK-TRIM-NEXT: !Attributes: 3

llvm/test/tools/llvm-profgen/fname-canonicalization.test

 ; Test unique linkage name decoding and canonicalization from dwarf debug info
 ; 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]:43:0
+; CHECK-DWARF-FNAME:[main:1 @ foo]:309: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]:14:0
+; CHECK-DWARF-FNAME:[main:1 @ foo:3 @ bar.__uniq.26267048767521081047744692097241227776]:84:0
 ; CHECK-DWARF-FNAME: 1: 14
 
 
 ; Test unique linkage name decoding and canonicalization from pseudo probe info
 ; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/unique-linkage-name-probe.perfscript --binary=%S/Inputs/unique-linkage-name-probe.perfbin --output=%t --profile-summary-cold-count=0
 ; RUN: FileCheck %s --input-file %t --check-prefix=CHECK-PROBE-FNAME
 
 ; CHECK-PROBE-FNAME:[main:2 @ foo]:75:0

llvm/test/tools/llvm-profgen/fs-discriminator.test

 ; RUN: llvm-profgen --format=text --unsymbolized-profile=%S/Inputs/fs-discriminator.raw.prof --binary=%S/Inputs/fs-discriminator.perfbin --output=%t1
 ; RUN: FileCheck %s --input-file %t1 --check-prefix=CHECK
 ; RUN: llvm-profgen --unsymbolized-profile=%S/Inputs/fs-discriminator.raw.prof --binary=%S/Inputs/fs-discriminator.perfbin --output=%t1
 ; RUN: llvm-profdata show --sample --show-sec-info-only %t1 | FileCheck %s --check-prefix=CHECK-SECTION
 
 ;CHECK-SECTION: ProfileSummarySection - Offset: [[#]], Size: [[#]], Flags: {fs-discriminator}
 
-;CHECK: partition_pivot_last:88:1
+;CHECK: partition_pivot_last:507:1
 ;CHECK:  1: 4
 ;CHECK:  2: 4
 ;CHECK:  3: 4
 ;CHECK:  3.1: 4
 ;CHECK:  3.3: 4
 ;CHECK:  3.3072: 5
 ;CHECK:  3.7169: 4
 ;CHECK:  3.7171: 4
 ;CHECK:  4: 3
 ;CHECK:  4.3072: 6
 ;CHECK:  4.12800: 4
 ;CHECK:  4.3221238272: 2
 ;CHECK:  5: 2
 ;CHECK:  5.5120: 2
 ;CHECK:  6: 3
 ;CHECK:  7: 3
-;CHECK:  5: swap:18
+;CHECK:  5: swap:80
 ;CHECK:   1: 2
 ;CHECK:   1.1024: 2
 ;CHECK:   1.4096: 2
 ;CHECK:   2: 2
 ;CHECK:   2.9216: 2
 ;CHECK:   2.12288: 2
 ;CHECK:   3: 2
 ;CHECK:   3.512: 2
 ;CHECK:   3.3584: 2
-;CHECK:  6: swap:12
+;CHECK:   65532: 2
+;CHECK:  6: swap:51
 ;CHECK:   1.14336: 3
 ;CHECK:   2.7168: 3
 ;CHECK:   2.11776: 3
 ;CHECK:   3.13824: 3
-;CHECK: partition_pivot_first:41:1
+;CHECK: main:369:0
+;CHECK:  0: 0
+;CHECK:  3: 0
+;CHECK:  4.1: 1
+;CHECK:  4.3: 1
+;CHECK:  5.3: 4
+;CHECK:  5.1537: 4
+;CHECK:  6: 4
+;CHECK:  6.1: 3
+;CHECK:  6.3: 4
+;CHECK:  7: 1
+;CHECK:  8: 1 quick_sort:1
+;CHECK:  9: 1
+;CHECK:  11: 0
+;CHECK:  14: 0
+;CHECK:  65499: 2
+;CHECK: partition_pivot_first:298:1
 ;CHECK:  0: 1
 ;CHECK:  1: 1
 ;CHECK:  2: 1
 ;CHECK:  3: 1
 ;CHECK:  3.1: 1
 ;CHECK:  3.11265: 7
 ;CHECK:  4: 7
 ;CHECK:  4.1: 4
 ;CHECK:  4.2: 2
 ;CHECK:  4.3: 4
 ;CHECK:  5: 1
 ;CHECK:  6: 1
-;CHECK:  4.2: swap:6
+;CHECK:  65516: 1
+;CHECK:  4.2: swap:24
 ;CHECK:   1.7168: 2
 ;CHECK:   2: 2
 ;CHECK:   3.4608: 2
-;CHECK:  5: swap:4
+;CHECK:  5: swap:17
 ;CHECK:   1: 1
 ;CHECK:   2.229376: 1
 ;CHECK:   2.589824: 1
 ;CHECK:   3: 1
-;CHECK: main:24:0
-;CHECK:  0: 0
-;CHECK:  3: 0
-;CHECK:  4.1: 1
-;CHECK:  4.3: 1
-;CHECK:  5.3: 4
-;CHECK:  5.1537: 4
-;CHECK:  6: 4
-;CHECK:  6.1: 3
-;CHECK:  6.3: 4
-;CHECK:  7: 1
-;CHECK:  8: 1 quick_sort:1
-;CHECK:  9: 1
-;CHECK:  11: 0
-;CHECK:  14: 0
-;CHECK: quick_sort:13:2
+;CHECK: quick_sort:122:2
 ;CHECK:  0: 2
 ;CHECK:  1: 2
 ;CHECK:  1.15360: 2
 ;CHECK:  2: 2 partition_pivot_first:1 partition_pivot_last:1
 ;CHECK:  3: 1 quick_sort:1
 ;CHECK:  4: 2
 ;CHECK:  6: 2
+;CHECK:  65507: 2
 
 
 ; original code:
 ; clang -O3 -g -mllvm --enable-fs-discriminator -fdebug-info-for-profiling qsort.c -o a.out
 #include <stdio.h>
 #include <stdlib.h>
 
 void swap(int *a, int *b) {

llvm/test/tools/llvm-profgen/func-split.test

 ; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/func-split.perfscript --binary=%S/Inputs/func-split.perfbin --output=%t
 ; RUN: FileCheck %s --input-file %t --check-prefix=CHECK
 ; 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]:82:0
+;CHECK: [foo]:409:0
 ;CHECK:  2.1: 27
 ;CHECK:  3: 27
 ;CHECK:  3.1: 2 bar:2
 ;CHECK:  3.2: 26
-;CHECK: [foo:3.1 @ bar]:2:0
+;CHECK: [foo:3.1 @ bar]:8:0
 ;CHECK:  1: 1
 ;CHECK:  5: 1
 ;CHECK: [bar]:0:1
 
 ;CHECK-NOT: foo.cold
 
-;CHECK-STRIP-CTX: foo:81:0
+;CHECK-STRIP-CTX: foo:1334: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:2:1
+;CHECK-STRIP-CTX: bar:27:1
 ;CHECK-STRIP-CTX:  1: 1
 ;CHECK-STRIP-CTX:  5: 1
 
 ;CHECK-STRIP-CTX-NOT: foo.cold
 
 
 ; clang -g -O3 -fdebug-info-for-profiling func-split.c -mllvm -mfs-count-threshold=0
 ; -fprofile-sample-use=profile.txt -fno-inline -mllvm --enable-split-machine-functions=1

llvm/test/tools/llvm-profgen/inline-cs-noprobe.test

 ; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/inline-cs-noprobe.perfscript --binary=%S/Inputs/inline-cs-noprobe.perfbin --output=%t --skip-symbolization --profile-summary-cold-count=0
 ; RUN: FileCheck %s --input-file %t --check-prefix=CHECK-UNWINDER
 ; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/inline-cs-noprobe.perfscript --binary=%S/Inputs/inline-cs-noprobe.perfbin --output=%t --profile-summary-cold-count=0
 ; RUN: FileCheck %s --input-file %t
 ; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/inline-cs-noprobe.perfscript --binary=%S/Inputs/inline-cs-noprobe.perfbin --output=%t --profile-summary-cold-count=0 --ignore-stack-samples
 ; RUN: FileCheck %s --input-file %t --check-prefix=CHECK-STRIP-CTX
 
 ; RUN: llvm-profgen --format=extbinary --perfscript=%S/Inputs/inline-cs-noprobe.perfscript --binary=%S/Inputs/inline-cs-noprobe.perfbin --output=%t --profile-summary-cold-count=0 --populate-profile-symbol-list=1
 ; RUN: llvm-profdata show -show-prof-sym-list -sample %t | FileCheck %s --check-prefix=CHECK-SYM-LIST
 
 ; CHECK-SYM-LIST: Dump profile symbol list
 ; CHECK-SYM-LIST: bar
 ; CHECK-SYM-LIST: foo
 ; CHECK-SYM-LIST: main
 
-; CHECK:[main:1 @ foo]:44:0
+; CHECK:[main:1 @ foo]:309: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]:14:0
+; CHECK: 65526: 14
+; CHECK:[main:1 @ foo:3.1 @ bar]:84:0
 ; CHECK: 1: 14
 
 ; CHECK-UNWINDER: [main:1 @ foo]
-; CHECK-UNWINDER:   3
-; CHECK-UNWINDER:   670-69b:1
-; CHECK-UNWINDER:   67e-69b:14
-; CHECK-UNWINDER:   6bf-6c8:14
+; CHECK-UNWINDER:   4
+; CHECK-UNWINDER:   670-6ad:1
+; CHECK-UNWINDER:   67e-69b:1
+; CHECK-UNWINDER:   67e-6ad:13
+; CHECK-UNWINDER:   6bd-6c8:14
 ; CHECK-UNWINDER:   2
 ; CHECK-UNWINDER:   69b->670:1
 ; CHECK-UNWINDER:   6c8->67e:15
 ; CHECK-UNWINDER: [main:1 @ foo:3.1 @ bar]
 ; CHECK-UNWINDER:   1
 ; CHECK-UNWINDER:   6af-6bb:14
 ; CHECK-UNWINDER:   0
 
-; CHECK-STRIP-CTX: main:44:0
+; CHECK-STRIP-CTX: main:1109:0
 ; CHECK-STRIP-CTX:  0: 0
 ; CHECK-STRIP-CTX:  2: 0
-; CHECK-STRIP-CTX:  1: foo:44
+; CHECK-STRIP-CTX:  1: foo:1109
 ; 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:14
+; CHECK-STRIP-CTX:   65526: 14
+; CHECK-STRIP-CTX:   3.1: bar:196
 ; CHECK-STRIP-CTX:    1: 14
 
 ; original code:
 ; clang -O3 -g test.c -o a.out
 #include <stdio.h>
 
 int bar(int x, int y) {
   if (x % 3) {

llvm/test/tools/llvm-profgen/inline-force-dwarf.test

 ; 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:43:0
+; CHECK:     main:1109:0
 ; CHECK-NEXT: 0: 0
 ; CHECK-NEXT: 2: 0
-; CHECK-NEXT: 1: foo:43
+; CHECK-NEXT: 1: foo:1109
 ; CHECK-NEXT:  2: 14
 ; CHECK-NEXT:  3: 15
 ; CHECK-NEXT:  4: 0
-; CHECK-NEXT:  3: bar:14
+; CHECK-NEXT:  65526: 14
+; CHECK-NEXT:  3: bar:224
 ; CHECK-NEXT:   1: 14
+; CHECK-NEXT:   65533: 14
 
 
 ; clang -O3 -fexperimental-new-pass-manager -fuse-ld=lld -fpseudo-probe-for-profiling
 ; -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -Xclang -mdisable-tail-calls
 ; -g test.c  -o a.out
 
 #include <stdio.h>
 

llvm/test/tools/llvm-profgen/inline-noprobe.test

 ; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/inline-noprobe.perfscript --binary=%S/Inputs/inline-noprobe.perfbin --output=%t --skip-symbolization
 ; RUN: FileCheck %s --input-file %t --check-prefix=CHECK-RAW-PROFILE
 ; RUN: llvm-profgen --format=text --use-dwarf-correlation --perfscript=%S/Inputs/inline-noprobe.perfscript --binary=%S/Inputs/inline-noprobe.perfbin --output=%t --skip-symbolization
 ; RUN: FileCheck %s --input-file %t --check-prefix=CHECK-RAW-PROFILE
 ; RUN: llvm-profgen --format=text --unsymbolized-profile=%t --binary=%S/Inputs/inline-noprobe.perfbin --output=%t1
 ; RUN: FileCheck %s --input-file %t1 --check-prefix=CHECK
+; RUN: llvm-profgen --format=text --unsymbolized-profile=%t --binary=%S/Inputs/inline-noprobe.perfbin --output=%t1 --update-total-samples
+; RUN: FileCheck %s --input-file %t1 --check-prefix=CHECK-UPDATE-TOTAL-SAMPLE
 ; 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
 ; RUN: echo -e "0\n0" > %t
 ; RUN: llvm-profgen --format=text --unsymbolized-profile=%t --binary=%S/Inputs/inline-noprobe.perfbin --output=%t1 --fill-zero-for-all-funcs
 ; RUN: FileCheck %s --input-file %t1 --check-prefix=CHECK-ALL-ZERO
 ; RUN: llvm-profgen --format=text --unsymbolized-profile=%S/Inputs/out-of-bounds.raw.prof --binary=%S/Inputs/inline-noprobe.perfbin --output=%t1
 ; RUN: FileCheck %s --input-file %t1 --check-prefix=CHECK-OB
 
-CHECK: main:188:0
+CHECK: main:2609:0
 CHECK:  0: 0
 CHECK:  2: 0
-CHECK:  1: foo:188
+CHECK:  1: foo:2609
 CHECK:   2.1: 42
 CHECK:   3: 62
 CHECK:   3.2: 21
 CHECK:   4: 0
-CHECK:   3.1: bar:42
+CHECK:   65526: 62
+CHECK:   3.1: bar:546
 CHECK:    1: 42
-CHECK:   3.2: bar:21
+CHECK:    65533: 42
+CHECK:   3.2: bar:189
 CHECK:    1: 21
 
+CHECK-UPDATE-TOTAL-SAMPLE: main:292:0
+CHECK-UPDATE-TOTAL-SAMPLE:  0: 0
+CHECK-UPDATE-TOTAL-SAMPLE:  2: 0
+CHECK-UPDATE-TOTAL-SAMPLE:  1: foo:292
+CHECK-UPDATE-TOTAL-SAMPLE:   2.1: 42
+CHECK-UPDATE-TOTAL-SAMPLE:   3: 62
+CHECK-UPDATE-TOTAL-SAMPLE:   3.2: 21
+CHECK-UPDATE-TOTAL-SAMPLE:   4: 0
+CHECK-UPDATE-TOTAL-SAMPLE:   65526: 62
+CHECK-UPDATE-TOTAL-SAMPLE:   3.1: bar:84
+CHECK-UPDATE-TOTAL-SAMPLE:    1: 42
+CHECK-UPDATE-TOTAL-SAMPLE:    65533: 42
+CHECK-UPDATE-TOTAL-SAMPLE:   3.2: bar:21
+CHECK-UPDATE-TOTAL-SAMPLE:    1: 21
+
 CHECK-ALL-ZERO: bar:0:0
 CHECK-ALL-ZERO:  1: 0
 CHECK-ALL-ZERO:  5: 0
 CHECK-ALL-ZERO: foo:0:0
 CHECK-ALL-ZERO:  0: 0
 CHECK-ALL-ZERO:  2.1: 0
 CHECK-ALL-ZERO:  3: 0
 CHECK-ALL-ZERO:  3.2: 0

 CHECK-RAW-PROFILE:      3
 CHECK-RAW-PROFILE-NEXT: 650-691:21
 CHECK-RAW-PROFILE-NEXT: 669-677:20
 CHECK-RAW-PROFILE-NEXT: 669-691:21
 CHECK-RAW-PROFILE-NEXT: 2
 CHECK-RAW-PROFILE-NEXT: 677->650:21
 CHECK-RAW-PROFILE-NEXT: 691->669:43
 
-;CHECK-OB: foo:8:0
+;CHECK-OB: foo:114:0
 ;CHECK-OB:  0: 1
 ;CHECK-OB:  2.1: 1
 ;CHECK-OB:  3: 1
 ;CHECK-OB:  3.2: 1
 ;CHECK-OB:  4: 1
-;CHECK-OB:  3.1: bar:1
+;CHECK-OB:  3.1: bar:13
 ;CHECK-OB:   1: 1
-;CHECK-OB:  3.2: bar:2
+;CHECK-OB:   65533: 1
+;CHECK-OB:  3.2: bar:24
 ;CHECK-OB:   1: 1
 ;CHECK-OB:   7: 1
-;CHECK-OB: main:8:0
+;CHECK-OB: main:100:0
 ;CHECK-OB:  0: 1
 ;CHECK-OB:  2: 1
-;CHECK-OB:  1: foo:6
+;CHECK-OB:  1: foo:80
 ;CHECK-OB:   2.1: 1
 ;CHECK-OB:   3: 1
 ;CHECK-OB:   3.2: 1
 ;CHECK-OB:   4: 1
-;CHECK-OB:   3.1: bar:1
+;CHECK-OB:   65526: 1
+;CHECK-OB:   3.1: bar:13
 ;CHECK-OB:    1: 1
-;CHECK-OB:   3.2: bar:1
+;CHECK-OB:    65533: 1
+;CHECK-OB:   3.2: bar:9
 ;CHECK-OB:    1: 1
-;CHECK-OB: bar:2:0
+;CHECK-OB: bar:14:0
 ;CHECK-OB:  1: 1
 ;CHECK-OB:  5: 1
 
 ; original code:
 ; clang -O3 -g -fdebug-info-for-profiling test.c -o a.out
 #include <stdio.h>
 
 int bar(int x, int y) {

llvm/test/tools/llvm-profgen/inline-noprobe2.test

 ; CHECK-SYM-LIST: partition_pivot_last
 ; CHECK-SYM-LIST: quick_sort
 ; CHECK-SYM-LIST: swap
 
 
 ;CHECK-RAW-PROFILE-NOT: 7f7448e889e4
 ;CHECK-RAW-PROFILE-NOT: 7f7448e88826
 
-;CHECK:       partition_pivot_first:367:5
-;CHECK-NEXT:  0: 5
-;CHECK-NEXT:  1: 5
-;CHECK-NEXT:  2: 5
-;CHECK-NEXT:  3: 5
-;CHECK-NEXT:  3.1: 83
-;CHECK-NEXT:  4: 82
-;CHECK-NEXT:  4.1: 26
-;CHECK-NEXT:  4.2: 25
-;CHECK-NEXT:  4.3: 26
-;CHECK-NEXT:  5: 6
-;CHECK-NEXT:  6: 6
-;CHECK-NEXT:  4.2: swap:75
-;CHECK-NEXT:   1: 25
-;CHECK-NEXT:   2: 25
-;CHECK-NEXT:   3: 25
-;CHECK-NEXT:  5: swap:18
-;CHECK-NEXT:   1: 6
-;CHECK-NEXT:   2: 6
-;CHECK-NEXT:   3: 6
-;CHECK-NEXT: partition_pivot_last:225:7
-;CHECK-NEXT:  1: 6
-;CHECK-NEXT:  2: 6
-;CHECK-NEXT:  3: 6
+;CHECK: partition_pivot_first:3022:5
+;CHECK:  0: 5
+;CHECK:  1: 5
+;CHECK:  2: 5
+;CHECK:  3: 5
+;CHECK:  3.1: 83
+;CHECK:  4: 82
+;CHECK:  4.1: 26
+;CHECK:  4.2: 25
+;CHECK:  4.3: 26
+;CHECK:  5: 6
+;CHECK:  6: 6
+;CHECK:  65516: 5
+;CHECK:  4.2: swap:300
+;CHECK:   1: 25
+;CHECK:   2: 25
+;CHECK:   3: 25
+;CHECK:  5: swap:102
+;CHECK:   1: 6
+;CHECK:   2: 6
+;CHECK:   3: 6
+;CHECK: partition_pivot_last:1210:7
+;CHECK:  1: 6
+;CHECK:  2: 6
+;CHECK:  3: 6
 
 ;w/o duplication factor :  3.1: 18
 ;w/o duplication factor :  3.3: 18
 ;w/o duplication factor :  4: 19
 ;w/o duplication factor :  5: 9
-;CHECK-NEXT:  3.1: 36
-;CHECK-NEXT:  3.3: 36
-;CHECK-NEXT:  4: 38
-;CHECK-NEXT:  5: 18
-
-;CHECK-NEXT:  6: 5
-;CHECK-NEXT:  7: 5
-;CHECK-NEXT:  5: swap:54
+
+;CHECK:  3.1: 36
+;CHECK:  3.3: 36
+;CHECK:  4: 38
+;CHECK:  5: 18
+;CHECK:  6: 5
+;CHECK:  7: 5
+;CHECK:  65526: 2
+;CHECK:  5: swap:247
 
 ;w/o duplication factor :  1: 9
 ;w/o duplication factor :  2: 9
 ;w/o duplication factor :  3: 9
-;CHECK-NEXT:   1: 18
-;CHECK-NEXT:   2: 18
-;CHECK-NEXT:   3: 18
-
-;CHECK-NEXT:  6: swap:15
-;CHECK-NEXT:   1: 5
-;CHECK-NEXT:   2: 5
-;CHECK-NEXT:   3: 5
-;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:52:0
-;CHECK-NEXT:  0: 0
-;CHECK-NEXT:  3: 0
-;CHECK-NEXT:  4.1: 0
-;CHECK-NEXT:  4.3: 0
-;CHECK-NEXT:  5.1: 10
-;CHECK-NEXT:  5.3: 10
-;CHECK-NEXT:  6: 10
-;CHECK-NEXT:  6.1: 12
-;CHECK-NEXT:  6.3: 10
-;CHECK-NEXT:  7: 0
-;CHECK-NEXT:  8: 0 quick_sort:1
-;CHECK-NEXT:  9: 0
-;CHECK-NEXT:  11: 0
-;CHECK-NEXT:  14: 0
+
+;CHECK:   1: 18
+;CHECK:   2: 18
+;CHECK:   3: 18
+;CHECK:  6: swap:85
+;CHECK:   1: 5
+;CHECK:   2: 5
+;CHECK:   3: 5
+;CHECK: main:820:0
+;CHECK:  0: 0
+;CHECK:  3: 0
+;CHECK:  4.1: 0
+;CHECK:  4.3: 0
+;CHECK:  5.1: 10
+;CHECK:  5.3: 10
+;CHECK:  6: 10
+;CHECK:  6.1: 12
+;CHECK:  6.3: 10
+;CHECK:  7: 0
+;CHECK:  8: 0 quick_sort:1
+;CHECK:  9: 0
+;CHECK:  11: 0
+;CHECK:  14: 0
+;CHECK:  65499: 0
+
 
 ; original code:
 ; clang -O3 -g -fno-optimize-sibling-calls -fdebug-info-for-profiling qsort.c -o a.out
 #include <stdio.h>
 #include <stdlib.h>
 
 void swap(int *a, int *b) {
   int t = *a;

llvm/test/tools/llvm-profgen/multi-load-segs.test

 ; RUN: llvm-profgen --perfscript=%S/Inputs/multi-load-segs.perfscript --binary=%S/Inputs/multi-load-segs.perfbin --output=%t --format=text
 ; RUN: FileCheck %s --input-file %t
 
 ;;  %S/Inputs/multi-load-segs.perfbin is an ELF image with two executable load segments.
 ; running llvm-readelf -l %S/Inputs/multi-load-segs.perfbin gives:
 ;;  LOAD           0x000000 0x0000000000200000 0x0000000000200000 0x00075c 0x00075c R   0x1000
 ;;  LOAD           0x000760 0x0000000000201760 0x0000000000201760 0x0004c0 0x0004c0 R E 0x1000
 ;;  LOAD           0x000c20 0x0000000000202c20 0x0000000000202c20 0x0001f0 0x0001f0 RW  0x1000
 ;;  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]:124:0
+; CHECK:      [main:2 @ _Z10sort_arrayv:6 @ _Z11bubble_sortPii]:465:0
 ; CHECK-NEXT:  4: 31
 ; CHECK-NEXT:  5: 31
 ; CHECK-NEXT:  7: 31
 ; CHECK-NEXT:  8: 31
+; CHECK-NEXT:  65516: 31
 ; CHECK-NEXT:    !Attributes: 1

llvm/test/tools/llvm-profgen/noinline-cs-noprobe.test

 ; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/noinline-cs-noprobe.perfscript --binary=%S/Inputs/noinline-cs-noprobe.perfbin --output=%t1 --profile-summary-cold-count=0
 ; RUN: llvm-profgen --format=extbinary --perfscript=%S/Inputs/noinline-cs-noprobe.perfscript --binary=%S/Inputs/noinline-cs-noprobe.perfbin --output=%t2 --profile-summary-cold-count=0 -use-md5
 ; RUN: llvm-profdata show --sample -show-sec-info-only %t2 | FileCheck %s --check-prefix=CHECK-MD5
 ; RUN: llvm-profdata show --sample -detailed-summary --function=dummy %t1 > %t.summary
 ; RUN: llvm-profdata show --sample -detailed-summary --function=dummy %t2 > %t2.summary
 ; RUN: diff -b %t.summary %t2.summary
 
 
-; CHECK-AGG:[main:1 @ foo:3 @ bar]:24:6
+; 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: 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
 ; CHECK-AGG-UNWINDER-NEXT:   5ff-62f:6
 ; CHECK-AGG-UNWINDER-NEXT:   634-637:6
 ; CHECK-AGG-UNWINDER-NEXT:   645-645:6
 ; CHECK-AGG-UNWINDER-NEXT:   3
 ; CHECK-AGG-UNWINDER-NEXT:   62f->5b0:6
 ; CHECK-AGG-UNWINDER-NEXT:   637->645:6
 ; CHECK-AGG-UNWINDER-NEXT:   645->5ff:6
 ; CHECK-AGG-UNWINDER-NEXT: [main:1 @ foo:3 @ bar]
 ; CHECK-AGG-UNWINDER-NEXT:   4
 ; CHECK-AGG-UNWINDER-NEXT:   5b0-5c8:2
 ; CHECK-AGG-UNWINDER-NEXT:   5b0-5d7:4
 ; CHECK-AGG-UNWINDER-NEXT:   5dc-5e9:2
 ; CHECK-AGG-UNWINDER-NEXT:   5e5-5e9:4
 ; CHECK-AGG-UNWINDER-NEXT:   3
 ; CHECK-AGG-UNWINDER-NEXT:   5c8->5dc:4
 ; CHECK-AGG-UNWINDER-NEXT:   5d7->5e5:4
 ; CHECK-AGG-UNWINDER-NEXT:   5e9->634:6
 
 
-; CHECK:[main:1 @ foo:3 @ bar]:12:3
+; CHECK:[main:1 @ foo]:54:0
+; CHECK: 2: 3
+; CHECK: 3: 3 bar:3
+; CHECK:[main:1 @ foo:3 @ bar]:50: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: 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: foo:198: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:142: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
 ; CHECK-UNWINDER-NEXT:   5ff-62f:3
 ; CHECK-UNWINDER-NEXT:   634-637:3
 ; CHECK-UNWINDER-NEXT:   645-645:3
 ; CHECK-UNWINDER-NEXT:   3
 ; CHECK-UNWINDER-NEXT:   62f->5b0:3

llvm/test/tools/llvm-profgen/noinline-noprobe.test

 ; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/noprobe.perfscript --binary=%S/Inputs/noprobe.perfbin --output=%t --skip-symbolization
 ; RUN: FileCheck %s --input-file %t --check-prefix=CHECK-RAW-PROFILE
 ; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/noprobe.mmap.perfscript --binary=%S/Inputs/noprobe.perfbin --output=%t --skip-symbolization
 ; RUN: FileCheck %s --input-file %t --check-prefix=CHECK-RAW-PROFILE
 ; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/noprobe.aggperfscript --binary=%S/Inputs/noprobe.perfbin --output=%t --skip-symbolization
 ; RUN: FileCheck %s --input-file %t --check-prefix=CHECK-RAW-PROFILE-AGG
 ; 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: 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: foo:1241:0
+;CHECK:  0: 0
+;CHECK:  1: 0
+;CHECK:  2: 19
+;CHECK:  3: 19 bar:21
+;CHECK:  4: 0
+;CHECK:  5: 0
+;CHECK: bar:926:21
+;CHECK:  0: 20
+;CHECK:  1: 20
+;CHECK:  2: 13
+;CHECK:  4: 6
+;CHECK:  5: 18
 
 CHECK-RAW-PROFILE:      7
 CHECK-RAW-PROFILE-NEXT: 5b0-5c8:7
 CHECK-RAW-PROFILE-NEXT: 5b0-5d7:13
 CHECK-RAW-PROFILE-NEXT: 5dc-5e9:6
 CHECK-RAW-PROFILE-NEXT: 5e5-5e9:12
 CHECK-RAW-PROFILE-NEXT: 5ff-62f:19
 CHECK-RAW-PROFILE-NEXT: 634-637:18

llvm/test/tools/llvm-profgen/profile-density.test

-; RUN: llvm-profgen --format=text --unsymbolized-profile=%S/Inputs/profile-density.raw.prof --binary=%S/Inputs/inline-noprobe2.perfbin --output=%t1 --use-offset=0 --show-density -hot-function-density-threshold=1 &> %t2
+; RUN: llvm-profgen --format=text --unsymbolized-profile=%S/Inputs/profile-density.raw.prof --binary=%S/Inputs/inline-noprobe2.perfbin --output=%t1 --use-offset=0 --show-density -hot-function-density-threshold=10  --trim-cold-profile=0 &> %t2
 ; RUN: FileCheck %s --input-file %t2 --check-prefix=CHECK-DENSITY
 
 ; RUN: llvm-profgen --format=text --unsymbolized-profile=%S/Inputs/profile-density-cs.raw.prof --binary=%S/Inputs/inline-noprobe2.perfbin --output=%t3 --show-density -hot-function-density-threshold=1 &> %t4
 ; RUN: FileCheck %s --input-file %t4 --check-prefix=CHECK-DENSITY-CS
 
-;CHECK-DENSITY: AutoFDO is estimated to optimize better with 4.9x more samples. Please consider increasing sampling rate or profiling for longer duration to get more samples.
-;CHECK-DENSITY: Minimum profile density for hot functions with top 99.00% total samples: 0.2
+;CHECK-DENSITY: AutoFDO is estimated to optimize better with 3.1x more samples. Please consider increasing sampling rate or profiling for longer duration to get more samples.
+;CHECK-DENSITY: Minimum profile density for hot functions with top 99.00% total samples: 3.2
 
-;CHECK-DENSITY-CS: Minimum profile density for hot functions with top 99.00% total samples: 31.4
+;CHECK-DENSITY-CS: Minimum profile density for hot functions with top 99.00% total samples: 128.3
 
 ; original code:
 ; clang -O3 -g -fno-optimize-sibling-calls -fdebug-info-for-profiling qsort.c -o a.out
 #include <stdio.h>
 #include <stdlib.h>
 
 void swap(int *a, int *b) {
   int t = *a;

llvm/test/tools/llvm-profgen/recursion-compression-noprobe.test

 ; Firstly test uncompression(--compress-recursion=0)
 ; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/recursion-compression-noprobe.perfscript --binary=%S/Inputs/recursion-compression-noprobe.perfbin --output=%t --compress-recursion=0 --profile-summary-cold-count=0
 ; RUN: FileCheck %s --input-file %t -check-prefix=CHECK-UNCOMPRESS
 ; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/recursion-compression-noprobe.perfscript --binary=%S/Inputs/recursion-compression-noprobe.perfbin --output=%t --profile-summary-cold-count=0
 ; RUN: FileCheck %s --input-file %t
 ; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/recursion-compression-noprobe.perfscript --binary=%S/Inputs/recursion-compression-noprobe.perfbin --output=%t --compress-recursion=0 --profile-summary-cold-count=0 --csprof-max-context-depth=2
 ; RUN: FileCheck %s --input-file %t -check-prefix=CHECK-MAX-CTX-DEPTH
 
-; CHECK-UNCOMPRESS:[main:1 @ foo:3 @ fa]:14:0
-; CHECK-UNCOMPRESS: 1: 1
-; CHECK-UNCOMPRESS: 2: 13 fb:11
-; CHECK-UNCOMPRESS:[main:1 @ foo:3 @ fa:2 @ fb]:12:0
+; CHECK-UNCOMPRESS:[main:1 @ foo:3 @ fa:2 @ fb]:48:0
 ; CHECK-UNCOMPRESS: 1: 11
 ; CHECK-UNCOMPRESS: 2: 1 fa:1
-; CHECK-UNCOMPRESS:[main:1 @ foo]:3:0
+; CHECK-UNCOMPRESS: 65532: 11
+; CHECK-UNCOMPRESS: !Attributes: 1
+; CHECK-UNCOMPRESS:[main:1 @ foo:3 @ fa]:24:0
+; CHECK-UNCOMPRESS: 1: 1
+; CHECK-UNCOMPRESS: 2: 13 fb:11
+; CHECK-UNCOMPRESS: 65527: 1
+; CHECK-UNCOMPRESS: !Attributes: 1
+; CHECK-UNCOMPRESS:[main:1 @ foo]:7:0
 ; CHECK-UNCOMPRESS: 2: 1
 ; CHECK-UNCOMPRESS: 3: 2 fa:1
-; CHECK-UNCOMPRESS:[main:1 @ foo:3 @ fa:2 @ fb:2 @ fa]:2:0
+; CHECK-UNCOMPRESS: !Attributes: 1
+; CHECK-UNCOMPRESS:[main:1 @ foo:3 @ fa:2 @ fb:2 @ fa]:7:0
 ; CHECK-UNCOMPRESS: 1: 1
-; CHECK-UNCOMPRESS: 2: 1
-; CHECK-UNCOMPRESS:[main:1 @ foo:3 @ fa:2 @ fb:2 @ fa:2 @ fb:2 @ fa]:1:0
+; CHECK-UNCOMPRESS: 2: 2 fb:1
+; CHECK-UNCOMPRESS: !Attributes: 1
+; CHECK-UNCOMPRESS:[main:1 @ foo:3 @ fa:2 @ fb:2 @ fa:2 @ fb]:2:0
+; CHECK-UNCOMPRESS: 2: 1 fa:1
+; CHECK-UNCOMPRESS: 65532: 1
+; CHECK-UNCOMPRESS: !Attributes: 1
+; CHECK-UNCOMPRESS:[main:1 @ foo:3 @ fa:2 @ fb:2 @ fa:2 @ fb:2 @ fa]:2:0
 ; CHECK-UNCOMPRESS: 4: 1
+; CHECK-UNCOMPRESS: !Attributes: 0
 
-; CHECK-MAX-CTX-DEPTH:[foo:3 @ fa:2 @ fb]:11:0
-; CHECK-MAX-CTX-DEPTH: 1: 11
-; CHECK-MAX-CTX-DEPTH:[fa:2 @ fb:2 @ fa]:3:0
-; CHECK-MAX-CTX-DEPTH: 1: 1
-; CHECK-MAX-CTX-DEPTH: 2: 1
-; CHECK-MAX-CTX-DEPTH: 4: 1
-; CHECK-MAX-CTX-DEPTH:[main:1 @ foo]:3:0
-; CHECK-MAX-CTX-DEPTH: 2: 1
-; CHECK-MAX-CTX-DEPTH: 3: 2 fa:1
-; CHECK-MAX-CTX-DEPTH:[main:1 @ foo:3 @ fa]:3:0
-; CHECK-MAX-CTX-DEPTH: 1: 1
-; CHECK-MAX-CTX-DEPTH: 2: 2
-
+; CHECK-MAX-CTX-DEPTH: [foo:3 @ fa:2 @ fb]:47:0
+; CHECK-MAX-CTX-DEPTH:  1: 11
+; CHECK-MAX-CTX-DEPTH:  65532: 11
+; CHECK-MAX-CTX-DEPTH:  !Attributes: 1
+; CHECK-MAX-CTX-DEPTH: [main:1 @ foo:3 @ fa]:13:0
+; CHECK-MAX-CTX-DEPTH:  1: 1
+; CHECK-MAX-CTX-DEPTH:  2: 2
+; CHECK-MAX-CTX-DEPTH:  65527: 1
+; CHECK-MAX-CTX-DEPTH:  !Attributes: 1
+; CHECK-MAX-CTX-DEPTH: [fa:2 @ fb:2 @ fa]:8:0
+; CHECK-MAX-CTX-DEPTH:  1: 1
+; CHECK-MAX-CTX-DEPTH:  2: 1
+; CHECK-MAX-CTX-DEPTH:  4: 1
+; CHECK-MAX-CTX-DEPTH:  !Attributes: 1
+; CHECK-MAX-CTX-DEPTH: [main:1 @ foo]:7:0
+; CHECK-MAX-CTX-DEPTH:  2: 1
+; CHECK-MAX-CTX-DEPTH:  3: 2 fa:1
+; CHECK-MAX-CTX-DEPTH:  !Attributes: 1
+; CHECK-MAX-CTX-DEPTH: [fb:2 @ fa:2 @ fb]:1:0
+; CHECK-MAX-CTX-DEPTH:  65532: 1
+; CHECK-MAX-CTX-DEPTH:  !Attributes: 1
 
 
-
-; CHECK: [main:1 @ foo:3 @ fa]:14:0
-; CHECK:  1: 1
-; CHECK:  2: 13 fb:11
-; CHECK: [main:1 @ foo:3 @ fa:2 @ fb]:12:0
-; CHECK:  1: 11
-; CHECK:  2: 1 fa:1
-; CHECK: [main:1 @ foo]:3:0
-; CHECK:  2: 1
-; CHECK:  3: 2 fa:1
-; CHECK: [main:1 @ foo:3 @ fa:2 @ fb:2 @ fa]:3:0
-; CHECK:  1: 1
-; CHECK:  2: 1
-; CHECK:  4: 1
-
+;CHECK: [main:1 @ foo:3 @ fa:2 @ fb]:48:0
+;CHECK:  1: 11
+;CHECK:  2: 1 fa:1
+;CHECK:  65532: 11
+;CHECK:  !Attributes: 1
+;CHECK: [main:1 @ foo:3 @ fa]:24:0
+;CHECK:  1: 1
+;CHECK:  2: 13 fb:11
+;CHECK:  65527: 1
+;CHECK:  !Attributes: 1
+;CHECK: [main:1 @ foo:3 @ fa:2 @ fb:2 @ fa]:9:0
+;CHECK:  1: 1
+;CHECK:  2: 2 fb:1
+;CHECK:  4: 1
+;CHECK:  !Attributes: 1
+;CHECK: [main:1 @ foo]:7:0
+;CHECK:  2: 1
+;CHECK:  3: 2 fa:1
+;CHECK:  !Attributes: 1
+;CHECK: [main:1 @ foo:3 @ fa:2 @ fb:2 @ fa:2 @ fb]:1:0
+;CHECK:  65532: 1
+;CHECK:  !Attributes: 1
 
 ; original code:
 ; clang -O3 -g test.c -o a.out
 #include <stdio.h>
 
 int fb(int n) {
   if(n > 10) return fb(n / 2);
   return fa(n - 1);

llvm/tools/llvm-profgen/ProfileGenerator.h

 private:
   void generateLineNumBasedProfile();
   RangeSample preprocessRangeCounter(const RangeSample &RangeCounter);
   FunctionSamples &getTopLevelFunctionProfile(StringRef FuncName);
   // Helper function to get the leaf frame's FunctionProfile by traversing the
   // inline stack and meanwhile it adds the total samples for each frame's
   // function profile.
   FunctionSamples &
-  getLeafFrameProfile(const SampleContextFrameVector &FrameVec);
+  getLeafProfileAndAddTotalSamples(const SampleContextFrameVector &FrameVec,
+                                   uint64_t Count);
   void populateBodySamplesForAllFunctions(const RangeSample &RangeCounter);
   void
   populateBoundarySamplesForAllFunctions(const BranchSample &BranchCounters);
   void postProcessProfiles();
   void trimColdProfiles(const SampleProfileMap &Profiles,
                         uint64_t ColdCntThreshold);
 };
 

llvm/tools/llvm-profgen/ProfileGenerator.cpp

static cl::opt<double> HotFunctionDensityThreshold(
     "hot-function-density-threshold", llvm::cl::init(1000),
     llvm::cl::desc(
         "specify density threshold for hot functions (default: 1000)"),
     llvm::cl::Optional);
 static cl::opt<bool> ShowDensity("show-density", llvm::cl::init(false),
                                  llvm::cl::desc("show profile density details"),
                                  llvm::cl::Optional);
 
+static cl::opt<bool> UpdateTotalSamples(
+    "update-total-samples", llvm::cl::init(false),
+    llvm::cl::desc(
+        "Update total samples by accumulating all its body samples."),
+    llvm::cl::Optional);
+
 extern cl::opt<int> ProfileSummaryCutoffHot;
 
 using namespace llvm;
 using namespace sampleprof;
 
 namespace llvm {
 namespace sampleprof {
 
void ProfileGeneratorBase::updateBodySamplesforFunctionProfile(
   uint64_t PreviousCount = R ? R.get() : 0;
   if (PreviousCount <= Count) {
     FunctionProfile.addBodySamples(LeafLoc.Location.LineOffset, Discriminator,
                                    Count - PreviousCount);
   }
 }
 
 void ProfileGeneratorBase::updateTotalSamples() {
+  if (!UpdateTotalSamples)
+    return;
+
   for (auto &Item : ProfileMap) {
     FunctionSamples &FunctionProfile = Item.second;
     FunctionProfile.updateTotalSamples();
   }
 }
 
 FunctionSamples &
 ProfileGenerator::getTopLevelFunctionProfile(StringRef FuncName) {
void ProfileGenerator::generateLineNumBasedProfile() {
   // Fill in function body samples
   populateBodySamplesForAllFunctions(SC.RangeCounter);
   // Fill in boundary sample counts as well as call site samples for calls
   populateBoundarySamplesForAllFunctions(SC.BranchCounter);
 
   updateTotalSamples();
 }
 
-FunctionSamples &ProfileGenerator::getLeafFrameProfile(
-    const SampleContextFrameVector &FrameVec) {
+FunctionSamples &ProfileGenerator::getLeafProfileAndAddTotalSamples(
+    const SampleContextFrameVector &FrameVec, uint64_t Count) {
   // Get top level profile
   FunctionSamples *FunctionProfile =
       &getTopLevelFunctionProfile(FrameVec[0].FuncName);
+  FunctionProfile->addTotalSamples(Count);
 
   for (size_t I = 1; I < FrameVec.size(); I++) {
     LineLocation Callsite(
         FrameVec[I - 1].Location.LineOffset,
         getBaseDiscriminator(FrameVec[I - 1].Location.Discriminator));
     FunctionSamplesMap &SamplesMap =
         FunctionProfile->functionSamplesAt(Callsite);
     auto Ret =
         SamplesMap.emplace(FrameVec[I].FuncName.str(), FunctionSamples());
     if (Ret.second) {
       SampleContext Context(FrameVec[I].FuncName);
       Ret.first->second.setContext(Context);
     }
     FunctionProfile = &Ret.first->second;
+    FunctionProfile->addTotalSamples(Count);
   }
 
   return *FunctionProfile;
 }
 
 RangeSample
 ProfileGenerator::preprocessRangeCounter(const RangeSample &RangeCounter) {
   RangeSample Ranges(RangeCounter.begin(), RangeCounter.end());
for (auto Range : preprocessRangeCounter(RangeCounter)) {
     if (IP.Address > RangeEnd)
       continue;
 
     do {
       uint64_t Offset = Binary->virtualAddrToOffset(IP.Address);
       const SampleContextFrameVector &FrameVec =
           Binary->getFrameLocationStack(Offset);
       if (!FrameVec.empty()) {
-        FunctionSamples &FunctionProfile = getLeafFrameProfile(FrameVec);
+        // FIXME: As accumulating total count per instruction caused some
+        // regression, we changed to accumulate total count per byte as a
+        // workaround. Tuning hotness threshold on the compiler side might be
+        // necessary in the future.
+        FunctionSamples &FunctionProfile = getLeafProfileAndAddTotalSamples(
+            FrameVec, Count * Binary->getInstSize(Offset));
         updateBodySamplesforFunctionProfile(FunctionProfile, FrameVec.back(),
                                             Count);
       }
     } while (IP.advance() && IP.Address <= RangeEnd);
   }
 }
 
 StringRef ProfileGeneratorBase::getCalleeNameForOffset(uint64_t TargetOffset) {
for (auto Entry : BranchCounters) {
 
     StringRef CalleeName = getCalleeNameForOffset(TargetOffset);
     if (CalleeName.size() == 0)
       continue;
     // Record called target sample and its count.
     const SampleContextFrameVector &FrameVec =
         Binary->getFrameLocationStack(SourceOffset);
     if (!FrameVec.empty()) {
-      FunctionSamples &FunctionProfile = getLeafFrameProfile(FrameVec);
+      FunctionSamples &FunctionProfile =
+          getLeafProfileAndAddTotalSamples(FrameVec, 0);
       FunctionProfile.addCalledTargetSamples(
           FrameVec.back().Location.LineOffset,
           getBaseDiscriminator(FrameVec.back().Location.Discriminator),
           CalleeName, Count);
     }
     // Add head samples for callee.
     FunctionSamples &CalleeProfile = getTopLevelFunctionProfile(CalleeName);
     CalleeProfile.addHeadSamples(Count);
if (IP.Address > RangeEnd)
       continue;
 
     do {
       uint64_t Offset = Binary->virtualAddrToOffset(IP.Address);
       auto LeafLoc = Binary->getInlineLeafFrameLoc(Offset);
       if (LeafLoc.hasValue()) {
         // Recording body sample for this specific context
         updateBodySamplesforFunctionProfile(FunctionProfile, *LeafLoc, Count);
+        FunctionProfile.addTotalSamples(Count);
       }
     } while (IP.advance() && IP.Address <= RangeEnd);
   }
 }
 
 void CSProfileGenerator::populateBoundarySamplesForFunction(
     SampleContextFrames ContextId, FunctionSamples &FunctionProfile,
     const BranchSample &BranchCounters) {
if (!EstimatedCallCount && !CalleeProfile.getBodySamples().size())
       EstimatedCallCount = 1;
     CallerProfile.addCalledTargetSamples(
         CallerLeafFrameLoc.Location.LineOffset,
         CallerLeafFrameLoc.Location.Discriminator,
         CalleeProfile.getContext().getName(), EstimatedCallCount);
     CallerProfile.addBodySamples(CallerLeafFrameLoc.Location.LineOffset,
                                  CallerLeafFrameLoc.Location.Discriminator,
                                  EstimatedCallCount);
+    CallerProfile.addTotalSamples(EstimatedCallCount);
   }
 }
 
 void CSProfileGenerator::postProcessProfiles() {
   // Compute hot/cold threshold based on profile. This will be used for cold
   // context profile merging/trimming.
   computeSummaryAndThreshold();
 

llvm/tools/llvm-profgen/ProfiledBinary.h

public:
   uint64_t getTextSegmentOffset() const { return TextSegmentOffsets[0]; }
   const std::vector<uint64_t> &getPreferredTextSegmentAddresses() const {
     return PreferredTextSegmentAddresses;
   }
   const std::vector<uint64_t> &getTextSegmentOffsets() const {
     return TextSegmentOffsets;
   }
 
+  uint64_t getInstSize(uint64_t Offset) const {
+    auto I = Offset2InstSizeMap.find(Offset);
+    if (I == Offset2InstSizeMap.end())
+      return 0;
+    return I->second;
+  }
+
   bool offsetIsCode(uint64_t Offset) const {
     return Offset2InstSizeMap.find(Offset) != Offset2InstSizeMap.end();
   }
   bool addressIsCode(uint64_t Address) const {
     uint64_t Offset = virtualAddrToOffset(Address);
     return offsetIsCode(Offset);
   }
   bool addressIsCall(uint64_t Address) const {

llvm/tools/llvm-profgen/ProfiledBinary.cpp

for (int32_t I = InlineStack.getNumberOfFrames() - 1; I >= 0; I--) {
     if (CallerFrame.FunctionName == "<invalid>")
       break;
 
     StringRef FunctionName(CallerFrame.FunctionName);
     if (UseCanonicalFnName)
       FunctionName = FunctionSamples::getCanonicalFnName(FunctionName);
 
     uint32_t Discriminator = CallerFrame.Discriminator;
-    uint32_t LineOffset = CallerFrame.Line - CallerFrame.StartLine;
+    uint32_t LineOffset = (CallerFrame.Line - CallerFrame.StartLine) & 0xffff;
     if (UseProbeDiscriminator) {
       LineOffset =
           PseudoProbeDwarfDiscriminator::extractProbeIndex(Discriminator);
       Discriminator = 0;
-    } else {
-      // Filter out invalid negative(int type) lineOffset
-      if (LineOffset & 0xffff0000)
-        return SampleContextFrameVector();
     }
 
     LineLocation Line(LineOffset, Discriminator);
     auto It = NameStrings.insert(FunctionName.str());
     CallStack.emplace_back(*It.first, Line);
   }
 
   return CallStack;