Added ifelse tests.

Author: chriselrod

Manifest.toml

@@ -49,9 +49,9 @@ uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 
 [[SIMDPirates]]
 deps = ["VectorizationBase"]
-git-tree-sha1 = "16e34b8028fa9d419a0e0b7f4d702c9b590a1977"
+git-tree-sha1 = "6d93eddeaf847073dfa36ad339d76015c59a9adb"
 uuid = "21efa798-c60a-11e8-04d3-e1a92915a26a"
-version = "0.3.13"
+version = "0.3.14"
 
 [[SLEEFPirates]]
 deps = ["Libdl", "SIMDPirates", "VectorizationBase"]

src/costs.jl

@@ -136,7 +136,7 @@ const COST = Dict{Instruction,InstructionCost}(
     Instruction(:<<) => InstructionCost(1, 0.5),
     Instruction(:max) => InstructionCost(4,0.5),
     Instruction(:min) => InstructionCost(4,0.5),
-    Instruction(:ifelse) => InstructionCost(1, 0.5),
+    # Instruction(:ifelse) => InstructionCost(1, 0.5),
     Instruction(:vifelse) => InstructionCost(1, 0.5),
     Instruction(:inv) => InstructionCost(13,4.0,-2.0,1),
     Instruction(:vinv) => InstructionCost(13,4.0,-2.0,1),
@@ -315,6 +315,8 @@ const FUNCTIONSYMBOLS = Dict{Type{<:Function},Instruction}(
     typeof(min) => :min,
     typeof(<<) => :<<,
     typeof(>>) => :>>,
-    typeof(>>>) => :>>>
+    typeof(>>>) => :>>>,
+    typeof(ifelse) => :vifelse,
+    typeof(vifelse) => :vifelse
 )
 

test/ifelsemasks.jl

@@ -29,6 +29,26 @@
             c[i] = 1 + (a[i] > b[i] ? a[i] + b[i] : a[i] * b[i])
         end
     end
+    function addifelsemul_avx!(c, a, b)
+        @_avx for i ∈ eachindex(c,a,b)
+            c[i] = ifelse(a[i] > b[i], a[i] + b[i], a[i] * b[i])
+        end
+    end
+    function addifelsemulavx!(c, a, b)
+        @avx for i ∈ eachindex(c,a,b)
+            c[i] = ifelse(a[i] > b[i], a[i] + b[i], a[i] * b[i])
+        end
+    end
+    function addifelsemulp1_avx!(c, a, b)
+        @_avx for i ∈ eachindex(c,a,b)
+            c[i] = 1 + ifelse(a[i] > b[i], a[i] + b[i], a[i] * b[i])
+        end
+    end
+    function addifelsemulp1avx!(c, a, b)
+        @avx for i ∈ eachindex(c,a,b)
+            c[i] = 1 + ifelse(a[i] > b[i], a[i] + b[i], a[i] * b[i])
+        end
+    end
 
 
     function maybewriteand!(c, a, b)
@@ -205,18 +225,26 @@
             a = rand(-T(100):T(100), N); b = rand(-T(100):T(100), N);
         else
             a = rand(T, N); b = rand(T, N);
-        end
+        end;
         c1 = similar(a); c2 = similar(a);
         addormul!(c1, a, b)
         addormul_avx!(c2, a, b)
         @test c1 ≈ c2
         fill!(c2, -999999999); addormulavx!(c2, a, b)
         @test c1 ≈ c2
+        fill!(c2, -999999999); addifelsemul_avx!(c2, a, b)
+        @test c1 ≈ c2
+        fill!(c2, -999999999); addifelsemulavx!(c2, a, b)
+        @test c1 ≈ c2
         addormulp1!(c1, a, b)
         addormulp1_avx!(c2, a, b)
         @test c1 ≈ c2
         fill!(c2, -999999999); addormulp1avx!(c2, a, b)
         @test c1 ≈ c2
+        fill!(c2, -999999999); addifelsemulp1_avx!(c2, a, b)
+        @test c1 ≈ c2
+        fill!(c2, -999999999); addifelsemulp1avx!(c2, a, b)
+        @test c1 ≈ c2
 
         fill!(c1, -999999999); maybewriteand!(c1, a, b)
         fill!(c2, -999999999); maybewriteand_avx!(c2, a, b)