resolve bin_llvm from default compiler layout when not provided

Author: ndgrigorian

scripts/_build_helper.py

@@ -35,40 +35,6 @@ def err(msg: str):
     print(f"[build_locally][error] {msg}", file=sys.stderr)
 
 
-def resolve_compilers(
-    oneapi: bool, c_compiler: str, cxx_compiler: str, compiler_root: str
-):
-    is_linux = "linux" in sys.platform
-
-    if oneapi or (
-        c_compiler is None and cxx_compiler is None and compiler_root is None
-    ):
-        return "icx", ("icpx" if is_linux else "icx")
-
-    if not compiler_root or not os.path.exists(compiler_root):
-        raise RuntimeError(
-            "--compiler-root option must be set when using non-default DPC++ "
-            "layout"
-        )
-
-    # default values
-    if c_compiler is None:
-        c_compiler = "icx"
-    if cxx_compiler is None:
-        cxx_compiler = "icpx" if is_linux else "icx"
-
-    for name, opt_name in (
-        (c_compiler, "--c-compiler"),
-        (cxx_compiler, "--cxx-compiler"),
-    ):
-        path = (
-            name if os.path.exists(name) else os.path.join(compiler_root, name)
-        )
-        if not os.path.exists(path):
-            raise RuntimeError(f"{opt_name} value {name} not found")
-    return c_compiler, cxx_compiler
-
-
 def make_cmake_args(
     c_compiler=None,
     cxx_compiler=None,

scripts/build_locally.py

@@ -27,11 +27,44 @@
     err,
     install_editable,
     make_cmake_args,
-    resolve_compilers,
     warn,
 )
 
 
+def resolve_compilers(
+    oneapi: bool, c_compiler: str, cxx_compiler: str, compiler_root: str
+):
+    is_linux = "linux" in sys.platform
+
+    if oneapi or (
+        c_compiler is None and cxx_compiler is None and compiler_root is None
+    ):
+        return "icx", ("icpx" if is_linux else "icx")
+
+    if not compiler_root or not os.path.exists(compiler_root):
+        raise RuntimeError(
+            "--compiler-root option must be set when using non-default DPC++ "
+            "layout"
+        )
+
+    # default values
+    if c_compiler is None:
+        c_compiler = "icx"
+    if cxx_compiler is None:
+        cxx_compiler = "icpx" if is_linux else "icx"
+
+    for name, opt_name in (
+        (c_compiler, "--c-compiler"),
+        (cxx_compiler, "--cxx-compiler"),
+    ):
+        path = (
+            name if os.path.exists(name) else os.path.join(compiler_root, name)
+        )
+        if not os.path.exists(path):
+            raise RuntimeError(f"{opt_name} value {name} not found")
+    return c_compiler, cxx_compiler
+
+
 def parse_args():
     p = argparse.ArgumentParser(description="Local dpctl build driver")
 

scripts/gen_coverage.py

@@ -30,12 +30,68 @@
     err,
     install_editable,
     make_cmake_args,
-    resolve_compilers,
     run,
     warn,
 )
 
 
