RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-04-03 16:51:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename one of our two llvm::GCOVOptions classes to llvm::GCOV::Options. We used

Browse Source 
to get away with this because llvm/Support/GCOV.h was an implementation detail
of the llvm-gcov tool, but it's now being used by FDO.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@250258 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Richard Smith 2015-10-14 00:04:19 +00:00
parent 9403b88ae6
commit 1184005c1e
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/llvm/Support/GCOV.h
View File

@ -31,11 +31,10 @@ class FileInfo;
namespace GCOV { namespace GCOV {
enum GCOVVersion { V402, V404, V704 }; enum GCOVVersion { V402, V404, V704 };
} // end GCOV namespace
/// GCOVOptions - A struct for passing gcov options between functions. /// \brief A struct for passing gcov options between functions.
struct GCOVOptions { struct Options {
GCOVOptions(bool A, bool B, bool C, bool F, bool P, bool U, bool L, bool N) Options(bool A, bool B, bool C, bool F, bool P, bool U, bool L, bool N)
: AllBlocks(A), BranchInfo(B), BranchCount(C), FuncCoverage(F), : AllBlocks(A), BranchInfo(B), BranchCount(C), FuncCoverage(F),
PreservePaths(P), UncondBranch(U), LongFileNames(L), NoOutput(N) {} PreservePaths(P), UncondBranch(U), LongFileNames(L), NoOutput(N) {}
@ -48,6 +47,7 @@ struct GCOVOptions {
bool LongFileNames; bool LongFileNames;
bool NoOutput; bool NoOutput;
}; };
} // end GCOV namespace
/// GCOVBuffer - A wrapper around MemoryBuffer to provide GCOV specific /// GCOVBuffer - A wrapper around MemoryBuffer to provide GCOV specific
/// read operations. /// read operations.
@ -395,7 +395,7 @@ class FileInfo {
}; };
public: public:
FileInfo(const GCOVOptions &Options) FileInfo(const GCOV::Options &Options)
: Options(Options), LineInfo(), RunCount(0), ProgramCount(0) {} : Options(Options), LineInfo(), RunCount(0), ProgramCount(0) {}
void addBlockLine(StringRef Filename, uint32_t Line, const GCOVBlock *Block) { void addBlockLine(StringRef Filename, uint32_t Line, const GCOVBlock *Block) {
@ -429,7 +429,7 @@ private:
void printFuncCoverage(raw_ostream &OS) const; void printFuncCoverage(raw_ostream &OS) const;
void printFileCoverage(raw_ostream &OS) const; void printFileCoverage(raw_ostream &OS) const;
const GCOVOptions &Options; const GCOV::Options &Options;
StringMap<LineData> LineInfo; StringMap<LineData> LineInfo;
uint32_t RunCount; uint32_t RunCount;
uint32_t ProgramCount; uint32_t ProgramCount;

4
include/llvm/module.modulemap
View File

@ -190,10 +190,6 @@ module LLVM_Utils {
// Exclude this; it's fundamentally non-modular. // Exclude this; it's fundamentally non-modular.
exclude header "Support/PluginLoader.h" exclude header "Support/PluginLoader.h"
// Exclude this; it's a weirdly-factored part of llvm-gcov and conflicts
// with the Analysis module (which also defines an llvm::GCOVOptions).
exclude header "Support/GCOV.h"
// FIXME: Mislayered? // FIXME: Mislayered?
exclude header "Support/TargetRegistry.h" exclude header "Support/TargetRegistry.h"

4
lib/IR/GCOV.cpp
View File

@ -448,7 +448,7 @@ static uint32_t branchDiv(uint64_t Numerator, uint64_t Divisor) {
namespace { namespace {
struct formatBranchInfo { struct formatBranchInfo {
formatBranchInfo(const GCOVOptions &Options, uint64_t Count, uint64_t Total) formatBranchInfo(const GCOV::Options &Options, uint64_t Count, uint64_t Total)
: Options(Options), Count(Count), Total(Total) {} : Options(Options), Count(Count), Total(Total) {}
void print(raw_ostream &OS) const { void print(raw_ostream &OS) const {
@ -460,7 +460,7 @@ struct formatBranchInfo {
OS << "taken " << branchDiv(Count, Total) << "%"; OS << "taken " << branchDiv(Count, Total) << "%";
} }
const GCOVOptions &Options; const GCOV::Options &Options;
uint64_t Count; uint64_t Count;
uint64_t Total; uint64_t Total;
}; };

6
tools/llvm-cov/gcov.cpp
View File

@ -26,7 +26,7 @@ using namespace llvm;
static void reportCoverage(StringRef SourceFile, StringRef ObjectDir, static void reportCoverage(StringRef SourceFile, StringRef ObjectDir,
const std::string &InputGCNO, const std::string &InputGCNO,
const std::string &InputGCDA, bool DumpGCOV, const std::string &InputGCDA, bool DumpGCOV,
const GCOVOptions &Options) { const GCOV::Options &Options) {
SmallString<128> CoverageFileStem(ObjectDir); SmallString<128> CoverageFileStem(ObjectDir);
if (CoverageFileStem.empty()) { if (CoverageFileStem.empty()) {
// If no directory was specified with -o, look next to the source file. // If no directory was specified with -o, look next to the source file.
@ -143,8 +143,8 @@ int gcovMain(int argc, const char *argv[]) {
cl::ParseCommandLineOptions(argc, argv, "LLVM code coverage tool\n"); cl::ParseCommandLineOptions(argc, argv, "LLVM code coverage tool\n");
GCOVOptions Options(AllBlocks, BranchProb, BranchCount, FuncSummary, GCOV::Options Options(AllBlocks, BranchProb, BranchCount, FuncSummary,
PreservePaths, UncondBranch, LongNames, NoOutput); PreservePaths, UncondBranch, LongNames, NoOutput);
for (const auto &SourceFile : SourceFiles) for (const auto &SourceFile : SourceFiles)
reportCoverage(SourceFile, ObjectDir, InputGCNO, InputGCDA, DumpGCOV, reportCoverage(SourceFile, ObjectDir, InputGCNO, InputGCDA, DumpGCOV,