[ESIMD] Size correction for array containing result values (intel#913)

* [ESIMD] Size correction for array containing 'gathered rgba' values

Author: dongkyunahn-intel

SYCL/ESIMD/api/esimd_pack_unpack_mask.cpp

@@ -8,6 +8,7 @@
 // REQUIRES: gpu
 // UNSUPPORTED: cuda || hip
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 // TODO: esimd_emulator fails due to unimplemented 'single_task()' method
 // XFAIL: esimd_emulator
@@ -17,6 +18,8 @@
 // TODO: fails on OpenCL - https://github.com/intel/llvm-test-suite/issues/901
 // UNSUPPORTED: opencl
 >>>>>>> 05909cd65 (Disable esimd_pack_unpack_mask test on OpenCL (#902))
+=======
+>>>>>>> e3ff34842 ([ESIMD] Size correction for array containing result values (#913))
 // RUN: %clangxx -fsycl %s -fsycl-device-code-split=per_kernel -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 //
@@ -105,6 +108,7 @@ bool test_impl(queue q, const char *title, InitF init_f) {
     }
   }
   for (unsigned i = N; i < MAX_N; ++i) {
+<<<<<<< HEAD
 <<<<<<< HEAD
     if (res_unpacked[i] != 0) {
       ++err_cnt;
@@ -116,6 +120,12 @@ bool test_impl(queue q, const char *title, InitF init_f) {
       std::cout << "    ERROR: non-zero lane " << i << ": 0x" << std::hex
                 << test_data[i] << std::dec << "\n";
 >>>>>>> 3c06ec209 ([ESIMD] Add smoke test for pack_mask/unpack_mask APIs. (#826))
+=======
+    if (res_unpacked[i] != 0) {
+      ++err_cnt;
+      std::cout << "    ERROR: non-zero lane " << i << ": 0x" << std::hex
+                << res_unpacked[i] << std::dec << " in unpacked result\n";
+>>>>>>> e3ff34842 ([ESIMD] Size correction for array containing result values (#913))
     }
   }
   std::cout << (err_cnt > 0 ? "  FAILED\n" : "  Passed\n");

SYCL/ESIMD/api/esimd_rgba_smoke.cpp

@@ -93,17 +93,22 @@ template <class, int, int> class TestID;
 template <rgba_channel_mask ChMask, unsigned NPixels, class T>
 bool test_impl(queue q) {
   constexpr unsigned NOnChs = get_num_channels_enabled(ChMask);
+<<<<<<< HEAD
 <<<<<<< HEAD
   const unsigned Size = NPixels * NAllChs;
 =======
   unsigned SizeIn = NPixels * NAllChs;
   unsigned SizeOut = NPixels * NOnChs;
 >>>>>>> 5ed4bac7d ([ESIMD] Add gather/scatter_rgba smoke test, can be used as an example. (#835))
+=======
+  const unsigned Size = NPixels * NAllChs;
+>>>>>>> e3ff34842 ([ESIMD] Size correction for array containing result values (#913))
 
   std::cout << "Testing mask=";
   print_mask(ChMask);
   std::cout << ", T=" << typeid(T).name() << ", NPixels=" << NPixels << "\n";
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   T *A = malloc_shared<T>(Size, q);
   T *B = malloc_shared<T>(Size, q);
@@ -113,6 +118,11 @@ bool test_impl(queue q) {
   T *B = malloc_shared<T>(SizeOut, q);
   T *C = malloc_shared<T>(SizeOut, q);
 >>>>>>> 5ed4bac7d ([ESIMD] Add gather/scatter_rgba smoke test, can be used as an example. (#835))
+=======
+  T *A = malloc_shared<T>(Size, q);
+  T *B = malloc_shared<T>(Size, q);
+  T *C = malloc_shared<T>(Size, q);
+>>>>>>> e3ff34842 ([ESIMD] Size correction for array containing result values (#913))
 
   for (unsigned p = 0; p < NPixels; ++p) {
     char ch_names[] = {'R', 'G', 'B', 'A'};