+def find_bin_llvm(compiler_name):
+    icx_path = subprocess.check_output(["which", compiler_name])
+    bin_dir = os.path.dirname(icx_path)
+    compiler_dir = os.path.join(bin_dir.decode("utf-8"), "compiler")
+    if os.path.exists(compiler_dir):
+        bin_llvm = compiler_dir
+    else:
+        bin_dir = os.path.dirname(bin_dir)
+        bin_llvm = os.path.join(bin_dir.decode("utf-8"), "bin-llvm")
+    assert os.path.exists(bin_llvm)
+    return bin_llvm
+
+
+def resolve_compilers(
+    oneapi: bool,
+    c_compiler: str,
+    cxx_compiler: str,
+    compiler_root: str,
+    bin_llvm: str = None,
+):
+    is_linux = "linux" in sys.platform
+
+    if oneapi or (
+        c_compiler is None
+        and cxx_compiler is None
+        and compiler_root is None
+        and bin_llvm is None
+    ):
+        return "icx", ("icpx" if is_linux else "icx"), find_bin_llvm("icx")
+
+    if not compiler_root or not os.path.exists(compiler_root):
+        raise RuntimeError(
+            "--compiler-root option must be set when using non-default DPC++ "
+            "layout"
+        )
+
+    # default values
+    if c_compiler is None:
+        c_compiler = "icx"
+    if cxx_compiler is None:
+        cxx_compiler = "icpx" if is_linux else "icx"
+    if bin_llvm is None:
+        bin_llvm = find_bin_llvm(c_compiler)
+
+    for name, opt_name in (
+        (c_compiler, "--c-compiler"),
+        (cxx_compiler, "--cxx-compiler"),
+        (bin_llvm, "--bin-llvm"),
+    ):
+        path = (
+            name if os.path.exists(name) else os.path.join(compiler_root, name)
+        )
+        if not os.path.exists(path):
+            raise RuntimeError(f"{opt_name} value {name} not found")
+    return c_compiler, cxx_compiler, bin_llvm
+
+
 def parse_args():
     p = argparse.ArgumentParser(description="Build dpctl and generate coverage")
 
@@ -140,8 +196,12 @@ def main():
     args = parse_args()
     setup_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-    c_compiler, cxx_compiler = resolve_compilers(
-        args.oneapi, args.c_compiler, args.cxx_compiler, args.compiler_root
+    c_compiler, cxx_compiler, bin_llvm = resolve_compilers(
+        args.oneapi,
+        args.c_compiler,
+        args.cxx_compiler,
+        args.compiler_root,
+        args.bin_llvm,
     )
 
     if args.clean:
@@ -178,21 +238,14 @@ def main():
         warn("Ignoring pre-existing CMAKE_ARGS in environment")
         del env["CMAKE_ARGS"]
 
-    if args.bin_llvm:
-        env["PATH"] = ":".join((env.get("PATH", ""), args.bin_llvm))
-        env["LLVM_TOOLS_HOME"] = args.bin_llvm
-        llvm_profdata = os.path.join(args.bin_llvm, "llvm-profdata")
-        llvm_cov = os.path.join(args.bin_llvm, "llvm-cov")
-        cmake_args += f" -DLLVM_TOOLS_HOME={args.bin_llvm}"
-        cmake_args += f" -DLLVM_PROFDATA={llvm_profdata}"
-        cmake_args += f" -DLLVM_COV={llvm_cov}"
-        # Add LLVMCov_EXE for CMake find_package(LLVMCov)
-        cmake_args += f" -DLLVMCov_EXE={llvm_cov}"
-
-    print(f"[gen_coverage] Using CMake args:\n {env['CMAKE_ARGS']}")
+    if bin_llvm:
+        env["PATH"] = ":".join((env.get("PATH", ""), bin_llvm))
+        env["LLVM_TOOLS_HOME"] = bin_llvm
 
     env["CMAKE_ARGS"] = cmake_args
 
+    print(f"[gen_coverage] Using CMake args:\n {env['CMAKE_ARGS']}")
+
     build_extension(
         setup_dir,
         env,
@@ -242,7 +295,7 @@ def main():
 
         run(
             [
-                os.path.join(args.bin_llvm or "", "llvm-profdata"),
+                os.path.join(bin_llvm, "llvm-profdata"),
                 "merge",
                 "-sparse",
                 env["LLVM_PROFILE_FILE"],
@@ -254,7 +307,7 @@ def main():
         with open("dpctl_pytest.lcov", "w") as fh:
             subprocess.check_call(
                 [
-                    os.path.join(args.bin_llvm or "", "llvm-cov"),
+                    os.path.join(bin_llvm, "llvm-cov"),
                     "export",
                     "-format=lcov",
                     "-ignore-filename-regex=/tmp/icpx*",