Fix missing tablegen, tidy Offload tests

Author: callumfare

offload/liboffload/API/CMakeLists.txt

@@ -7,10 +7,10 @@ if (CLANG_FORMAT)
     set(LLVM_TARGET_DEFINITIONS ${CMAKE_CURRENT_SOURCE_DIR}/OffloadAPI.td)
 
     tablegen(OFFLOAD OffloadAPI.h -gen-api)
+    tablegen(OFFLOAD OffloadEntryPoints.inc -gen-entry-points)
     tablegen(OFFLOAD OffloadFuncs.inc -gen-func-names)
     tablegen(OFFLOAD OffloadImplFuncDecls.inc -gen-impl-func-decls)
     tablegen(OFFLOAD OffloadPrint.hpp -gen-print-header)
-    tablegen(OFFLOAD OffloadExports -gen-exports)
 
     set(OFFLOAD_GENERATED_FILES ${TABLEGEN_OUTPUT})
     add_public_tablegen_target(OffloadGenerate)

offload/unittests/OffloadAPI/common/Fixtures.hpp

@@ -55,9 +55,8 @@ struct offloadDeviceTest : offloadPlatformTest {
 
     uint32_t NumDevices;
     ASSERT_SUCCESS(olGetDeviceCount(Platform, &NumDevices));
-    if (NumDevices == 0) {
+    if (NumDevices == 0)
       GTEST_SKIP() << "No available devices on this platform.";
-    }
     ASSERT_SUCCESS(olGetDevice(Platform, 1, &Device));
   }
 

offload/unittests/OffloadAPI/device/olGetDevice.cpp

@@ -15,7 +15,9 @@ using olGetDeviceTest = offloadPlatformTest;
 TEST_F(olGetDeviceTest, Success) {
   uint32_t Count = 0;
   ASSERT_SUCCESS(olGetDeviceCount(Platform, &Count));
-  ASSERT_NE(Count, 0lu);
+  if (Count == 0)
+    GTEST_SKIP() << "No available devices on this platform.";
+
   std::vector<ol_device_handle_t> Devices(Count);
   ASSERT_SUCCESS(olGetDevice(Platform, Count, Devices.data()));
   for (auto Device : Devices) {
@@ -26,9 +28,9 @@ TEST_F(olGetDeviceTest, Success) {
 TEST_F(olGetDeviceTest, SuccessSubsetOfDevices) {
   uint32_t Count;
   ASSERT_SUCCESS(olGetDeviceCount(Platform, &Count));
-  if (Count < 2) {
+  if (Count < 2)
     GTEST_SKIP() << "Only one device is available on this platform.";
-  }
+
   std::vector<ol_device_handle_t> Devices(Count - 1);
   ASSERT_SUCCESS(olGetDevice(Platform, Count - 1, Devices.data()));
   for (auto Device : Devices) {

offload/unittests/OffloadAPI/device/olGetDeviceCount.cpp

@@ -15,7 +15,6 @@ using olGetDeviceCountTest = offloadPlatformTest;
 TEST_F(olGetDeviceCountTest, Success) {
   uint32_t Count = 0;
   ASSERT_SUCCESS(olGetDeviceCount(Platform, &Count));
-  ASSERT_NE(Count, 0lu);
 }
 
 TEST_F(olGetDeviceCountTest, InvalidNullPlatform) {