Fix Bool to Vec for NaNStatistics

brenhinkeller/NaNStatistics.jl@7c21dba

Author: chriselrod

Project.toml

@@ -1,7 +1,7 @@
 name = "VectorizationBase"
 uuid = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f"
 authors = ["Chris Elrod <elrodc@gmail.com>"]
-version = "0.21.63"
+version = "0.21.64"
 
 [deps]
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"

src/llvm_intrin/conversion.jl

@@ -183,6 +183,8 @@ end
 @inline vconvert(::Type{Vec{W,T}}, v::Vec{W,T}) where {W,T} = v
 @inline vconvert(::Type{Vec{W,T}}, s::NativeTypes) where {W,T} =
   vbroadcast(Val{W}(), T(s))
+@inline vconvert(::Type{Vec{W,Bool}}, s::Bool) where {W} =
+  vconvert(Vec{W,Bool}, vbroadcast(Val{W}(), s))
 @inline vconvert(
   ::Type{Vec{W,T}},
   s::IntegerTypesHW

src/llvm_intrin/masks.jl

@@ -31,13 +31,14 @@ function truncate_mask!(instrs, input, W, suffix, reverse_load::Bool = false)
   push!(instrs, str)
   decl
 end
-function zext_mask!(instrs, input, W, suffix)
+function zext_mask!(instrs, input, W, suffix, sext::Bool = false)
   mtyp_input = "i$(max(8,nextpow2(W)))"
   mtyp_trunc = "i$(W)"
   str = if mtyp_input == mtyp_trunc
     "%res.$(suffix) = bitcast <$W x i1> %$input to $mtyp_input"
   else
-    "%restrunc.$(suffix) = bitcast <$W x i1> %$input to $mtyp_trunc\n%res.$(suffix) = zext $mtyp_trunc %restrunc.$(suffix) to $mtyp_input"
+    ext = sext ? "sext" : "zext"
+    "%restrunc.$(suffix) = bitcast <$W x i1> %$input to $mtyp_trunc\n%res.$(suffix) = $ext $mtyp_trunc %restrunc.$(suffix) to $mtyp_input"
   end
   push!(instrs, str)
 end
@@ -109,7 +110,7 @@ end
 @generated function vconvert(
   ::Type{Vec{W,I}},
   m::AbstractMask{W,U}
-) where {W,I<:IntegerTypesHW,U<:Union{UInt8,UInt16,UInt32,UInt64}}
+) where {W,I<:Union{IntegerTypesHW,Bool},U<:Union{UInt8,UInt16,UInt32,UInt64}}
   bits = 8sizeof(I)
   instrs = String[]
   truncate_mask!(instrs, '0', W, 0)
@@ -818,8 +819,13 @@ end
 
 @inline vifelse(m::Vec{W,Bool}, s1::T, s2::T) where {W,T<:NativeTypes} =
   vifelse(m, Vec{W,T}(s1), Vec{W,T}(s2))
-@inline vifelse(m::AbstractMask{W}, s1::T, s2::T) where {W,T<:NativeTypes} =
+@inline function vifelse(
+  m::AbstractMask{W},
+  s1::T,
+  s2::T
+) where {W,T<:NativeTypes}
   vifelse(m, Vec{W,T}(s1), Vec{W,T}(s2))
+end
 @inline vifelse(m::AbstractMask{W,U}, s1, s2) where {W,U} =
   ((x1, x2) = promote(s1, s2); vifelse(m, x1, x2))
 @inline vifelse(