propagated DPCTL_GENERATE_COVERAGE to top-level CMakeLists.txt

Decoupled llvm-genhtml and llvm-cov targets. Used object files in
llvm-genhtml as it was done in llvm-cov target.

Author: oleksandr-pavlyk

CMakeLists.txt

@@ -8,6 +8,12 @@ project(dpctl
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 
+# Option to generate code coverage report using llvm-cov and lcov.
+option(DPCTL_GENERATE_COVERAGE
+    "Build dpctl with coverage instrumentation"
+    OFF
+)
+
 find_package(IntelDPCPP REQUIRED PATHS ${CMAKE_SOURCE_DIR}/cmake NO_DEFAULT_PATH)
 
 add_subdirectory(libsyclinterface)

libsyclinterface/CMakeLists.txt

@@ -25,7 +25,7 @@ option(DPCTL_ENABLE_L0_PROGRAM_CREATION
 )
 # Option to generate code coverage report using llvm-cov and lcov.
 option(DPCTL_GENERATE_COVERAGE
-    "Build dpctl C API with coverage instrumentation instrumentation"
+    "Build dpctl C API with coverage instrumentation"
     OFF
 )
 # Option to output html coverage report at a specific location.
@@ -158,12 +158,9 @@ file(GLOB_RECURSE helper_sources
 
 # Enable code coverage related settings
 if(DPCTL_GENERATE_COVERAGE)
-    # check if lcov is available
-    find_package(Lcov REQUIRED)
-    # check if llvm-cov version 11 is available
-    find_package(LLVMCov 11 REQUIRED)
-    # check if llvm-profdata is available
-    find_package(LLVMProfdata REQUIRED)
+    include(SetupCoverage)
+    setup_coverage_generation()
+
     # Turn on DPCTL_BUILD_CAPI_TESTS as building tests is needed to generate
     # coverage reports.
     set(DPCTL_BUILD_CAPI_TESTS "ON")
@@ -173,11 +170,6 @@ if(DPCTL_GENERATE_COVERAGE)
         set(COVERAGE_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
     endif()
     message(STATUS "Coverage reports to be saved at ${COVERAGE_OUTPUT_DIR}")
-
-    # Add profiling flags
-    set(CMAKE_CXX_FLAGS
-        "${CMAKE_CXX_FLAGS} -fprofile-instr-generate -fcoverage-mapping -fno-sycl-use-footer -DDPCTL_COVERAGE"
-    )
 endif()
 
 add_library(DPCTLSyclInterface

libsyclinterface/cmake/modules/SetupCoverage.cmake

@@ -0,0 +1,22 @@
+
+function(setup_coverage_generation)
+    # check if lcov is available
+    find_package(Lcov REQUIRED)
+    # check if llvm-cov version 11 is available
+    find_package(LLVMCov 11 REQUIRED)
+    # check if llvm-profdata is available
+    find_package(LLVMProfdata REQUIRED)
+
+    string(CONCAT PROFILE_FLAGS
+        "-fprofile-instr-generate "
+        "-fcoverage-mapping "
+        "-fno-sycl-use-footer "
+        "-DDPCTL_COVERAGE "
+    )
+
+    # Add profiling flags
+    set(CMAKE_CXX_FLAGS
+        "${CMAKE_CXX_FLAGS} ${PROFILE_FLAGS}"
+        PARENT_SCOPE
+    )
+endfunction(setup_coverage_generation)

libsyclinterface/tests/CMakeLists.txt

@@ -53,7 +53,6 @@ if(DPCTL_GENERATE_COVERAGE)
             dpctl.profdata
         COMMAND ${LLVMCov_EXE}
             report
-            ${CMAKE_CURRENT_BINARY_DIR}/dpctl_c_api_tests
             -instr-profile=dpctl.profdata
             "${object_arg}$<JOIN:$<TARGET_OBJECTS:DPCTLSyclInterface>,;${object_arg}>"
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
@@ -62,19 +61,25 @@ if(DPCTL_GENERATE_COVERAGE)
     )
 
     add_custom_target(lcov-genhtml
+        COMMAND ${CMAKE_COMMAND} -E env DPCTL_VERBOSITY=warning ${CMAKE_CURRENT_BINARY_DIR}/dpctl_c_api_tests
+        COMMAND ${LLVMProfdata_EXE}
+            merge
+            -sparse default.profraw
+            -o
+            dpctl.profdata
         COMMAND ${LLVMCov_EXE}
             export
             -format=lcov
-            ${CMAKE_CURRENT_BINARY_DIR}/dpctl_c_api_tests
             -instr-profile=dpctl.profdata
-            ${dpctl_sources}
-            ${helper_sources} > dpctl.lcov
+            "${object_arg}$<JOIN:$<TARGET_OBJECTS:DPCTLSyclInterface>,;${object_arg}>"
+            > dpctl.lcov
         COMMAND ${GENHTML_EXE}
             ${CMAKE_CURRENT_BINARY_DIR}/dpctl.lcov
             --output-directory
             ${COVERAGE_OUTPUT_DIR}/dpctl-c-api-coverage
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        DEPENDS llvm-cov
+        COMMAND_EXPAND_LISTS
+        DEPENDS dpctl_c_api_tests
     )
 else()
     file(GLOB_RECURSE sources ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)