Cleanup headers and added more forward declarations

Author: kcloudy0717

lib/API/MTL/MTLDescriptorHeap.cpp

@@ -1,6 +1,5 @@
-#define IR_RUNTIME_METALCPP
 #include "MTLDescriptorHeap.h"
-#include "metal_irconverter_runtime.h"
+#include "MetalIRConverter.h"
 
 using namespace offloadtest;
 
@@ -41,6 +40,11 @@ MTLDescriptorHeap::create(MTL::Device *Device,
   return std::make_unique<MTLDescriptorHeap>(Desc, Buf);
 }
 
+MTLDescriptorHeap::~MTLDescriptorHeap() {
+  if (Buffer)
+    Buffer->release();
+}
+
 MTLGPUDescriptorHandle
 MTLDescriptorHeap::getGPUDescriptorHandleForHeapStart() const {
   return MTLGPUDescriptorHandle{Buffer->gpuAddress()};

lib/API/MTL/MTLDescriptorHeap.h

@@ -12,17 +12,23 @@
 #ifndef OFFLOADTEST_API_MTL_MTLDESCRIPTORHEAP_H
 #define OFFLOADTEST_API_MTL_MTLDESCRIPTORHEAP_H
 
-#include "Metal/Metal.hpp"
 #include "llvm/Support/Error.h"
 #include <memory>
 
+// Forward declarations
+namespace MTL {
+class Device;
+class Buffer;
+class RenderCommandEncoder;
+class ComputeCommandEncoder;
+} // namespace MTL
 struct IRDescriptorTableEntry;
 
 namespace offloadtest {
 struct MTLGPUDescriptorHandle {
   MTLGPUDescriptorHandle &Offset(int32_t OffsetInDescriptors);
 
-  MTL::GPUAddress Ptr;
+  uint64_t Ptr;
 };
 
 enum class MTLDescriptorHeapType {
@@ -49,10 +55,7 @@ class MTLDescriptorHeap {
 
   MTLDescriptorHeap(const MTLDescriptorHeapDesc &Desc, MTL::Buffer *Buffer)
       : Desc(Desc), Buffer(Buffer) {}
-  ~MTLDescriptorHeap() {
-    if (Buffer)
-      Buffer->release();
-  }
+  ~MTLDescriptorHeap();
 
   MTLGPUDescriptorHandle getGPUDescriptorHandleForHeapStart() const;
 

lib/API/MTL/MTLTopLevelArgumentBuffer.cpp

@@ -1,6 +1,4 @@
-#define IR_RUNTIME_METALCPP
 #include "MTLTopLevelArgumentBuffer.h"
-#include "metal_irconverter_runtime.h"
 
 using namespace offloadtest;
 

lib/API/MTL/MTLTopLevelArgumentBuffer.h

@@ -13,12 +13,7 @@
 #define OFFLOADTEST_API_MTL_MTLTOPLEVELARGUMENTBUFFER_H
 
 #include "MTLDescriptorHeap.h"
-#include "Metal/Metal.hpp"
-#include "metal_irconverter.h"
-#include "llvm/Support/Error.h"
-#include <memory>
-
-struct IRDescriptorTableEntry;
+#include "MetalIRConverter.h"
 
 namespace offloadtest {
 // Manages a Metal buffer that serves as the top-level argument buffer for

lib/API/MTL/MetalIRConverter.h

@@ -0,0 +1,22 @@
+//===- MetalIRConverter.h - Metal IR Converter ---------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef OFFLOADTEST_API_MTL_METALIRCONVERTER_H
+#define OFFLOADTEST_API_MTL_METALIRCONVERTER_H
+
+#pragma push_macro("IR_RUNTIME_METALCPP")
+#define IR_RUNTIME_METALCPP
+#include "Metal/Metal.hpp"
+#include "metal_irconverter.h"
+#include "metal_irconverter_runtime.h"
+#pragma pop_macro("IR_RUNTIME_METALCPP")
+
+#endif // OFFLOADTEST_API_MTL_METALIRCONVERTER_H