Small fixes

Author: RossBrunton

offload/liboffload/API/Common.td

@@ -149,7 +149,7 @@ def : Struct {
 }
 
 def : Struct {
-  let name = "ol_range_t";
+  let name = "ol_dimensions_t";
   let desc = "A three element vector";
   let members = [
     StructMember<"size_t", "x", "X">,

offload/liboffload/API/Device.td

@@ -32,7 +32,7 @@ def : Enum {
     TaggedEtor<"NAME", "char[]", "Device name">,
     TaggedEtor<"VENDOR", "char[]", "Device vendor">,
     TaggedEtor<"DRIVER_VERSION", "char[]", "Driver version">,
-    TaggedEtor<"MAX_WORK_GROUP_SIZE", "ol_range_t", "Maximum work group size in each dimension">,
+    TaggedEtor<"MAX_WORK_GROUP_SIZE", "ol_dimensions_t", "Maximum work group size in each dimension">,
   ];
 }
 

offload/liboffload/src/OffloadImpl.cpp

@@ -228,7 +228,7 @@ Error olGetDeviceInfoImplDetail(ol_device_handle_t Device,
   ReturnHelper ReturnValue(PropSize, PropValue, PropSizeRet);
 
   // Find the info if it exists under any of the given names
-  auto FindInfo = [&](InfoQueueTy &DevInfo, std::vector<std::string> &Names)
+  auto FindInfo = [&](InfoQueueTy &DevInfo, llvm::SmallVector<StringRef> &Names)
       -> std::optional<decltype(DevInfo.getQueue().begin())> {
     if (!Device->Device)
       return std::nullopt;
@@ -250,7 +250,7 @@ Error olGetDeviceInfoImplDetail(ol_device_handle_t Device,
 
     return std::nullopt;
   };
-  auto GetInfoString = [&](std::vector<std::string> Names) {
+  auto GetInfoString = [&](llvm::SmallVector<StringRef> Names) {
     InfoQueueTy DevInfo;
 
     if (auto Item = FindInfo(DevInfo, Names)) {
@@ -259,12 +259,12 @@ Error olGetDeviceInfoImplDetail(ol_device_handle_t Device,
       return "";
     }
   };
-  auto GetInfoXyz = [&](std::vector<std::string> Names) {
+  auto GetInfoXyz = [&](llvm::SmallVector<StringRef> Names) {
     InfoQueueTy DevInfo;
 
     if (auto Item = FindInfo(DevInfo, Names)) {
       auto Iter = *Item;
-      ol_range_t Out{0, 0, 0};
+      ol_dimensions_t Out{0, 0, 0};
       auto Level = Iter->Level + 1;
 
       while ((++Iter)->Level == Level) {
@@ -286,7 +286,7 @@ Error olGetDeviceInfoImplDetail(ol_device_handle_t Device,
 
       return Out;
     } else {
-      return ol_range_t{0, 0, 0};
+      return ol_dimensions_t{0, 0, 0};
     }
   };
 

offload/unittests/OffloadAPI/device/olGetDeviceInfo.cpp

@@ -78,12 +78,12 @@ TEST_P(olGetDeviceInfoTest, SuccessDriverVersion) {
 }
 
 TEST_P(olGetDeviceInfoTest, SuccessMaxWorkGroupSize) {
-  ol_range_t Value{0, 0, 0};
+  ol_dimensions_t Value{0, 0, 0};
   ASSERT_SUCCESS(olGetDeviceInfo(Device, OL_DEVICE_INFO_MAX_WORK_GROUP_SIZE,
                                  sizeof(Value), &Value));
-  ASSERT_GT(Value.x, 0);
-  ASSERT_GT(Value.y, 0);
-  ASSERT_GT(Value.z, 0);
+  ASSERT_GT(Value.x, 0u);
+  ASSERT_GT(Value.y, 0u);
+  ASSERT_GT(Value.z, 0u);
 }
 
 TEST_P(olGetDeviceInfoTest, InvalidNullHandleDevice) {

offload/unittests/OffloadAPI/device/olGetDeviceInfoSize.cpp

@@ -48,7 +48,7 @@ TEST_P(olGetDeviceInfoSizeTest, SuccessMaxWorkGroupSize) {
   size_t Size = 0;
   ASSERT_SUCCESS(
       olGetDeviceInfoSize(Device, OL_DEVICE_INFO_MAX_WORK_GROUP_SIZE, &Size));
-  ASSERT_EQ(Size, sizeof(ol_range_t));
+  ASSERT_EQ(Size, sizeof(ol_dimensions_t));
   ASSERT_EQ(Size, sizeof(size_t) * 3);
 }