[PATCH] D14739: [llvm-profdata] Improve error messaging when merging mismatched profile data

[Nathan Slingerland via llvm-commits]

slingn created this revision.
slingn added reviewers: dnovillo, davidxl, bogner.
slingn added a subscriber: llvm-commits.

This change tries to make the root cause of instrumented profile data merge failures clearer.

Previous:

$ llvm-profdata merge test_0.profraw test_1.profraw -o test_merged.profdata
test_1.profraw: foo: Function count mismatch
test_1.profraw: bar: Function count mismatch
test_1.profraw: baz: Function count mismatch
...

Changed:

$ llvm-profdata merge test_0.profraw test_1.profraw -o test_merged.profdata
test_1.profraw: foo: Function basic block count change detected (counter mismatch)
Make sure that all profile data to be merged is generated from the same binary.
test_1.profraw: bar: Function basic block count change detected (counter mismatch)
test_1.profraw: baz: Function basic block count change detected (counter mismatch)
...

http://reviews.llvm.org/D14739

Files:
  lib/ProfileData/InstrProf.cpp
  test/tools/llvm-profdata/count-mismatch.proftext
  tools/llvm-profdata/llvm-profdata.cpp

-------------- next part --------------
A non-text attachment was scrubbed...
Name: D14739.40367.patch
Type: text/x-patch
Size: 4447 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20151117/122eeb2d/attachment.bin>