Skip to content

RFC: sorting for SVectors #754

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

Merged
merged 1 commit into from
Mar 31, 2020
Merged
Show file tree
Hide file tree
Changes from all 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
1 change: 1 addition & 0 deletions src/StaticArrays.jl
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ include("abstractarray.jl")
include("indexing.jl")
include("broadcast.jl")
include("mapreduce.jl")
include("sort.jl")
include("arraymath.jl")
include("linalg.jl")
include("matrix_multiply.jl")
Expand Down
75 changes: 75 additions & 0 deletions src/sort.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
import Base.Order: Ordering, Forward, ReverseOrdering, ord
import Base.Sort: Algorithm, lt, sort


struct BitonicSortAlg <: Algorithm end

const BitonicSort = BitonicSortAlg()


# BitonicSort has non-optimal asymptotic behaviour, so we define a cutoff
# length. This also prevents compilation time to skyrocket for larger vectors.
defalg(a::StaticVector) =
isimmutable(a) && length(a) <= 20 ? BitonicSort : QuickSort

@inline function sort(a::StaticVector;
alg::Algorithm = defalg(a),
lt = isless,
by = identity,
rev::Union{Bool,Nothing} = nothing,
order::Ordering = Forward)
length(a) <= 1 && return a
ordr = ord(lt, by, rev, order)
return _sort(a, alg, ordr)
end

@inline _sort(a::StaticVector, alg, order) =
similar_type(a)(sort!(Base.copymutable(a); alg=alg, order=order))

@inline _sort(a::StaticVector, alg::BitonicSortAlg, order) =
similar_type(a)(_sort(Tuple(a), alg, order))

# Implementation loosely following
# https://www.inf.hs-flensburg.de/lang/algorithmen/sortieren/bitonic/oddn.htm
@generated function _sort(a::NTuple{N}, ::BitonicSortAlg, order) where N
function swap_expr(i, j, rev)
ai = Symbol('a', i)
aj = Symbol('a', j)
order = rev ? :revorder : :order
return :( ($ai, $aj) = lt($order, $ai, $aj) ? ($ai, $aj) : ($aj, $ai) )
end

function merge_exprs(idx, rev)
exprs = Expr[]
length(idx) == 1 && return exprs

ci = 2^(ceil(Int, log2(length(idx))) - 1)
# TODO: generate simd code for these swaps
for i in first(idx):last(idx)-ci
push!(exprs, swap_expr(i, i+ci, rev))
end
append!(exprs, merge_exprs(idx[1:ci], rev))
append!(exprs, merge_exprs(idx[ci+1:end], rev))
return exprs
end

function sort_exprs(idx, rev=false)
exprs = Expr[]
length(idx) == 1 && return exprs

append!(exprs, sort_exprs(idx[1:end÷2], !rev))
append!(exprs, sort_exprs(idx[end÷2+1:end], rev))
append!(exprs, merge_exprs(idx, rev))
return exprs
end

idx = 1:N
symlist = (Symbol('a', i) for i in idx)
return quote
@_inline_meta
revorder = Base.Order.ReverseOrdering(order)
($(symlist...),) = a
($(sort_exprs(idx)...);)
return ($(symlist...),)
end
end
1 change: 1 addition & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ include("abstractarray.jl")
include("indexing.jl")
include("initializers.jl")
Random.seed!(42); include("mapreduce.jl")
Random.seed!(42); include("sort.jl")
Random.seed!(42); include("accumulate.jl")
Random.seed!(42); include("arraymath.jl")
include("broadcast.jl")
Expand Down
22 changes: 22 additions & 0 deletions test/sort.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
using StaticArrays, Test

@testset "sort" begin

@testset "basics" for T in (Int, Float64)
for N in (0, 1, 2, 3, 10, 20, 30)
vs = rand(SVector{N,T})
vm = MVector{N,T}(vs)
vref = sort(Vector(vs))

@test @inferred(sort(vs)) isa SVector
@test @inferred(sort(vs, alg=QuickSort)) isa SVector
@test @inferred(sort(vm)) isa MVector
@test vref == sort(vs)
@test vref == sort(vm)

# @allocated seems broken since 1.4
#N <= 20 && @test 0 == @allocated sort(vs)
end
end

end