Bump SIMDPirates dependency to fix #54. Additionally, remove maybeconvert. It will be better to handle conversions by method-based promotion until proper op-dependent typing is added.

Author: chriselrod

Manifest.toml

@@ -49,9 +49,9 @@ uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 
 [[SIMDPirates]]
 deps = ["VectorizationBase"]
-git-tree-sha1 = "42da6678fbe40c1a968a48da5bf76d15e3652ba1"
+git-tree-sha1 = "456a334075b92d1770fc7c37a9c6944681e44793"
 uuid = "21efa798-c60a-11e8-04d3-e1a92915a26a"
-version = "0.3.11"
+version = "0.3.12"
 
 [[SLEEFPirates]]
 deps = ["Libdl", "SIMDPirates", "VectorizationBase"]
@@ -71,6 +71,6 @@ uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [[VectorizationBase]]
 deps = ["CpuId", "LinearAlgebra"]
-git-tree-sha1 = "47209cb34f04e6f6d4855e5011644ec111066f6f"
+git-tree-sha1 = "5d9f62daaa09921c07d5fd7b4a686e0842bfdb0a"
 uuid = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f"
-version = "0.2.7"
+version = "0.3.0"

Project.toml

@@ -1,7 +1,7 @@
 name = "LoopVectorization"
 uuid = "bdcacae8-1622-11e9-2a5c-532679323890"
 authors = ["Chris Elrod <[email protected]>"]
-version = "0.6.11"
+version = "0.6.12"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
@@ -12,9 +12,9 @@ VectorizationBase = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f"
 
 [compat]
 Parameters = "0"
-SIMDPirates = "0.3.11, 0.4, 0.5"
+SIMDPirates = "0.3.12, 0.4, 0.5"
 SLEEFPirates = "0.3.5, 0.4, 0.5"
-VectorizationBase = "0.2.7, 0.3, 0.4"
+VectorizationBase = "0.3, 0.4, 0.5"
 julia = "1.1"
 
 [extras]

src/add_compute.jl

@@ -86,10 +86,10 @@ function update_reduction_status!(parentvec::Vector{Operation}, deps::Vector{Sym
         end
     end
 end
-function add_compute!(ls::LoopSet, op::Operation)
-    @assert iscompute(op)
-    pushop!(ls, child, name(op))
-end
+# function add_compute!(ls::LoopSet, op::Operation)
+    # @assert iscompute(op)
+    # pushop!(ls, child, name(op))
+# end
 function isreductzero(op::Operation, ls::LoopSet, reduct_zero::Symbol)
     isconstant(op) || return false
     reduct_zero === op.instruction.mod && return true

src/costs.jl

@@ -222,7 +222,7 @@ const REDUCTION_CLASS = Dict{Symbol,Float64}(
     :min => MIN
 )
 reduction_instruction_class(instr::Symbol) = get(REDUCTION_CLASS, instr, NaN)
-reduction_instruction_class(instr::Instruction) = get(REDUCTION_CLASS, instr.instr, NaN)
+reduction_instruction_class(instr::Instruction) = reduction_instruction_class(instr.instr)
 function reduction_to_single_vector(x::Float64)
     # x == 1.0 ? :evadd : x == 2.0 ? :evmul : x == 3.0 ? :vor : x == 4.0 ? :vand : x == 5.0 ? :max : x == 6.0 ? :min : throw("Reduction not found.")
     x == 1.0 ? :evadd : x == 2.0 ? :evmul : x == 5.0 ? :max : x == 6.0 ? :min : throw("Reduction not found.")

src/lower_constant.jl

@@ -41,7 +41,8 @@ function lower_constant!(
     mvar = variable_name(op, suffix)
     constsym = instruction.instr
     if vectorized ∈ loopdependencies(op) || vectorized ∈ reducedchildren(op) || vectorized ∈ reduceddependencies(op)
-        call = Expr(:call, lv(:vbroadcast), W, Expr(:call, lv(:maybeconvert), typeT, constsym))
+        # call = Expr(:call, lv(:vbroadcast), W, Expr(:call, lv(:maybeconvert), typeT, constsym))
+        call = Expr(:call, lv(:vbroadcast), W, constsym)
         if unrolled ∈ loopdependencies(op) || unrolled ∈ reducedchildren(op) || unrolled ∈ reduceddependencies(op)
             for u ∈ 0:U-1
                 push!(q.args, Expr(:(=), Symbol(mvar, u), call))
@@ -77,15 +78,16 @@ function setconstantop!(ls, op, val)
     nothing
 end
 
-@inline maybeconvert(::Type{T}, s::Number) where {T} = convert(T, s)
-@inline maybeconvert(::Type{T}, s::T) where {T <: Number} = s
-@inline maybeconvert(::Type, s) = s
+# @inline maybeconvert(::Type{T}, s::Number) where {T} = convert(T, s)
+# @inline maybeconvert(::Type{T}, s::T) where {T <: Number} = s
+# @inline maybeconvert(::Type, s) = s
 
 
 function lower_licm_constants!(ls::LoopSet)
     ops = operations(ls)
     for (id, sym) ∈ ls.preamble_symsym
-        setconstantop!(ls, ops[id], Expr(:call, lv(:maybeconvert), ls.T, sym))
+        # setconstantop!(ls, ops[id], Expr(:call, lv(:maybeconvert), ls.T, sym))
+        setconstantop!(ls, ops[id],  sym)
     end
     for (id,intval) ∈ ls.preamble_symint
         setop!(ls, ops[id], Expr(:call, lv(:sizeequivalentint), ls.T, intval))