Improve test coverage

Author: chriselrod

src/parse/memory_ops_common.jl

@@ -6,16 +6,16 @@ function dottosym(x::Expr)::Symbol
   xa2 isa QuoteNode ? Symbol(s1, "###extractarray###", xa2.value) : Symbol(s1, "###extractarray###", xa2)
 end
 function extract_array_symbol_from_ref!(ls::LoopSet, ex::Expr, offset1::Int)::Symbol
-    ar = ex.args[1 + offset1]
-    if isa(ar, Symbol)
-        return ar
-    elseif isa(ar, Expr) && (ar.head === :(.) || ar.head === :ref)
-        s = dottosym(ar)
-        pushprepreamble!(ls, Expr(:(=), s, ar))
-        return s
-    else
-        throw("Indexing into the following expression was not recognized: $ar")
-    end
+  ar = ex.args[1 + offset1]
+  if isa(ar, Symbol)
+    return ar
+  elseif isa(ar, Expr) && (ar.head === :(.) || ar.head === :ref)
+    s = dottosym(ar)
+    pushprepreamble!(ls, Expr(:(=), s, ar))
+    return s
+  else
+    throw("Indexing into the following expression was not recognized: $ar")
+  end
 end
 
 
@@ -27,12 +27,12 @@ ref_from_ref!(ls::LoopSet, ex::Expr) = ref_from_expr!(ls, ex, 0, 0)
 ref_from_getindex!(ls::LoopSet, ex::Expr) = ref_from_expr!(ls, ex, 1, 1)
 ref_from_setindex!(ls::LoopSet, ex::Expr) = ref_from_expr!(ls, ex, 1, 2)
 function ref_from_expr!(ls::LoopSet, ex::Expr)
-    if ex.head === :ref
-        ref_from_ref!(ls, ex)
-    else#if ex.head === :call
-        f = first(ex.args)::Symbol
-        f === :getindex ? ref_from_getindex!(ls, ex) : ref_from_setindex!(ls, ex)
-    end
+  if ex.head === :ref
+    ref_from_ref!(ls, ex)
+  else#if ex.head === :call
+    f = first(ex.args)::Symbol
+    f === :getindex ? ref_from_getindex!(ls, ex) : ref_from_setindex!(ls, ex)
+  end
 end
 
 add_vptr!(ls::LoopSet, op::Operation) = add_vptr!(ls, op.ref)
