Some tweaks.

Author: chriselrod

benchmark/driver.jl

@@ -22,34 +22,32 @@ end
 # sizes = 23:23
 sizes = 256:-1:2
 
-AmulB_bench = benchmark_AmulB(sizes)
-AmulBt_bench = benchmark_AmulBt(sizes)
-AtmulBt_bench = benchmark_AtmulBt(sizes)
-AtmulB_bench = benchmark_AtmulB(sizes)
-
-Amulvb_bench = benchmark_Amulvb(sizes)
-Atmulvb_bench = benchmark_Atmulvb(sizes)
-
-filter2d_dynamic_bench = benchmark_filter2ddynamic(sizes)#512:-1:2)
-filter2d_3x3_bench = benchmark_filter2d3x3(sizes)#512:-1:2)
-filter2d_unrolled_bench = benchmark_filter2dunrolled(sizes)#512:-1:2)
-
-dot3_bench = benchmark_dot3(sizes)
-dot_bench = benchmark_dot(sizes)
-selfdot_bench = benchmark_selfdot(sizes)
-sse_bench = benchmark_sse(sizes)
-aplusBc_bench = benchmark_aplusBc(sizes)
-AplusAt_bench = benchmark_AplusAt(sizes)
-vexp_bench = benchmark_exp(sizes)
-randomaccess_bench = benchmark_random_access(sizes)
-logdettriangle_bench = benchmark_logdettriangle(sizes)
+@show AmulB_bench = benchmark_AmulB(sizes);
+@show AmulBt_bench = benchmark_AmulBt(sizes);
+@show AtmulBt_bench = benchmark_AtmulBt(sizes);
+@show AtmulB_bench = benchmark_AtmulB(sizes);
+
+@show Amulvb_bench = benchmark_Amulvb(sizes);
+@show Atmulvb_bench = benchmark_Atmulvb(sizes);
+
+@show filter2d_dynamic_bench = benchmark_filter2ddynamic(sizes);
+@show filter2d_3x3_bench = benchmark_filter2d3x3(sizes);
+@show filter2d_unrolled_bench = benchmark_filter2dunrolled(sizes);
+
+@show dot3_bench = benchmark_dot3(sizes);
+@show dot_bench = benchmark_dot(sizes);
+@show selfdot_bench = benchmark_selfdot(sizes);
+@show sse_bench = benchmark_sse(sizes);
+@show aplusBc_bench = benchmark_aplusBc(sizes);
+@show AplusAt_bench = benchmark_AplusAt(sizes);
+@show vexp_bench = benchmark_exp(sizes);
+@show randomaccess_bench = benchmark_random_access(sizes);
+@show logdettriangle_bench = benchmark_logdettriangle(sizes);
 
 const v = 1
 using Cairo, Fontconfig
 const PICTURES = joinpath(pkgdir(LoopVectorization), "docs", "src", "assets")
-function saveplot(f, br)
-    draw(PNG(joinpath(PICTURES, f * "$v.png"), 12inch, 8inch), plot(br))
-end
+saveplot(f, br) = draw(PNG(joinpath(PICTURES, f * "$v.png"), 12inch, 8inch), plot(br))
 
 saveplot("bench_filter2d_dynamic_v", filter2d_dynamic_bench);
 saveplot("bench_filter2d_3x3_v", filter2d_3x3_bench);
@@ -70,19 +68,3 @@ saveplot("bench_AtmulBt_v", AtmulBt_bench);
 saveplot("bench_Amulvb_v", Amulvb_bench);
 saveplot("bench_Atmulvb_v", Atmulvb_bench);
 
-
-
-
-# plot(gemm_bench)
-# plot(AtmulB_bench)
-# plot(dot_bench)
-# plot(selfdot_bench)
-# plot(gemv_bench)
-# plot(dot3_bench)
-# plot(sse_bench)
-# plot(vexp_bench)
-# plot(aplusBc_bench)
-# plot(AplusAt_bench)
-
-
-

benchmark/looptests.jl

@@ -1,22 +1,24 @@
 using LoopVectorization, LinearAlgebra, OffsetArrays
 BLAS.set_num_threads(1)
 
+using LoopVectorization.VectorizationBase: StaticUnitRange
 struct SizedOffsetMatrix{T,LR,UR,LC,RC} <: DenseMatrix{T}
     data::Matrix{T}
 end
-using LoopVectorization.VectorizationBase: StaticUnitRange
 Base.axes(::SizedOffsetMatrix{T,LR,UR,LC,UC}) where {T,LR,UR,LC,UC} = (StaticUnitRange{LR,UR}(),StaticUnitRange{LC,UC}())
+Base.parent(A::SizedOffsetMatrix) = A.data
 @generated function LoopVectorization.stridedpointer(A::SizedOffsetMatrix{T,LR,UR,LC,RC}) where {T,LR,UR,LC,RC}
     quote
         $(Expr(:meta,:inline))
         LoopVectorization.OffsetStridedPointer(
-            LoopVectorization.StaticStridedPointer{$T,Tuple{1,$(UR-LR+1)}}(pointer(A.data)),
-            ($(LR-2), $(LC-2))
+            LoopVectorization.StaticStridedPointer{$T,Tuple{1,$(UR-LR+1)}}(pointer(parent(A))),
+            ($(LR-1), $(LC-1))
         )
     end
 end
+Base.getindex(A::SizedOffsetMatrix, i, j) = LoopVectorization.vload(LoopVectorization.stridedpointer(A), (i-1,j-1))
+Base.axes(::SizedOffsetMatrix{T,LR,UR,LC,UC}) where {T,LR,UR,LC,UC} = (StaticUnitRange{LR,UR}(),StaticUnitRange{LC,UC}())
 Base.size(A::SizedOffsetMatrix{T,LR,UR,LC,UC}) where {T,LR,UR,LC,UC} = (1 + UR-LR, 1 + UC-LC)
-Base.getindex(A::SizedOffsetMatrix, i, j) = LoopVectorization.vload(LoopVectorization.stridedpointer(A), (i,j)) # only needed to print
 Base.unsafe_convert(::Type{Ptr{Float64}}, A::SizedOffsetMatrix) = Base.unsafe_convert(Ptr{Float64}, A.data)