<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Dec 4, 2013 at 8:15 AM, Lang Hames <span dir="ltr"><<a href="mailto:lhames@gmail.com" target="_blank" class="cremed">lhames@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div dir="ltr">Hi Yuchen,<div><br></div><div>This seems to have broken the clang/test/CodeGen/code-coverage.c test. Could you please take a look at it and fix or revert the patch?</div>
<div><br></div><div>Thanks very much!</div>
<div><br></div><div>Cheers,</div><div>Lang.</div><div><br></div></div><div><div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Dec 3, 2013 at 10:00 PM, Yuchen Wu <span dir="ltr"><<a href="mailto:yuchenericwu@hotmail.com" target="_blank" class="cremed">yuchenericwu@hotmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">Author: ywu<br>
Date: Wed Dec 4 00:00:17 2013<br>
New Revision: 196358<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=196358&view=rev" target="_blank" class="cremed">http://llvm.org/viewvc/llvm-project?rev=196358&view=rev</a><br>
Log:<br>
llvm-cov: Added support for function checksums.<br>
<br>
The function checksums are hashed from the concatenation of the function<br>
name and line number.<br>
<br>
Added:<br>
llvm/trunk/test/tools/llvm-cov/Inputs/test_file_checksum_fail.gcda<br>
llvm/trunk/test/tools/llvm-cov/Inputs/test_func_checksum_fail.gcda<br>
Removed:<br>
llvm/trunk/test/tools/llvm-cov/Inputs/test_checksum_mismatch.gcda<br>
Modified:<br>
llvm/trunk/include/llvm/Support/GCOV.h<br>
llvm/trunk/lib/IR/GCOV.cpp<br>
llvm/trunk/lib/Transforms/Instrumentation/GCOVProfiling.cpp<br>
llvm/trunk/test/tools/llvm-cov/Inputs/test.gcda<br>
llvm/trunk/test/tools/llvm-cov/Inputs/test.gcno<br>
llvm/trunk/test/tools/llvm-cov/Inputs/test_read_fail.gcno<br>
llvm/trunk/test/tools/llvm-cov/llvm-cov.test<br>
<br>
Modified: llvm/trunk/include/llvm/Support/GCOV.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/GCOV.h?rev=196358&r1=196357&r2=196358&view=diff" target="_blank" class="cremed">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/GCOV.h?rev=196358&r1=196357&r2=196358&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/Support/GCOV.h (original)<br>
+++ llvm/trunk/include/llvm/Support/GCOV.h Wed Dec 4 00:00:17 2013<br>
@@ -250,6 +250,7 @@ public:<br>
private:<br>
GCOVFile &Parent;<br>
uint32_t Ident;<br>
+ uint32_t Checksum;<br>
uint32_t LineNumber;<br>
StringRef Name;<br>
StringRef Filename;<br>
<br>
Modified: llvm/trunk/lib/IR/GCOV.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/GCOV.cpp?rev=196358&r1=196357&r2=196358&view=diff" target="_blank" class="cremed">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/GCOV.cpp?rev=196358&r1=196357&r2=196358&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/IR/GCOV.cpp (original)<br>
+++ llvm/trunk/lib/IR/GCOV.cpp Wed Dec 4 00:00:17 2013<br>
@@ -125,7 +125,7 @@ bool GCOVFunction::readGCNO(GCOVBuffer &<br>
uint32_t Dummy;<br>
if (!Buff.readInt(Dummy)) return false; // Function header length<br>
if (!Buff.readInt(Ident)) return false;<br>
- if (!Buff.readInt(Dummy)) return false; // Checksum #1<br>
+ if (!Buff.readInt(Checksum)) return false;<br>
if (Version != GCOV::V402) {<br>
uint32_t CfgChecksum;<br>
if (!Buff.readInt(CfgChecksum)) return false;<br>
@@ -212,6 +212,7 @@ bool GCOVFunction::readGCNO(GCOVBuffer &<br>
bool GCOVFunction::readGCDA(GCOVBuffer &Buff, GCOV::GCOVVersion Version) {<br>
uint32_t Dummy;<br>
if (!Buff.readInt(Dummy)) return false; // Function header length<br>
+<br>
uint32_t GCDAIdent;<br>
if (!Buff.readInt(GCDAIdent)) return false;<br>
if (Ident != GCDAIdent) {<br>
@@ -220,8 +221,13 @@ bool GCOVFunction::readGCDA(GCOVBuffer &<br>
return false;<br>
}<br>
<br>
- if (!Buff.readInt(Dummy)) return false; // Checksum #1<br>
-<br>
+ uint32_t GCDAChecksum;<br>
+ if (!Buff.readInt(GCDAChecksum)) return false;<br>
+ if (Checksum != GCDAChecksum) {<br>
+ errs() << "Function checksums do not match: " << Checksum << " != "<br>
+ << GCDAChecksum << " (in " << Name << ").\n";<br>
+ return false;<br>
+ }<br>
<br>
uint32_t CfgChecksum;<br>
if (Version != GCOV::V402) {<br>
<br>
Modified: llvm/trunk/lib/Transforms/Instrumentation/GCOVProfiling.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/GCOVProfiling.cpp?rev=196358&r1=196357&r2=196358&view=diff" target="_blank" class="cremed">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/GCOVProfiling.cpp?rev=196358&r1=196357&r2=196358&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Transforms/Instrumentation/GCOVProfiling.cpp (original)<br>
+++ llvm/trunk/lib/Transforms/Instrumentation/GCOVProfiling.cpp Wed Dec 4 00:00:17 2013<br>
@@ -314,12 +314,18 @@ namespace {<br>
this->os = os;<br>
<br>
Function *F = SP.getFunction();<br>
- DEBUG(dbgs() << "Function: " << F->getName() << "\n");<br>
+ DEBUG(dbgs() << "Function: " << getFunctionName(SP) << "\n");<br>
uint32_t i = 0;<br>
for (Function::iterator BB = F->begin(), E = F->end(); BB != E; ++BB) {<br>
Blocks[BB] = new GCOVBlock(i++, os);<br>
}<br>
ReturnBlock = new GCOVBlock(i++, os);<br>
+<br>
+ std::string FunctionNameAndLine;<br>
+ raw_string_ostream FNLOS(FunctionNameAndLine);<br>
+ FNLOS << getFunctionName(SP) << SP.getLineNumber();<br>
+ FNLOS.flush();<br>
+ FuncChecksum = hash_value(FunctionNameAndLine);<br>
}<br>
<br>
~GCOVFunction() {<br>
@@ -347,6 +353,10 @@ namespace {<br>
return EdgeDestinations;<br>
}<br>
<br>
+ uint32_t getFuncChecksum() {<br>
+ return FuncChecksum;<br>
+ }<br>
+<br>
void setCfgChecksum(uint32_t Checksum) {<br>
CfgChecksum = Checksum;<br>
}<br>
@@ -359,7 +369,7 @@ namespace {<br>
++BlockLen;<br>
write(BlockLen);<br>
write(Ident);<br>
- write(0); // lineno checksum<br>
+ write(FuncChecksum);<br>
if (UseCfgChecksum)<br>
write(CfgChecksum);<br>
writeGCOVString(getFunctionName(SP));<br>
@@ -401,6 +411,7 @@ namespace {<br>
private:<br>
DISubprogram SP;<br>
uint32_t Ident;<br>
+ uint32_t FuncChecksum;<br>
bool UseCfgChecksum;<br>
uint32_t CfgChecksum;<br>
DenseMap<BasicBlock *, GCOVBlock *> Blocks;<br>
@@ -731,6 +742,7 @@ Constant *GCOVProfiler::getEmitFunctionF<br>
Type *Args[] = {<br>
Type::getInt32Ty(*Ctx), // uint32_t ident<br>
Type::getInt8PtrTy(*Ctx), // const char *function_name<br>
+ Type::getInt32Ty(*Ctx), // uint32_t func_checksum<br>
Type::getInt8Ty(*Ctx), // uint8_t use_extra_checksum<br>
Type::getInt32Ty(*Ctx), // uint32_t cfg_checksum<br>
};<br>
@@ -813,11 +825,12 @@ Function *GCOVProfiler::insertCounterWri<br>
Builder.getInt32(CfgChecksum));<br>
for (unsigned j = 0, e = CountersBySP.size(); j != e; ++j) {<br>
DISubprogram SP(CountersBySP[j].second);<br>
- Builder.CreateCall4(<br>
+ Builder.CreateCall5(<br>
EmitFunction, Builder.getInt32(j),<br>
Options.FunctionNamesInData ?<br>
Builder.CreateGlobalStringPtr(getFunctionName(SP)) :<br>
Constant::getNullValue(Builder.getInt8PtrTy()),<br>
+ Builder.getInt32(Funcs[j]->getFuncChecksum()),<br></blockquote></div></div></div></div></blockquote><div><br></div><div>The problem is that Funcs[j] is out of bounds (j is zero, but Funcs is empty). However, I don't know how to fix this so I have rolled it back in r196365. Sorry if this causes extra trouble.</div>
<div><br></div><div>Cheers,</div><div>Daniel</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<div><div><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
Builder.getInt8(Options.UseCfgChecksum),<br>
Builder.getInt32(CfgChecksum));<br>
<br>
<br>
Modified: llvm/trunk/test/tools/llvm-cov/Inputs/test.gcda<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/Inputs/test.gcda?rev=196358&r1=196357&r2=196358&view=diff" target="_blank" class="cremed">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/Inputs/test.gcda?rev=196358&r1=196357&r2=196358&view=diff</a><br>
==============================================================================<br>
Binary files llvm/trunk/test/tools/llvm-cov/Inputs/test.gcda (original) and llvm/trunk/test/tools/llvm-cov/Inputs/test.gcda Wed Dec 4 00:00:17 2013 differ<br>
<br>
Modified: llvm/trunk/test/tools/llvm-cov/Inputs/test.gcno<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/Inputs/test.gcno?rev=196358&r1=196357&r2=196358&view=diff" target="_blank" class="cremed">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/Inputs/test.gcno?rev=196358&r1=196357&r2=196358&view=diff</a><br>
==============================================================================<br>
Binary files llvm/trunk/test/tools/llvm-cov/Inputs/test.gcno (original) and llvm/trunk/test/tools/llvm-cov/Inputs/test.gcno Wed Dec 4 00:00:17 2013 differ<br>
<br>
Removed: llvm/trunk/test/tools/llvm-cov/Inputs/test_checksum_mismatch.gcda<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/Inputs/test_checksum_mismatch.gcda?rev=196357&view=auto" target="_blank" class="cremed">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/Inputs/test_checksum_mismatch.gcda?rev=196357&view=auto</a><br>
==============================================================================<br>
Binary files llvm/trunk/test/tools/llvm-cov/Inputs/test_checksum_mismatch.gcda (original) and llvm/trunk/test/tools/llvm-cov/Inputs/test_checksum_mismatch.gcda (removed) differ<br>
<br>
Added: llvm/trunk/test/tools/llvm-cov/Inputs/test_file_checksum_fail.gcda<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/Inputs/test_file_checksum_fail.gcda?rev=196358&view=auto" target="_blank" class="cremed">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/Inputs/test_file_checksum_fail.gcda?rev=196358&view=auto</a><br>
==============================================================================<br>
Binary files llvm/trunk/test/tools/llvm-cov/Inputs/test_file_checksum_fail.gcda (added) and llvm/trunk/test/tools/llvm-cov/Inputs/test_file_checksum_fail.gcda Wed Dec 4 00:00:17 2013 differ<br>
<br>
Added: llvm/trunk/test/tools/llvm-cov/Inputs/test_func_checksum_fail.gcda<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/Inputs/test_func_checksum_fail.gcda?rev=196358&view=auto" target="_blank" class="cremed">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/Inputs/test_func_checksum_fail.gcda?rev=196358&view=auto</a><br>
==============================================================================<br>
Binary files llvm/trunk/test/tools/llvm-cov/Inputs/test_func_checksum_fail.gcda (added) and llvm/trunk/test/tools/llvm-cov/Inputs/test_func_checksum_fail.gcda Wed Dec 4 00:00:17 2013 differ<br>
<br>
Modified: llvm/trunk/test/tools/llvm-cov/Inputs/test_read_fail.gcno<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/Inputs/test_read_fail.gcno?rev=196358&r1=196357&r2=196358&view=diff" target="_blank" class="cremed">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/Inputs/test_read_fail.gcno?rev=196358&r1=196357&r2=196358&view=diff</a><br>
==============================================================================<br>
Binary files llvm/trunk/test/tools/llvm-cov/Inputs/test_read_fail.gcno (original) and llvm/trunk/test/tools/llvm-cov/Inputs/test_read_fail.gcno Wed Dec 4 00:00:17 2013 differ<br>
<br>
Modified: llvm/trunk/test/tools/llvm-cov/llvm-cov.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/llvm-cov.test?rev=196358&r1=196357&r2=196358&view=diff" target="_blank" class="cremed">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/llvm-cov.test?rev=196358&r1=196357&r2=196358&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/tools/llvm-cov/llvm-cov.test (original)<br>
+++ llvm/trunk/test/tools/llvm-cov/llvm-cov.test Wed Dec 4 00:00:17 2013<br>
@@ -11,6 +11,8 @@ RUN: rm test.cpp.llcov<br>
<br>
RUN: not llvm-cov -gcno=test_read_fail.gcno -gcda=test.gcda<br>
<br>
-RUN: not llvm-cov -gcno=test.gcno -gcda=test_checksum_mismatch.gcda<br>
+RUN: not llvm-cov -gcno=test.gcno -gcda=test_file_checksum_fail.gcda<br>
+<br>
+RUN: not llvm-cov -gcno=test.gcno -gcda=test_func_checksum_fail.gcda<br>
<br>
XFAIL: powerpc64, s390x, mips<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank" class="cremed">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank" class="cremed">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>
</div></div><br>_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank" class="cremed">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank" class="cremed">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
<br></blockquote></div><br></div></div>