Support more updating assignments

Author: chriselrod

src/vectorizationbase_compat/contract_pass.jl

@@ -209,17 +209,21 @@ function contract!(expr::Expr, ex::Expr, i::Int, mod)
   if ex.head === :(+=)
     call = append_update_args(:add_fast, ex)
     expr.args[i] = ex = Expr(:(=), first(ex.args), call)
-  elseif ex.head === :(-=)
-    call = Expr(:call, :sub_fast)
-    append!(call.args, ex.args)
-    expr.args[i] = ex = Expr(:(=), first(ex.args), call)
   elseif ex.head === :(*=)
     call = append_update_args(:mul_fast, ex)
     expr.args[i] = ex = Expr(:(=), first(ex.args), call)
-  elseif ex.head === :(/=)
-    call = Expr(:call, :div_fast)
-    append!(call.args, ex.args)
-    expr.args[i] = ex = Expr(:(=), first(ex.args), call)
+  elseif Meta.isexpr(ex, :(\=), 2)
+    exa1 = ex.args[1]
+    call = Expr(:call, :div_fast, ex.args[2], exa1)
+    expr.args[i] = ex = Expr(:(=), exa1, call)
+  else
+    j = findfirst(Base.Fix2(===, ex.head), (:(-=),  :(/=),  :(÷=),  :(%=),  :(^=),  :(&=),  :(|=),  :(⊻=),  :(>>>=),  :(>>=),  :(<<=)))
+    if j ≢ nothing
+      f = (:sub_fast,  :div_fast,  :(÷),  :(%),  :(^),  :(&),  :(|),  :(⊻),  :(>>>),  :(>>),  :(<<))[j::Int]
+      call = Expr(:call, f)
+      append!(call.args, ex.args)
+      expr.args[i] = ex = Expr(:(=), first(ex.args), call)
+    end
   end
   if ex.head === :(=)
     RHS = ex.args[2]

test/grouptests.jl

@@ -51,6 +51,8 @@ const START_TIME = time()
     @time include("reduction_untangling.jl")
 
     @time include("manyloopreductions.jl")
+
+    @time include("simplemisc.jl")
   end
 
   @time if LOOPVECTORIZATION_TEST == "all" || LOOPVECTORIZATION_TEST == "part2"

test/simplemisc.jl

@@ -0,0 +1,15 @@
+
+function lv_turbo(r::Vector{UInt64}, mask::UInt64)
+  @turbo for i in 1:length(r)
+    r[i] &= mask
+  end
+  r
+end
+
+@testset "Simple Miscellaneous" begin
+  r1 = rand(UInt, 239);
+  mask = ~(one(eltype(r))<<(2))
+  r2 = r1 .& mask;
+  @test lv_turbo(r1, mask) == r2;
+end
+