Various fixes

Author: callumfare

offload/unittests/OffloadAPI/CMakeLists.txt

@@ -31,8 +31,6 @@ add_libompt_unittest("offload.unittests"
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel/olCreateKernel.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel/olReleaseKernel.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel/olRetainKernel.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/kernel/olSetKernelArgValue.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/kernel/olSetKernelArgsData.cpp
     )
 add_dependencies("offload.unittests" ${PLUGINS_TEST_COMMON} LibompUnitTestsDeviceBins)
 target_compile_definitions("offload.unittests" PRIVATE DEVICE_CODE_PATH="${OFFLOAD_TEST_DEVICE_CODE_PATH}")

offload/unittests/OffloadAPI/enqueue/olEnqueueKernelLaunch.cpp

@@ -37,7 +37,7 @@ struct olEnqueueKernelLaunchTest : offloadQueueTest {
 
 TEST_F(olEnqueueKernelLaunchTest, Success) {
   void *Mem;
-  ASSERT_SUCCESS(olMemAlloc(Device, OL_ALLOC_TYPE_SHARED, 1024, &Mem));
+  ASSERT_SUCCESS(olMemAlloc(Device, OL_ALLOC_TYPE_SHARED, 64, &Mem));
   ol_kernel_launch_size_args_t LaunchArgs{};
   LaunchArgs.Dimensions = 1;
   LaunchArgs.GroupSizeX = 64;
@@ -48,8 +48,12 @@ TEST_F(olEnqueueKernelLaunchTest, Success) {
   LaunchArgs.NumGroupsY = 1;
   LaunchArgs.NumGroupsZ = 1;
 
-  ASSERT_SUCCESS(olSetKernelArgValue(Kernel, 0, sizeof(Mem), &Mem));
-  ASSERT_SUCCESS(olEnqueueKernelLaunch(Queue, Kernel, &LaunchArgs, nullptr));
+  struct {
+    void *Mem;
+  } Args{Mem};
+
+  ASSERT_SUCCESS(olEnqueueKernelLaunch(Queue, Kernel, &Args, sizeof(Args),
+                                       &LaunchArgs, nullptr));
 
   ASSERT_SUCCESS(olFinishQueue(Queue));
 

offload/unittests/OffloadAPI/kernel/olSetKernelArgValue.cpp

@@ -23,37 +23,5 @@ TEST_F(olCreateProgramTest, Success) {
       olCreateProgram(Device, DeviceBin->data(), DeviceBin->size(), &Program));
   ASSERT_NE(Program, nullptr);
 
-  // TEMP: This will be split off into an enqueue test
-  ol_kernel_handle_t Kernel = nullptr;
-  ASSERT_SUCCESS(olCreateKernel(Program, "foo", &Kernel));
-
-  void *Mem;
-  ASSERT_SUCCESS(olMemAlloc(Device, OL_ALLOC_TYPE_SHARED, 1024, &Mem));
-
-  ol_queue_handle_t Queue = nullptr;
-  ASSERT_SUCCESS(olCreateQueue(Device, &Queue));
-  ol_kernel_launch_size_args_t LaunchArgs{};
-  LaunchArgs.Dimensions = 1;
-  LaunchArgs.GroupSizeX = 64;
-  LaunchArgs.GroupSizeY = 1;
-  LaunchArgs.GroupSizeZ = 1;
-
-  LaunchArgs.NumGroupsX = 1;
-  LaunchArgs.NumGroupsY = 1;
-  LaunchArgs.NumGroupsZ = 1;
-
-  ASSERT_SUCCESS(olSetKernelArgValue(Kernel, 0, sizeof(Mem), &Mem));
-  ASSERT_SUCCESS(olEnqueueKernelLaunch(Queue, Kernel, &LaunchArgs, nullptr));
-
-  ASSERT_SUCCESS(olFinishQueue(Queue));
-
-  int *Data = (int *)Mem;
-  for (int i = 0; i < 64; i++) {
-    ASSERT_EQ(Data[i], i);
-  }
-
-  ASSERT_SUCCESS(olReleaseQueue(Queue));
-  ASSERT_SUCCESS(olReleaseKernel(Kernel));
   ASSERT_SUCCESS(olReleaseProgram(Program));
-  ASSERT_SUCCESS(olMemFree(Device, OL_ALLOC_TYPE_SHARED, Mem));
 }