Support unpacking up to 14 return values.

Author: chriselrod

Project.toml

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

src/getconstindexes.jl

@@ -1,9 +1,4 @@
-@inline second(x) = @inbounds getindex(x, 2)
-@inline third(x) = @inbounds getindex(x, 3)
-@inline fourth(x) = @inbounds getindex(x, 4)
-@inline fifth(x) = @inbounds getindex(x, 5)
-@inline sixth(x) = @inbounds getindex(x, 6)
-@inline seventh(x) = @inbounds getindex(x, 7)
-@inline eighth(x) = @inbounds getindex(x, 8)
-@inline ninth(x) = @inbounds getindex(x, 9)
+for (i,f) ∈ enumerate((:first,:second,:third,:fourth,:fifth,:sixth,:seventh,:eighth,:ninth,:tenth,:eleventh,:twelfth,:thirteenth))
+  @eval @inline $f(x) = @inbounds getindex(x, $(i+1))
+end
 

src/modeling/costs.jl

@@ -252,6 +252,11 @@ const COST = Dict{Symbol,InstructionCost}(
     :seventh => InstructionCost(0,0.0,0.0,0),
     :eighth => InstructionCost(0,0.0,0.0,0),
     :ninth => InstructionCost(0,0.0,0.0,0),
+    :tenth => InstructionCost(0,0.0,0.0,0),
+    :eleventh => InstructionCost(0,0.0,0.0,0),
+    :twelfth => InstructionCost(0,0.0,0.0,0),
+    :thirteenth => InstructionCost(0,0.0,0.0,0),
+    :last => InstructionCost(0,0.0,0.0,0),
     :prefetch => InstructionCost(0,0.0,0.0,0),
     :prefetch0 => InstructionCost(0,0.0,0.0,0),
     :prefetch1 => InstructionCost(0,0.0,0.0,0),

src/modeling/graphs.jl

@@ -1119,11 +1119,11 @@ function add_assignment!(ls::LoopSet, LHS, RHS, elementbytes::Int, position::Int
         end
         return last(operations(ls)) # FIXME: dummy
       end
-      @assert length(LHS.args) ≤ 9 "Functions returning more than 9 values aren't currently supported."
+      @assert length(LHS.args) ≤ 14 "Functions returning more than 9 values aren't currently supported."
       lhstemp = gensym!(ls, "lhstuple")
       vparents = Operation[maybe_const_compute!(ls, lhstemp, add_operation!(ls, lhstemp, RHS, elementbytes, position), elementbytes, position)]
       for i ∈ eachindex(LHS.args)
-        f = (:first,:second,:third,:fourth,:fifth,:sixth,:seventh,:eighth,:ninth)[i]
+        f = (:first,:second,:third,:fourth,:fifth,:sixth,:seventh,:eighth,:ninth,:tenth,:eleventh,:twelfth,:thirteenth,:last)[i]
         lhsi = LHS.args[i]
         if lhsi isa Symbol
           add_compute!(ls, lhsi, f, vparents, elementbytes)