SWDEV-381627 - Move cl_vk_amd.hpp into rocclr

Rename VK interop to ExternalMemory object, since it should handle
DX interops also

Change-Id: I536ec46d3e53ece35234a2e29030393ad411b96d


[ROCm/clr commit: 3e5803c4c0]

projects/clr/rocclr/device/pal/palmemory.cpp

@@ -34,7 +34,7 @@
 #include "platform/interop_d3d11.hpp"
 #endif  //_WIN32
 #include "platform/interop_gl.hpp"
-#include "amdocl/cl_vk_amd.hpp"
+#include "platform/external_memory.hpp"
 
 #include <string>
 #include <fstream>
@@ -241,7 +241,7 @@ bool Memory::createInterop() {
   amd::InteropObject* interop = owner()->getInteropObj();
   assert((interop != nullptr) && "An invalid interop object is impossible!");
 
-  amd::VkObject* vkObject = interop->asVkObject();
+  auto ext_memory = interop->asExternalMemory();
   amd::GLObject* glObject = interop->asGLObject();
 #ifdef _WIN32
   amd::D3D10Object* d3d10Object = interop->asD3D10Object();
@@ -351,14 +351,16 @@ bool Memory::createInterop() {
     }
   } else
 #endif  //_WIN32
-  if (vkObject != nullptr) {
+  if (ext_memory != nullptr) {
     createParams = &vkRes;
     vkRes.owner_ = owner();
     memType = Resource::VkInterop;
-    vkRes.handle_ = vkObject->getVkSharedHandle();
+    vkRes.handle_ = ext_memory->Handle();
     vkRes.type_ = Resource::InteropTypeless;
     vkRes.nt_handle_ =
-        (vkObject->getHandleType() == amd::VkObject::ExternalMemoryWin32) ? true : false;
+      ((ext_memory->Type() != amd::ExternalMemory::HandleType::OpaqueFd) &&
+       (ext_memory->Type() != amd::ExternalMemory::HandleType::OpaqueWin32Kmt) &&
+       (ext_memory->Type() != amd::ExternalMemory::HandleType::D3D11ResourceKmt)) ? true : false;
   }
 
   else if (glObject != nullptr) {

projects/clr/rocclr/device/rocm/rocmemory.cpp

@@ -36,7 +36,7 @@
 #include "platform/memory.hpp"
 #include "platform/sampler.hpp"
 #include "platform/interop_gl.hpp"
-#include "amdocl/cl_vk_amd.hpp"
+#include "platform/external_memory.hpp"
 
 namespace roc {
 
@@ -815,10 +815,10 @@ bool Buffer::create(bool alloc_local) {
   // Interop buffer
   if (owner()->isInterop()) {
     amd::InteropObject* interop = owner()->getInteropObj();
-    amd::VkObject* vkObject = interop->asVkObject();
+    auto ext_memory = interop->asExternalMemory();
     amd::GLObject* glObject = interop->asGLObject();
-    if (vkObject != nullptr) {
-      hsa_status_t status = interopMapBuffer(vkObject->getVkSharedHandle());
+    if (ext_memory != nullptr) {
+      hsa_status_t status = interopMapBuffer(ext_memory->Handle());
       if (status != HSA_STATUS_SUCCESS) return false;
       return true;
     } else if (glObject != nullptr) {

projects/clr/rocclr/platform/external_memory.hpp

@@ -0,0 +1,95 @@
+/* Copyright (c) 2010 - 2021 Advanced Micro Devices, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE. */
+
+#pragma once
+
+#include "platform/context.hpp"
+#include "platform/memory.hpp"
+
+namespace amd
+{
+  class ExternalMemory : public InteropObject
+  {
+  public:
+    enum class HandleType : uint32_t {
+      OpaqueFd = 1,
+      OpaqueWin32 = 2,
+      OpaqueWin32Kmt = 3,
+      D3D12Heap = 4,
+      D3D12Resource = 5,
+      D3D11Resource = 6,
+      D3D11ResourceKmt = 7
+    };
+
+    ExternalMemory(amd::Os::FileDesc handle, ExternalMemory::HandleType handle_type)
+        : handle_(handle), handle_type_(handle_type) {}
+
+    virtual ~ExternalMemory() override {}
+    ExternalMemory* asExternalMemory() final { return this; }
+
+    amd::Os::FileDesc Handle() const { return handle_; }
+    HandleType Type() const { return handle_type_; }
+
+  protected:
+    amd::Os::FileDesc handle_;
+    ExternalMemory::HandleType handle_type_;
+  };
+
+  class ExternalBuffer : public Buffer, public ExternalMemory
+  {
+  protected:
+    // Initializes device memory array, which is located after ExternalBuffer object in memory
+    void initDeviceMemory() {
+      deviceMemories_ =
+        reinterpret_cast<DeviceMemory*>(reinterpret_cast<char*>(this) + sizeof(ExternalBuffer));
+      memset(deviceMemories_, 0, context_().devices().size() * sizeof(DeviceMemory));
+    }
+
+  public:
+    ExternalBuffer(Context& amdContext, size_t size_in_bytes, amd::Os::FileDesc handle,
+        ExternalMemory::HandleType handle_type)
+        : Buffer(amdContext, 0, size_in_bytes), ExternalMemory(handle, handle_type) {
+      setInteropObj(this);
+    }
+
+    virtual ~ExternalBuffer() final {}
+  };
+
+  // to be modified once image requirments are known, for now, implement like buffer
+  class ExternalImage : public Buffer, public ExternalMemory
+  {
+  protected:
+    // Initializes device memory array, which is located after ExternalImage object in memory
+    void initDeviceMemory() {
+      deviceMemories_ =
+        reinterpret_cast<DeviceMemory*>(reinterpret_cast<char*>(this) + sizeof(ExternalImage));
+      memset(deviceMemories_, 0, context_().devices().size() * sizeof(DeviceMemory));
+    }
+
+  public:
+    ExternalImage(Context& amdContext, size_t size_in_bytes, amd::Os::FileDesc handle,
+        ExternalMemory::HandleType handle_type)
+        : Buffer(amdContext, 0, size_in_bytes), ExternalMemory(handle, handle_type) {
+      setInteropObj(this);
+    }
+
+    virtual ~ExternalImage() final {}
+  };
+}

projects/clr/rocclr/platform/interop.hpp

@@ -26,8 +26,7 @@ namespace amd {
 //! Forward declarations of interop classes
 class GLObject;
 class BufferGL;
-class VkObject;
-class BufferVk;
+class ExternalMemory;
 
 
 #ifdef _WIN32
@@ -45,9 +44,7 @@ class InteropObject {
   // Static cast functions for interop objects
   virtual GLObject* asGLObject() { return nullptr; }
   virtual BufferGL* asBufferGL() { return nullptr; }
-
-  virtual VkObject* asVkObject() { return nullptr; }
-  virtual BufferVk* asBufferVk() { return nullptr; }
+  virtual ExternalMemory* asExternalMemory() { return nullptr; }
 
 #ifdef _WIN32
   virtual D3D10Object* asD3D10Object() { return nullptr; }