Use Aqua in tests and fix a few ambiguities.

Author: chriselrod

Project.toml

@@ -24,9 +24,10 @@ VectorizationBase = "0.14.10"
 julia = "1.5"
 
 [extras]
+Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["InteractiveUtils", "Random", "Test"]
+test = ["Aqua", "InteractiveUtils", "Random", "Test"]

src/LoopVectorization.jl

@@ -33,7 +33,7 @@ import LinearAlgebra # for check_args
 using Base.FastMath: add_fast, sub_fast, mul_fast, div_fast
 
 using ArrayInterface
-using ArrayInterface: OptionallyStaticUnitRange, Zero, One, static_length
+using ArrayInterface: OptionallyStaticUnitRange, Zero, One#, static_length
 const Static = ArrayInterface.StaticInt
 
 

src/broadcast.jl

@@ -349,7 +349,7 @@ function add_broadcast_loops!(ls::LoopSet, loopsyms::Vector{Symbol}, destsym::Sy
         push!(axes_tuple.args, Nrange)
         pushpreamble!(ls, Expr(:(=), Nlower, Expr(:call, lv(:maybestaticfirst), Nrange)))
         pushpreamble!(ls, Expr(:(=), Nupper, Expr(:call, lv(:maybestaticlast), Nrange)))
-        pushpreamble!(ls, Expr(:(=), Nlen, Expr(:call, lv(:static_length), Nrange)))
+        pushpreamble!(ls, Expr(:(=), Nlen, Expr(:call, lv(:maybestaticlength), Nrange)))
     end
 end
 # size of dest determines loops
@@ -421,7 +421,7 @@ end
 end
 @inline function vmaterialize!(
     dest′::Union{Adjoint{T,A},Transpose{T,A}}, bc::Broadcasted{Base.Broadcast.DefaultArrayStyle{0},Nothing,typeof(identity),Tuple{T2}}, ::Val{Mod}
-) where {T <: NativeTypes, N, A <: AbstractArray{T,N}, T2 <: NativeTypes, Mod}
+) where {T <: NativeTypes, N, A <: AbstractArray{T,N}, T2 <: Number, Mod}
     arg = T(first(bc.args))
     dest = parent(dest′)
     @avx for i ∈ eachindex(dest)

src/graphs.jl

@@ -512,20 +512,20 @@ function range_loop!(ls::LoopSet, r::Expr, itersym::Symbol)::Loop
             pushprepreamble!(ls, Expr(:(=), rangename, Expr(:call, :(:), staticexpr(liiv), supper)))
             Loop(itersym, liiv, supper, rangename, lenname)
         end
-        pushprepreamble!(ls, Expr(:(=), lenname, Expr(:call, lv(:static_length), rangename)))
+        pushprepreamble!(ls, Expr(:(=), lenname, Expr(:call, lv(:maybestaticlength), rangename)))
     elseif uii # only upper bound is an integer
         uiiv = convert(Int, upper::Integer)::Int
         rangename = gensym!(ls, "range"); lenname = gensym!(ls, "length")
         slower = add_loop_bound!(ls, itersym, lower, false)
         pushprepreamble!(ls, Expr(:(=), rangename, Expr(:call, :(:), slower, staticexpr(uiiv))))
         loop = Loop(itersym, slower, uiiv, rangename, lenname)
-        pushprepreamble!(ls, Expr(:(=), lenname, Expr(:call, lv(:static_length), rangename)))
+        pushprepreamble!(ls, Expr(:(=), lenname, Expr(:call, lv(:maybestaticlength), rangename)))
     else # neither are integers
         L = add_loop_bound!(ls, itersym, lower, false)
         U = add_loop_bound!(ls, itersym, upper, true)
         rangename = gensym!(ls, "range"); lenname = gensym!(ls, "length")
         pushprepreamble!(ls, Expr(:(=), rangename, Expr(:call, :(:), L, U)))
-        pushprepreamble!(ls, Expr(:(=), lenname, Expr(:call, lv(:static_length), rangename)))
+        pushprepreamble!(ls, Expr(:(=), lenname, Expr(:call, lv(:maybestaticlength), rangename)))
         loop = Loop(itersym, L, U, rangename, lenname)
     end
     loop
@@ -547,7 +547,7 @@ end
 function misc_loop!(ls::LoopSet, r::Union{Expr,Symbol}, itersym::Symbol)::Loop
     rangename = gensym!(ls, "looprange" * string(itersym)); lenname = gensym!(ls, "looplen" * string(itersym));
     pushprepreamble!(ls, Expr(:(=), rangename, Expr(:call, lv(:canonicalize_range), static_literals!(r))))
-    pushprepreamble!(ls, Expr(:(=), lenname, Expr(:call, lv(:static_length), rangename)))
+    pushprepreamble!(ls, Expr(:(=), lenname, Expr(:call, lv(:maybestaticlength), rangename)))
     L = add_loop_bound!(ls, itersym, Expr(:call, lv(:maybestaticfirst), rangename), false)
     U = add_loop_bound!(ls, itersym, Expr(:call, lv(:maybestaticlast), rangename), true)
     Loop(itersym, L, U, rangename, lenname)

src/mapreduce.jl

