Add static test

Author: RossBrunton

offload/unittests/OffloadAPI/device_code/CMakeLists.txt

@@ -4,6 +4,14 @@ add_offload_test_device_code(bar.c bar)
 add_offload_test_device_code(noargs.c noargs -O3)
 add_offload_test_device_code(localmem.c localmem)
 add_offload_test_device_code(localmem_reduction.c localmem_reduction)
+add_offload_test_device_code(localmem_static.c localmem_static)
 
-add_custom_target(offload_device_binaries DEPENDS foo.bin bar.bin noargs.bin localmem.bin localmem_reduction.bin)
+add_custom_target(offload_device_binaries DEPENDS
+    foo.bin
+    bar.bin
+    noargs.bin
+    localmem.bin
+    localmem_reduction.bin
+    localmem_static.bin
+)
 set(OFFLOAD_TEST_DEVICE_CODE_PATH ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)

offload/unittests/OffloadAPI/kernel/olLaunchKernel.cpp

@@ -38,36 +38,19 @@ struct LaunchKernelTestBase : OffloadQueueTest {
   ol_kernel_launch_size_args_t LaunchArgs{};
 };
 
-struct olLaunchKernelTest : LaunchKernelTestBase {
-  void SetUp() override {
-    RETURN_ON_FATAL_FAILURE(LaunchKernelTestBase::SetUpKernel("foo"));
-  }
-};
-OFFLOAD_TESTS_INSTANTIATE_DEVICE_FIXTURE(olLaunchKernelTest);
-
-struct olLaunchKernelNoArgsTest : LaunchKernelTestBase {
-  void SetUp() override {
-    RETURN_ON_FATAL_FAILURE(LaunchKernelTestBase::SetUpKernel("noargs"));
-  }
-};
-OFFLOAD_TESTS_INSTANTIATE_DEVICE_FIXTURE(olLaunchKernelNoArgsTest);
-
-struct olLaunchKernelLocalMemTest : LaunchKernelTestBase {
-  void SetUp() override {
-    RETURN_ON_FATAL_FAILURE(LaunchKernelTestBase::SetUpKernel("localmem"));
-  }
-};
-OFFLOAD_TESTS_INSTANTIATE_DEVICE_FIXTURE(olLaunchKernelLocalMemTest);
-
-struct olLaunchKernelLocalMemReductionTest : LaunchKernelTestBase {
-  void SetUp() override {
-    RETURN_ON_FATAL_FAILURE(
-        LaunchKernelTestBase::SetUpKernel("localmem_reduction"));
-  }
-};
-OFFLOAD_TESTS_INSTANTIATE_DEVICE_FIXTURE(olLaunchKernelLocalMemReductionTest);
-
-TEST_P(olLaunchKernelTest, Success) {
+#define KERNEL_TEST(NAME, KERNEL)                                              \
+  struct olLaunchKernel##NAME##Test : LaunchKernelTestBase {                   \
+    void SetUp() override { LaunchKernelTestBase::SetUpKernel(#KERNEL); }      \
+  };                                                                           \
+  OFFLOAD_TESTS_INSTANTIATE_DEVICE_FIXTURE(olLaunchKernel##NAME##Test);
+
+KERNEL_TEST(Foo, foo)
+KERNEL_TEST(NoArgs, noargs)
+KERNEL_TEST(LocalMem, localmem)
+KERNEL_TEST(LocalMemReduction, localmem_reduction)
+KERNEL_TEST(LocalMemStatic, localmem_static)
+
+TEST_P(olLaunchKernelFooTest, Success) {
   void *Mem;
   ASSERT_SUCCESS(olMemAlloc(Device, OL_ALLOC_TYPE_MANAGED,
                             LaunchArgs.GroupSize.x * sizeof(uint32_t), &Mem));
@@ -95,7 +78,7 @@ TEST_P(olLaunchKernelNoArgsTest, Success) {
   ASSERT_SUCCESS(olWaitQueue(Queue));
 }
 
-TEST_P(olLaunchKernelTest, SuccessSynchronous) {
+TEST_P(olLaunchKernelFooTest, SuccessSynchronous) {
   void *Mem;
   ASSERT_SUCCESS(olMemAlloc(Device, OL_ALLOC_TYPE_MANAGED,
                             LaunchArgs.GroupSize.x * sizeof(uint32_t), &Mem));
@@ -162,3 +145,26 @@ TEST_P(olLaunchKernelLocalMemReductionTest, Success) {
 
   ASSERT_SUCCESS(olMemFree(Mem));
 }
+
+TEST_P(olLaunchKernelLocalMemStaticTest, Success) {
+  LaunchArgs.NumGroups.x = 4;
+  LaunchArgs.DynSharedMemory = 0;
+
+  void *Mem;
+  ASSERT_SUCCESS(olMemAlloc(Device, OL_ALLOC_TYPE_MANAGED,
+                            LaunchArgs.NumGroups.x * sizeof(uint32_t), &Mem));
+  struct {
+    void *Mem;
+  } Args{Mem};
+
+  ASSERT_SUCCESS(olLaunchKernel(Queue, Device, Kernel, &Args, sizeof(Args),
+                                &LaunchArgs, nullptr));
+
+  ASSERT_SUCCESS(olWaitQueue(Queue));
+
+  uint32_t *Data = (uint32_t *)Mem;
+  for (uint32_t i = 0; i < LaunchArgs.NumGroups.x; i++)
+    ASSERT_EQ(Data[i], 2 * LaunchArgs.GroupSize.x);
+
+  ASSERT_SUCCESS(olMemFree(Mem));
+}