[SYCL][ESIMD]Add tests for 8/16 bit data for lsc_slm_block_load and lsc_slm_block_store API (#12416)

…

Author: fineg74

sycl/test-e2e/ESIMD/lsc/Inputs/lsc_slm_load.hpp

@@ -23,8 +23,6 @@ bool test(queue Q, uint32_t PMask = ~0) {
   }
 
   static_assert(DS != lsc_data_size::u16u32h, "D16U32h not supported in HW");
-  static_assert(sizeof(T) >= 4,
-                "D8 and D16 are valid only in 2D block load/store");
 
   if constexpr (!Transpose && NChannels > 1) {
     static_assert(VL == 16 || VL == 32,
@@ -99,7 +97,7 @@ bool test(queue Q, uint32_t PMask = ~0) {
 
          simd<T, VL * NChannels> Vals;
          if constexpr (TestMergeOperand) {
-           simd<T, VL *NChannels> OldVals = MergeValue;
+           simd<T, VL * NChannels> OldVals = MergeValue;
            Vals = lsc_slm_gather<T, NChannels, DS>(Offsets, Pred, OldVals);
          } else {
            Vals = lsc_slm_gather<T, NChannels, DS>(Offsets, Pred);

sycl/test-e2e/ESIMD/lsc/Inputs/lsc_slm_store.hpp

@@ -19,8 +19,6 @@ bool test(uint32_t PMask = ~0) {
   }
 
   static_assert(DS != lsc_data_size::u16u32h, "D16U32h not supported in HW");
-  static_assert(sizeof(T) >= 4,
-                "D8 and D16 are valid only in 2D block load/store");
 
   if constexpr (!Transpose && NChannels > 1) {
     static_assert(VL == 16 || VL == 32,

sycl/test-e2e/ESIMD/lsc/lsc_slm_block_load.cpp

@@ -36,8 +36,17 @@ int main() {
   Passed &= test_load<uint32_t, TestMerging>(Q);
   Passed &= test_load<uint64_t, TestMerging>(Q);
 
-  // TODO: Enable the test with 1- and 2-byte element types, with floating point
-  // types when lsc_slm_block_load() API is ready.
+  Passed &= test_load<uint16_t, !TestMerging>(Q);
+  Passed &= test_load<uint8_t, !TestMerging>(Q);
+
+  Passed &= test_load<uint16_t, TestMerging>(Q);
+  Passed &= test_load<uint8_t, TestMerging>(Q);
+
+  Passed &= test_load<float, !TestMerging>(Q);
+  Passed &= test_load<double, !TestMerging>(Q);
+
+  Passed &= test_load<float, TestMerging>(Q);
+  Passed &= test_load<double, TestMerging>(Q);
 
   std::cout << (Passed ? "Passed" : "FAILED") << std::endl;
   return Passed ? 0 : 1;

sycl/test-e2e/ESIMD/lsc/lsc_slm_block_store.cpp

@@ -17,6 +17,10 @@ template <int Id, int NGroups, int LocalSize, int VL> bool test_store() {
   bool Passed = true;
   Passed &= test<Id, uint32_t, NGroups, LocalSize, VL, 1, true>();
   Passed &= test<Id + 1, uint64_t, NGroups, LocalSize, VL, 1, true>();
+  Passed &= test<Id + 2, uint16_t, NGroups, LocalSize, VL, 1, true>();
+  if constexpr (VL >= 4) {
+    Passed &= test<Id + 3, uint8_t, NGroups, LocalSize, VL, 1, true>();
+  }
   return Passed;
 }
 
@@ -25,11 +29,11 @@ int main(void) {
 
   // test_store<Id, NGroups, LocalSize, VL>();
   Passed &= test_store<0, 1, 1, 4>();
-  Passed &= test_store<2, 1, 7, 16>();
-  Passed &= test_store<4, 4, 3, 2>();
-  Passed &= test_store<6, 16, 8, 8>();
-  Passed &= test_store<8, 2, 4, 32>();
-  Passed &= test_store<10, 2, 4, 64>();
+  Passed &= test_store<4, 1, 7, 16>();
+  Passed &= test_store<8, 4, 3, 2>();
+  Passed &= test_store<12, 16, 8, 8>();
+  Passed &= test_store<16, 2, 4, 32>();
+  Passed &= test_store<20, 2, 4, 64>();
 
   std::cout << (Passed ? "Passed" : "FAILED") << std::endl;
   return Passed ? 0 : 1;