diff options
30 files changed, 417 insertions, 197 deletions
diff --git a/include/llvm/Support/LineIterator.h b/include/llvm/Support/LineIterator.h index 861c19881f..92a9cc5c57 100644 --- a/include/llvm/Support/LineIterator.h +++ b/include/llvm/Support/LineIterator.h @@ -56,6 +56,7 @@ public: /// \brief Get the current line as a \c StringRef. StringRef operator*() const { return CurrentLine; } + const StringRef *operator->() const { return &CurrentLine; } friend bool operator==(const line_iterator &LHS, const line_iterator &RHS) { return LHS.Buffer == RHS.Buffer && diff --git a/test/tools/llvm-profdata/Inputs/bad-function-count.profdata b/test/tools/llvm-profdata/Inputs/bad-function-count.profdata deleted file mode 100644 index 7d247626e5..0000000000 --- a/test/tools/llvm-profdata/Inputs/bad-function-count.profdata +++ /dev/null @@ -1,2 +0,0 @@ -function_count_not 1count -1 diff --git a/test/tools/llvm-profdata/Inputs/bad-hash.profdata.input b/test/tools/llvm-profdata/Inputs/bad-hash.profdata.input new file mode 100644 index 0000000000..faa6f40152 --- /dev/null +++ b/test/tools/llvm-profdata/Inputs/bad-hash.profdata.input @@ -0,0 +1,4 @@ +function_count_not +badhash +1 +1 diff --git a/test/tools/llvm-profdata/Inputs/bar3-1.profdata b/test/tools/llvm-profdata/Inputs/bar3-1.profdata deleted file mode 100644 index cb8b409891..0000000000 --- a/test/tools/llvm-profdata/Inputs/bar3-1.profdata +++ /dev/null @@ -1,4 +0,0 @@ -bar 3 -1 -2 -3 diff --git a/test/tools/llvm-profdata/Inputs/bar3-1.profdata.input b/test/tools/llvm-profdata/Inputs/bar3-1.profdata.input new file mode 100644 index 0000000000..5486e9d84d --- /dev/null +++ b/test/tools/llvm-profdata/Inputs/bar3-1.profdata.input @@ -0,0 +1,6 @@ +bar +3 +3 +1 +2 +3 diff --git a/test/tools/llvm-profdata/Inputs/empty.profdata b/test/tools/llvm-profdata/Inputs/empty.profdata.input index e69de29bb2..e69de29bb2 100644 --- a/test/tools/llvm-profdata/Inputs/empty.profdata +++ b/test/tools/llvm-profdata/Inputs/empty.profdata.input diff --git a/test/tools/llvm-profdata/Inputs/extra-word.profdata b/test/tools/llvm-profdata/Inputs/extra-word.profdata.input index 67a662909c..67a662909c 100644 --- a/test/tools/llvm-profdata/Inputs/extra-word.profdata +++ b/test/tools/llvm-profdata/Inputs/extra-word.profdata.input diff --git a/test/tools/llvm-profdata/Inputs/foo3-1.profdata b/test/tools/llvm-profdata/Inputs/foo3-1.profdata deleted file mode 100644 index d6f9f648b7..0000000000 --- a/test/tools/llvm-profdata/Inputs/foo3-1.profdata +++ /dev/null @@ -1,4 +0,0 @@ -foo 3 -1 -2 -3 diff --git a/test/tools/llvm-profdata/Inputs/foo3-1.profdata.input b/test/tools/llvm-profdata/Inputs/foo3-1.profdata.input new file mode 100644 index 0000000000..14a6200435 --- /dev/null +++ b/test/tools/llvm-profdata/Inputs/foo3-1.profdata.input @@ -0,0 +1,6 @@ +foo +3 +3 +1 +2 +3 diff --git a/test/tools/llvm-profdata/Inputs/foo3-2.profdata b/test/tools/llvm-profdata/Inputs/foo3-2.profdata deleted file mode 100644 index 94fd034391..0000000000 --- a/test/tools/llvm-profdata/Inputs/foo3-2.profdata +++ /dev/null @@ -1,4 +0,0 @@ -foo 3 -7 -5 -3 diff --git a/test/tools/llvm-profdata/Inputs/foo3-2.profdata.input b/test/tools/llvm-profdata/Inputs/foo3-2.profdata.input new file mode 100644 index 0000000000..801846e440 --- /dev/null +++ b/test/tools/llvm-profdata/Inputs/foo3-2.profdata.input @@ -0,0 +1,6 @@ +foo +3 +3 +7 +5 +3 diff --git a/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata b/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata deleted file mode 100644 index 85b702d497..0000000000 --- a/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata +++ /dev/null @@ -1,9 +0,0 @@ -foo 3 -2 -3 -5 - -bar 3 -7 -11 -13 diff --git a/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata.input b/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata.input new file mode 100644 index 0000000000..12157b9f9a --- /dev/null +++ b/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata.input @@ -0,0 +1,13 @@ +foo +3 +3 +2 +3 +5 + +bar +3 +3 +7 +11 +13 diff --git a/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata b/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata.input index d652781a35..f1f10bd6f3 100644 --- a/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata +++ b/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata.input @@ -1,9 +1,13 @@ -foo 3 +foo +3 +3 17 19 23 -bar 3 +bar +3 +3 29 31 37 diff --git a/test/tools/llvm-profdata/Inputs/foo4-1.profdata b/test/tools/llvm-profdata/Inputs/foo4-1.profdata.input index 4d694080bf..31d2a2ce75 100644 --- a/test/tools/llvm-profdata/Inputs/foo4-1.profdata +++ b/test/tools/llvm-profdata/Inputs/foo4-1.profdata.input @@ -1,4 +1,6 @@ -foo 4 +foo +4 +4 11 22 33 diff --git a/test/tools/llvm-profdata/Inputs/foo4-2.profdata b/test/tools/llvm-profdata/Inputs/foo4-2.profdata.input index 8d91d8bbef..01d8309b5c 100644 --- a/test/tools/llvm-profdata/Inputs/foo4-2.profdata +++ b/test/tools/llvm-profdata/Inputs/foo4-2.profdata.input @@ -1,4 +1,6 @@ -foo 4 +foo +4 +4 7 6 5 diff --git a/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata b/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata deleted file mode 100644 index 5575df3fda..0000000000 --- a/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata +++ /dev/null @@ -1,2 +0,0 @@ -invalid_count 1 -1later diff --git a/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata.input b/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata.input new file mode 100644 index 0000000000..2b61c55a67 --- /dev/null +++ b/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata.input @@ -0,0 +1,4 @@ +invalid_count +1 +1 +1later diff --git a/test/tools/llvm-profdata/Inputs/overflow.profdata b/test/tools/llvm-profdata/Inputs/overflow.profdata.input index bfb9a52d2e..c9a9d697ec 100644 --- a/test/tools/llvm-profdata/Inputs/overflow.profdata +++ b/test/tools/llvm-profdata/Inputs/overflow.profdata.input @@ -1,2 +1,4 @@ -overflow 1 +overflow +1 +1 9223372036854775808 diff --git a/test/tools/llvm-profdata/Inputs/three-words-long.profdata b/test/tools/llvm-profdata/Inputs/three-words-long.profdata.input index a4d45fb3bf..a4d45fb3bf 100644 --- a/test/tools/llvm-profdata/Inputs/three-words-long.profdata +++ b/test/tools/llvm-profdata/Inputs/three-words-long.profdata.input diff --git a/test/tools/llvm-profdata/Inputs/wrong-count.profdata.input b/test/tools/llvm-profdata/Inputs/wrong-count.profdata.input new file mode 100644 index 0000000000..129db626d1 --- /dev/null +++ b/test/tools/llvm-profdata/Inputs/wrong-count.profdata.input @@ -0,0 +1,4 @@ +wrong_count +3 +3 +1 diff --git a/test/tools/llvm-profdata/errors.test b/test/tools/llvm-profdata/errors.test deleted file mode 100644 index 6335ea95f9..0000000000 --- a/test/tools/llvm-profdata/errors.test +++ /dev/null @@ -1,22 +0,0 @@ -RUN: not llvm-profdata %p/Inputs/empty.profdata %p/Inputs/foo3-1.profdata 2>&1 | FileCheck %s --check-prefix=LENGTH -RUN: not llvm-profdata %p/Inputs/foo3-1.profdata %p/Inputs/foo3bar3-1.profdata 2>&1 | FileCheck %s --check-prefix=LENGTH -RUN: not llvm-profdata %p/Inputs/foo4-1.profdata %p/Inputs/empty.profdata 2>&1 | FileCheck %s --check-prefix=LENGTH -LENGTH: error: {{.*}}: truncated file - -RUN: not llvm-profdata %p/Inputs/foo3-1.profdata %p/Inputs/bar3-1.profdata 2>&1 | FileCheck %s --check-prefix=NAME -NAME: error: {{.*}}: function name mismatch - -RUN: not llvm-profdata %p/Inputs/foo3-1.profdata %p/Inputs/foo4-1.profdata 2>&1 | FileCheck %s --check-prefix=COUNT -COUNT: error: {{.*}}: function count mismatch - -RUN: not llvm-profdata %p/Inputs/overflow.profdata %p/Inputs/overflow.profdata 2>&1 | FileCheck %s --check-prefix=OVERFLOW -OVERFLOW: error: {{.*}}: counter overflow - -RUN: not llvm-profdata %p/Inputs/invalid-count-later.profdata %p/Inputs/invalid-count-later.profdata 2>&1 | FileCheck %s --check-prefix=INVALID-COUNT-LATER -INVALID-COUNT-LATER: error: {{.*}}: invalid counter - -RUN: not llvm-profdata %p/Inputs/bad-function-count.profdata %p/Inputs/bad-function-count.profdata 2>&1 | FileCheck %s --check-prefix=BAD-FUNCTION-COUNT -BAD-FUNCTION-COUNT: error: {{.*}}: bad function count - -RUN: not llvm-profdata %p/Inputs/three-words-long.profdata %p/Inputs/three-words-long.profdata 2>&1 | FileCheck %s --check-prefix=INVALID-DATA -INVALID-DATA: error: {{.*}}: invalid data diff --git a/test/tools/llvm-profdata/generate.test b/test/tools/llvm-profdata/generate.test new file mode 100644 index 0000000000..71e8b50fca --- /dev/null +++ b/test/tools/llvm-profdata/generate.test @@ -0,0 +1,38 @@ +RUN: llvm-profdata generate %p/Inputs/empty.profdata.input | llvm-profdata show -all-functions -counts - | FileCheck %s --check-prefix=EMPTY + +EMPTY: Total functions: 0 +EMPTY: Maximum function count: 0 +EMPTY: Maximum internal block count: 0 + +RUN: llvm-profdata generate %p/Inputs/foo3-1.profdata.input | llvm-profdata show -all-functions -counts - | FileCheck %s --check-prefix=FOO3 + +FOO3: foo: +FOO3: Counters: 3 +FOO3: Function count: 1 +FOO3: Block counts: [2, 3] +FOO3: Total functions: 1 +FOO3: Maximum function count: 1 +FOO3: Maximum internal block count: 3 + +RUN: llvm-profdata generate %p/Inputs/foo3bar3-1.profdata.input | llvm-profdata show -all-functions -counts - | FileCheck %s --check-prefix=FOO3BAR3 + +FOO3BAR3: foo: +FOO3BAR3: Counters: 3 +FOO3BAR3: Function count: 2 +FOO3BAR3: Block counts: [3, 5] +FOO3BAR3: bar: +FOO3BAR3: Counters: 3 +FOO3BAR3: Function count: 7 +FOO3BAR3: Block counts: [11, 13] +FOO3BAR3: Total functions: 2 +FOO3BAR3: Maximum function count: 7 +FOO3BAR3: Maximum internal block count: 13 + +RUN: not llvm-profdata generate %p/Inputs/invalid-count-later.profdata.input -o /dev/null 2>&1 | FileCheck %s --check-prefix=INVALID-COUNT-LATER +INVALID-COUNT-LATER: error: {{.*}}: Failed to read counter + +RUN: not llvm-profdata generate %p/Inputs/bad-hash.profdata.input -o /dev/null 2>&1 | FileCheck %s --check-prefix=BAD-HASH +BAD-HASH: error: {{.*}}: Failed to read hash + +RUN: not llvm-profdata generate %p/Inputs/wrong-count.profdata.input -o /dev/null 2>&1 | FileCheck %s --check-prefix=BAD-FUNCTION-COUNT +BAD-FUNCTION-COUNT: error: {{.*}}: Truncated file diff --git a/test/tools/llvm-profdata/merge-errors.test b/test/tools/llvm-profdata/merge-errors.test new file mode 100644 index 0000000000..1ab08be9f1 --- /dev/null +++ b/test/tools/llvm-profdata/merge-errors.test @@ -0,0 +1,21 @@ +RUN: llvm-profdata generate %p/Inputs/empty.profdata.input > %t-empty.profdata +RUN: llvm-profdata generate %p/Inputs/foo3-1.profdata.input > %t-foo3-1.profdata +RUN: llvm-profdata generate %p/Inputs/bar3-1.profdata.input > %t-bar3-1.profdata +RUN: llvm-profdata generate %p/Inputs/foo3bar3-1.profdata.input > %t-foo3bar3-1.profdata +RUN: llvm-profdata generate %p/Inputs/foo4-1.profdata.input > %t-foo4-1.profdata + +RUN: not llvm-profdata merge %t-empty.profdata %t-foo3-1.profdata -o /dev/null 2>&1 | FileCheck %s --check-prefix=LENGTH +RUN: not llvm-profdata merge %t-foo3-1.profdata %t-foo3bar3-1.profdata -o /dev/null 2>&1 | FileCheck %s --check-prefix=LENGTH +RUN: not llvm-profdata merge %t-foo4-1.profdata %t-empty.profdata -o /dev/null 2>&1 | FileCheck %s --check-prefix=LENGTH +LENGTH: error: {{.*}}: Truncated file + +RUN: not llvm-profdata merge %t-foo3-1.profdata %t-bar3-1.profdata -o /dev/null 2>&1 | FileCheck %s --check-prefix=NAME +NAME: error: {{.*}}: Function name mismatch + +RUN: not llvm-profdata merge %t-foo3-1.profdata %t-foo4-1.profdata -o /dev/null 2>&1 | FileCheck %s --check-prefix=COUNT +COUNT: error: {{.*}}: Function count mismatch + +RUN: llvm-profdata generate %p/Inputs/overflow.profdata.input > %t-overflow.profdata + +RUN: not llvm-profdata merge %t-overflow.profdata %t-overflow.profdata -o /dev/null 2>&1 | FileCheck %s --check-prefix=OVERFLOW +OVERFLOW: error: {{.*}}: Counter overflow diff --git a/test/tools/llvm-profdata/simple-merges.test b/test/tools/llvm-profdata/simple-merges.test new file mode 100644 index 0000000000..401ae6b58e --- /dev/null +++ b/test/tools/llvm-profdata/simple-merges.test @@ -0,0 +1,33 @@ +RUN: llvm-profdata generate %p/Inputs/foo3-1.profdata.input > %t-foo3-1.profdata +RUN: llvm-profdata generate %p/Inputs/foo3-2.profdata.input > %t-foo3-2.profdata + +RUN: llvm-profdata merge %t-foo3-1.profdata %t-foo3-2.profdata 2>&1 | llvm-profdata show -all-functions -counts - | FileCheck %s --check-prefix=FOO3 +RUN: llvm-profdata merge %t-foo3-2.profdata %t-foo3-1.profdata 2>&1 | llvm-profdata show -all-functions -counts - | FileCheck %s --check-prefix=FOO3 +FOO3: foo: +FOO3: Counters: 3 +FOO3: Function count: 8 +FOO3: Block counts: [7, 6] + +RUN: llvm-profdata generate %p/Inputs/foo4-1.profdata.input > %t-foo4-1.profdata +RUN: llvm-profdata generate %p/Inputs/foo4-2.profdata.input > %t-foo4-2.profdata + +RUN: llvm-profdata merge %t-foo4-1.profdata %t-foo4-2.profdata 2>&1 | llvm-profdata show -all-functions -counts - | FileCheck %s --check-prefix=FOO4 +RUN: llvm-profdata merge %t-foo4-2.profdata %t-foo4-1.profdata 2>&1 | llvm-profdata show -all-functions -counts - | FileCheck %s --check-prefix=FOO4 +FOO4: foo: +FOO4: Counters: 4 +FOO4: Function count: 18 +FOO4: Block counts: [28, 38, 48] + +RUN: llvm-profdata generate %p/Inputs/foo3bar3-1.profdata.input > %t-foo3bar3-1.profdata +RUN: llvm-profdata generate %p/Inputs/foo3bar3-2.profdata.input > %t-foo3bar3-2.profdata + +RUN: llvm-profdata merge %t-foo3bar3-1.profdata %t-foo3bar3-2.profdata 2>&1 | llvm-profdata show -all-functions -counts - | FileCheck %s --check-prefix=FOO3BAR3 +RUN: llvm-profdata merge %t-foo3bar3-2.profdata %t-foo3bar3-1.profdata 2>&1 | llvm-profdata show -all-functions -counts - | FileCheck %s --check-prefix=FOO3BAR3 +FOO3BAR3: foo: +FOO3BAR3: Counters: 3 +FOO3BAR3: Function count: 19 +FOO3BAR3: Block counts: [22, 28] +FOO3BAR3: bar: +FOO3BAR3: Counters: 3 +FOO3BAR3: Function count: 36 +FOO3BAR3: Block counts: [42, 50] diff --git a/test/tools/llvm-profdata/simple.test b/test/tools/llvm-profdata/simple.test deleted file mode 100644 index 87073fad9c..0000000000 --- a/test/tools/llvm-profdata/simple.test +++ /dev/null @@ -1,25 +0,0 @@ -RUN: llvm-profdata %p/Inputs/foo3-1.profdata %p/Inputs/foo3-2.profdata 2>&1 | FileCheck %s --check-prefix=FOO3 -RUN: llvm-profdata %p/Inputs/foo3-2.profdata %p/Inputs/foo3-1.profdata 2>&1 | FileCheck %s --check-prefix=FOO3 -FOO3: {{^foo 3$}} -FOO3-NEXT: {{^8$}} -FOO3-NEXT: {{^7$}} -FOO3-NEXT: {{^6$}} - -RUN: llvm-profdata %p/Inputs/foo4-1.profdata %p/Inputs/foo4-2.profdata 2>&1 | FileCheck %s --check-prefix=FOO4 -RUN: llvm-profdata %p/Inputs/foo4-2.profdata %p/Inputs/foo4-1.profdata 2>&1 | FileCheck %s --check-prefix=FOO4 -FOO4: {{^foo 4$}} -FOO4-NEXT: {{^18$}} -FOO4-NEXT: {{^28$}} -FOO4-NEXT: {{^38$}} -FOO4-NEXT: {{^48$}} - -RUN: llvm-profdata %p/Inputs/foo3bar3-1.profdata %p/Inputs/foo3bar3-2.profdata 2>&1 | FileCheck %s --check-prefix=FOO3BAR3 -RUN: llvm-profdata %p/Inputs/foo3bar3-2.profdata %p/Inputs/foo3bar3-1.profdata 2>&1 | FileCheck %s --check-prefix=FOO3BAR3 -FOO3BAR3: {{^foo 3$}} -FOO3BAR3-NEXT: {{^19$}} -FOO3BAR3-NEXT: {{^22$}} -FOO3BAR3-NEXT: {{^28$}} -FOO3BAR3: {{^bar 3$}} -FOO3BAR3-NEXT: {{^36$}} -FOO3BAR3-NEXT: {{^42$}} -FOO3BAR3-NEXT: {{^50$}} diff --git a/tools/llvm-profdata/CMakeLists.txt b/tools/llvm-profdata/CMakeLists.txt index 4b1357d87e..f0667f16f9 100644 --- a/tools/llvm-profdata/CMakeLists.txt +++ b/tools/llvm-profdata/CMakeLists.txt @@ -1,4 +1,4 @@ -set(LLVM_LINK_COMPONENTS core support ) +set(LLVM_LINK_COMPONENTS core profile support) add_llvm_tool(llvm-profdata llvm-profdata.cpp diff --git a/tools/llvm-profdata/LLVMBuild.txt b/tools/llvm-profdata/LLVMBuild.txt index fc9e469199..f6492da26c 100644 --- a/tools/llvm-profdata/LLVMBuild.txt +++ b/tools/llvm-profdata/LLVMBuild.txt @@ -19,4 +19,4 @@ type = Tool name = llvm-profdata parent = Tools -required_libraries = Support +required_libraries = Profile Support diff --git a/tools/llvm-profdata/Makefile b/tools/llvm-profdata/Makefile index 9d7ad527b1..11276e25b9 100644 --- a/tools/llvm-profdata/Makefile +++ b/tools/llvm-profdata/Makefile @@ -9,7 +9,7 @@ LEVEL := ../.. TOOLNAME := llvm-profdata -LINK_COMPONENTS := core support +LINK_COMPONENTS := core profile support # This tool has no plugins, optimize startup time. TOOL_NO_EXPORTS := 1 diff --git a/tools/llvm-profdata/llvm-profdata.cpp b/tools/llvm-profdata/llvm-profdata.cpp index b338efd27e..fcc54042f4 100644 --- a/tools/llvm-profdata/llvm-profdata.cpp +++ b/tools/llvm-profdata/llvm-profdata.cpp @@ -12,7 +12,10 @@ //===----------------------------------------------------------------------===// #include "llvm/ADT/StringRef.h" +#include "llvm/Profile/ProfileDataReader.h" +#include "llvm/Profile/ProfileDataWriter.h" #include "llvm/Support/CommandLine.h" +#include "llvm/Support/LineIterator.h" #include "llvm/Support/ManagedStatic.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/PrettyStackTrace.h" @@ -21,91 +24,211 @@ using namespace llvm; -static cl::opt<std::string> Filename1(cl::Positional, cl::Required, - cl::desc("file1")); -static cl::opt<std::string> Filename2(cl::Positional, cl::Required, - cl::desc("file2")); - -static cl::opt<std::string> OutputFilename("output", cl::value_desc("output"), - cl::init("-"), - cl::desc("Output file")); -static cl::alias OutputFilenameA("o", cl::desc("Alias for --output"), - cl::aliasopt(OutputFilename)); - -static bool readLine(const char *&Start, const char *End, StringRef &S) { - if (Start == End) - return false; - - for (const char *I = Start; I != End; ++I) { - assert(*I && "unexpected binary data"); - if (*I == '\n') { - S = StringRef(Start, I - Start); - Start = I + 1; - return true; +static void exitWithError(const std::string &Message, + const std::string &Filename, int64_t Line = -1) { + errs() << "error: " << Filename; + if (Line >= 0) + errs() << ":" << Line; + errs() << ": " << Message << "\n"; + ::exit(1); +} + +int merge_main(int argc, const char *argv[]) { + cl::opt<std::string> Filename1(cl::Positional, cl::Required, + cl::desc("file1")); + cl::opt<std::string> Filename2(cl::Positional, cl::Required, + cl::desc("file2")); + + cl::opt<std::string> OutputFilename("output", cl::value_desc("output"), + cl::init("-"), + cl::desc("Output file")); + cl::alias OutputFilenameA("o", cl::desc("Alias for --output"), + cl::aliasopt(OutputFilename)); + + cl::ParseCommandLineOptions(argc, argv, "LLVM profile data merger\n"); + + std::unique_ptr<ProfileDataReader> Reader1, Reader2; + if (error_code EC = ProfileDataReader::create(Filename1, Reader1)) + exitWithError(EC.message(), Filename1); + if (error_code EC = ProfileDataReader::create(Filename2, Reader2)) + exitWithError(EC.message(), Filename2); + + if (OutputFilename.empty()) + OutputFilename = "-"; + + std::string ErrorInfo; + raw_fd_ostream Output(OutputFilename.data(), ErrorInfo, sys::fs::F_Text); + if (!ErrorInfo.empty()) + exitWithError(ErrorInfo, OutputFilename); + + if (Output.is_displayed()) + exitWithError("Refusing to write a binary file to stdout", OutputFilename); + + StringRef Name1, Name2; + std::vector<uint64_t> Counts1, Counts2, NewCounts; + uint64_t Hash1, Hash2; + ProfileDataWriter Writer; + ProfileDataReader::name_iterator I1 = Reader1->begin(), + E1 = Reader1->end(), + I2 = Reader2->begin(), + E2 = Reader2->end(); + for (; I1 != E1 && I2 != E2; ++I1, ++I2) { + Name1 = *I1; + Name2 = *I2; + if (Name1 != Name2) + exitWithError("Function name mismatch", Filename2); // ??? + + if (error_code EC = Reader1->getFunctionCounts(Name1, Hash1, Counts1)) + exitWithError(EC.message(), Filename1); + if (error_code EC = Reader2->getFunctionCounts(Name2, Hash2, Counts2)) + exitWithError(EC.message(), Filename2); + + if (Counts1.size() != Counts2.size()) + exitWithError("Function count mismatch", Filename2); // ??? + if (Hash1 != Hash2) + exitWithError("Function hash mismatch", Filename2); // ??? + + for (size_t II = 0, EE = Counts1.size(); II < EE; ++II) { + uint64_t Sum = Counts1[II] + Counts2[II]; + if (Sum < Counts1[II]) + exitWithError("Counter overflow", Filename2); // ??? + NewCounts.push_back(Sum); } + + Writer.addFunctionCounts(Name1, Hash1, NewCounts.size(), NewCounts.data()); + + Counts1.clear(); + Counts2.clear(); + NewCounts.clear(); } + if (I1 != E1 || I2 != E2) + exitWithError("Truncated file", Filename2); + + Writer.write(Output); - S = StringRef(Start, End - Start); - Start = End; - return true; + return 0; } -static StringRef getWord(const char *&Start, const char *End) { - for (const char *I = Start; I != End; ++I) - if (*I == ' ') { - StringRef S(Start, I - Start); - Start = I + 1; - return S; +struct HashPrinter { + uint64_t Hash; + HashPrinter(uint64_t Hash) : Hash(Hash) {} + void print(raw_ostream &OS) const { + char Buf[18], *Cur = Buf; + *Cur++ = '0'; *Cur++ = 'x'; + for (unsigned I = 16; I;) { + char Digit = 0xF & (Hash >> (--I * 4)); + *Cur++ = (Digit < 10 ? '0' + Digit : 'A' + Digit - 10); } - StringRef S(Start, End - Start); - Start = End; - return S; + OS.write(Buf, 18); + } +}; +static raw_ostream &operator<<(raw_ostream &OS, const HashPrinter &Hash) { + Hash.print(OS); + return OS; } -static size_t splitWords(const StringRef &Line, std::vector<StringRef> &Words) { - const char *Start = Line.data(); - const char *End = Line.data() + Line.size(); - Words.clear(); - while (Start != End) - Words.push_back(getWord(Start, End)); - return Words.size(); +struct FreqPrinter { + double Freq; + FreqPrinter(double Freq) : Freq(Freq) {} + void print(raw_ostream &OS) const { + OS << (unsigned)(Freq * 100) << "." << ((unsigned)(Freq * 1000) % 10) + << ((unsigned)(Freq * 10000) % 10) << "%"; + } +}; +static raw_ostream &operator<<(raw_ostream &OS, const FreqPrinter &Freq) { + Freq.print(OS); + return OS; } -static bool getNumber(const StringRef &S, uint64_t &N) { - N = 0; - for (StringRef::iterator I = S.begin(), E = S.end(); I != E; ++I) - if (*I >= '0' && *I <= '9') - N = N * 10 + (*I - '0'); - else - return false; +int show_main(int argc, const char *argv[]) { + cl::opt<std::string> Filename(cl::Positional, cl::Required, + cl::desc("<profdata-file>")); - return true; -} + cl::opt<bool> ShowCounts("counts", cl::init(false)); + cl::opt<bool> ShowAllFunctions("all-functions", cl::init(false)); + cl::opt<std::string> ShowFunction("function"); -static void exitWithError(const std::string &Message, - const std::string &Filename, int64_t Line = -1) { - errs() << "error: " << Filename; - if (Line >= 0) - errs() << ":" << Line; - errs() << ": " << Message << "\n"; - ::exit(1); + cl::opt<std::string> OutputFilename("output", cl::value_desc("output"), + cl::init("-"), + cl::desc("Output file")); + cl::alias OutputFilenameA("o", cl::desc("Alias for --output"), + cl::aliasopt(OutputFilename)); + + cl::ParseCommandLineOptions(argc, argv, "LLVM profile data summary\n"); + + std::unique_ptr<ProfileDataReader> Reader; + if (error_code EC = ProfileDataReader::create(Filename, Reader)) + exitWithError(EC.message(), Filename); + + if (OutputFilename.empty()) + OutputFilename = "-"; + + std::string ErrorInfo; + raw_fd_ostream OS(OutputFilename.data(), ErrorInfo, sys::fs::F_Text); + if (!ErrorInfo.empty()) + exitWithError(ErrorInfo, OutputFilename); + + if (ShowAllFunctions && !ShowFunction.empty()) + errs() << "warning: -function argument ignored: showing all functions\n"; + + uint64_t MaxBlockCount = 0, MaxFunctionCount = 0; + uint64_t Hash; + double CallFreq; + size_t ShownFunctions = false; + std::vector<uint64_t> Counts; + for (const auto &Name : *Reader) { + bool Show = ShowAllFunctions || Name.find(ShowFunction) != Name.npos; + if (error_code EC = Reader->getFunctionCounts(Name, Hash, Counts)) + exitWithError(EC.message(), Filename); + if (error_code EC = Reader->getCallFrequency(Name, Hash, CallFreq)) + exitWithError(EC.message(), Filename); + if (Show) { + if (!ShownFunctions) + OS << "Counters:\n"; + ++ShownFunctions; + OS << " " << Name << ":\n" + << " Hash: " << HashPrinter(Hash) << "\n" + << " Relative call frequency: " << FreqPrinter(CallFreq) << "\n" + << " Counters: " << Counts.size() << "\n" + << " Function count: " << Counts[0] << "\n"; + } + + if (Counts[0] > MaxFunctionCount) + MaxFunctionCount = Counts[0]; + + if (Show && ShowCounts) + OS << " Block counts: ["; + for (size_t I = 1, E = Counts.size(); I < E; ++I) { + if (Counts[I] > MaxBlockCount) + MaxBlockCount = Counts[I]; + if (Show && ShowCounts) + OS << (I == 1 ? "" : ", ") << Counts[I]; + } + if (Show && ShowCounts) + OS << "]\n"; + + Counts.clear(); + } + + if (ShowAllFunctions || !ShowFunction.empty()) + OS << "Functions shown: " << ShownFunctions << "\n"; + OS << "Total functions: " << Reader->numProfiledFunctions() << "\n"; + OS << "Maximum function count: " << MaxFunctionCount << "\n"; + OS << "Maximum internal block count: " << MaxBlockCount << "\n"; + return 0; } -//===----------------------------------------------------------------------===// -int main(int argc, char **argv) { - // Print a stack trace if we signal out. - sys::PrintStackTraceOnErrorSignal(); - PrettyStackTraceProgram X(argc, argv); - llvm_shutdown_obj Y; // Call llvm_shutdown() on exit. +int generate_main(int argc, const char *argv[]) { + cl::opt<std::string> InputName(cl::Positional, cl::Required, + cl::desc("<input-file>")); - cl::ParseCommandLineOptions(argc, argv, "LLVM profile data merger\n"); + cl::opt<std::string> OutputFilename("output", cl::value_desc("output"), + cl::init("-"), + cl::desc("Output file")); + cl::alias OutputFilenameA("o", cl::desc("Alias for --output"), + cl::aliasopt(OutputFilename)); - std::unique_ptr<MemoryBuffer> File1; - std::unique_ptr<MemoryBuffer> File2; - if (error_code ec = MemoryBuffer::getFile(Filename1, File1)) - exitWithError(ec.message(), Filename1); - if (error_code ec = MemoryBuffer::getFile(Filename2, File2)) - exitWithError(ec.message(), Filename2); + cl::ParseCommandLineOptions(argc, argv, "LLVM profile data generator\n"); if (OutputFilename.empty()) OutputFilename = "-"; @@ -115,63 +238,86 @@ int main(int argc, char **argv) { if (!ErrorInfo.empty()) exitWithError(ErrorInfo, OutputFilename); - const char *Start1 = File1->getBufferStart(); - const char *Start2 = File2->getBufferStart(); - const char *End1 = File1->getBufferEnd(); - const char *End2 = File2->getBufferEnd(); - const char *P1 = Start1; - const char *P2 = Start2; - - StringRef Line1, Line2; - int64_t Num = 0; - while (readLine(P1, End1, Line1)) { - ++Num; - if (!readLine(P2, End2, Line2)) - exitWithError("truncated file", Filename2, Num); - - std::vector<StringRef> Words1, Words2; - if (splitWords(Line1, Words1) != splitWords(Line2, Words2)) - exitWithError("data mismatch", Filename2, Num); - - if (Words1.size() > 2) - exitWithError("invalid data", Filename1, Num); - - if (Words1.empty()) { - Output << "\n"; + if (Output.is_displayed()) + exitWithError("Refusing to write a binary file to stdout", OutputFilename); + + std::unique_ptr<MemoryBuffer> Buffer; + if (error_code EC = MemoryBuffer::getFile(InputName, Buffer)) + exitWithError(EC.message(), InputName); + + ProfileDataWriter Writer; + StringRef Name; + uint64_t Hash, NumCounters; + std::vector<uint64_t> Counters; + for (line_iterator I(*Buffer, '#'); !I.is_at_end(); ++I) { + if (I->empty()) continue; + Name = *I; + if ((++I).is_at_end()) + exitWithError("Truncated file", InputName, I.line_number()); + if (I->getAsInteger(10, Hash)) + exitWithError("Failed to read hash", InputName, I.line_number()); + if ((++I).is_at_end()) + exitWithError("Truncated file", InputName, I.line_number()); + if (I->getAsInteger(10, NumCounters)) + exitWithError("Failed to read num counters", InputName, I.line_number()); + for (uint64_t CurCounter = 0; CurCounter < NumCounters; ++CurCounter) { + uint64_t Counter; + if ((++I).is_at_end()) + exitWithError("Truncated file", InputName, I.line_number()); + if (I->getAsInteger(10, Counter)) + exitWithError("Failed to read counter", InputName, I.line_number()); + Counters.push_back(Counter); } + Writer.addFunctionCounts(Name, Hash, NumCounters, Counters.data()); + Counters.clear(); + } + + Writer.write(Output); + + return 0; +} - if (Words1.size() == 2) { - if (Words1[0] != Words2[0]) - exitWithError("function name mismatch", Filename2, Num); +int main(int argc, const char *argv[]) { + // Print a stack trace if we signal out. + sys::PrintStackTraceOnErrorSignal(); + PrettyStackTraceProgram X(argc, argv); + llvm_shutdown_obj Y; // Call llvm_shutdown() on exit. - uint64_t N1, N2; - if (!getNumber(Words1[1], N1)) - exitWithError("bad function count", Filename1, Num); - if (!getNumber(Words2[1], N2)) - exitWithError("bad function count", Filename2, Num); + StringRef ProgName(sys::path::filename(argv[0])); + if (argc > 1) { + int (*func)(int, const char *[]) = 0; - if (N1 != N2) - exitWithError("function count mismatch", Filename2, Num); + if (strcmp(argv[1], "merge") == 0) + func = merge_main; + else if (strcmp(argv[1], "show") == 0) + func = show_main; + else if (strcmp(argv[1], "generate") == 0) + func = generate_main; - Output << Line1 << "\n"; - continue; + if (func) { + std::string Invocation(ProgName.str() + " " + argv[1]); + argv[1] = Invocation.c_str(); + return func(argc - 1, argv + 1); } - uint64_t N1, N2; - if (!getNumber(Words1[0], N1)) - exitWithError("invalid counter", Filename1, Num); - if (!getNumber(Words2[0], N2)) - exitWithError("invalid counter", Filename2, Num); - - uint64_t Sum = N1 + N2; - if (Sum < N1) - exitWithError("counter overflow", Filename2, Num); + if (strcmp(argv[1], "-h") == 0 || + strcmp(argv[1], "-help") == 0 || + strcmp(argv[1], "--help") == 0) { - Output << N1 + N2 << "\n"; + errs() << "OVERVIEW: LLVM profile data tools\n\n" + << "USAGE: " << ProgName << " <command> [args...]\n" + << "USAGE: " << ProgName << " <command> -help\n\n" + << "Available commands: merge, show, generate\n"; + return 0; + } } - if (readLine(P2, End2, Line2)) - exitWithError("truncated file", Filename1, Num + 1); - return 0; + if (argc < 2) + errs() << ProgName << ": No command specified!\n"; + else + errs() << ProgName << ": Unknown command!\n"; + + errs() << "USAGE: " << ProgName << " <merge|show|generate> [args...]\n"; + return 1; } |