Merge pull request #529 from JuliaGPU/tb/kwdef

Use kwdef for CompilerJob.

Author: maleadt

src/compiler/common.jl

@@ -1,25 +1,23 @@
 # common functionality
 
-struct CompilerJob
+Base.@kwdef struct CompilerJob
     # core invocation
     f::Base.Callable
     tt::DataType
     cap::VersionNumber
     kernel::Bool
 
     # optional properties
-    minthreads::Union{Nothing,CuDim}
-    maxthreads::Union{Nothing,CuDim}
-    blocks_per_sm::Union{Nothing,Integer}
-    maxregs::Union{Nothing,Integer}
-    name::Union{Nothing,String}
-
-    CompilerJob(f, tt, cap, kernel; name=nothing,
-                    minthreads=nothing, maxthreads=nothing,
-                    blocks_per_sm=nothing, maxregs=nothing) =
-        new(f, tt, cap, kernel, minthreads, maxthreads, blocks_per_sm, maxregs, name)
+    minthreads::Union{Nothing,CuDim} = nothing
+    maxthreads::Union{Nothing,CuDim} = nothing
+    blocks_per_sm::Union{Nothing,Integer} = nothing
+    maxregs::Union{Nothing,Integer} = nothing
+    name::Union{Nothing,String} = nothing
 end
 
+CompilerJob(f, tt, cap, kernel; kwargs...) =
+    CompilerJob(f=f, tt=tt, cap=cap, kernel=kernel; kwargs...)
+
 # global job reference
 # FIXME: thread through `job` everywhere (deadlocks the Julia compiler when doing so with
 #        the LLVM passes in CUDAnative)

src/compiler/driver.jl

@@ -1,5 +1,10 @@
 # compiler driver and main interface
 
+# NOTE: the keyword arguments to compile/codegen control those aspects of compilation that
+#       might have to be changed (e.g. set libraries=false when recursing, or set
+#       strip=true for reflection). What remains defines the compilation job itself,
+#       and those values are contained in the CompilerJob struct.
+
 # (::CompilerJob)
 const compile_hook = Ref{Union{Nothing,Function}}(nothing)
 
@@ -17,12 +22,12 @@ The following keyword arguments are supported:
 - `libraries`: link the CUDAnative runtime and `libdevice` libraries (if required)
 - `dynamic_parallelism`: resolve dynamic parallelism (if required)
 - `optimize`: optimize the code (default: true)
-- `strip`: strip non-functional metadata and debug information  (default: false)
+- `strip`: strip non-functional metadata and debug information (default: false)
 - `strict`: perform code validation either as early or as late as possible
 
 Other keyword arguments can be found in the documentation of [`cufunction`](@ref).
 """
-compile(target::Symbol, cap::VersionNumber, @nospecialize(f::Core.Function),
+compile(target::Symbol, cap::VersionNumber, @nospecialize(f::Base.Callable),
         @nospecialize(tt), kernel::Bool=true; libraries::Bool=true,
         dynamic_parallelism::Bool=true, optimize::Bool=true,
         strip::Bool=false, strict::Bool=true, kwargs...) =
@@ -51,7 +56,7 @@ end
 
 function codegen(target::Symbol, job::CompilerJob;
                  libraries::Bool=true, dynamic_parallelism::Bool=true, optimize::Bool=true,
-                 strip::Bool=false,strict::Bool=true)
+                 strip::Bool=false, strict::Bool=true)
     ## Julia IR
 
     @timeit_debug to "validation" check_method(job)