sancov test suite

[aizatsky]

cleanup & reformat

[krasin]

test/CMakeLists.txt

23 ↗

(On Diff #39975)

What was the logic of this reordering? Did you try to put them in the alphabet order? If yes, I think that capital letters should go before regular, i.e. Z < a.

test/tools/sancov/Inputs/test.cpp

13 ↗

(On Diff #39975)

What is the point of returning the str argument? Why do you return it as the result?

[aizatsky]

review.

[aizatsky]

ptal

test/tools/sancov/Inputs/test.cpp

13 ↗

(On Diff #39975)

to have a complicated mangled name.

[samsonov]

Looks fine, but please check this:

tools/sancov/sancov.cc

230 ↗

(On Diff #39979)

Shouldn't it be

if (FileName.size() > FilePrefix.size())

?

[aizatsky]

tools/sancov/sancov.cc

230 ↗

(On Diff #39979)

Nice catch. I guess I need a multi-file test to properly check it. Hold on.

[aizatsky]

multiple files test-case.

llvm/trunk/test/CMakeLists.txt

 # Don't include check-llvm into check-all without LLVM_BUILD_TOOLS.
 if(NOT LLVM_BUILD_TOOLS)
   set(EXCLUDE_FROM_ALL ON)
 endif()
 
 # Set the depends list as a variable so that it can grow conditionally.
 # NOTE: Sync the substitutions in test/lit.cfg when adding to this list.
 set(LLVM_TEST_DEPENDS
-          llvm-config
-          UnitTests
           BugpointPasses
+          FileCheck
           LLVMHello
+          UnitTests
           bugpoint
+          count
           llc
           lli
           lli-child-target
           llvm-ar
           llvm-as
           llvm-bcanalyzer
           llvm-c-test
+          llvm-config
           llvm-cov
           llvm-cxxdump
           llvm-diff
           llvm-dis
           llvm-dsymutil
           llvm-dwarfdump
           llvm-extract
           llvm-lib
           llvm-link
           llvm-lto
           llvm-mc
           llvm-mcmarkup
           llvm-nm
           llvm-objdump
           llvm-pdbdump
           llvm-profdata
           llvm-ranlib
           llvm-readobj
           llvm-rtdyld
           llvm-size
           llvm-split
           llvm-symbolizer
           llvm-tblgen
-          opt
-          FileCheck
-          count
           not
-          yaml-bench
-          yaml2obj
           obj2yaml
+          opt
+          sancov
           verify-uselistorder
+          yaml-bench
+          yaml2obj
         )
 
 # If Intel JIT events are supported, depend on a tool that tests the listener.
 if( LLVM_USE_INTEL_JITEVENTS )
   set(LLVM_TEST_DEPENDS ${LLVM_TEST_DEPENDS} llvm-jitlistener)
 endif( LLVM_USE_INTEL_JITEVENTS )
 
 if(TARGET LLVMgold)

llvm/trunk/test/tools/sancov/Inputs/foo.cpp

+#include <stdio.h>
+#include <string>
+
+__attribute__((noinline))
+void foo() { printf("foo\n"); }

llvm/trunk/test/tools/sancov/Inputs/test.cpp

+// compile & generate coverage data using:
+// clang++ -g -o test-linux_x86_64 -fsanitize=address -fsanitize-coverage=edge *.cpp
+// ASAN_OPTIONS="coverage=1" ./test-linux_x86_64 && mv test-linux_x86_64.*.sancov test-linux_x86_64.sancov
+// ASAN_OPTIONS="coverage=1" ./test-linux_x86_64 1 && mv test-linux_x86_64.*.sancov test-linux_x86_64-1.sancov
+
+#include <stdio.h>
+#include <string>
+
+void foo();
+
+__attribute__((noinline))
+std::string bar(std::string str) { printf("bar\n"); return str; }
+
+int main(int argc, char **argv) {
+    if (argc == 2)
+        foo();
+    bar("str");
+    printf("main\n");
+}

llvm/trunk/test/tools/sancov/covered_functions.test

+RUN: sancov -obj %p/Inputs/test-linux_x86_64 -covered_functions %p/Inputs/test-linux_x86_64.sancov | FileCheck %s
+RUN: sancov -obj %p/Inputs/test-linux_x86_64 -covered_functions %p/Inputs/test-linux_x86_64-1.sancov | FileCheck --check-prefix=MULTIPLE_FILES %s
+RUN: sancov -obj %p/Inputs/test-linux_x86_64 -demangle=0 -covered_functions %p/Inputs/test-linux_x86_64.sancov | FileCheck --check-prefix=NO_DEMANGLE %s
+
+CHECK: Inputs/test.cpp:12 bar(std::string)
+CHECK: Inputs/test.cpp:14 main
+
+MULTIPLE_FILES: {{^}}foo.cpp:5 foo()
+MULTIPLE_FILES: {{^}}test.cpp:12 bar(std::string)
+MULTIPLE_FILES: {{^}}test.cpp:14 main
+
+NO_DEMANGLE: Inputs/test.cpp:12 _Z3barSs
+NO_DEMANGLE: Inputs/test.cpp:14 main

llvm/trunk/test/tools/sancov/print.test

+RUN: sancov -obj %p/Inputs/test-linux_x86_64 -print %p/Inputs/test-linux_x86_64.sancov | FileCheck %s
+
+CHECK: 0x4db18b
+CHECK: 0x4db2d2
+CHECK: 0x4db322
+CHECK: 0x4db376
+CHECK: 0x4db3bd
+CHECK: 0x4db3f4
+CHECK: 0x4db427
+CHECK: 0x4db45a

llvm/trunk/tools/sancov/sancov.cc

public:
 
   // Print list of covered functions.
   // Line format: <file_name>:<line> <function_name>
   void printCoveredFunctions(raw_ostream &out) {
     if (Addrs->empty())
       return;
     symbolize::LLVMSymbolizer::Options SymbolizerOptions;
     SymbolizerOptions.Demangle = ClDemangle;
-    symbolize::LLVMSymbolizer Symbolizer;
+    symbolize::LLVMSymbolizer Symbolizer(SymbolizerOptions);
 
     struct FileLoc {
       std::string FileName;
       uint32_t Line;
       bool operator<(const FileLoc &Rhs) const {
         return std::tie(FileName, Line) < std::tie(Rhs.FileName, Rhs.Line);
       }
     };
// Print first function occurence in a file.
 
         if (LastFileName != FileName)
           ProcessedFunctions.clear();
         LastFileName = FileName;
 
         if (!ProcessedFunctions.insert(FunctionName).second)
           continue;
 
-        out << FileName.substr(FilePrefix.size()) << ":" << Line << " "
-            << FunctionName << "\n";
+        // Don't strip prefix if we only have a single file.
+        if (FileName.size() > FilePrefix.size())
+          FileName = FileName.substr(FilePrefix.size());
+
+        out << FileName << ":" << Line << " " << FunctionName << "\n";
       }
     }
   }
 
  private:
   explicit CoverageData(std::unique_ptr<std::vector<uint64_t>> Addrs)
       : Addrs(std::move(Addrs)) {}