RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 11:02:59 +02:00
Code Issues Projects Releases Wiki Activity

[sancov] hash prefix results in huge merge files, use shorter prefix

Browse Source 
llvm-svn: 290277
This commit is contained in:
Mike Aizatsky 2016-12-21 22:09:57 +00:00
parent 4e146dfe3d
commit 04679cbc10
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
test/tools/sancov/merge.test
View File

@ -29,34 +29,34 @@ MERGE1-NEXT: }
MERGE1-NEXT: }
MERGE2: {
MERGE2-NEXT: "covered-points" : ["BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5:4e132b", "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5:4e1472", "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5:4e14c2", "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5:4e1520", "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5:4e1553", "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5:4e1586", "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5:4e178c"],
MERGE2-NEXT: "covered-points" : ["04e132b", "04e1472", "04e1520", "04e1553", "04e1586", "14e132b", "14e1472", "14e14c2", "14e1520", "14e1553", "14e1586", "14e178c"],
MERGE2-NEXT: "point-symbol-info" : {
MERGE2-NEXT: "test/tools/sancov/Inputs/foo.cpp" : {
MERGE2-NEXT: "foo()" : {
MERGE2-NEXT: "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5:4e178c" : "5:0",
MERGE2-NEXT: "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5:4e178c" : "5:0"
MERGE2-NEXT: "04e178c" : "5:0",
MERGE2-NEXT: "14e178c" : "5:0"
MERGE2-NEXT: }
MERGE2-NEXT: },
MERGE2-NEXT: "test/tools/sancov/Inputs/test.cpp" : {
MERGE2-NEXT: "bar(std::string)" : {
MERGE2-NEXT: "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5:4e132b" : "12:0",
MERGE2-NEXT: "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5:4e132b" : "12:0"
MERGE2-NEXT: "04e132b" : "12:0",
MERGE2-NEXT: "14e132b" : "12:0"
MERGE2-NEXT: },
MERGE2-NEXT: "main" : {
MERGE2-NEXT: "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5:4e1472" : "14:0",
MERGE2-NEXT: "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5:4e14c2" : "16:9",
MERGE2-NEXT: "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5:4e1520" : "17:5",
MERGE2-NEXT: "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5:4e1553" : "17:5",
MERGE2-NEXT: "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5:4e1586" : "17:5",
MERGE2-NEXT: "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5:4e1635" : "19:1",
MERGE2-NEXT: "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5:4e1690" : "17:5",
MERGE2-NEXT: "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5:4e1472" : "14:0",
MERGE2-NEXT: "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5:4e14c2" : "16:9",
MERGE2-NEXT: "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5:4e1520" : "17:5",
MERGE2-NEXT: "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5:4e1553" : "17:5",
MERGE2-NEXT: "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5:4e1586" : "17:5",
MERGE2-NEXT: "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5:4e1635" : "19:1",
MERGE2-NEXT: "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5:4e1690" : "17:5"
MERGE2-NEXT: "04e1472" : "14:0",
MERGE2-NEXT: "04e14c2" : "16:9",
MERGE2-NEXT: "04e1520" : "17:5",
MERGE2-NEXT: "04e1553" : "17:5",
MERGE2-NEXT: "04e1586" : "17:5",
MERGE2-NEXT: "04e1635" : "19:1",
MERGE2-NEXT: "04e1690" : "17:5",
MERGE2-NEXT: "14e1472" : "14:0",
MERGE2-NEXT: "14e14c2" : "16:9",
MERGE2-NEXT: "14e1520" : "17:5",
MERGE2-NEXT: "14e1553" : "17:5",
MERGE2-NEXT: "14e1586" : "17:5",
MERGE2-NEXT: "14e1635" : "19:1",
MERGE2-NEXT: "14e1690" : "17:5"
MERGE2-NEXT: }
MERGE2-NEXT: }
MERGE2-NEXT: }

3
tools/sancov/sancov.cc
View File

@ -1079,8 +1079,7 @@ merge(const std::vector<std::unique_ptr<SymbolizedCoverage>> &Coverages) {
std::string Prefix;
if (Coverages.size() > 1) {
// prefix is not needed when there's only one file.
Prefix =
(Coverage.BinaryHash.size() ? Coverage.BinaryHash : utostr(I)) + ":";
Prefix = utostr(I);
}
for (const auto &Id : Coverage.CoveredIds) {