Remove the Dim class

Author: leandrolcampos

offload/unittests/Conformance/include/mathtest/DeviceContext.hpp

@@ -19,7 +19,6 @@
 #define MATHTEST_DEVICECONTEXT_HPP
 
 #include "mathtest/DeviceResources.hpp"
-#include "mathtest/Dim.hpp"
 #include "mathtest/ErrorHandling.hpp"
 #include "mathtest/Support.hpp"
 
@@ -29,6 +28,7 @@
 
 #include <cassert>
 #include <cstddef>
+#include <cstdint>
 #include <memory>
 #include <optional>
 #include <tuple>
@@ -111,8 +111,8 @@ class DeviceContext {
   }
 
   template <typename KernelSignature, typename... ArgTypes>
-  void launchKernel(DeviceKernel<KernelSignature> Kernel, Dim NumGroups,
-                    Dim GroupSize, ArgTypes &&...Args) const noexcept {
+  void launchKernel(DeviceKernel<KernelSignature> Kernel, uint32_t NumGroups,
+                    uint32_t GroupSize, ArgTypes &&...Args) const noexcept {
     using ExpectedTypes =
         typename FunctionTypeTraits<KernelSignature>::ArgTypesTuple;
     using ProvidedTypes = std::tuple<std::decay_t<ArgTypes>...>;
@@ -151,8 +151,8 @@ class DeviceContext {
   getKernelImpl(ol_program_handle_t ProgramHandle,
                 llvm::StringRef KernelName) const noexcept;
 
-  void launchKernelImpl(ol_symbol_handle_t KernelHandle, const Dim &NumGroups,
-                        const Dim &GroupSize, const void *KernelArgs,
+  void launchKernelImpl(ol_symbol_handle_t KernelHandle, uint32_t NumGroups,
+                        uint32_t GroupSize, const void *KernelArgs,
                         std::size_t KernelArgsSize) const noexcept;
 
   std::size_t GlobalDeviceId;

offload/unittests/Conformance/include/mathtest/Dim.hpp

@@ -29,6 +29,7 @@
 
 #include <OffloadAPI.h>
 #include <cstddef>
+#include <cstdint>
 #include <memory>
 #include <optional>
 #include <string>
@@ -299,13 +300,12 @@ DeviceContext::getKernelImpl(ol_program_handle_t ProgramHandle,
 }
 
 void DeviceContext::launchKernelImpl(
-    ol_symbol_handle_t KernelHandle, const Dim &NumGroups, const Dim &GroupSize,
+    ol_symbol_handle_t KernelHandle, uint32_t NumGroups, uint32_t GroupSize,
     const void *KernelArgs, std::size_t KernelArgsSize) const noexcept {
   ol_kernel_launch_size_args_t LaunchArgs;
-  LaunchArgs.Dimensions = 3; // It seems this field is not used anywhere.
-                             // Defaulting to the safest value.
-  LaunchArgs.NumGroups = {NumGroups[0], NumGroups[1], NumGroups[2]};
-  LaunchArgs.GroupSize = {GroupSize[0], GroupSize[1], GroupSize[2]};
+  LaunchArgs.Dimensions = 1;
+  LaunchArgs.NumGroups = {NumGroups, 1, 1};
+  LaunchArgs.GroupSize = {GroupSize, 1, 1};
   LaunchArgs.DynSharedMemory = 0;
 
   OL_CHECK(olLaunchKernel(nullptr, DeviceHandle, KernelHandle, KernelArgs,