From ac81c91f5f3fb57d4914fcfd195058607d5793b2 Mon Sep 17 00:00:00 2001
From: "Plyakhin, Yury" <yury.plyakhin@intel.com>
Date: Fri, 31 Jan 2025 14:21:39 -0800
Subject: [PATCH] Updates

---
 .../test-e2e/Matrix/Inputs/joint_matrix_out_bounds_impl.hpp | 3 ++-
 sycl/test-e2e/Matrix/SG32/joint_matrix_out_bounds.cpp       | 1 +
 sycl/test-e2e/Matrix/joint_matrix_out_bounds.cpp            | 1 +
 sycl/test-e2e/Matrix/joint_matrix_out_bounds_colmajor.cpp   | 2 ++
 .../e2e_test_requirements/no-unsupported-without-info.cpp   | 6 +-----
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/sycl/test-e2e/Matrix/Inputs/joint_matrix_out_bounds_impl.hpp b/sycl/test-e2e/Matrix/Inputs/joint_matrix_out_bounds_impl.hpp
index 70c6f934a3c68..40c8a7bf2e2b3 100644
--- a/sycl/test-e2e/Matrix/Inputs/joint_matrix_out_bounds_impl.hpp
+++ b/sycl/test-e2e/Matrix/Inputs/joint_matrix_out_bounds_impl.hpp
@@ -147,7 +147,8 @@ void test() {
 
 template <layout A_layout, layout B_layout> void test_all() {
   std::cout << "bf16: ";
-  test<bfloat16, float, 1024 + 14, 1024, 1024 + 24, 8, 16, 16, A_layout,
+  test<bfloat16, float, /*MATRIX_M*/ 1024 + 14, /*MATRIX_N*/ 1024,
+       /*MATRIX_K*/ 1024 + 24, /*TM*/ 8, /*TN*/ 16, /*TK*/ 16, A_layout,
        B_layout>();
   std::cout << "half: ";
   test<half, float, 1024 + 14, 1024, 1024 + 24, 8, 16, 16, A_layout,
diff --git a/sycl/test-e2e/Matrix/SG32/joint_matrix_out_bounds.cpp b/sycl/test-e2e/Matrix/SG32/joint_matrix_out_bounds.cpp
index cf982bed31562..e79e329e5a259 100644
--- a/sycl/test-e2e/Matrix/SG32/joint_matrix_out_bounds.cpp
+++ b/sycl/test-e2e/Matrix/SG32/joint_matrix_out_bounds.cpp
@@ -9,6 +9,7 @@
 // REQUIRES-INTEL-DRIVER: lin: 27501, win: 101.4943
 
 // UNSUPPORTED: gpu-intel-dg2, cpu
+// UNSUPPORTED-INTENDED: Checked load/stores are not supported by DG2 and CPU HW
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/Matrix/joint_matrix_out_bounds.cpp b/sycl/test-e2e/Matrix/joint_matrix_out_bounds.cpp
index 4aa30435a2ffc..f71d091c6cbd8 100644
--- a/sycl/test-e2e/Matrix/joint_matrix_out_bounds.cpp
+++ b/sycl/test-e2e/Matrix/joint_matrix_out_bounds.cpp
@@ -8,6 +8,7 @@
 // REQUIRES: aspect-ext_intel_matrix
 
 // UNSUPPORTED: gpu-intel-dg2, cpu
+// UNSUPPORTED-INTENDED: Checked load/stores are not supported by DG2 and CPU HW
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/Matrix/joint_matrix_out_bounds_colmajor.cpp b/sycl/test-e2e/Matrix/joint_matrix_out_bounds_colmajor.cpp
index 30cdb69730e39..51c10c44642a5 100644
--- a/sycl/test-e2e/Matrix/joint_matrix_out_bounds_colmajor.cpp
+++ b/sycl/test-e2e/Matrix/joint_matrix_out_bounds_colmajor.cpp
@@ -6,7 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 // REQUIRES: aspect-ext_intel_matrix
+
 // UNSUPPORTED: gpu-intel-dg2, cpu
+// UNSUPPORTED-INTENDED: Checked load/stores are not supported by DG2 and CPU HW
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test/e2e_test_requirements/no-unsupported-without-info.cpp b/sycl/test/e2e_test_requirements/no-unsupported-without-info.cpp
index f95323d179fb0..8b826d58a8dab 100644
--- a/sycl/test/e2e_test_requirements/no-unsupported-without-info.cpp
+++ b/sycl/test/e2e_test_requirements/no-unsupported-without-info.cpp
@@ -54,7 +54,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-UNSUPPORTED-WITHOUT-INFO: 375
+// NUMBER-OF-UNSUPPORTED-WITHOUT-INFO: 371
 //
 // List of improperly UNSUPPORTED tests.
 // Remove the CHECK once the test has been properly UNSUPPORTED.
@@ -273,22 +273,18 @@
 // CHECK-NEXT: Matrix/SG32/joint_matrix_down_convert.cpp
 // CHECK-NEXT: Matrix/SG32/joint_matrix_half.cpp
 // CHECK-NEXT: Matrix/SG32/joint_matrix_int8_rowmajorA_rowmajorB.cpp
-// CHECK-NEXT: Matrix/SG32/joint_matrix_out_bounds.cpp
 // CHECK-NEXT: Matrix/SG32/joint_matrix_prefetch.cpp
 // CHECK-NEXT: Matrix/SG32/joint_matrix_rowmajorA_rowmajorB.cpp
 // CHECK-NEXT: Matrix/SG32/joint_matrix_ss_int8.cpp
 // CHECK-NEXT: Matrix/SG32/joint_matrix_su_int8.cpp
 // CHECK-NEXT: Matrix/SG32/joint_matrix_transposeC.cpp
-// CHECK-NEXT: Matrix/SG32/joint_matrix_unaligned_k.cpp
 // CHECK-NEXT: Matrix/SG32/joint_matrix_us_int8.cpp
 // CHECK-NEXT: Matrix/SG32/joint_matrix_uu_int8.cpp
 // CHECK-NEXT: Matrix/joint_matrix_annotated_ptr.cpp
 // CHECK-NEXT: Matrix/joint_matrix_bf16_fill_k_cache_OOB.cpp
 // CHECK-NEXT: Matrix/joint_matrix_bf16_fill_k_cache_prefetch.cpp
 // CHECK-NEXT: Matrix/joint_matrix_down_convert.cpp
-// CHECK-NEXT: Matrix/joint_matrix_out_bounds.cpp
 // CHECK-NEXT: Matrix/joint_matrix_rowmajorA_rowmajorB.cpp
-// CHECK-NEXT: Matrix/joint_matrix_unaligned_k.cpp
 // CHECK-NEXT: NewOffloadDriver/aot-gpu.cpp
 // CHECK-NEXT: NewOffloadDriver/spirv_device_obj_smoke.cpp
 // CHECK-NEXT: NonUniformGroups/ballot_group.cpp