Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add nextafter intrinsic #529

Merged
merged 8 commits into from
Feb 11, 2025
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Metal.jl
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ include("device/utils.jl")
include("device/pointer.jl")
include("device/array.jl")
include("device/runtime.jl")
include("device/intrinsics/version.jl")
include("device/intrinsics/arguments.jl")
include("device/intrinsics/math.jl")
include("device/intrinsics/synchronization.jl")
include("device/intrinsics/memory.jl")
include("device/intrinsics/simd.jl")
include("device/intrinsics/version.jl")
include("device/intrinsics/atomics.jl")
include("device/quirks.jl")

Expand Down
4 changes: 2 additions & 2 deletions src/compiler/execution.jl
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ certain extent arguments will be converted and managed automatically using `mtlc
Finally, a call to `mtlcall` is performed, creating a command buffer in the current global
command queue then committing it.

There is one supported keyword argument that influences the behavior of `@metal`:
There are a few keyword arguments that influence the behavior of `@metal`:

- `launch`: whether to launch this kernel, defaults to `true`. If `false` the returned
- `launch`: whether to launch this kernel, defaults to `true`. If `false`, the returned
kernel object should be launched by calling it and passing arguments again.
- `name`: the name of the kernel in the generated code. Defaults to an automatically-
generated name.
Expand Down
15 changes: 15 additions & 0 deletions src/device/intrinsics/math.jl
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,21 @@ end
@device_override Base.trunc(x::Float32) = ccall("extern air.trunc.f32", llvmcall, Cfloat, (Cfloat,), x)
@device_override Base.trunc(x::Float16) = ccall("extern air.trunc.f16", llvmcall, Float16, (Float16,), x)

@device_function function nextafter(x::Float32, y::Float32)
if metal_version() >= sv"3.1" # macOS 14+
ccall("extern air.nextafter.f32", llvmcall, Cfloat, (Cfloat, Cfloat), x, y)
else
nextfloat(x, unsafe_trunc(Int32, sign(y - x)))
end
end
@device_function function nextafter(x::Float16, y::Float16)
if metal_version() >= sv"3.1" # macOS 14+
ccall("extern air.nextafter.f16", llvmcall, Float16, (Float16, Float16), x, y)
else
nextfloat(x, unsafe_trunc(Int16, sign(y - x)))
end
end

# hypot without use of double
#
# taken from Cosmopolitan Libc
Expand Down
26 changes: 25 additions & 1 deletion test/device/intrinsics.jl
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ MATH_INTR_FUNCS_2_ARG = [
# frexp, # T frexp(T x, Ti &exponent)
# ldexp, # T ldexp(T x, Ti k)
# modf, # T modf(T x, T &intval)
# nextafter, # T nextafter(T x, T y) # Metal 3.1+
hypot, # NOT MSL but tested the same
]

Expand Down Expand Up @@ -353,6 +352,31 @@ end
vec = Array(expm1.(buffer))
@test vec ≈ expm1.(arr)
end


let # nextafter
N = 4
function nextafter_test(X, y)
idx = thread_position_in_grid_1d()
X[idx] = Metal.nextafter(X[idx], y)
return nothing
end
arr = rand(T, N)

# test the intrinsic
buffer1 = MtlArray(arr)
Metal.@sync @metal threads = N nextafter_test(buffer1, typemax(T))
@test Array(buffer1) == nextfloat.(arr)
Metal.@sync @metal threads = N nextafter_test(buffer1, typemin(T))
@test Array(buffer1) == arr

# test for metal < 3.1
buffer2 = MtlArray(arr)
Metal.@sync @metal threads = N metal = v"3.0" nextafter_test(buffer2, typemax(T))
@test Array(buffer2) == nextfloat.(arr)
Metal.@sync @metal threads = N metal = v"3.0" nextafter_test(buffer2, typemin(T))
@test Array(buffer2) == arr
christiangnrd marked this conversation as resolved.
Show resolved Hide resolved
end
end
end

Expand Down