Use opaque pointer to std::vector directly

Switch approach to not introduce an intermediate struct, but have the
opaque pointer directly point to std::vector instead.

Author: sommerlukas

dpctl/_backend.pxd

@@ -573,9 +573,6 @@ cdef extern from "syclinterface/dpctl_sycl_extension_interface.h":
 
     cdef bint DPCTLWorkGroupMemory_Available()
 
-    cdef struct RawKernelArgDataTy
-    ctypedef RawKernelArgDataTy RawKernelArgData
-
     cdef struct DPCTLOpaqueRawKernelArg
     ctypedef DPCTLOpaqueRawKernelArg *DPCTLSyclRawKernelArgRef;
 

dpctl/sycl.pxd

@@ -45,8 +45,6 @@ cdef extern from "sycl/sycl.hpp" namespace "sycl":
 cdef extern from "syclinterface/dpctl_sycl_extension_interface.h":
     cdef struct RawWorkGroupMemoryTy
     ctypedef RawWorkGroupMemoryTy RawWorkGroupMemory
-    cdef struct RawKernelArgDataTy
-    ctypedef RawKernelArgDataTy RawKernelArgData
 
 cdef extern from "syclinterface/dpctl_sycl_type_casters.hpp" \
         namespace "dpctl::syclinterface":
@@ -90,9 +88,9 @@ cdef extern from "syclinterface/dpctl_sycl_type_casters.hpp" \
 
     # raw kernel arg extension
     cdef dpctl_backend.DPCTLSyclRawKernelArgRef wrap_raw_kernel_arg \
-            "dpctl::syclinterface::wrap<RawKernelArgData>" \
-            (const RawKernelArgData *)
+            "dpctl::syclinterface::wrap<std::vector<unsigned char>>" \
+            (const std::vector<unsigned char> *)
 
-    cdef RawKernelArgData * unwrap_raw_kernel_arg \
-            "dpctl::syclinterface::unwrap<RawKernelArgData>" (
+    cdef std::vector<unsigned char> * unwrap_raw_kernel_arg \
+            "dpctl::syclinterface::unwrap<std::vector<unsigned char>>" (
             dpctl_backend.DPCTLSyclRawKernelArgRef)

libsyclinterface/include/syclinterface/dpctl_sycl_extension_interface.h

@@ -34,9 +34,6 @@
 #include "dpctl_sycl_enum_types.h"
 #include "dpctl_sycl_types.h"
 
-#include <cstring>
-#include <vector>
-
 DPCTL_C_EXTERN_C_BEGIN
 
 typedef struct RawWorkGroupMemoryTy
@@ -56,21 +53,6 @@ void DPCTLWorkGroupMemory_Delete(__dpctl_take DPCTLSyclWorkGroupMemoryRef Ref);
 DPCTL_API
 bool DPCTLWorkGroupMemory_Available();
 
-typedef class RawKernelArgDataTy
-{
-public:
-    RawKernelArgDataTy(void *bytes, size_t count) : data(count)
-    {
-        std::memcpy(data.data(), bytes, count);
-    }
-
-    void *bytes() { return data.data(); }
-    size_t count() { return data.size(); }
-
-private:
-    std::vector<unsigned char> data;
-} RawKernelArgData;
-
 typedef struct DPCTLOpaqueSyclRawKernelArg *DPCTLSyclRawKernelArgRef;
 
 DPCTL_API

libsyclinterface/include/syclinterface/dpctl_sycl_type_casters.hpp

@@ -84,7 +84,8 @@ DEFINE_SIMPLE_CONVERSION_FUNCTIONS(std::vector<DPCTLSyclEventRef>,
 DEFINE_SIMPLE_CONVERSION_FUNCTIONS(RawWorkGroupMemory,
                                    DPCTLSyclWorkGroupMemoryRef)
 
-DEFINE_SIMPLE_CONVERSION_FUNCTIONS(RawKernelArgData, DPCTLSyclRawKernelArgRef)
+DEFINE_SIMPLE_CONVERSION_FUNCTIONS(std::vector<unsigned char>,
+                                   DPCTLSyclRawKernelArgRef)
 
 #endif
 

libsyclinterface/source/dpctl_sycl_extension_interface.cpp

@@ -63,15 +63,18 @@ bool DPCTLWorkGroupMemory_Available()
 #endif
 }
 
+using raw_kernel_arg_t = std::vector<unsigned char>;
+
 DPCTL_API
 __dpctl_give DPCTLSyclRawKernelArgRef DPCTLRawKernelArg_Create(void *bytes,
                                                                size_t count)
 {
     DPCTLSyclRawKernelArgRef rka = nullptr;
     try {
-        auto RawKernelArg = std::unique_ptr<RawKernelArgData>(
-            new RawKernelArgData(bytes, count));
-        rka = wrap<RawKernelArgData>(RawKernelArg.get());
+        auto RawKernelArg =
+            std::unique_ptr<raw_kernel_arg_t>(new raw_kernel_arg_t(count));
+        std::memcpy(RawKernelArg->data(), bytes, count);
+        rka = wrap<raw_kernel_arg_t>(RawKernelArg.get());
         RawKernelArg.release();
     } catch (std::exception const &e) {
         error_handler(e, __FILE__, __func__, __LINE__);
@@ -82,7 +85,7 @@ __dpctl_give DPCTLSyclRawKernelArgRef DPCTLRawKernelArg_Create(void *bytes,
 DPCTL_API
 void DPCTLRawKernelArg_Delete(__dpctl_take DPCTLSyclRawKernelArgRef Ref)
 {
-    delete unwrap<RawKernelArgData>(Ref);
+    delete unwrap<raw_kernel_arg_t>(Ref);
 }
 
 DPCTL_API

libsyclinterface/source/dpctl_sycl_queue_interface.cpp

@@ -237,9 +237,10 @@ bool set_kernel_arg(handler &cgh,
     case DPCTL_RAW_KERNEL_ARG:
     {
         auto ref = static_cast<DPCTLSyclRawKernelArgRef>(Arg);
-        RawKernelArgData *raw_arg = unwrap<RawKernelArgData>(ref);
-        void *bytes = raw_arg->bytes();
-        size_t count = raw_arg->count();
+        std::vector<unsigned char> *raw_arg =
+            unwrap<std::vector<unsigned char>>(ref);
+        void *bytes = raw_arg->data();
+        size_t count = raw_arg->size();
         sycl::ext::oneapi::experimental::raw_kernel_arg arg{bytes, count};
         cgh.set_arg(idx, arg);
         break;

libsyclinterface/tests/test_sycl_queue_submit_raw_kernel_arg.cpp

@@ -93,7 +93,7 @@ void submit_kernel(DPCTLSyclQueueRef QRef,
     Params<T> p{T{4}, T{5}};
     auto rka = DPCTLRawKernelArg_Create(&p, sizeof(Params<T>));
     ASSERT_TRUE(rka != nullptr);
-    auto *rka_raw = unwrap<RawKernelArgData>(rka);
+    auto *rka_raw = unwrap<std::vector<unsigned char>>(rka);
     ASSERT_TRUE(rka_raw != nullptr);
     void *args_1d[NARGS] = {unwrap<void>(a), rka};
     DPCTLKernelArgType addKernelArgTypes[] = {DPCTL_VOID_PTR,