more feedback

Author: alexbatashev

sycl/tools/xpti_helpers/pi_arguments_handler.hpp

@@ -25,9 +25,10 @@ inline auto get(char *Data, const std::index_sequence<Is...> &) {
 
   // Calculate sizeof all elements before target + target element then substract
   // sizeof target element
-  size_t Res = (sizeof(typename std::tuple_element<Is, TupleT>::type) + ...) -
-               sizeof(TargetType);
-  return *(typename std::decay<TargetType>::type *)(Data + Res);
+  const size_t Offset =
+      (sizeof(typename std::tuple_element<Is, TupleT>::type) + ...) -
+      sizeof(TargetType);
+  return *(typename std::decay<TargetType>::type *)(Data + Offset);
 }
 
 template <typename TupleT, size_t... Is>

sycl/unittests/pi/CMakeLists.txt

@@ -6,10 +6,12 @@ add_sycl_unittest(PiTests OBJECT
   EnqueueMemTest.cpp
   PiMock.cpp
   PlatformTest.cpp
+  pi_arguments_handler.cpp
 )
 
 add_dependencies(PiTests sycl)
 target_include_directories(PiTests PRIVATE SYSTEM ${sycl_inc_dir})
+target_include_directories(PiTests PRIVATE ${sycl_src_dir}/../tools/xpti_helpers)
 
 if(SYCL_BUILD_PI_CUDA)
     add_subdirectory(cuda)

sycl/unittests/pi/pi_arguments_handler.cpp

@@ -0,0 +1,40 @@
+//==------- pi_arguments_handler.cpp --- A test for XPTI PI args helper ---===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include <gtest/gtest.h>
+
+#include "pi_arguments_handler.hpp"
+
+#include <CL/sycl/detail/pi.h>
+
+#include <array>
+
+TEST(PiArgumentsHandlerTest, CanUnpackArguments) {
+  sycl::xpti_helpers::PiArgumentsHandler Handler;
+
+  const pi_uint32 NumPlatforms = 42;
+  pi_platform *Platforms = new pi_platform[NumPlatforms];
+
+  Handler.set_piPlatformsGet(
+      [&](pi_uint32 NP, pi_platform *Plts, pi_uint32 *Ret) {
+        EXPECT_EQ(NP, NumPlatforms);
+        EXPECT_EQ(Platforms, Plts);
+        EXPECT_EQ(Ret, nullptr);
+      });
+
+  constexpr size_t Size = sizeof(pi_uint32) + 2 * sizeof(void *);
+  std::array<unsigned char, Size> Data{0};
+  *reinterpret_cast<pi_uint32 *>(Data.data()) = NumPlatforms;
+  *reinterpret_cast<pi_platform **>(Data.data() + sizeof(pi_uint32)) =
+      Platforms;
+
+  uint32_t ID = static_cast<uint32_t>(sycl::detail::PiApiKind::piPlatformsGet);
+  Handler.handle(ID, Data.data());
+
+  delete[] Platforms;
+}