Skip to content

Commit d1a235b

Browse files
committed
Use at-inline instead of _inline_meta.
1 parent 00675f2 commit d1a235b

File tree

8 files changed

+17
-31
lines changed

8 files changed

+17
-31
lines changed

Manifest.toml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,15 @@ version = "0.1.6"
7777

7878
[[GPUArrays]]
7979
deps = ["Adapt", "LinearAlgebra", "Printf", "Random", "Serialization", "Statistics"]
80-
git-tree-sha1 = "59aa54826b2667e2a9161f6dbd9e37255fdb541b"
81-
repo-rev = "e1a4b3d"
82-
repo-url = "https://github.com/JuliaGPU/GPUArrays.jl.git"
80+
git-tree-sha1 = "7c39d767a9c55fafd01f7bc8b3fd0adf175fbc97"
8381
uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7"
84-
version = "8.0.2"
82+
version = "8.1.0"
8583

8684
[[GPUCompiler]]
8785
deps = ["ExprTools", "InteractiveUtils", "LLVM", "Libdl", "Logging", "TimerOutputs", "UUIDs"]
88-
git-tree-sha1 = "4ed2616d5e656c8716736b64da86755467f26cf5"
86+
git-tree-sha1 = "55ea723d032654a52671923fdce9d785e02ed577"
8987
uuid = "61eb1bfa-7361-4325-ad38-22787b887f55"
90-
version = "0.12.9"
88+
version = "0.13.0"
9189

9290
[[InteractiveUtils]]
9391
deps = ["Markdown"]
@@ -106,9 +104,9 @@ version = "1.3.0"
106104

107105
[[LLVM]]
108106
deps = ["CEnum", "LLVMExtra_jll", "Libdl", "Printf", "Unicode"]
109-
git-tree-sha1 = "23a47d417a3cd9c2e73c854bac7dd4731c105ef7"
107+
git-tree-sha1 = "36d95ecdfbc3240d728f68d73064d5b097fbf2ef"
110108
uuid = "929cbde3-209d-540e-8aea-75f648917ca0"
111-
version = "4.4.0"
109+
version = "4.5.2"
112110

113111
[[LLVMExtra_jll]]
114112
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ BFloat16s = "0.1"
3333
CEnum = "0.2, 0.3, 0.4"
3434
ExprTools = "0.1"
3535
GPUArrays = "8"
36-
GPUCompiler = "0.12.6"
36+
GPUCompiler = "0.13.0"
3737
LLVM = "4.1.1"
3838
Random123 = "1.2"
3939
RandomNumbers = "1.5.3"

lib/cudadrv/execution.jl

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@ export cudacall
66
## device
77

88
# pack arguments in a buffer that CUDA expects
9-
@generated function pack_arguments(f::Function, args...)
9+
@inline @generated function pack_arguments(f::Function, args...)
1010
for arg in args
1111
isbitstype(arg) || throw(ArgumentError("Arguments to kernel should be bitstype."))
1212
end
1313

14-
ex = quote
15-
Base.@_inline_meta
16-
end
14+
ex = quote end
1715

1816
# If f has N parameters, then kernelParams needs to be an array of N pointers.
1917
# Each of kernelParams[0] through kernelParams[N-1] must point to a region of memory
@@ -78,12 +76,10 @@ end
7876

7977
# convert the argument values to match the kernel's signature (specified by the user)
8078
# (this mimics `lower-ccall` in julia-syntax.scm)
81-
@generated function convert_arguments(f::Function, ::Type{tt}, args...) where {tt}
79+
@inline @generated function convert_arguments(f::Function, ::Type{tt}, args...) where {tt}
8280
types = tt.parameters
8381

84-
ex = quote
85-
Base.@_inline_meta
86-
end
82+
ex = quote end
8783

8884
converted_args = Vector{Symbol}(undef, length(args))
8985
arg_ptrs = Vector{Symbol}(undef, length(args))

lib/cudnn/util.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ juliaDataType(a)=(a==CUDNN_DATA_HALF ? Float16 :
2424
tuple_strides(A::Tuple) = _strides((1,), A)
2525
_strides(out::Tuple{Int}, A::Tuple{}) = ()
2626
_strides(out::NTuple{N,Int}, A::NTuple{N}) where {N} = out
27-
function _strides(out::NTuple{M,Int}, A::Tuple) where M
28-
Base.@_inline_meta
27+
@inline function _strides(out::NTuple{M,Int}, A::Tuple) where M
2928
_strides((out..., out[M]*A[M]), A)
3029
end
3130

perf/volumerhs.jl

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ for (jlf, f) in zip((:+, :*, :-), (:add, :mul, :sub))
2727
"""
2828
@eval begin
2929
# the @pure is necessary so that we can constant propagate.
30-
Base.@pure function $jlf(a::$T, b::$T)
31-
Base.@_inline_meta
30+
@inline Base.@pure function $jlf(a::$T, b::$T)
3231
Base.llvmcall($ir, $T, Tuple{$T, $T}, a, b)
3332
end
3433
end
@@ -46,10 +45,8 @@ let (jlf, f) = (:div_arcp, :div)
4645
"""
4746
@eval begin
4847
# the @pure is necessary so that we can constant propagate.
49-
Base.@pure function $jlf(a::$T, b::$T)
50-
@Base._inline_meta
48+
@inline Base.@pure function $jlf(a::$T, b::$T) =
5149
Base.llvmcall($ir, $T, Tuple{$T, $T}, a, b)
52-
end
5350
end
5451
end
5552
@eval function $jlf(args...)

src/compiler/execution.jl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ The following keyword arguments are supported:
174174
"""
175175
AbstractKernel
176176

177-
@generated function call(kernel::AbstractKernel{F,TT}, args...; call_kwargs...) where {F,TT}
177+
@inline @generated function call(kernel::AbstractKernel{F,TT}, args...; call_kwargs...) where {F,TT}
178178
sig = Tuple{F, TT.parameters...} # Base.signature_type with a function type
179179
args = (:(kernel.f), (:( args[$i] ) for i in 1:length(args))...)
180180

@@ -197,8 +197,6 @@ AbstractKernel
197197
call_tt = Base.to_tuple_type(call_t)
198198

199199
quote
200-
Base.@_inline_meta
201-
202200
cudacall(kernel.fun, $call_tt, $(call_args...); call_kwargs...)
203201
end
204202
end

src/device/intrinsics/dynamic_parallelism.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,9 @@ function launch(f::CuDeviceFunction, args::Vararg{Any,N}; blocks::CuDim=1, threa
7373
return
7474
end
7575

76-
@generated function parameter_buffer(f::CuDeviceFunction, blocks, threads, shmem, args...)
76+
@inline @generated function parameter_buffer(f::CuDeviceFunction, blocks, threads, shmem, args...)
7777
# allocate a buffer
7878
ex = quote
79-
Base.@_inline_meta
8079
buf = cudaGetParameterBufferV2(f, blocks, threads, shmem)
8180
ptr = Base.unsafe_convert(Ptr{UInt32}, buf)
8281
end

src/device/intrinsics/output.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ const cuprint_specifiers = Dict(
117117
Cstring => "%s",
118118
)
119119

120-
@generated function _cuprint(parts...)
120+
@inline @generated function _cuprint(parts...)
121121
fmt = ""
122122
args = Expr[]
123123

@@ -170,7 +170,6 @@ const cuprint_specifiers = Dict(
170170
end
171171

172172
quote
173-
Base.@_inline_meta
174173
@cuprintf($fmt, $(args...))
175174
end
176175
end

0 commit comments

Comments
 (0)