stop relying on LLD_jll

Author: simeonschaub

Project.toml

@@ -19,7 +19,6 @@ GPUArrays = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7"
 GPUCompiler = "61eb1bfa-7361-4325-ad38-22787b887f55"
 GPUToolbox = "096a3bc2-3ced-46d0-87f4-dd12716f4bfc"
 KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
-LLD_jll = "d55e3150-da41-5e91-b323-ecfd1eec6109"
 LLVM = "929cbde3-209d-540e-8aea-75f648917ca0"
 LLVM_jll = "86de99a1-58d6-5da7-8064-bd56ce2e322c"
 LazyArtifacts = "4af54fe1-eca0-43a8-85a7-787d91b784e3"
@@ -63,7 +62,6 @@ GPUArrays = "11.3.1"
 GPUCompiler = "1"
 GPUToolbox = "0.1.0, 0.2, 0.3, 1"
 KernelAbstractions = "0.9.2"
-LLD_jll = "15, 16, 17, 18, 19, 20"
 LLVM = "9"
 LLVM_jll = "15, 16, 17, 18, 19, 20"
 LazyArtifacts = "1.10"

src/compiler/Compiler.jl

@@ -1,7 +1,6 @@
 module Compiler
 
 import Core: LLVMPtr
-import LLD_jll
 
 using ..GPUCompiler
 using ..LLVM

src/compiler/codegen.jl

@@ -222,18 +222,13 @@ function hipfunction(f::F, tt::TT = Tuple{}; kwargs...) where {F <: Core.Functio
 end
 
 function create_executable(obj)
-    lld = if AMDGPU.lld_artifact
-        `$(LLD_jll.lld()) -flavor gnu`
-    else
-        @assert !isempty(AMDGPU.lld_path) "ld.lld was not found; cannot link kernel"
-        `$(AMDGPU.lld_path)`
-    end
+    @assert !isempty(AMDGPU.lld_path) "ld.lld was not found; cannot link kernel"
 
     path_o = tempname(;cleanup=false) * ".obj"
     path_exe = tempname(;cleanup=false) * ".exe"
 
     write(path_o, obj)
-    run(`$lld -shared -o $path_exe $path_o`)
+    run(`$(AMDGPU.lld_path) -shared -o $path_exe $path_o`)
     bin = read(path_exe)
 
     rm(path_o)

src/discovery/discovery.jl

@@ -4,7 +4,6 @@ export lld_artifact, lld_path, clang_path, clang_artifact, libhsaruntime, libdev
 export librocblas, librocsparse, librocsolver
 export librocrand, librocfft, libMIOpen_path
 
-using LLD_jll
 using LazyArtifacts
 using Preferences
 using Libdl
@@ -13,29 +12,6 @@ Base.include(@__MODULE__, joinpath(@__DIR__, "..", "..", ".pkg", "platform_augme
 
 include("utils.jl")
 
-function get_artifact_library(pkg::Symbol, libname::Symbol)::String
-    succ, res = safe_exec("import $pkg; println($pkg.$libname)")
-    (succ && ispath(res)) || return ""
-    return res
-end
-
-function get_ld_lld(rocm_path::String)::Tuple{String, Bool}
-    lld_path = find_ld_lld(rocm_path)
-    isempty(lld_path) || return (lld_path, false)
-    LLD_jll.is_available() || return (lld_path, false)
-    return (LLD_jll.lld_path, true)
-end
-
-function get_clang(rocm_path::String)::Tuple{String, Bool}
-    clang_path = find_clang(rocm_path)
-    if isempty(clang_path)
-        # Not found, could use LLD_jll or something if it had clang, but it doesn't.
-        # So return empty
-        return ("", false)
-    end
-    return (clang_path, true)
-end
-
 function _hip_runtime_version()
     v_ref = Ref{Cint}()
     res = ccall((:hipRuntimeGetVersion, libhip), UInt32, (Ptr{Cint},), v_ref)
@@ -51,9 +27,7 @@ end
 global rel_libdir::String = Sys.islinux() ? "" : "bin"
 global libhsaruntime::String = ""
 global lld_path::String = ""
-global lld_artifact::Bool = false
 global clang_path::String = ""
-global clang_artifact::Bool = false
 global libhip::String = ""
 global libdevice_libs::String = ""
 global librocblas::String = ""
@@ -87,14 +61,8 @@ function __init__()
             ""
 
         # Linker.
-        lld_path, lld_artifact = get_ld_lld(rocm_path)
-        global lld_path = lld_path
-        global lld_artifact = lld_artifact
-
-        # Clang
-        clang_path, clang_artifact = get_clang(rocm_path)
-        global clang_path = clang_path
-        global clang_artifact = clang_artifact
+        global lld_path = find_ld_lld(rocm_path)
+        global clang_path = find_clang(rocm_path)
         global libhip = find_rocm_library(Sys.islinux() ? "libamdhip64" : "amdhip64"; rocm_path)
 
         global libdevice_libs = find_device_libs(rocm_path)