[SYCL] Fix h_item initialization bug when flexible range is used.

Signed-off-by: Konstantin S Bobrovsky <konstantin.s.bobrovsky@intel.com>
intel · Sep 26, 2019 · ab3e71e · ab3e71e
1 parent dc9db24
commit ab3e71e
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 4 deletions.
diff --git a/sycl/include/CL/sycl/group.hpp b/sycl/include/CL/sycl/group.hpp
@@ -202,8 +202,8 @@ template <int dimensions = 1> class group {
         detail::Builder::createItem<dimensions, false>(GlobalSize, GlobalId);
     item<dimensions, false> LocalItem =
         detail::Builder::createItem<dimensions, false>(LocalSize, LocalId);
-    h_item<dimensions> HItem =
-        detail::Builder::createHItem<dimensions>(GlobalItem, LocalItem);
+    h_item<dimensions> HItem = detail::Builder::createHItem<dimensions>(
+        GlobalItem, LocalItem, flexibleRange);
 
     // iterate over flexible range with work group size stride; each item
     // performs flexibleRange/LocalSize iterations (if the former is divisible
@@ -225,8 +225,8 @@ template <int dimensions = 1> class group {
           item<dimensions, false> LocalItem =
               detail::Builder::createItem<dimensions, false>(localRange,
                                                              LocalID);
-          h_item<dimensions> HItem =
-              detail::Builder::createHItem<dimensions>(GlobalItem, LocalItem);
+          h_item<dimensions> HItem = detail::Builder::createHItem<dimensions>(
+              GlobalItem, LocalItem, flexibleRange);
 
           detail::NDLoop<dimensions>::iterate(
               LocalID, localRange, flexibleRange,

diff --git a/sycl/test/hier_par/hier_par_basic.cpp b/sycl/test/hier_par/hier_par_basic.cpp
@@ -264,6 +264,45 @@ int main() {
       passed &= verify(3, range_length, ptr1,
                        [&](int i) -> int { return N_ITER * (1 + i + 5); });
     }
+    {
+      // Testcase5
+      // - flexible range different from the physical one is used,
+      // get_logical_local_range and get_physical_local_range apis are tested
+      const int wi_chunk = 2;
+      constexpr size_t range_length =
+          N_WG * WG_SIZE_GREATER_THAN_PHYSICAL * wi_chunk;
+      std::unique_ptr<int[]> data(new int[range_length]);
+      int *ptr = data.get();
+
+      std::memset(ptr, 0, range_length * sizeof(ptr[0]));
+      buffer<int, 1> buf(ptr, range<1>(range_length));
+      myQueue.submit([&](handler &cgh) {
+        auto dev_ptr = buf.get_access<access::mode::read_write>(cgh);
+
+        cgh.parallel_for_work_group<class hpar_ranges>(
+            range<1>(N_WG), range<1>(WG_SIZE_PHYSICAL), [=](group<1> g) {
+              for (int cnt = 0; cnt < N_ITER; cnt++) {
+                g.parallel_for_work_item(
+                    range<1>(WG_SIZE_GREATER_THAN_PHYSICAL), [&](h_item<1> i) {
+                      size_t wg_offset = WG_SIZE_GREATER_THAN_PHYSICAL *
+                                         wi_chunk * g.get_id(0);
+                      size_t wi_offset =
+                          wg_offset +
+                          i.get_logical_local_id().get(0) * wi_chunk;
+                      dev_ptr[wi_offset + 0] += i.get_logical_local_range()[0];
+                      dev_ptr[wi_offset + 1] += i.get_physical_local_range()[0];
+                    });
+              }
+            });
+      });
+      auto ptr1 = buf.get_access<access::mode::read>().get_pointer();
+      passed &= verify(5, range_length, ptr1, [&](int i) -> int {
+        int gold =
+            i % 2 == 0 ? WG_SIZE_GREATER_THAN_PHYSICAL : WG_SIZE_PHYSICAL;
+        gold *= N_ITER;
+        return gold;
+      });
+    }
   } catch (cl::sycl::exception const &e) {
     std::cout << "SYCL exception caught: " << e.what() << '\n';
     return 2;