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

[llvm-profdata] Add option to ingest filepaths from a file

Browse Source 
Differential Revision: http://reviews.llvm.org/D20980

llvm-svn: 271709
This commit is contained in:
Vedant Kumar 2016-06-03 19:05:20 +00:00
parent 21c0bc722b
commit 6bbf734940
3 changed files with 70 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/CommandGuide/llvm-profdata.rst
View File

@ -44,6 +44,9 @@ interpreted as relatively more important than a shorter run. Depending on the
nature of the training runs it may be useful to adjust the weight given to each
input file by using the ``-weighted-input`` option.
Profiles passed in via ``-weighted-input``, ``-input-files``, or via positional
arguments are processed once for each time they are seen.
OPTIONS
^^^^^^^
@ -65,6 +68,12 @@ OPTIONS
Input files specified without using this option are assigned a default
weight of 1. Examples are shown below.
.. option:: -input-files=path, -f=path
Specify a file which contains a list of files to merge. The entries in this
file are newline-separated. Lines starting with '#' are skipped. Entries may
be of the form <filename> or <weight>,<filename>.
.. option:: -instr (default)
Specify that the input profile is an instrumentation-based profile.

16
test/tools/llvm-profdata/input-filenames.test Normal file
View File

@ -0,0 +1,16 @@
# Create an input file.
RUN: printf '# comment 1\n' > %t.input
RUN: printf ' # comment 2\n' >> %t.input
RUN: printf 'foo\n' >> %t.input
RUN: printf ' bar\n' >> %t.input
RUN: printf "2,%t.weighted\n" >> %t.input
# Create the weighted file, since these actually need to exist.
RUN: printf ' ' > %t.weighted
# RUN: llvm-profdata merge -f %t.input -dump-input-file-list -o /dev/null | FileCheck %s
# RUN: llvm-profdata merge -input-files %t.input -dump-input-file-list -o /dev/null | FileCheck %s
# CHECK: 1,foo
# CHECK-NEXT: 1,bar
# CHECK-NEXT: 2,{{.*}}.weighted

49
tools/llvm-profdata/llvm-profdata.cpp
View File

@ -223,11 +223,45 @@ static WeightedFile parseWeightedFile(const StringRef &WeightedFilename) {
return WeightedFile(FileName, Weight);
}
static void parseInputFilenamesFile(const StringRef &InputFilenamesFile,
WeightedFileVector &WFV) {
if (InputFilenamesFile == "")
return;
auto Buf = MemoryBuffer::getFileOrSTDIN(InputFilenamesFile);
if (!Buf)
exitWithErrorCode(Buf.getError(), InputFilenamesFile);
StringRef Data = Buf.get()->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.rfind(',') == StringRef::npos)
WFV.emplace_back(SanitizedEntry, 1);
else
WFV.emplace_back(parseWeightedFile(SanitizedEntry));
}
}
static int merge_main(int argc, const char *argv[]) {
cl::list<std::string> InputFilenames(cl::Positional,
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 "
"<filename>[,<weight>] 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"));
@ -249,15 +283,22 @@ static int merge_main(int argc, const char *argv[]) {
cl::ParseCommandLineOptions(argc, argv, "LLVM profile data merger\n");
if (InputFilenames.empty() && WeightedInputFilenames.empty())
exitWithError("No input files specified. See " +
sys::path::filename(argv[0]) + " -help");
WeightedFileVector WeightedInputs;
for (StringRef Filename : InputFilenames)
WeightedInputs.push_back(WeightedFile(Filename, 1));
for (StringRef WeightedFilename : WeightedInputFilenames)
WeightedInputs.push_back(parseWeightedFile(WeightedFilename));
parseInputFilenamesFile(InputFilenamesFile, WeightedInputs);
if (WeightedInputs.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;
}
if (ProfileKind == instr)
mergeInstrProfile(WeightedInputs, OutputFilename, OutputFormat,