Only reference function module for those within LoopVectorization's namespace. Fixes #79.

Author: chriselrod

.travis.yml

@@ -5,7 +5,7 @@ os:
   - osx
 julia:
   - 1.1
-  - 1.3
+  - 1.4
   - nightly
 notifications:
   email: false

Manifest.toml

@@ -69,6 +69,6 @@ version = "0.1.0"
 
 [[VectorizationBase]]
 deps = ["CpuId", "LinearAlgebra"]
-git-tree-sha1 = "83f073a514b5d654cc9c72ae283a33388a0d0386"
+git-tree-sha1 = "83e32d4835fc4f4ecfd43eb59fa7fc00854b3d41"
 uuid = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f"
-version = "0.9.3"
+version = "0.9.4"

Project.toml

@@ -1,7 +1,7 @@
 name = "LoopVectorization"
 uuid = "bdcacae8-1622-11e9-2a5c-532679323890"
 authors = ["Chris Elrod <[email protected]>"]
-version = "0.6.22"
+version = "0.6.23"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

src/broadcast.jl

@@ -184,9 +184,9 @@ function add_broadcast!(
     elementbytes::Int
 ) where {N,S<:Base.Broadcast.AbstractArrayStyle{N},F,A}
     instr = get(FUNCTIONSYMBOLS, F) do
-        # f = gensym(:func)
-        # pushpreamble!(ls, Expr(:(=), f, Expr(:(.), bcname, QuoteNode(:f))))
-        Instruction(bcname, :f)
+        f = gensym(:func)
+        pushpreamble!(ls, Expr(:(=), f, Expr(:(.), bcname, QuoteNode(:f))))
+        Instruction(bcname, f)
     end
     args = A.parameters
     Nargs = length(args)

src/costs.jl

@@ -18,10 +18,10 @@ Base.convert(::Type{Expr}, instr::Instruction) = Expr(:(.), instr.mod, QuoteNode
 function Base.Expr(instr::Instruction, args...)
     if instr.mod === :LoopVectorization
         Expr(:call, lv(instr.instr), args...)::Expr
-    elseif instr.mod === :Main
+    else#if instr.mod === :Main
         Expr(:call, instr.instr, args...)::Expr
-    else
-        Expr(:call, convert(Expr, instr), args...)::Expr
+    # else
+        # Expr(:call, convert(Expr, instr), args...)::Expr
     end
 end
 Base.hash(instr::Instruction, h::UInt64) = hash(instr.instr, hash(instr.mod, h))
@@ -373,5 +373,6 @@ const FUNCTIONSYMBOLS = IdDict{Type{<:Function},Instruction}(
     typeof(>>) => :>>,
     typeof(>>>) => :>>>,
     typeof(ifelse) => :vifelse,
-    typeof(vifelse) => :vifelse
+    typeof(vifelse) => :vifelse,
+    typeof(identity) => :identity
 )

src/reconstruct_loopset.jl

@@ -4,7 +4,7 @@ function Loop(ls::LoopSet, ex::Expr, sym::Symbol, ::Type{<:AbstractUnitRange})
     pushpreamble!(ls, Expr(:(=), loopsym, ex))
     pushpreamble!(ls, Expr(:(=), start, Expr(:call, :first, loopsym)))
     pushpreamble!(ls, Expr(:(=), stop, Expr(:call, :last, loopsym)))
-    Loop(sym, 0, 1024, start, stop, false, false)::Loop
+    Loop(sym, 1, 1024, start, stop, false, false)::Loop
 end
 function Loop(ls::LoopSet, ex::Expr, sym::Symbol, ::Type{StaticUpperUnitRange{U}}) where {U}
     start = gensym(String(sym)*"_loopstart")