@@ -91,20 +91,20 @@ function subset_vptr!(ls::LoopSet, vptr::Symbol, indnum::Int, ind, previndices,
 end
 
 function gesp_const_offset!(ls::LoopSet, vptrarray, ninds, indices, loopedindex, mlt::Integer, sym)
-    if isone(mlt)
-        subset_vptr!(ls, vptrarray, ninds, sym, indices, loopedindex, false)
-    else        
-        mltsym = Symbol(sym, "##multiplied##by##", mlt)
-        pushprepreamble!(ls, Expr(:(=), mltsym, Expr(:call, :(*), mlt, sym))) # want same name for arrays to be given the same name if possible
-        subset_vptr!(ls, vptrarray, ninds, mltsym, indices, loopedindex, false)
-    end
+  if isone(mlt)
+    subset_vptr!(ls, vptrarray, ninds, sym, indices, loopedindex, false)
+  else        
+    mltsym = Symbol(sym, "##multiplied##by##", mlt)
+    pushprepreamble!(ls, Expr(:(=), mltsym, Expr(:call, :(*), mlt, sym))) # want same name for arrays to be given the same name if possible
+    subset_vptr!(ls, vptrarray, ninds, mltsym, indices, loopedindex, false)
+  end
 end
 function gesp_const_offsets!(ls::LoopSet, vptrarray, ninds, indices, loopedindex, mltsyms)
-    length(mltsyms) > 1 && sort!(mltsyms, by = last) # if multiple have same combination of syms, make sure they match even if order is different
-    for (mlt,sym) ∈ mltsyms
-        vptrarray = gesp_const_offset!(ls, vptrarray, ninds, indices, loopedindex, mlt, sym)
-    end
-    vptrarray
+  length(mltsyms) > 1 && sort!(mltsyms, by = last) # if multiple have same combination of syms, make sure they match even if order is different
+  for (mlt,sym) ∈ mltsyms
+    vptrarray = gesp_const_offset!(ls, vptrarray, ninds, indices, loopedindex, mlt, sym)
+  end
+  vptrarray
 end
 
 
@@ -296,7 +296,7 @@ function checkforoffset!(
         addconstindex!(indices, offsets, strides, loopedindex, offset)
         return vptrarray
     elseif length(mult_syms) == 1
-        mlt, sym = only(mult_syms)
+      mlt, sym = mult_syms[1]
         if sym ∈ ls.loopsymbols
             if byterepresentable(mlt)
                 _addoffset!(indices, offsets, strides, loopedindex, loopdependencies, sym, offset, mlt)

src/vectorizationbase_compat/subsetview.jl

@@ -32,19 +32,21 @@
         StridedPointer{$T,$(N-1),$newC,$B,$newR}($gptr, $newstrd, $newoffsets)
     end
 end
-@generated function _gesp(sp::AbstractStridedPointer{T,N}, ::StaticInt{I}, i::Integer) where {I,N,T}
-    t = Expr(:tuple)
-    for j ∈ 1:I-1
-        push!(t.args, staticexpr(0))
-    end
-    push!(t.args, :i)
+@generated function _gesp(sp, ::StaticInt{I}, i::Integer) where {I,N,T}
+  t = Expr(:tuple)
+  for j ∈ 1:I-1
+    push!(t.args, staticexpr(0))
+  end
+  push!(t.args, :i)
+  if I > 1
     for j ∈ I+1:N
-        push!(t.args, staticexpr(0))
-    end
-    quote
-        $(Expr(:meta,:inline))
-        gesp(sp, $t)
+      push!(t.args, staticexpr(0))
     end
+  end
+  quote
+    $(Expr(:meta,:inline))
+    gesp(sp, $t)
+  end
 end
 
 

test/copy.jl

@@ -170,6 +170,19 @@ using LoopVectorization, OffsetArrays, Test
       dest[2, i] = src[1, i]
     end
   end
+
+  function fill_with_3rd!(dest, src)
+    p = 1
+    @turbo for i ∈ eachindex(dest)
+      dest[i] = src[3*p]
+    end
+  end
+  function fill_with_r1c3!(dest, src::AbstractMatrix)
+    p = 1
+    @turbo for i ∈ eachindex(dest)
+      dest[i] = src[p, 3*p]
+    end
+  end
 
     for T ∈ (Float32, Float64, Int32, Int64)
         @show T, @__LINE__
@@ -201,7 +214,16 @@ using LoopVectorization, OffsetArrays, Test
         @test A1 == A2
         fill!(A2, 0); offset_copy_avx2!(A2, B);
         @test A1 == A2
-        
+        fill_with_3rd!(A1, B)
+        @test all(==(B[3]), A1)
+        fill_with_3rd!(A1, eachindex(B))
+        @test all(==(3), A1)
+
+        fill_with_r1c3!(A1, B)
+        @test all(==(B[1,3]), A1)
+        fill_with_r1c3!(A1, LinearIndices(B))
+        @test all(==(LinearIndices(B)[1,3]), A1)
+      
         a = rand(R)
         myfillavx!(x, a);
         fill!(q2, a);

test/threading.jl

@@ -1,4 +1,11 @@
 using OffsetArrays, LinearAlgebra, LoopVectorization, Test
+
+let nt = min(Threads.nthreads(), (Sys.CPU_THREADS)::Int) - 1
+  if (LoopVectorization.num_cores() < 4) && (nt ≥ 4)
+    @eval LoopVectorization.num_cores() = LoopVectorization.StaticInt{$nt}()
+  end
+end
+
 function mydotavx(a, b)
     s = zero(eltype(a))
     @tturbo for i ∈ eachindex(a,b)