Skip to content

Commit e366339

Browse files
committed
test fixes
1 parent 7f7d281 commit e366339

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

src/LoopVectorization.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ include("precompile.jl")
115115
_precompile_()
116116

117117
_vreduce(+, Float64[1.0])
118+
# matmul_params(64, 32, 64)
118119

119120
# import ChainRulesCore, ForwardDiff
120121
# include("vmap_grad.jl")

test/gemm.jl

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -633,17 +633,17 @@
633633
C[m,n] = ΔCₘₙ
634634
end) |> LoopVectorization.loopset;
635635
if LoopVectorization.register_count() == 32
636-
if LoopVectorization.register_size() == 64
637-
# @test LoopVectorization.choose_order(lsAtmulBt8) == ([:n, :m, :k], :m, :n, :m, 1, 8)
638-
@test LoopVectorization.choose_order(lsAtmulBt8) == ([:n, :m, :k], :k, :n, :m, 1, 8)
639-
elseif LoopVectorization.register_size() == 16
640-
@test LoopVectorization.choose_order(lsAtmulBt8) == ([:n, :m, :k], :m, :n, :m, 4, 4)
641-
end
636+
if LoopVectorization.register_size() == 64
637+
@test LoopVectorization.choose_order(lsAtmulBt8) == ([:n, :m, :k], :m, :n, :m, 1, 8)
638+
# @test LoopVectorization.choose_order(lsAtmulBt8) == ([:n, :m, :k], :k, :n, :m, 1, 8)
639+
elseif LoopVectorization.register_size() == 16
640+
@test LoopVectorization.choose_order(lsAtmulBt8) == ([:n, :m, :k], :m, :n, :m, 4, 4)
641+
end
642642
elseif LoopVectorization.register_count() == 16
643-
# @test LoopVectorization.choose_order(lsAtmulBt8) == ([:n, :m, :k], :m, :n, :m, 2, 4)
644-
@test LoopVectorization.choose_order(lsAtmulBt8) == ([:n, :m, :k], :n, :m, :n, 2, 4)
643+
@test LoopVectorization.choose_order(lsAtmulBt8) == ([:n, :m, :k], :m, :n, :m, 2, 4)
644+
# @test LoopVectorization.choose_order(lsAtmulBt8) == ([:n, :m, :k], :n, :m, :n, 2, 4)
645645
elseif LoopVectorization.register_count() == 8
646-
@test LoopVectorization.choose_order(lsAtmulBt8) == ([:n, :m, :k], :m, :n, :m, 1, 4)
646+
@test LoopVectorization.choose_order(lsAtmulBt8) == ([:n, :m, :k], :m, :n, :m, 1, 4)
647647
end
648648

649649
struct SizedMatrix{M,N,T} <: DenseMatrix{T}

test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ if LOOPVECTORIZATION_TEST == "all"
1919
env = copy(ENV)
2020
env["LOOPVECTORIZATION_TEST"] = "part$i"
2121
env["JULIA_NUM_THREADS"] = string(Threads.nthreads())
22-
processes[i] = run(pipeline(setenv(`$(Base.julia_cmd()) $(@__FILE__)`, env), stderr = io, stdout = io), wait=false)
22+
processes[i] = run(pipeline(setenv(`$(Base.julia_cmd()) $(@__FILE__) --project=$(Base.active_project())`, env), stderr = io, stdout = io), wait=false)
2323
end
2424
completed = fill(false, NUMGROUPS)
2525
while true

0 commit comments

Comments
 (0)