From b6e62f99d085016a993222460168358ce1b4361e Mon Sep 17 00:00:00 2001 From: pghafari Date: Wed, 28 Apr 2021 11:29:36 -0400 Subject: [PATCH] SWDEV-245532 - HIP - Vulkan interop semaphores linuxpro syntax update Change-Id: Id77e0d82c504fb7a1bd8edfac7dc962e428c87b4 [ROCm/clr commit: 89168d4812d891b8278f895f66820312beb9e7ae] --- projects/clr/rocclr/device/device.hpp | 2 +- projects/clr/rocclr/device/pal/paldevice.cpp | 2 +- projects/clr/rocclr/device/pal/paldevice.hpp | 4 ++-- projects/clr/rocclr/device/rocm/rocdevice.hpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/clr/rocclr/device/device.hpp b/projects/clr/rocclr/device/device.hpp index 7a8132f5a4..8c25dd9d00 100644 --- a/projects/clr/rocclr/device/device.hpp +++ b/projects/clr/rocclr/device/device.hpp @@ -1618,7 +1618,7 @@ class Device : public RuntimeObject { virtual bool globalFreeMemory(size_t* freeMemory //!< Free memory information on a GPU device ) const = 0; - virtual bool importExtSemaphore(void** extSemaphore, amd::Os::FileDesc handle) = 0; + virtual bool importExtSemaphore(void** extSemaphore, const amd::Os::FileDesc& handle) = 0; virtual void DestroyExtSemaphore(void* extSemaphore) = 0; /** * @return True if the device has its own custom host allocator to be used diff --git a/projects/clr/rocclr/device/pal/paldevice.cpp b/projects/clr/rocclr/device/pal/paldevice.cpp index cef828d7bd..7523055aa5 100644 --- a/projects/clr/rocclr/device/pal/paldevice.cpp +++ b/projects/clr/rocclr/device/pal/paldevice.cpp @@ -2410,7 +2410,7 @@ bool Device::SetClockMode(const cl_set_device_clock_mode_input_amd setClockModeI } -bool Device::importExtSemaphore(void** extSemaphore, amd::Os::FileDesc handle) { +bool Device::importExtSemaphore(void** extSemaphore, const amd::Os::FileDesc& handle) { Pal::ExternalQueueSemaphoreOpenInfo palOpenInfo = {}; palOpenInfo.externalSemaphore = handle; palOpenInfo.flags.crossProcess = false; diff --git a/projects/clr/rocclr/device/pal/paldevice.hpp b/projects/clr/rocclr/device/pal/paldevice.hpp index bdc3ea0160..6ba4c4d16b 100644 --- a/projects/clr/rocclr/device/pal/paldevice.hpp +++ b/projects/clr/rocclr/device/pal/paldevice.hpp @@ -136,7 +136,7 @@ class NullDevice : public amd::Device { return NULL; } virtual void svmFree(void* ptr) const { return; } - virtual bool importExtSemaphore(void** extSemaphore, void* handle) { return false; } + virtual bool importExtSemaphore(void** extSemaphore,const amd::Os::FileDesc& handle) { return false; } virtual void DestroyExtSemaphore(void* extSemaphore) { } void* Alloc(const Util::AllocInfo& allocInfo) { return allocator_.Alloc(allocInfo); } @@ -594,7 +594,7 @@ class Device : public NullDevice { return false; } - virtual bool importExtSemaphore(void** extSemaphore, amd::Os::FileDesc handle); + virtual bool importExtSemaphore(void** extSemaphore, const amd::Os::FileDesc& handle); virtual void DestroyExtSemaphore(void* extSemaphore); private: diff --git a/projects/clr/rocclr/device/rocm/rocdevice.hpp b/projects/clr/rocclr/device/rocm/rocdevice.hpp index bcf7eca6eb..61a37eaeb4 100644 --- a/projects/clr/rocclr/device/rocm/rocdevice.hpp +++ b/projects/clr/rocclr/device/rocm/rocdevice.hpp @@ -191,7 +191,7 @@ class NullDevice : public amd::Device { return !settings().enableCoarseGrainSVM_ || (memory->getContext().devices().size() > 1); } - virtual bool importExtSemaphore(void** extSemahore, amd::Os::FileDesc handle) { + virtual bool importExtSemaphore(void** extSemahore, const amd::Os::FileDesc& handle) { ShouldNotReachHere(); return false; }