From bf10dafb829d8544d1040a12aa43796636402a50 Mon Sep 17 00:00:00 2001 From: "Zhang, Yixing" Date: Tue, 26 Nov 2024 13:55:03 -0800 Subject: [PATCH 1/4] Uncomment the tests for Joint Matrix combination 32x32x16 --- sycl/test-e2e/Matrix/element_wise_all_ops_impl.hpp | 6 +++--- sycl/test-e2e/Matrix/element_wise_ops_impl.hpp | 3 +-- .../Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp | 2 ++ .../test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_impl.hpp | 4 ++-- .../Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp | 2 ++ .../Matrix/joint_matrix_rowmajorA_rowmajorB_impl.hpp | 4 ++-- .../test/e2e_test_requirements/no-xfail-without-tracker.cpp | 4 +++- 7 files changed, 15 insertions(+), 10 deletions(-) diff --git a/sycl/test-e2e/Matrix/element_wise_all_ops_impl.hpp b/sycl/test-e2e/Matrix/element_wise_all_ops_impl.hpp index 0105ea076839d..6124b7aee0ef0 100644 --- a/sycl/test-e2e/Matrix/element_wise_all_ops_impl.hpp +++ b/sycl/test-e2e/Matrix/element_wise_all_ops_impl.hpp @@ -242,9 +242,9 @@ int main() { test_ewops_ab(); test_ewops_ab(); test_ewops_c(); - // test_ewops_ab(); - // test_ewops_ab(); - // test_ewops_c(); + test_ewops_ab(); + test_ewops_ab(); + test_ewops_c(); break; } } diff --git a/sycl/test-e2e/Matrix/element_wise_ops_impl.hpp b/sycl/test-e2e/Matrix/element_wise_ops_impl.hpp index 5a2cf801eb3ec..aa979250bbf0c 100644 --- a/sycl/test-e2e/Matrix/element_wise_ops_impl.hpp +++ b/sycl/test-e2e/Matrix/element_wise_ops_impl.hpp @@ -142,8 +142,7 @@ int main() { passed &= test(); passed &= test(); passed &= test(); - // passed &= test(); + passed &= test(); break; } } diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp index 6a0699541d343..bc2d7b4b0f78b 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp @@ -12,5 +12,7 @@ // -ffp-model=precise is added to not depend on compiler defaults. +// XFAIL: gpu + #include "common.hpp" #include "joint_matrix_bf16_fill_k_cache_impl.hpp" diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_impl.hpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_impl.hpp index 22ce2b3f0e16a..1afb397d9815a 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_impl.hpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_impl.hpp @@ -493,8 +493,8 @@ size_t matrix_size = -1; test(matrix_size); - // test(matrix_size); + test(matrix_size); break; } } diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp index f2939b2c02a01..7b9291f90eef6 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp @@ -12,5 +12,7 @@ // -ffp-model=precise is added to not depend on compiler defaults. +// XFAIL: gpu + #include "common.hpp" #include "joint_matrix_bf16_fill_k_cache_impl.hpp" diff --git a/sycl/test-e2e/Matrix/joint_matrix_rowmajorA_rowmajorB_impl.hpp b/sycl/test-e2e/Matrix/joint_matrix_rowmajorA_rowmajorB_impl.hpp index 87fbc1e90a386..1e62623b69da0 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_rowmajorA_rowmajorB_impl.hpp +++ b/sycl/test-e2e/Matrix/joint_matrix_rowmajorA_rowmajorB_impl.hpp @@ -144,8 +144,8 @@ int main() { gemm_row_major<8, 8, 32, class su_8x8x32, int8_t, uint8_t, int32_t>(); res += gemm_row_major<8, 8, 32, class uu_8x8x32, uint8_t, uint8_t, int32_t>(); - // res += gemm_row_major<32, 32, 16, class dg2_bf16_32x32x16, bfloat16, - // bfloat16, float>(); + res += gemm_row_major<32, 32, 16, class dg2_bf16_32x32x16, bfloat16, + bfloat16, float>(); break; } } diff --git a/sycl/test/e2e_test_requirements/no-xfail-without-tracker.cpp b/sycl/test/e2e_test_requirements/no-xfail-without-tracker.cpp index c867ce1f4f420..4c7591782326d 100644 --- a/sycl/test/e2e_test_requirements/no-xfail-without-tracker.cpp +++ b/sycl/test/e2e_test_requirements/no-xfail-without-tracker.cpp @@ -51,7 +51,7 @@ // tests to match the required format and in that case you should just update // (i.e. reduce) the number and the list below. // -// NUMBER-OF-XFAIL-WITHOUT-TRACKER: 77 +// NUMBER-OF-XFAIL-WITHOUT-TRACKER: 79 // // List of improperly XFAIL-ed tests. // Remove the CHECK once the test has been properly XFAIL-ed. @@ -96,6 +96,8 @@ // CHECK-NEXT: Matrix/SG32/joint_matrix_prefetch.cpp // CHECK-NEXT: Matrix/SG32/joint_matrix_rowmajorA_rowmajorB.cpp // CHECK-NEXT: Matrix/SG32/joint_matrix_unaligned_k.cpp +// CHECK-NEXT: Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp +// CHECK-NEXT: Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp // CHECK-NEXT: Matrix/joint_matrix_bfloat16_colmajorA_colmajorB.cpp // CHECK-NEXT: Matrix/joint_matrix_colA_rowB_colC.cpp // CHECK-NEXT: Matrix/joint_matrix_int8_colmajorA_colmajorB.cpp From 7561b2f13e67958a97f94210ba19c99dea8af0dc Mon Sep 17 00:00:00 2001 From: "Zhang, Yixing" Date: Mon, 2 Dec 2024 08:14:41 -0800 Subject: [PATCH 2/4] resolve comments --- .../Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp | 2 ++ .../Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp | 2 ++ sycl/test/e2e_test_requirements/no-xfail-without-tracker.cpp | 4 +--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp index bc2d7b4b0f78b..df4975a485ac6 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp @@ -12,7 +12,9 @@ // -ffp-model=precise is added to not depend on compiler defaults. +// Waiting for the commit in IGC to be pulled into the driver to resolve the test. // XFAIL: gpu +// XFAIL-TRACKER: CMPLRLLVM-63710 #include "common.hpp" #include "joint_matrix_bf16_fill_k_cache_impl.hpp" diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp index 7b9291f90eef6..8b5fcd57ddad8 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp @@ -12,7 +12,9 @@ // -ffp-model=precise is added to not depend on compiler defaults. +// Waiting for the commit in IGC to be pulled into the driver // XFAIL: gpu +// XFAIL-TRACKER: CMPLRLLVM-63710 #include "common.hpp" #include "joint_matrix_bf16_fill_k_cache_impl.hpp" diff --git a/sycl/test/e2e_test_requirements/no-xfail-without-tracker.cpp b/sycl/test/e2e_test_requirements/no-xfail-without-tracker.cpp index 4c7591782326d..c867ce1f4f420 100644 --- a/sycl/test/e2e_test_requirements/no-xfail-without-tracker.cpp +++ b/sycl/test/e2e_test_requirements/no-xfail-without-tracker.cpp @@ -51,7 +51,7 @@ // tests to match the required format and in that case you should just update // (i.e. reduce) the number and the list below. // -// NUMBER-OF-XFAIL-WITHOUT-TRACKER: 79 +// NUMBER-OF-XFAIL-WITHOUT-TRACKER: 77 // // List of improperly XFAIL-ed tests. // Remove the CHECK once the test has been properly XFAIL-ed. @@ -96,8 +96,6 @@ // CHECK-NEXT: Matrix/SG32/joint_matrix_prefetch.cpp // CHECK-NEXT: Matrix/SG32/joint_matrix_rowmajorA_rowmajorB.cpp // CHECK-NEXT: Matrix/SG32/joint_matrix_unaligned_k.cpp -// CHECK-NEXT: Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp -// CHECK-NEXT: Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp // CHECK-NEXT: Matrix/joint_matrix_bfloat16_colmajorA_colmajorB.cpp // CHECK-NEXT: Matrix/joint_matrix_colA_rowB_colC.cpp // CHECK-NEXT: Matrix/joint_matrix_int8_colmajorA_colmajorB.cpp From f764365f4930bbd6dd4a4db02f046216e9b6e5b1 Mon Sep 17 00:00:00 2001 From: "Zhang, Yixing" Date: Mon, 2 Dec 2024 08:15:39 -0800 Subject: [PATCH 3/4] code clean up --- .../Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp index 8b5fcd57ddad8..52ba9d6e2016a 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp @@ -12,7 +12,7 @@ // -ffp-model=precise is added to not depend on compiler defaults. -// Waiting for the commit in IGC to be pulled into the driver +// Waiting for the commit in IGC to be pulled into the driver to resolve the test. // XFAIL: gpu // XFAIL-TRACKER: CMPLRLLVM-63710 From 48957e1d312eb77119178f41f98ef2fb667f0078 Mon Sep 17 00:00:00 2001 From: "Zhang, Yixing" Date: Mon, 2 Dec 2024 08:27:27 -0800 Subject: [PATCH 4/4] code clean up --- .../test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp | 3 ++- .../Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp index df4975a485ac6..ddd3627f46132 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp @@ -12,7 +12,8 @@ // -ffp-model=precise is added to not depend on compiler defaults. -// Waiting for the commit in IGC to be pulled into the driver to resolve the test. +// Waiting for the commit in IGC to be pulled into the driver to resolve the +// test. // XFAIL: gpu // XFAIL-TRACKER: CMPLRLLVM-63710 diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp index 52ba9d6e2016a..632f6732da7f8 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp @@ -12,7 +12,8 @@ // -ffp-model=precise is added to not depend on compiler defaults. -// Waiting for the commit in IGC to be pulled into the driver to resolve the test. +// Waiting for the commit in IGC to be pulled into the driver to resolve the +// test. // XFAIL: gpu // XFAIL-TRACKER: CMPLRLLVM-63710