Accidentally forgot to comment lines in offsetarrays tests, and updated 16-register tests.

Author: chriselrod

test/miscellaneous.jl

@@ -4,12 +4,16 @@ using Test
 
 @testset "Miscellaneous" begin
 
-    Unum, Tnum = LoopVectorization.VectorizationBase.REGISTER_COUNT == 16 ? (3, 3) : (4, 4)
+    Unum, Tnum = LoopVectorization.VectorizationBase.REGISTER_COUNT == 16 ? (3, 4) : (4, 4)
     dot3q = :(for m ∈ 1:M, n ∈ 1:N
               s += x[m] * A[m,n] * y[n]
               end);
     lsdot3 = LoopVectorization.LoopSet(dot3q);
-    @test LoopVectorization.choose_order(lsdot3) == ([:n, :m], :n, :m, :m, Unum, Tnum)#&-2
+    if LoopVectorization.VectorizationBase.REGISTER_COUNT == 32
+        @test LoopVectorization.choose_order(lsdot3) == ([:n, :m], :n, :m, :m, Unum, Tnum)#&-2
+    else
+        @test LoopVectorization.choose_order(lsdot3) == ([:n, :m], :m, :n, :m, Unum, Tnum)#&-2
+    end
 
     @static if VERSION < v"1.4"
         dot3(x, A, y) = dot(x, A * y)
@@ -57,7 +61,11 @@ using Test
                 B[j,i] = A[j,i] - x[j]
                 end)
     lssubcol = LoopVectorization.LoopSet(subcolq);
-    @test LoopVectorization.choose_order(lssubcol) == (Symbol[:j,:i], :j, :i, :j, 4, 6)
+    if LoopVectorization.VectorizationBase.REGISTER_COUNT == 32
+        @test LoopVectorization.choose_order(lssubcol) == (Symbol[:j,:i], :j, :i, :j, 4, 6)
+    else
+        @test LoopVectorization.choose_order(lssubcol) == ([:j, :i], :j, :i, :j, 3, 4)#&-2
+    end
     ## @avx is SLOWER!!!!
     ## need to fix!
     function mysubcol!(B, A, x)
@@ -82,8 +90,11 @@ using Test
                 x[j] += A[j,i] - 0.25
                 end)
     lscolsum = LoopVectorization.LoopSet(colsumq);
-    @test LoopVectorization.choose_order(lscolsum) == (Symbol[:j,:i], :j, :i, :j, 4, 6)
-
+    if LoopVectorization.VectorizationBase.REGISTER_COUNT == 32
+        @test LoopVectorization.choose_order(lscolsum) == (Symbol[:j,:i], :j, :i, :j, 4, 6)
+    else
+        @test LoopVectorization.choose_order(lscolsum) == (Symbol[:j,:i], :j, :i, :j, 3, 4)
+    end
     # my colsum is wrong (by 0.25), but slightly more interesting
     function mycolsum!(x, A)
         @. x = 0
@@ -119,8 +130,12 @@ using Test
     lsvar = LoopVectorization.LoopSet(varq);
     # LoopVectorization.choose_order(lsvar)
     # @test LoopVectorization.choose_order(lscolsum) == (Symbol[:j,:i], :j, Symbol("##undefined##"), :j, 4, -1)
-    @test LoopVectorization.choose_order(lsvar) == (Symbol[:j,:i], :j, :i, :j, 4, 6)
-
+    if LoopVectorization.VectorizationBase.REGISTER_COUNT == 32
+        @test LoopVectorization.choose_order(lsvar) == (Symbol[:j,:i], :j, :i, :j, 4, 6)
+    else
+        @test LoopVectorization.choose_order(lsvar) == (Symbol[:j,:i], :j, :i, :j, 4, 4)
+    end
+    
     function myvar!(s², A, x̄)
         @. s² = 0
         @inbounds for i ∈ 1:size(A,2)

test/offsetarrays.jl

@@ -29,17 +29,17 @@ T = Float64
     #     tmp += A[i+ik,j+jk]*skern[ik,jk]
     # end;
     # ls1
-    out = out1;
-    rng1,  rng2  = CartesianIndices(out1).indices;
-    rng1k, rng2k = axes(skern);
-    ls2dstatic = LoopVectorization.@avx_debug for j in rng2, i in rng1
-            tmp = zero(eltype(out))
-            for jk in rng2k, ik in rng1k
-                tmp += A[i+ik,j+jk]*skern[ik,jk]
-            end
-            out1[i,j] = tmp
-    end;
-    LoopVectorization.choose_order(ls2dstatic)
+    # out = out1;
+    # rng1,  rng2  = CartesianIndices(out1).indices;
+    # rng1k, rng2k = axes(skern);
+    # ls2dstatic = LoopVectorization.@avx_debug for j in rng2, i in rng1
+    #         tmp = zero(eltype(out))
+    #         for jk in rng2k, ik in rng1k
+    #             tmp += A[i+ik,j+jk]*skern[ik,jk]
+    #         end
+    #         out1[i,j] = tmp
+    # end;
+    # LoopVectorization.choose_order(ls2dstatic)
     # q2d = :(for j in rng2, i in rng1
     #         tmp = zero(eltype(out))
     #         for jk in rng2k, ik in rng1k