Minor corrections to the tests

Signed-off-by: Vyacheslav N Klochkov <[email protected]>

Author: v-klochkov

SYCL/ESIMD/dpas/dpas_common.hpp

@@ -1,4 +1,4 @@
-//==---------------- dpas_utils.hpp  - DPC++ ESIMD on-device test ----------==//
+//==---------------- dpas_common.hpp  - DPC++ ESIMD on-device test ---------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -28,6 +28,7 @@ constexpr dpas_argument_type s8 = dpas_argument_type::s8;
 constexpr dpas_argument_type u8 = dpas_argument_type::u8;
 
 constexpr dpas_argument_type fp16 = dpas_argument_type::fp16;
+constexpr dpas_argument_type bf16 = dpas_argument_type::bf16;
 
 std::string toString(dpas_argument_type T) {
   switch (T) {
@@ -192,8 +193,8 @@ ReadT readFromHorizontallyPackedMatrix(void *VVec, int Row, int Col) {
     unsigned int Mask = (static_cast<uint64_t>(1) << ElemBitSize) - 1;
     ElemT Value = (TargetElem >> Offset) & Mask;
     if constexpr (std::is_signed_v<ElemT>) {
-      Value <<= (32 - ElemBitSize);
-      Value >>= (32 - ElemBitSize);
+      Value <<= ((sizeof(ElemT) * 8) - ElemBitSize);
+      Value >>= ((sizeof(ElemT) * 8) - ElemBitSize);
     }
     return Value;
   }
@@ -257,7 +258,7 @@ template <int M, int N, dpas_argument_type ArgPrecision, typename ReadT,
           bool IsHorizontalPack>
 void printMatrix(void *Vec, std::string Msg) {
   std::cout << Msg << "(" << M << "x" << N
-            << "), element bit size = " << toString(ArgPrecision) << std::endl;
+            << "), element precision = " << toString(ArgPrecision) << std::endl;
   for (int I = 0; I < M; I++) {
     for (int J = 0; J < N; J++) {
 
@@ -316,12 +317,10 @@ bool test(queue &Q, bool Print) {
   auto BPacked = aligned_alloc_shared<BNaturalType>(128, BPackedSize, Q);
   auto Res = aligned_alloc_shared<ResNaturalType>(128, M * N, Q);
   // Init APacked;
-  int VVV = 0;
+  int Value = 0;
   for (int II = 0; II < M; II++) {
     for (int JJ = 0; JJ < K; JJ++) {
-      // int Value = VVV++;
-      // int Value = JJ == 1 ? 1 : 0;
-      int Value = 1;
+      Value++;
       writeToHorizontallyPackedMatrix<M, K, APrec>(
           APacked, II, JJ, static_cast<ANaturalType>(Value));
     }
@@ -332,10 +331,7 @@ bool test(queue &Q, bool Print) {
   // Init BPacked;
   for (int II = 0; II < K; II++) {
     for (int JJ = 0; JJ < N; JJ++) {
-      // int Value = (II+JJ % 4) == 0 ? 1 : (2 + II + JJ) % 3;
-      // int Value = 2;
-      // int Value = JJ == 1 ? ((II+JJ % 4) == 0 ? 1 : (2 + II + JJ) % 3) : 0;
-      int Value = JJ == 1 ? 1 : 0;
+      int Value = (II + JJ % 4) == 0 ? 1 : (2 + II + JJ) % 3;
       writeToVerticallyPackedMatrix<K, N, BPrec>(
           BPacked, II, JJ, static_cast<BNaturalType>(Value));
       assert(Value == (int)(static_cast<BNaturalType>(Value)) && "ERROR");
@@ -345,7 +341,7 @@ bool test(queue &Q, bool Print) {
     printMatrix<K, N, BPrec, BPrintT, false /*vertical-pack*/>(BPacked, "B");
 
   Q.single_task([=]() SYCL_ESIMD_KERNEL {
-     simd<BNaturalType, APackedSize> A(APacked, overaligned_tag<16>{});
+     simd<ANaturalType, APackedSize> A(APacked, overaligned_tag<16>{});
      simd<BNaturalType, BPackedSize> B(BPacked, overaligned_tag<16>{});
      simd<ResNaturalType, M * N> C;
 

SYCL/ESIMD/dpas/dpas_int.cpp

@@ -23,17 +23,21 @@ int main(int argc, const char *argv[]) {
   // Test unsigned 2-bit integers./
   Passed &= tests<8, 8, u2, u2>(Q, Print);
   Passed &= tests<8, 4, u2, u2>(Q, Print);
-  Passed &= tests<8, 3, u2, u2>(Q, Print);
+  // TODO: enable this case when the problem with simd constructor
+  // is resolved.
+  //Passed &= tests<8, 3, u2, u2>(Q, Print);
   Passed &= tests<8, 1, u2, u2>(Q, Print);
 
   // Test signed 2-bit integers.
   Passed &= tests<8, 8, s2, s2>(Q, Print);
-  Passed &= tests<8, 5, s2, s2>(Q, Print);
+  // TODO: enable this case when the problem with simd constructor
+  // is resolved.
+  //Passed &= tests<8, 5, s2, s2>(Q, Print);
   Passed &= tests<8, 2, s2, s2>(Q, Print);
   Passed &= tests<8, 1, s2, s2>(Q, Print);
 
   // Test the mix of signed and unsigned 2-bit integers.
-  Passed &= tests<8, 8, u2, s2>(Q, Print);
+  Passed &= tests<8, 1, u2, s2>(Q, Print);
   Passed &= tests<8, 1, s2, u2>(Q, Print);
 
   // Test couple combinations with 4-bit integers.