Skip to content

Commit ad6cf22

Browse files
committed
VecUnroll, format
1 parent c37380d commit ad6cf22

File tree

2 files changed

+13
-23
lines changed

2 files changed

+13
-23
lines changed

src/base_defs.jl

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ end
255255
x::Real,
256256
y::Real
257257
)
258-
fmap(ifelse, data(m), data(x), data(y))
258+
VecUnroll(fmap(ifelse, data(m), data(x), data(y)))
259259
end
260260

261261
@inline function promote_except_first(a, b, c)
@@ -278,11 +278,7 @@ end
278278
y, z = promote(b, c)
279279
vifelse(tomask(a), y, z)
280280
end
281-
@inline function IfElse.ifelse(
282-
a::AbstractMask,
283-
b::AbstractSIMD,
284-
c::NativeTypes
285-
)
281+
@inline function IfElse.ifelse(a::AbstractMask, b::AbstractSIMD, c::NativeTypes)
286282
y, z = promote(b, c)
287283
vifelse(a, y, z)
288284
end
@@ -294,11 +290,7 @@ end
294290
y, z = promote(b, c)
295291
vifelse(tomask(a), y, z)
296292
end
297-
@inline function IfElse.ifelse(
298-
a::AbstractMask,
299-
b::NativeTypes,
300-
c::AbstractSIMD
301-
)
293+
@inline function IfElse.ifelse(a::AbstractMask, b::NativeTypes, c::AbstractSIMD)
302294
y, z = promote(b, c)
303295
vifelse(a, y, z)
304296
end
@@ -314,11 +306,7 @@ end
314306
y, z = promote(b, c)
315307
vifelse(a, y, z)
316308
end
317-
@inline function IfElse.ifelse(
318-
a::AbstractMask,
319-
b::NativeTypes,
320-
c::NativeTypes
321-
)
309+
@inline function IfElse.ifelse(a::AbstractMask, b::NativeTypes, c::NativeTypes)
322310
y, z = promote(b, c)
323311
vifelse(a, y, z)
324312
end
@@ -339,8 +327,7 @@ end
339327
vifelse(a, y, z)
340328
end
341329

342-
for (op, f)
343-
[(:(Base.fma), :vfma), (:(Base.muladd), :vmuladd)]
330+
for (op, f) [(:(Base.fma), :vfma), (:(Base.muladd), :vmuladd)]
344331
@eval begin
345332
@inline function $op(a::AbstractSIMD, b::AbstractSIMD, c::AbstractSIMD)
346333
x, y, z = promote(a, b, c)

test/runtests.jl

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -392,11 +392,14 @@ include("testsetup.jl")
392392
end
393393
@test convert(Bool, Mask{8}(0xec)) ===
394394
Vec(false, false, true, true, false, true, true, true) ===
395-
convert(Bool, VectorizationBase.ifelse(
396-
convert(Bool, Mask{8}(0xec)),
397-
vbroadcast(Val(8), true),
398-
vbroadcast(Val(8), false)
399-
))
395+
convert(
396+
Bool,
397+
VectorizationBase.ifelse(
398+
convert(Bool, Mask{8}(0xec)),
399+
vbroadcast(Val(8), true),
400+
vbroadcast(Val(8), false)
401+
)
402+
)
400403

401404
@test (MM{8}(2) 3:8) === Mask{8}(0x7e)
402405

0 commit comments

Comments
 (0)