Drop MacroTools dependency.

Author: chriselrod

Project.toml

@@ -5,14 +5,12 @@ version = "0.6.5"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
-MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
 Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
 SIMDPirates = "21efa798-c60a-11e8-04d3-e1a92915a26a"
 SLEEFPirates = "476501e8-09a2-5ece-8869-fb82de89a1fa"
 VectorizationBase = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f"
 
 [compat]
-MacroTools = "0"
 Parameters = "0"
 SIMDPirates = "0.3.3, 0.4, 0.5"
 SLEEFPirates = "0.3.2, 0.4, 0.5"

src/LoopVectorization.jl

@@ -1,6 +1,6 @@
 module LoopVectorization
 
-using VectorizationBase, SIMDPirates, SLEEFPirates, MacroTools, Parameters
+using VectorizationBase, SIMDPirates, SLEEFPirates, Parameters
 using VectorizationBase: REGISTER_SIZE, REGISTER_COUNT, extract_data, num_vector_load_expr,
     mask, masktable, pick_vector_width_val, valmul, valrem, valmuladd, valadd, valsub, _MM,
     maybestaticlength, maybestaticsize, staticm1, subsetview, vzero, stridedpointer_for_broadcast,
@@ -10,7 +10,6 @@ using SIMDPirates: VECTOR_SYMBOLS, evadd, evmul, vrange, reduced_add, reduced_pr
 #    vmullog2, vmullog10, vdivlog2, vdivlog2add, vdivlog10, vdivlog10add, vfmaddaddone
 using Base.Broadcast: Broadcasted, DefaultArrayStyle
 using LinearAlgebra: Adjoint, Transpose
-using MacroTools: prewalk, postwalk
 
 
 export LowDimArray, stridedpointer, vectorizable,

src/constructors.jl

@@ -43,7 +43,7 @@ end
 
 
 function LoopSet(q::Expr, mod::Symbol = :LoopVectorization)
-    q = SIMDPirates.contract_pass(q)
+    SIMDPirates.contract_pass!(q)
     ls = LoopSet(mod)
     copyto!(ls, q)
     resize!(ls.loop_order, num_loops(ls))

src/memory_ops_common.jl

@@ -1,3 +1,18 @@
+function ref_from_expr(ex, offset1::Int, offset2::Int)
+    (ex.args[1 + offset1])::Symbol, @view(ex.args[2 + offset2:end])
+end
+ref_from_ref(ex::Expr) = ref_from_expr(ex, 0, 0)
+ref_from_getindex(ex::Expr) = ref_from_expr(ex, 1, 1)
+ref_from_setindex(ex::Expr) = ref_from_expr(ex, 1, 2)
+function ref_from_expr(ex::Expr)
+    if ex.head === :ref
+        ref_from_ref(ex)
+    else#if ex.head === :call
+        f = first(ex.args)::Symbol
+        f === :getindex ? ref_from_getindex(ex) : ref_from_setindex(ex)
+    end
+end
+
 add_vptr!(ls::LoopSet, op::Operation) = add_vptr!(ls, op.ref)
 add_vptr!(ls::LoopSet, mref::ArrayReferenceMeta) = add_vptr!(ls, mref.ref.array, vptr(mref))
 function add_vptr!(ls::LoopSet, array::Symbol, vptrarray::Symbol = vptr(array), actualarray::Bool = true, broadcast::Bool = false)

src/operations.jl

@@ -36,21 +36,6 @@ Base.:(==)(x::ArrayReference, y::ArrayReference) = isequal(x, y)
 Base.:(==)(x::ArrayReferenceMeta, y::ArrayReferenceMeta) = isequal(x.ref, y.ref) && x.ptr === y.ptr
 
 
-function ref_from_expr(ex, offset1::Int, offset2::Int)
-    (ex.args[1 + offset1])::Symbol, @view(ex.args[2 + offset2:end])
-end
-ref_from_ref(ex::Expr) = ref_from_expr(ex, 0, 0)
-ref_from_getindex(ex::Expr) = ref_from_expr(ex, 1, 1)
-ref_from_setindex(ex::Expr) = ref_from_expr(ex, 1, 2)
-function ref_from_expr(ex::Expr)
-    if ex.head === :ref
-        ref_from_ref(ex)
-    else#if ex.head === :call
-        f = first(ex.args)::Symbol
-        f === :getindex ? ref_from_getindex(ex) : ref_from_setindex(ex)
-    end
-end
-
 Base.:(==)(x::ArrayReference, y::ArrayReferenceMeta) = x == y.ref
 Base.:(==)(x::ArrayReferenceMeta, y::ArrayReference) = x.ref == y
 Base.:(==)(x::ArrayReference, y) = false

test/runtests.jl

@@ -28,7 +28,7 @@ end
     @test occursin("Operation[", s)
     @test occursin("s = 0", s)
     @test occursin("s = LoopVectorization.vfmadd", s)
-    
+# using LoopVectorization    
 @time @testset "dot" begin
     dotq = :(for i ∈ eachindex(a,b)
              s += a[i]*b[i]
@@ -395,6 +395,13 @@ end
                 y[i] = yᵢ
             end
         end
+        q = :(for i ∈ eachindex(y)
+                yᵢ = zero(eltype(y))
+                for j ∈ eachindex(x)
+                    yᵢ += A[i,j] * x[j]
+                end
+                y[i] = yᵢ
+            end)
         function mygemv_avx!(y, A, x)
             @_avx for i ∈ eachindex(y)
                 yᵢ = zero(eltype(y))