Skip to content

Commit 0c5358e

Browse files
committed
Enable triton kernels matmul tests
Signed-off-by: Witold Dziurdz <[email protected]>
1 parent aa01f5c commit 0c5358e

File tree

7 files changed

+1
-76
lines changed

7 files changed

+1
-76
lines changed

python/triton_kernels/triton_kernels/matmul_ogs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ def matmul_ogs(x, w, bias,
596596
out_matmul_scale = out_matmul_scale.data.view(torch.uint8)
597597
if has_scratchpad and "mx_out_scale" in memory["scratchpad"]:
598598
out_matmul_scale = memory["scratchpad"]["mx_out_scale"]
599-
out_matmul_has_mx = out_matmul_scale is not None and out_matmul.element_size() == 1
599+
out_matmul_has_mx = out_matmul_scale is not None and bitwidth(out_dtype) == 8
600600
# matrix multiplication
601601
flex = precision_config.flex_ctx
602602
bias_stride = None if bias is None else bias.stride(0)
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
tests/test_matmul.py::test_op
21
tests/test_matmul.py::test_fused_act
32
tests/test_matmul.py::test_zero_reduction_dim
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
tests/test_matmul.py::test_op
21
tests/test_matmul.py::test_fused_act
32
tests/test_matmul.py::test_zero_reduction_dim
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
tests/test_matmul.py::test_op
21
tests/test_matmul.py::test_fused_act
32
tests/test_matmul.py::test_zero_reduction_dim

scripts/skiplist/default/triton_kernels.txt

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,16 @@
11
# https://github.com/intel/intel-xpu-backend-for-triton/issues/5074
2-
tests/test_matmul.py::test_op[False-False-False-False-False-None-128-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-False-None-False-False-False]
3-
tests/test_matmul.py::test_op[False-False-False-False-False-None-128-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
42
tests/test_matmul.py::test_op[False-False-False-False-False-None-128-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
53
tests/test_matmul.py::test_op[False-False-False-False-False-None-128-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
6-
tests/test_matmul.py::test_op[False-False-False-False-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-False-None-False-False-False]
7-
tests/test_matmul.py::test_op[False-False-False-False-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
84
tests/test_matmul.py::test_op[False-False-False-False-False-None-16-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
95
tests/test_matmul.py::test_op[False-False-False-False-False-None-16-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
106
tests/test_matmul.py::test_op[False-False-False-True-False-None-128-1000-400-400-ragged-float8_e4m3fn-float8_e4m3fn-3-1-1-False-None-False-False-False]
11-
tests/test_matmul.py::test_op[False-False-False-True-False-None-128-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-False-None-False-False-False]
12-
tests/test_matmul.py::test_op[False-False-False-True-False-None-128-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
137
tests/test_matmul.py::test_op[False-False-False-True-False-None-128-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
148
tests/test_matmul.py::test_op[False-False-False-True-False-None-128-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
159
tests/test_matmul.py::test_op[False-False-False-True-False-None-16-1000-400-400-ragged-float8_e4m3fn-float8_e4m3fn-3-1-1-False-None-False-False-False]
16-
tests/test_matmul.py::test_op[False-False-False-True-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-False-None-False-False-False]
17-
tests/test_matmul.py::test_op[False-False-False-True-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
1810
tests/test_matmul.py::test_op[False-False-False-True-False-None-16-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
1911
tests/test_matmul.py::test_op[False-False-False-True-False-None-16-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
20-
tests/test_matmul.py::test_op[False-False-True-False-False-None-128-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-False-None-False-False-False]
21-
tests/test_matmul.py::test_op[False-False-True-False-False-None-128-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
2212
tests/test_matmul.py::test_op[False-False-True-False-False-None-128-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
2313
tests/test_matmul.py::test_op[False-False-True-False-False-None-128-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
24-
tests/test_matmul.py::test_op[False-False-True-False-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-False-None-False-False-False]
25-
tests/test_matmul.py::test_op[False-False-True-False-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
2614
tests/test_matmul.py::test_op[False-False-True-False-False-None-16-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
2715
tests/test_matmul.py::test_op[False-False-True-False-False-None-16-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
2816
tests/test_matmul.py::test_op[False-False-True-True-False-None-128-1000-400-400-ragged-float8_e4m3fn-float8_e4m3fn-3-1-1-False-None-False-False-False]
@@ -35,30 +23,18 @@ tests/test_matmul.py::test_op[False-False-True-True-False-None-16-1000-704-800-r
3523
tests/test_matmul.py::test_op[False-False-True-True-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
3624
tests/test_matmul.py::test_op[False-False-True-True-False-None-16-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
3725
tests/test_matmul.py::test_op[False-False-True-True-False-None-16-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
38-
tests/test_matmul.py::test_op[False-True-False-False-False-None-128-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-False-None-False-False-False]
39-
tests/test_matmul.py::test_op[False-True-False-False-False-None-128-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
4026
tests/test_matmul.py::test_op[False-True-False-False-False-None-128-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
4127
tests/test_matmul.py::test_op[False-True-False-False-False-None-128-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
42-
tests/test_matmul.py::test_op[False-True-False-False-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-False-None-False-False-False]
43-
tests/test_matmul.py::test_op[False-True-False-False-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
4428
tests/test_matmul.py::test_op[False-True-False-False-False-None-16-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
4529
tests/test_matmul.py::test_op[False-True-False-False-False-None-16-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
4630
tests/test_matmul.py::test_op[False-True-False-True-False-None-128-1000-400-400-ragged-float8_e4m3fn-float8_e4m3fn-3-1-1-False-None-False-False-False]
47-
tests/test_matmul.py::test_op[False-True-False-True-False-None-128-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-False-None-False-False-False]
48-
tests/test_matmul.py::test_op[False-True-False-True-False-None-128-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
4931
tests/test_matmul.py::test_op[False-True-False-True-False-None-128-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
5032
tests/test_matmul.py::test_op[False-True-False-True-False-None-128-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
5133
tests/test_matmul.py::test_op[False-True-False-True-False-None-16-1000-400-400-ragged-float8_e4m3fn-float8_e4m3fn-3-1-1-False-None-False-False-False]
52-
tests/test_matmul.py::test_op[False-True-False-True-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-False-None-False-False-False]
53-
tests/test_matmul.py::test_op[False-True-False-True-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
5434
tests/test_matmul.py::test_op[False-True-False-True-False-None-16-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
5535
tests/test_matmul.py::test_op[False-True-False-True-False-None-16-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
56-
tests/test_matmul.py::test_op[False-True-True-False-False-None-128-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-False-None-False-False-False]
57-
tests/test_matmul.py::test_op[False-True-True-False-False-None-128-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
5836
tests/test_matmul.py::test_op[False-True-True-False-False-None-128-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
5937
tests/test_matmul.py::test_op[False-True-True-False-False-None-128-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
60-
tests/test_matmul.py::test_op[False-True-True-False-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-False-None-False-False-False]
61-
tests/test_matmul.py::test_op[False-True-True-False-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
6238
tests/test_matmul.py::test_op[False-True-True-False-False-None-16-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
6339
tests/test_matmul.py::test_op[False-True-True-False-False-None-16-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
6440
tests/test_matmul.py::test_op[False-True-True-True-False-None-128-1000-400-400-ragged-float8_e4m3fn-float8_e4m3fn-3-1-1-False-None-False-False-False]

scripts/skiplist/lts/triton_kernels.txt

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,16 @@
11
# https://github.com/intel/intel-xpu-backend-for-triton/issues/5074
2-
tests/test_matmul.py::test_op[False-False-False-False-False-None-128-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-False-None-False-False-False]
3-
tests/test_matmul.py::test_op[False-False-False-False-False-None-128-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
42
tests/test_matmul.py::test_op[False-False-False-False-False-None-128-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
53
tests/test_matmul.py::test_op[False-False-False-False-False-None-128-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
6-
tests/test_matmul.py::test_op[False-False-False-False-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-False-None-False-False-False]
7-
tests/test_matmul.py::test_op[False-False-False-False-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
84
tests/test_matmul.py::test_op[False-False-False-False-False-None-16-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
95
tests/test_matmul.py::test_op[False-False-False-False-False-None-16-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
106
tests/test_matmul.py::test_op[False-False-False-True-False-None-128-1000-400-400-ragged-float8_e4m3fn-float8_e4m3fn-3-1-1-False-None-False-False-False]
11-
tests/test_matmul.py::test_op[False-False-False-True-False-None-128-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-False-None-False-False-False]
12-
tests/test_matmul.py::test_op[False-False-False-True-False-None-128-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
137
tests/test_matmul.py::test_op[False-False-False-True-False-None-128-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
148
tests/test_matmul.py::test_op[False-False-False-True-False-None-128-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
159
tests/test_matmul.py::test_op[False-False-False-True-False-None-16-1000-400-400-ragged-float8_e4m3fn-float8_e4m3fn-3-1-1-False-None-False-False-False]
16-
tests/test_matmul.py::test_op[False-False-False-True-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-False-None-False-False-False]
17-
tests/test_matmul.py::test_op[False-False-False-True-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
1810
tests/test_matmul.py::test_op[False-False-False-True-False-None-16-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
1911
tests/test_matmul.py::test_op[False-False-False-True-False-None-16-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
20-
tests/test_matmul.py::test_op[False-False-True-False-False-None-128-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-False-None-False-False-False]
21-
tests/test_matmul.py::test_op[False-False-True-False-False-None-128-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
2212
tests/test_matmul.py::test_op[False-False-True-False-False-None-128-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
2313
tests/test_matmul.py::test_op[False-False-True-False-False-None-128-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
24-
tests/test_matmul.py::test_op[False-False-True-False-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-False-None-False-False-False]
25-
tests/test_matmul.py::test_op[False-False-True-False-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
2614
tests/test_matmul.py::test_op[False-False-True-False-False-None-16-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
2715
tests/test_matmul.py::test_op[False-False-True-False-False-None-16-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
2816
tests/test_matmul.py::test_op[False-False-True-True-False-None-128-1000-400-400-ragged-float8_e4m3fn-float8_e4m3fn-3-1-1-False-None-False-False-False]
@@ -35,30 +23,18 @@ tests/test_matmul.py::test_op[False-False-True-True-False-None-16-1000-704-800-r
3523
tests/test_matmul.py::test_op[False-False-True-True-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
3624
tests/test_matmul.py::test_op[False-False-True-True-False-None-16-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
3725
tests/test_matmul.py::test_op[False-False-True-True-False-None-16-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
38-
tests/test_matmul.py::test_op[False-True-False-False-False-None-128-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-False-None-False-False-False]
39-
tests/test_matmul.py::test_op[False-True-False-False-False-None-128-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
4026
tests/test_matmul.py::test_op[False-True-False-False-False-None-128-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
4127
tests/test_matmul.py::test_op[False-True-False-False-False-None-128-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
42-
tests/test_matmul.py::test_op[False-True-False-False-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-False-None-False-False-False]
43-
tests/test_matmul.py::test_op[False-True-False-False-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
4428
tests/test_matmul.py::test_op[False-True-False-False-False-None-16-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
4529
tests/test_matmul.py::test_op[False-True-False-False-False-None-16-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
4630
tests/test_matmul.py::test_op[False-True-False-True-False-None-128-1000-400-400-ragged-float8_e4m3fn-float8_e4m3fn-3-1-1-False-None-False-False-False]
47-
tests/test_matmul.py::test_op[False-True-False-True-False-None-128-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-False-None-False-False-False]
48-
tests/test_matmul.py::test_op[False-True-False-True-False-None-128-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
4931
tests/test_matmul.py::test_op[False-True-False-True-False-None-128-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
5032
tests/test_matmul.py::test_op[False-True-False-True-False-None-128-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
5133
tests/test_matmul.py::test_op[False-True-False-True-False-None-16-1000-400-400-ragged-float8_e4m3fn-float8_e4m3fn-3-1-1-False-None-False-False-False]
52-
tests/test_matmul.py::test_op[False-True-False-True-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-False-None-False-False-False]
53-
tests/test_matmul.py::test_op[False-True-False-True-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
5434
tests/test_matmul.py::test_op[False-True-False-True-False-None-16-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
5535
tests/test_matmul.py::test_op[False-True-False-True-False-None-16-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
56-
tests/test_matmul.py::test_op[False-True-True-False-False-None-128-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-False-None-False-False-False]
57-
tests/test_matmul.py::test_op[False-True-True-False-False-None-128-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
5836
tests/test_matmul.py::test_op[False-True-True-False-False-None-128-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
5937
tests/test_matmul.py::test_op[False-True-True-False-False-None-128-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
60-
tests/test_matmul.py::test_op[False-True-True-False-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-False-None-False-False-False]
61-
tests/test_matmul.py::test_op[False-True-True-False-False-None-16-1000-704-800-ragged-mxfloat8_e4m3fn-mxfloat4_e2m1-8-2-9-True-None-False-False-False]
6238
tests/test_matmul.py::test_op[False-True-True-False-False-None-16-16-16-1000-batched-float16-float16-5-1-None-False-None-False-False-False]
6339
tests/test_matmul.py::test_op[False-True-True-False-False-None-16-16-16-1000-batched-float8_e5m2-float8_e5m2-5-1-None-False-None-False-False-False]
6440
tests/test_matmul.py::test_op[False-True-True-True-False-None-128-1000-400-400-ragged-float8_e4m3fn-float8_e4m3fn-3-1-1-False-None-False-False-False]

0 commit comments

Comments
 (0)