@@ -3,10 +3,10 @@
 @inline vreduce(::typeof(*), v::VectorizationBase.AbstractSIMDVector) = vprod(v)
 @inline vreduce(::typeof(max), v::VectorizationBase.AbstractSIMDVector) = vmaximum(v)
 @inline vreduce(::typeof(min), v::VectorizationBase.AbstractSIMDVector) = vminimum(v)
-@inline vreduce(op, v::VectorizationBase.AbstractSIMDVector) = _vreduce(op, v)
-@inline _vreduce(op, v::VectorizationBase.AbstractSIMDVector) = _reduce(op, Vec(v))
-_vreduce(op, v::Vec{1}) = VectorizationBase.extractelement(v, 0)
-@inline function _vreduce(op, v::Vec{W}) where {W}
+@inline vreduce(op, v::VectorizationBase.AbstractSIMDVector) = vec_vreduce(op, v)
+@inline vec_reduce(op, v::VectorizationBase.AbstractSIMDVector) = vec_reduce(op, Vec(v))
+vec_vreduce(op, v::Vec{1}) = VectorizationBase.extractelement(v, 0)
+@inline function vec_vreduce(op, v::Vec{W}) where {W}
     a = op(VectorizationBase.extractelement(v,0), VectorizationBase.extractelement(v, 1))
     for i ∈ 2:W-1
         a = op(a, VectorizationBase.extractelement(v, i))

src/operations.jl

@@ -75,8 +75,8 @@ Base.:(==)(x::ArrayReferenceMeta, y::ArrayReferenceMeta) = (x.ptr === y.ptr) &&
 # Errors preferable than silently working?
 Base.:(==)(x::ArrayReference, y::ArrayReferenceMeta) = x == y.ref
 Base.:(==)(x::ArrayReferenceMeta, y::ArrayReference) = x.ref == y
-Base.:(==)(x::ArrayReference, y) = false
-Base.:(==)(x::ArrayReferenceMeta, y) = false
+# Base.:(==)(x::ArrayReference, y) = false
+# Base.:(==)(x::ArrayReferenceMeta, y) = false
 
 abstract type AbstractLoopOperation end
 

src/reconstruct_loopset.jl

@@ -6,7 +6,7 @@ function Loop(ls::LoopSet, ex::Expr, sym::Symbol, ::Type{<:AbstractUnitRange})
     pushpreamble!(ls, Expr(:(=), loopsym, ex))
     pushpreamble!(ls, Expr(:(=), start, Expr(:call, lv(:first), loopsym)))
     pushpreamble!(ls, Expr(:(=), stop, Expr(:call, lv(:last), loopsym)))
-    pushpreamble!(ls, Expr(:(=), lensym, Expr(:call, lv(:static_length), loopsym)))
+    pushpreamble!(ls, Expr(:(=), lensym, Expr(:call, lv(:maybestaticlength), loopsym)))
     loop = Loop(sym, 1, 1024, start, stop, loopsym, lensym, false, false)::Loop
     pushpreamble!(ls, loopiteratesatleastonce(loop))
     loop
@@ -17,7 +17,7 @@ function add_static_upper_loop!(ls::LoopSet, ex::Expr, sym::Symbol, U::Int)
     start = gensym(ssym*"_loopstart"); loopsym = gensym(ssym * "_loop"); lensym = gensym(ssym * "_looplen")
     pushpreamble!(ls, Expr(:(=), loopsym, ex))
     pushpreamble!(ls, Expr(:(=), start, Expr(:call, lv(:first), loopsym)))
-    pushpreamble!(ls, Expr(:(=), lensym, Expr(:call, lv(:static_length), loopsym)))
+    pushpreamble!(ls, Expr(:(=), lensym, Expr(:call, lv(:maybestaticlength), loopsym)))
     loop = Loop(sym, U - 1023, U, start, Symbol(""), loopsym, lensym, false, true)::Loop
     pushpreamble!(ls, loopiteratesatleastonce(loop))
     loop
@@ -27,7 +27,7 @@ function add_static_lower_loop!(ls::LoopSet, ex::Expr, sym::Symbol, L::Int)
     stop = gensym(ssym*"_loopstop"); loopsym = gensym(ssym * "_loop"); lensym = gensym(ssym * "_looplen")
     pushpreamble!(ls, Expr(:(=), loopsym, ex))
     pushpreamble!(ls, Expr(:(=), stop, Expr(:call, lv(:last), loopsym)))
-    pushpreamble!(ls, Expr(:(=), lensym, Expr(:call, lv(:static_length), loopsym)))
+    pushpreamble!(ls, Expr(:(=), lensym, Expr(:call, lv(:maybestaticlength), loopsym)))
     loop = Loop(sym, L, L + 1023, Symbol(""), stop, loopsym, lensym, true, false)::Loop
     pushpreamble!(ls, loopiteratesatleastonce(loop))
     loop

test/runtests.jl

@@ -1,4 +1,4 @@
-using Test
+using Test, Aqua
 using LoopVectorization
 
 using LinearAlgebra
@@ -37,8 +37,9 @@ const RUN_SLOW_TESTS = LoopVectorization.REGISTER_COUNT ≤ 16 || !parse(Bool, g
 @show RUN_SLOW_TESTS
 
 @time @testset "LoopVectorization.jl" begin
-    
-    @test isempty(detect_unbound_args(LoopVectorization))
+
+    Aqua.test_all(LoopVectorization)
+    # @test isempty(detect_unbound_args(LoopVectorization))
 
     @time include("printmethods.jl")