Fix contract_pass for vmul/vadd no longer allowing contraction to fma.

Author: chriselrod

Project.toml

@@ -1,7 +1,7 @@
 name = "LoopVectorization"
 uuid = "bdcacae8-1622-11e9-2a5c-532679323890"
 authors = ["Chris Elrod <[email protected]>"]
-version = "0.9.4"
+version = "0.9.5"
 
 [deps]
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"

src/add_compute.jl

@@ -357,7 +357,7 @@ function add_pow!(
         while (t -= 1) >= 0
             xop = add_compute!(ls, gensym(:pbs), :abs2, [xop], elementbytes)
         end
-        yop = add_compute!(ls, iszero(pint) ? var : gensym(:pbs), :vmul, [xop, yop], elementbytes)
+        yop = add_compute!(ls, iszero(pint) ? var : gensym(:pbs), :(*), [xop, yop], elementbytes)
     end
     yop
 end

src/vectorizationbase_compat/contract_pass.jl

@@ -18,20 +18,20 @@ function mulexpr(mulexargs)
         cc = mulexprcost(c)
         maxc = max(ac, bc, cc)
         if ac == maxc
-            return (a, Expr(:call, :vmul, b, c))
+            return (a, Expr(:call, :(*), b, c))
         elseif bc == maxc
-            return (b, Expr(:call, :vmul, a, c))
+            return (b, Expr(:call, :(*), a, c))
         else
-            return (c, Expr(:call, :vmul, a, b))
+            return (c, Expr(:call, :(*), a, b))
         end
     else
-        return (a, Expr(:call, :vmul, @view(mulexargs[2:end])...)::Expr)
+        return (a, Expr(:call, :(*), @view(mulexargs[2:end])...)::Expr)
     end
     a = (mulexargs[1])::Union{Symbol,Expr,Number}
     b = if length(mulexargs) == 2 # two arg mul
         (mulexargs[2])::Union{Symbol,Expr,Number}
     else
-        Expr(:call, :vmul, @view(mulexargs[2:end])...)::Expr
+        Expr(:call, :(*), @view(mulexargs[2:end])...)::Expr
     end
     a, b
 end
@@ -143,19 +143,19 @@ function contract!(expr::Expr, ex::Expr, i::Int, mod = nothing)
     # if ex.head === :call
         # expr.args[i] = capture_muladd(ex, mod)
     if ex.head === :(+=)
-        call = Expr(:call, :vadd)
+        call = Expr(:call, :(+))
         append!(call.args, ex.args)
         expr.args[i] = ex = Expr(:(=), first(ex.args), call)
     elseif ex.head === :(-=)
-        call = Expr(:call, :vsub)
+        call = Expr(:call, :(-))
         append!(call.args, ex.args)
         expr.args[i] = ex = Expr(:(=), first(ex.args), call)
     elseif ex.head === :(*=)
-        call = Expr(:call, :vmul)
+        call = Expr(:call, :(*))
         append!(call.args, ex.args)
         expr.args[i] = ex = Expr(:(=), first(ex.args), call)
     elseif ex.head === :(/=)
-        call = Expr(:call, :vfdiv)
+        call = Expr(:call, :(/))
         append!(call.args, ex.args)
         expr.args[i] = ex = Expr(:(=), first(ex.args), call)
     end