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

Use a map instead of vector to store line counts.

Browse Source 
There are a few motivations for this:
- Using a map allows for checking if line is in map. This differentiates
  unexecutable lines (such as comments) from unexecuted logical lines of
  code. "#####" is now outputted in this case, in line with gcov.
- Source files are no longer read in twice: once when storing the line
  counts, and once when outputting the data.
- Greatly simplifies the function FileInfo::addLineCount().

llvm-svn: 193264
This commit is contained in:
Yuchen Wu 2013-10-23 19:45:03 +00:00
parent 56f5c84f6c
commit 79bf7ec05f
2 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@
#ifndef LLVM_SUPPORT_GCOV_H
#define LLVM_SUPPORT_GCOV_H
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringMap.h"
#include "llvm/Support/MemoryBuffer.h"
@ -212,10 +213,12 @@ private:
SmallVector<uint32_t, 4> Lines;
};
typedef SmallVector<uint64_t, 16> LineCounts;
typedef DenseMap<uint32_t, uint64_t> LineCounts;
class FileInfo {
public:
void addLineCount(StringRef Filename, uint32_t Line, uint64_t Count);
void addLineCount(StringRef Filename, uint32_t Line, uint64_t Count) {
LineInfo[Filename][Line-1] = Count;
}
void print(StringRef gcnoFile, StringRef gcdaFile);
private:
StringMap<LineCounts> LineInfo;

32
lib/IR/GCOV.cpp
View File

@ -235,24 +235,6 @@ void GCOVLines::dump() {
//===----------------------------------------------------------------------===//
// FileInfo implementation.
/// addLineCount - Add line count for the given line number in a file.
void FileInfo::addLineCount(StringRef Filename, uint32_t Line, uint64_t Count) {
if (LineInfo.find(Filename) == LineInfo.end()) {
OwningPtr<MemoryBuffer> Buff;
if (error_code ec = MemoryBuffer::getFileOrSTDIN(Filename, Buff)) {
errs() << Filename << ": " << ec.message() << "\n";
return;
}
StringRef AllLines = Buff.take()->getBuffer();
LineCounts L(AllLines.count('\n'));
L[Line-1] = Count;
LineInfo[Filename] = L;
return;
}
LineCounts &L = LineInfo[Filename];
L[Line-1] = Count;
}
/// print - Print source files with collected line count information.
void FileInfo::print(StringRef gcnoFile, StringRef gcdaFile) {
for (StringMap<LineCounts>::iterator I = LineInfo.begin(), E = LineInfo.end();
@ -268,16 +250,22 @@ void FileInfo::print(StringRef gcnoFile, StringRef gcdaFile) {
return;
}
StringRef AllLines = Buff.take()->getBuffer();
for (unsigned i = 0, e = L.size(); i != e; ++i) {
if (L[i])
outs() << format("%9lu:", L[i]);
else
uint32_t i = 0;
while (!AllLines.empty()) {
if (L.find(i) != L.end()) {
if (L[i] == 0)
outs() << " #####:";
else
outs() << format("%9lu:", L[i]);
} else {
outs() << " -:";
}
std::pair<StringRef, StringRef> P = AllLines.split('\n');
if (AllLines != P.first)
outs() << format("%5u:", i+1) << P.first;
outs() << "\n";
AllLines = P.second;
++i;
}
}
}