Skip to content

Commit d4c450c

Browse files
committed
don't test westmere orders
1 parent c948864 commit d4c450c

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

test/gemm.jl

+15-8
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Unum, Tnum = LoopVectorization.register_count() == 16 ? (2, 6) : (4, 6)
99
end
1010
Unumt, Tnumt = LoopVectorization.register_count() == 16 ? (2, 6) : (5, 5)
11-
if LoopVectorization.register_count() != 8
11+
if (LoopVectorization.register_count() != 8) && ((LoopVectorization.pick_vector_width(Float64) != 2) ||(LoopVectorization.register_count() != 16))
1212
@test @inferred(LoopVectorization.matmul_params()) == (Unum, Tnum)
1313
end
1414

@@ -30,7 +30,7 @@
3030
end
3131
)
3232
lsAmulBt1 = LoopVectorization.loopset(AmulBtq1)
33-
if LoopVectorization.register_count() != 8
33+
if (LoopVectorization.register_count() != 8) && ((LoopVectorization.pick_vector_width(Float64) != 2) ||(LoopVectorization.register_count() != 16))
3434
@test LoopVectorization.choose_order(lsAmulBt1) ==
3535
(Symbol[:n, :m, :k], :m, :n, :m, Unum, Tnum)
3636
end
@@ -43,7 +43,7 @@
4343
end
4444
)
4545
lsAmulB1 = LoopVectorization.loopset(AmulBq1)
46-
if LoopVectorization.register_count() != 8
46+
if (LoopVectorization.register_count() != 8) && ((LoopVectorization.pick_vector_width(Float64) != 2) ||(LoopVectorization.register_count() != 16))
4747
@test LoopVectorization.choose_order(lsAmulB1) ==
4848
(Symbol[:n, :m, :k], :m, :n, :m, Unum, Tnum)
4949
end
@@ -56,7 +56,7 @@
5656
end
5757
)
5858
lsAmulB2 = LoopVectorization.loopset(AmulBq2)
59-
if LoopVectorization.register_count() != 8
59+
if (LoopVectorization.register_count() != 8) && ((LoopVectorization.pick_vector_width(Float64) != 2) ||(LoopVectorization.register_count() != 16))
6060
@test LoopVectorization.choose_order(lsAmulB2) ==
6161
(Symbol[:n, :m, :k], :m, :n, :m, Unum, Tnum)
6262
end
@@ -70,11 +70,9 @@
7070
end
7171
)
7272
lsAmulB3 = LoopVectorization.loopset(AmulBq3)
73-
if LoopVectorization.register_count() != 8
73+
if (LoopVectorization.register_count() != 8) && ((LoopVectorization.pick_vector_width(Float64) != 2) ||(LoopVectorization.register_count() != 16))
7474
@test LoopVectorization.choose_order(lsAmulB3) ==
7575
(Symbol[:n, :m, :k], :m, :n, :m, Unum, Tnum)
76-
end
77-
if LoopVectorization.register_count() != 8
7876
for (fA, fB, v, Un, Tn) [
7977
(identity, identity, :m, Unum, Tnum),
8078
(adjoint, identity, :k, Unumt, Tnumt),
@@ -178,8 +176,13 @@
178176
)
179177
lsAmuladd = LoopVectorization.loopset(Amuladdq)
180178
if LoopVectorization.register_count() != 8
179+
if LoopVectorization.pick_vector_width(Float64) != 2
181180
@test LoopVectorization.choose_order(lsAmuladd) ==
182181
(Symbol[:n, :m, :k], :m, :n, :m, Unum, Tnum)
182+
else
183+
@test LoopVectorization.choose_order(lsAmuladd) ==
184+
(Symbol[:m, :n, :k], :n, :m, :m, Unum, Tnum)
185+
end
183186
end
184187
Atmuladdq = :(
185188
for m axes(A, 2), n axes(B, 2)
@@ -410,9 +413,13 @@
410413
@test LoopVectorization.choose_order(lsr2amb) == ([:m, :n, :k], :m, :n, :m, 3, 7)
411414
end
412415
elseif LoopVectorization.register_count() == 16
416+
if LoopVectorization.pick_vector_width(Float64) == 4
413417
# @test LoopVectorization.choose_order(lsr2amb) == ([:m, :n, :k], :m, :n, :m, 1, 6)
414418
# @test LoopVectorization.choose_order(lsr2amb) == ([:m, :n, :k], :m, :n, :m, 2, 4)
415-
@test LoopVectorization.choose_order(lsr2amb) == ([:n, :m, :k], :n, :m, :m, 3, 3)
419+
@test LoopVectorization.choose_order(lsr2amb) == ([:n, :m, :k], :n, :m, :m, 3, 3)
420+
elseif LoopVectorization.pick_vector_width(Float64) == 2
421+
@test LoopVectorization.choose_order(lsr2amb) == ([:m, :n, :k], :n, :m, :m, 3, 3)
422+
end
416423
end
417424
function rank2AmulBavx!(C, Aₘ, Aₖ, B)
418425
@turbo for m axes(C, 1), n axes(C, 2)

0 commit comments

Comments
 (0)