Fix test according to API semantics change.

Signed-off-by: Konstantin S Bobrovsky <[email protected]>

Author: kbobrovs

SYCL/ESIMD/api/esimd_merge.cpp

@@ -47,6 +47,7 @@ int main(void) {
   using MaskElT = typename simd_mask<1>::element_type;
   MaskElT *M = malloc_shared<MaskElT>(Size, q);
   int *C = malloc_shared<int>(Size, q);
+  int *C1 = malloc_shared<int>(Size, q);
   constexpr int VAL0 = 0;
   constexpr int VAL1 = 1;
   constexpr int VAL2 = 3;
@@ -58,6 +59,7 @@ int main(void) {
     // bit representation in a mask element:
     M[i] = (i % SUB_VL) >= (SUB_VL / 2) ? (i % SUB_VL - 1) : 0; // 00120012 ...
     C[i] = VAL0;
+    C1[i] = VAL0;
   }
 
   try {
@@ -71,11 +73,20 @@ int main(void) {
         // m:          0012001200120012
         // va.sel.sel: 1111
         // vb.sel.sel: 4444
-        // vc:         1144
+        // vc:         4411
         simd<int, SUB_VL> vc =
             esimd::merge(va.select<SUB_VL * 2, 2>(0).select<SUB_VL, 1>(1),
                          vb.select<SUB_VL * 1, 2>(1).select<SUB_VL, 1>(0), m);
         vc.copy_to(C + i * VL);
+
+        // also check that
+        //   vc = esimd::merge(a, b, m)
+        // is equivalent to
+        //   vc.merge(a, b, m)
+        simd<int, SUB_VL> vc1;
+        vc1.merge(va.select<SUB_VL * 2, 2>(0).select<SUB_VL, 1>(1).read(),
+                  vb.select<SUB_VL * 1, 2>(1).select<SUB_VL, 1>(0).read(), m);
+        vc1.copy_to(C1 + i * VL);
       });
     });
     e.wait();
@@ -84,6 +95,7 @@ int main(void) {
     sycl::free(A, q);
     sycl::free(B, q);
     sycl::free(C, q);
+    sycl::free(C1, q);
     sycl::free(M, q);
     return 1;
   }
@@ -98,14 +110,20 @@ int main(void) {
   for (int i = 0; i < Size; ++i) {
     int j = i % VL;
     int gold =
-        j >= SUB_VL ? VAL0 : ((j % SUB_VL) >= (SUB_VL / 2) ? VAL2 + 1 : VAL1);
+        j >= SUB_VL ? VAL0 : ((j % SUB_VL) >= (SUB_VL / 2) ? VAL1 : VAL2 + 1);
 
     if (C[i] != gold) {
       if (++err_cnt < 10) {
-        std::cout << "failed at index " << i << ", " << C[i] << " != " << gold
+        std::cout << "(esimd::merge) failed at index " << i << ", " << C[i] << " != " << gold
                   << " (gold)\n";
       }
     }
+    if (C1[i] != gold) {
+      if (++err_cnt < 10) {
+        std::cout << "(simd::merge) failed at index " << i << ", " << C1[i] << " != " << gold
+          << " (gold)\n";
+      }
+    }
   }
   if (err_cnt > 0) {
     std::cout << "  pass rate: "
@@ -116,6 +134,7 @@ int main(void) {
   sycl::free(A, q);
   sycl::free(B, q);
   sycl::free(C, q);
+  sycl::free(C1, q);
   sycl::free(M, q);
   std::cout << (err_cnt > 0 ? "FAILED\n" : "Passed\n");
   return err_cnt > 0 ? 1 : 0;