Fix #351, add tests, and bump version.

Author: chriselrod

Project.toml

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

src/parse/memory_ops_common.jl

@@ -522,6 +522,7 @@ function array_reference_meta!(ls::LoopSet, array::Symbol, rawindices, elementby
         if indop !== nothing  && !isconstant(indop)
           if iscompute(indop) && Base.sym_in(instruction(indop).instr, (:add_fast, :sub_fast))
             vptrarray = add_additive_index!(ls, parents, vptrarray, ind, indop, ninds, indices, offsets, strides, loopedindex, loopdependencies, reduceddeps, 0, 1, D)
+            ninds += 1
           else
             pushparent!(parents, loopdependencies, reduceddeps, indop)
             push!(indices, name(indop)); ninds += 1

test/grouptests.jl

@@ -61,6 +61,8 @@ const START_TIME = time()
     @time include("special.jl")
 
     @time include("mapreduce.jl")
+
+    @time include("index_processing.jl")
   end
 
   @time if LOOPVECTORIZATION_TEST == "all" || LOOPVECTORIZATION_TEST == "part3"

test/index_processing.jl

@@ -0,0 +1,35 @@
+
+
+function multiindexreverse(n,m)
+  A = zeros(n,2m)
+  @turbo for i=1:n÷2, j = 1:m
+    a = 1.23
+    b = 3.21
+    A[i, j] = a
+    A[i, m+j] = b
+    r = n + 1 - i
+    A[r, j] = a
+    A[r, m+j] = b
+  end
+  return A
+end
+function multiindexreverse_ref(n,m)
+  A = zeros(n,2m)
+  @turbo for i=1:n÷2, j = 1:m
+    a = 1.23
+    b = 3.21
+    A[i, j] = a
+    A[i, m+j] = b
+    r = n + 1 - i
+    A[r, j] = a
+    A[r, m+j] = b
+  end
+  return A
+end
+
+@testset "Multiple indices" begin
+  for m in 1:10, n in 1:20
+    @test multiindexreverse(n, m) == multiindexreverse_ref(n, m)
+  end  
+end
+