6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-09 11:25:55 +00:00
Code Issues Projects Releases Wiki Activity

Added command-line option to output llvm-cov to file.

Browse Source 
Added -o option to llvm-cov. If no output file is specified, it defaults
to STDOUT.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@193899 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Yuchen Wu
2013-11-02 00:09:17 +00:00
parent bc28e88a28
commit daaa8b720b
3 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -235,7 +235,7 @@ public:
LineInfo[Filename][Line-1] += Count; LineInfo[Filename][Line-1] += Count;
} }
void setProgramCount(uint32_t PC) { ProgramCount = PC; } void setProgramCount(uint32_t PC) { ProgramCount = PC; }
void print(StringRef gcnoFile, StringRef gcdaFile); void print(raw_fd_ostream &OS, StringRef gcnoFile, StringRef gcdaFile);
private: private:
StringMap<LineCounts> LineInfo; StringMap<LineCounts> LineInfo;
uint32_t ProgramCount; uint32_t ProgramCount;

21
lib/IR/GCOV.cpp
View File

@@ -250,14 +250,15 @@ void GCOVLines::dump() {
// FileInfo implementation. // FileInfo implementation.
/// print - Print source files with collected line count information. /// print - Print source files with collected line count information.
void FileInfo::print(StringRef gcnoFile, StringRef gcdaFile) { void FileInfo::print(raw_fd_ostream &OS, StringRef gcnoFile,
StringRef gcdaFile) {
for (StringMap<LineCounts>::iterator I = LineInfo.begin(), E = LineInfo.end(); for (StringMap<LineCounts>::iterator I = LineInfo.begin(), E = LineInfo.end();
I != E; ++I) { I != E; ++I) {
StringRef Filename = I->first(); StringRef Filename = I->first();
outs() << " -: 0:Source:" << Filename << "\n"; OS << " -: 0:Source:" << Filename << "\n";
outs() << " -: 0:Graph:" << gcnoFile << "\n"; OS << " -: 0:Graph:" << gcnoFile << "\n";
outs() << " -: 0:Data:" << gcdaFile << "\n"; OS << " -: 0:Data:" << gcdaFile << "\n";
outs() << " -: 0:Programs:" << ProgramCount << "\n"; OS << " -: 0:Programs:" << ProgramCount << "\n";
LineCounts &L = LineInfo[Filename]; LineCounts &L = LineInfo[Filename];
OwningPtr<MemoryBuffer> Buff; OwningPtr<MemoryBuffer> Buff;
if (error_code ec = MemoryBuffer::getFileOrSTDIN(Filename, Buff)) { if (error_code ec = MemoryBuffer::getFileOrSTDIN(Filename, Buff)) {
@@ -269,16 +270,16 @@ void FileInfo::print(StringRef gcnoFile, StringRef gcdaFile) {
while (!AllLines.empty()) { while (!AllLines.empty()) {
if (L.find(i) != L.end()) { if (L.find(i) != L.end()) {
if (L[i] == 0) if (L[i] == 0)
outs() << " #####:"; OS << " #####:";
else else
outs() << format("%9lu:", L[i]); OS << format("%9lu:", L[i]);
} else { } else {
outs() << " -:"; OS << " -:";
} }
std::pair<StringRef, StringRef> P = AllLines.split('\n'); std::pair<StringRef, StringRef> P = AllLines.split('\n');
if (AllLines != P.first) if (AllLines != P.first)
outs() << format("%5u:", i+1) << P.first; OS << format("%5u:", i+1) << P.first;
outs() << "\n"; OS << "\n";
AllLines = P.second; AllLines = P.second;
++i; ++i;
} }

11
tools/llvm-cov/llvm-cov.cpp
View File

@@ -17,6 +17,7 @@
#include "llvm/Support/ManagedStatic.h" #include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/MemoryObject.h" #include "llvm/Support/MemoryObject.h"
#include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/PrettyStackTrace.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/Signals.h" #include "llvm/Support/Signals.h"
#include "llvm/Support/system_error.h" #include "llvm/Support/system_error.h"
using namespace llvm; using namespace llvm;
@@ -30,6 +31,9 @@ InputGCNO("gcno", cl::desc("<input gcno file>"), cl::init(""));
static cl::opt<std::string> static cl::opt<std::string>
InputGCDA("gcda", cl::desc("<input gcda file>"), cl::init("")); InputGCDA("gcda", cl::desc("<input gcda file>"), cl::init(""));
static cl::opt<std::string>
OutputFile("o", cl::desc("<output llvm-cov file>"), cl::init("-"));
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
int main(int argc, char **argv) { int main(int argc, char **argv) {
@@ -40,6 +44,11 @@ int main(int argc, char **argv) {
cl::ParseCommandLineOptions(argc, argv, "llvm coverage tool\n"); cl::ParseCommandLineOptions(argc, argv, "llvm coverage tool\n");
std::string ErrorInfo;
raw_fd_ostream OS(OutputFile.c_str(), ErrorInfo);
if (!ErrorInfo.empty())
errs() << ErrorInfo << "\n";
GCOVFile GF; GCOVFile GF;
if (InputGCNO.empty()) if (InputGCNO.empty())
errs() << " " << argv[0] << ": No gcov input file!\n"; errs() << " " << argv[0] << ": No gcov input file!\n";
@@ -74,6 +83,6 @@ int main(int argc, char **argv) {
FileInfo FI; FileInfo FI;
GF.collectLineCounts(FI); GF.collectLineCounts(FI);
FI.print(InputGCNO, InputGCDA); FI.print(OS, InputGCNO, InputGCDA);
return 0; return 0;
} }