Skip to content

Commit 04e48b4

Browse files
committed
Reenable byte-store-as-bits test on non-AVX2 LLVM 6 architectures, and see if it passes.
1 parent c323837 commit 04e48b4

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ VectorizationBase = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f"
1313

1414
[compat]
1515
OffsetArrays = "1"
16-
SIMDPirates = "0.7.12"
16+
SIMDPirates = "0.7.13"
1717
SLEEFPirates = "0.4.4"
1818
UnPack = "0"
19-
VectorizationBase = "0.10.3"
19+
VectorizationBase = "0.10.4"
2020
julia = "1.1"
2121

2222
[extras]

src/determinestrategy.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ function evaluate_cost_unroll(
132132
loopdependencies(op) nested_loop_syms || continue
133133
# hasintersection(reduceddependencies(op), nested_loop_syms) && return Inf
134134
rd = reduceddependencies(op)
135-
hasintersection(rd, nested_loop_syms[1:end-length(rd)]) && return Inf
135+
hasintersection(rd, @view(nested_loop_syms[1:end-length(rd)])) && return Inf
136136
included_vars[id] = true
137137
# @show op first(cost(op, vectorized, Wshift, size_T)), iter
138138
total_cost += iter * first(cost(ls, op, vectorized, Wshift, size_T))
@@ -576,7 +576,7 @@ function evaluate_cost_tile(
576576
# # @show nested_loop_syms
577577
# # @show reduceddependencies(op)
578578
rd = reduceddependencies(op)
579-
hasintersection(rd, nested_loop_syms[1:end-length(rd)]) && return 0,0,Inf
579+
hasintersection(rd, @view(nested_loop_syms[1:end-length(rd)])) && return 0,0,Inf
580580
included_vars[id] = true
581581
unrolledtiled[1,id] = unrolled loopdependencies(op)
582582
unrolledtiled[2,id] = tiled loopdependencies(op)

test/ifelsemasks.jl

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -404,20 +404,22 @@ T = Float32
404404
@test t Bernoulli_logitavx(bit, a)
405405
@test t Bernoulli_logit_avx(bit, a)
406406

407-
if LoopVectorization.VectorizationBase.AVX2 || Base.libllvm_version v"8" #FIXME Why doesn't this work on Travis Ivy Bridge Julia 1.1?
408-
ai = [rand(Bool) for _ in 1:71];
409-
bi = [rand(Bool) for _ in 1:71];
407+
ai = [rand(Bool) for _ in 1:71];
408+
bi = [rand(Bool) for _ in 1:71];
409+
# if LoopVectorization.VectorizationBase.AVX2 || Base.libllvm_version ≥ v"8" #FIXME Why doesn't this work on Travis Ivy Bridge Julia 1.1?
410410
@test (ai .& bi) == (@avx ai .& bi)
411411
@test (ai .| bi) == (@avx ai .| bi)
412412
@test (ai .⊻ bi) == (@avx ai .⊻ bi)
413-
else
414-
@test_broken (ai .& bi) == (@avx ai .& bi)
415-
@test_broken (ai .| bi) == (@avx ai .| bi)
416-
@test_broken (ai .⊻ bi) == (@avx ai .⊻ bi)
417-
end
413+
# else
414+
# @test_broken (ai .& bi) == (@avx ai .& bi)
415+
# @test_broken (ai .| bi) == (@avx ai .| bi)
416+
# @test_broken (ai .⊻ bi) == (@avx ai .⊻ bi)
417+
# @test_broken (Ai .& bi) == (@avx Ai .& bi)
418+
# @test_broken (ai .| Bi) == (@avx ai .| Bi)
419+
# @test_broken (Ai .⊻ Bi) == (@avx Ai .⊻ Bi)
420+
# end
418421
a = bitrand(127); b = bitrand(127);
419422
@test (a .& b) == (@avx a .& b)
420423
@test (a .| b) == (@avx a .| b)
421424
@test (a .⊻ b) == (@avx a .⊻ b)
422-
423425
end

0 commit comments

Comments
 (0)