Make it possible to specify which llvm-cov to use via an envvar.

Author: Diptorup Deb

dpctl-capi/cmake/modules/FindLLVMCov.cmake

@@ -25,43 +25,61 @@
 # LLVMCov_FOUND
 # LLVMCov_VERSION
 
-find_program(LLVMCov_EXE llvm-cov)
+# Check if a LLVM_TOOLS_HOME envvar is defined. If so, then search specifically
+# in that path or else search in default locations. The check is to allow
+# a particular LLVM_COV executable to be used when there are multiple LLVM_COV
+# versions installed in the system.
 
-# get the version of llvm-cov
-execute_process(
-    COMMAND ${LLVMCov_EXE} "--version"
-    RESULT_VARIABLE result
-    OUTPUT_VARIABLE version_string
-)
-
-# If llvm-cov is found then set the package variables
-if(${result} MATCHES "0")
-    string(REPLACE "\n" ";" VERSION_LIST "${version_string}")
-    list(GET VERSION_LIST 1 ver_line)
-    # Extract the llvm-cov version
-    string(REGEX MATCH "[0-9]+\.[0-9]+\.[0-9]+" LLVMCov_VERSION ${ver_line})
-    # Split out the version into major, minor an patch
-    string(REPLACE "." ";" VERSION_LIST1 "${LLVMCov_VERSION}")
-    list(GET VERSION_LIST1 0 LLVMCov_VERSION_MAJOR)
-    list(GET VERSION_LIST1 1 LLVMCov_VERSION_MINOR)
-    list(GET VERSION_LIST1 2 LLVMCov_VERSION_PATCH)
+if(DEFINED ENV{LLVM_TOOLS_HOME})
+    find_program(LLVMCov_EXE
+        llvm-cov
+        PATHS $ENV{LLVM_TOOLS_HOME}
+        NO_DEFAULT_PATH
+    )
+    if(${LLVMCov_EXE} STREQUAL "LLVMCov_EXE-NOTFOUND")
+        message(WARN
+            "$ENV{LLVM_TOOLS_HOME} does not have an llvm-cov executable"
+        )
+    endif()
+else()
+    find_program(LLVMCov_EXE llvm-cov)
 endif()
 
-# Check if a specific version of llvm-cov is required.
-if(LLVMCov_FIND_VERSION AND (DEFINED LLVMCov_VERSION))
-    string(COMPARE LESS_EQUAL
-        ${LLVMCov_FIND_VERSION_MAJOR}
-        ${LLVMCov_VERSION_MAJOR}
-        VERSION_MATCH
+if(NOT ${LLVMCov_EXE} STREQUAL "LLVMCov_EXE-NOTFOUND")
+    # get the version of llvm-cov
+    execute_process(
+        COMMAND ${LLVMCov_EXE} "--version"
+        RESULT_VARIABLE result
+        OUTPUT_VARIABLE version_string
     )
-    if(VERSION_MATCH)
+    # If llvm-cov is found then set the package variables
+    if(${result} MATCHES "0")
+        string(REPLACE "\n" ";" VERSION_LIST "${version_string}")
+        list(GET VERSION_LIST 1 ver_line)
+        # Extract the llvm-cov version
+        string(REGEX MATCH "[0-9]+\.[0-9]+\.[0-9]+" LLVMCov_VERSION ${ver_line})
+        # Split out the version into major, minor an patch
+        string(REPLACE "." ";" VERSION_LIST1 "${LLVMCov_VERSION}")
+        list(GET VERSION_LIST1 0 LLVMCov_VERSION_MAJOR)
+        list(GET VERSION_LIST1 1 LLVMCov_VERSION_MINOR)
+        list(GET VERSION_LIST1 2 LLVMCov_VERSION_PATCH)
+    endif()
+    # Check if a specific version of llvm-cov is required.
+    if(LLVMCov_FIND_VERSION AND (DEFINED LLVMCov_VERSION))
+        string(COMPARE LESS_EQUAL
+            ${LLVMCov_FIND_VERSION_MAJOR}
+            ${LLVMCov_VERSION_MAJOR}
+            VERSION_MATCH
+        )
+        if(VERSION_MATCH)
+            set(LLVMCov_FOUND TRUE)
+        endif()
+    else()
         set(LLVMCov_FOUND TRUE)
     endif()
-else()
-    set(LLVMCov_FOUND TRUE)
+    message(STATUS "llvm-cov ${LLVMCov_VERSION} found at ${LLVMCov_EXE}.")
 endif()
 
-
 find_package_handle_standard_args(LLVMCov DEFAULT_MSG
     LLVMCov_EXE
     LLVMCov_FOUND

dpctl-capi/cmake/modules/FindLLVMProfdata.cmake

@@ -24,7 +24,20 @@
 # LLVMProfdata_EXE The path to llvm-cov executable
 # LLVMProfdata_FOUND
 
-find_program(LLVMProfdata_EXE llvm-profdata)
+if(DEFINED ENV{LLVM_TOOLS_HOME})
+    find_program(LLVMProfdata_EXE
+        llvm-profdata
+        PATHS $ENV{LLVM_TOOLS_HOME}
+        NO_DEFAULT_PATH
+    )
+    if(${LLVMProfdata_EXE} STREQUAL "LLVMProfdata_EXE-NOTFOUND")
+        message(WARN
+            "$ENV{LLVM_TOOLS_HOME} does not have an llvm-profdata executable"
+        )
+    endif()
+else()
+    find_program(LLVMProfdata_EXE llvm-profdata)
+endif()
 
 find_package_handle_standard_args(LLVMProfdata DEFAULT_MSG
     LLVMProfdata_EXE