diff options
author | Vedant Kumar <vsk@apple.com> | 2016-06-06 23:43:56 +0000 |
---|---|---|
committer | Vedant Kumar <vsk@apple.com> | 2016-06-06 23:43:56 +0000 |
commit | 4333164ff37160cf5e4120b864fd02a2d51c0138 (patch) | |
tree | b52e9594ecb59e5c44b791aa4e3067c277c4eb0a /tools/llvm-profdata | |
parent | 815649892ebfeac9d5c8041c97d761cb7b3ce889 (diff) |
Revert "Retry^2 "[llvm-profdata] Add option to ingest filepaths from a file""
This reverts commit r271953. It's still breaking on Windows, though the
list initialization issue is fixed:
http://bb.pgr.jp/builders/ninja-clang-i686-msc19-R/builds/3751
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@271963 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm-profdata')
-rw-r--r-- | tools/llvm-profdata/llvm-profdata.cpp | 76 |
1 files changed, 13 insertions, 63 deletions
diff --git a/tools/llvm-profdata/llvm-profdata.cpp b/tools/llvm-profdata/llvm-profdata.cpp index b5966a493ce..20a167226a3 100644 --- a/tools/llvm-profdata/llvm-profdata.cpp +++ b/tools/llvm-profdata/llvm-profdata.cpp @@ -108,12 +108,12 @@ static void handleMergeWriterError(Error E, StringRef WhenceFile = "", } struct WeightedFile { - std::string Filename; + StringRef Filename; uint64_t Weight; WeightedFile() {} - WeightedFile(std::string F, uint64_t W) : Filename(F), Weight(W) {} + WeightedFile(StringRef F, uint64_t W) : Filename{F}, Weight{W} {} }; typedef SmallVector<WeightedFile, 5> WeightedFileVector; @@ -208,53 +208,19 @@ static void mergeSampleProfile(const WeightedFileVector &Inputs, Writer->write(ProfileMap); } -static std::string canonicalizeFilePath(StringRef Filename) { - SmallString<256> CanonicalFilename; - sys::path::native(Filename, CanonicalFilename); - return StringRef(CanonicalFilename).str(); -} - static WeightedFile parseWeightedFile(const StringRef &WeightedFilename) { - StringRef WeightStr, FilenameStr; - std::tie(WeightStr, FilenameStr) = WeightedFilename.split(','); + StringRef WeightStr, FileName; + std::tie(WeightStr, FileName) = WeightedFilename.split(','); uint64_t Weight; if (WeightStr.getAsInteger(10, Weight) || Weight < 1) exitWithError("Input weight must be a positive integer."); - std::string CanonicalFilename = canonicalizeFilePath(FilenameStr); - - if (!sys::fs::exists(CanonicalFilename)) + if (!sys::fs::exists(FileName)) exitWithErrorCode(make_error_code(errc::no_such_file_or_directory), - CanonicalFilename); - - return WeightedFile(StringRef(CanonicalFilename).str(), Weight); -} + FileName); -static void parseInputFilenamesFile(const StringRef &InputFilenamesFile, - WeightedFileVector &WFV) { - if (InputFilenamesFile == "") - return; - - auto BufOrError = MemoryBuffer::getFileOrSTDIN(InputFilenamesFile); - if (!BufOrError) - exitWithErrorCode(BufOrError.getError(), InputFilenamesFile); - - auto Buffer = std::move(*BufOrError); - StringRef Data = Buffer->getBuffer(); - SmallVector<StringRef, 8> Entries; - Data.split(Entries, '\n', /*MaxSplit=*/-1, /*KeepEmpty=*/false); - for (const StringRef &FileWeightEntry : Entries) { - StringRef SanitizedEntry = FileWeightEntry.trim(" \t\v\f\r"); - // Skip comments. - if (SanitizedEntry.startswith("#")) - continue; - // If there's no comma, it's an unweighted profile. - else if (SanitizedEntry.find(',') == StringRef::npos) - WFV.emplace_back(canonicalizeFilePath(SanitizedEntry), 1); - else - WFV.emplace_back(parseWeightedFile(SanitizedEntry)); - } + return WeightedFile(FileName, Weight); } static int merge_main(int argc, const char *argv[]) { @@ -262,15 +228,6 @@ static int merge_main(int argc, const char *argv[]) { cl::desc("<filename...>")); cl::list<std::string> WeightedInputFilenames("weighted-input", cl::desc("<weight>,<filename>")); - cl::opt<std::string> InputFilenamesFile( - "input-files", cl::init(""), - cl::desc("Path to file containing newline-separated " - "[<weight>,]<filename> entries")); - cl::alias InputFilenamesFileA("f", cl::desc("Alias for --input-files"), - cl::aliasopt(InputFilenamesFile)); - cl::opt<bool> DumpInputFileList( - "dump-input-file-list", cl::init(false), cl::Hidden, - cl::desc("Dump the list of input files and their weights, then exit")); cl::opt<std::string> OutputFilename("output", cl::value_desc("output"), cl::init("-"), cl::Required, cl::desc("Output file")); @@ -292,22 +249,15 @@ static int merge_main(int argc, const char *argv[]) { cl::ParseCommandLineOptions(argc, argv, "LLVM profile data merger\n"); - WeightedFileVector WeightedInputs; - for (StringRef Filename : InputFilenames) - WeightedInputs.emplace_back(canonicalizeFilePath(Filename), 1); - for (StringRef WeightedFilename : WeightedInputFilenames) - WeightedInputs.emplace_back(parseWeightedFile(WeightedFilename)); - parseInputFilenamesFile(InputFilenamesFile, WeightedInputs); - - if (WeightedInputs.empty()) + if (InputFilenames.empty() && WeightedInputFilenames.empty()) exitWithError("No input files specified. See " + sys::path::filename(argv[0]) + " -help"); - if (DumpInputFileList) { - for (auto &WF : WeightedInputs) - outs() << WF.Weight << "," << WF.Filename << "\n"; - return 0; - } + WeightedFileVector WeightedInputs; + for (StringRef Filename : InputFilenames) + WeightedInputs.push_back(WeightedFile(Filename, 1)); + for (StringRef WeightedFilename : WeightedInputFilenames) + WeightedInputs.push_back(parseWeightedFile(WeightedFilename)); if (ProfileKind == instr) mergeInstrProfile(WeightedInputs, OutputFilename, OutputFormat, |