diff --git a/projects/clr/rocclr/device/device.hpp b/projects/clr/rocclr/device/device.hpp index de9fe4226e..2f6fd60bb8 100644 --- a/projects/clr/rocclr/device/device.hpp +++ b/projects/clr/rocclr/device/device.hpp @@ -1151,9 +1151,6 @@ class VirtualDevice : public amd::HeapObject { //! Destroy this virtual device. virtual ~VirtualDevice() {} - //! Prepare this virtual device for destruction. - virtual bool terminate() = 0; - //! Return the physical device for this virtual device. const amd::Device& device() const { return device_(); } diff --git a/projects/clr/rocclr/device/gpu/gpuvirtual.hpp b/projects/clr/rocclr/device/gpu/gpuvirtual.hpp index 08f4a945f0..63cb99285b 100644 --- a/projects/clr/rocclr/device/gpu/gpuvirtual.hpp +++ b/projects/clr/rocclr/device/gpu/gpuvirtual.hpp @@ -248,7 +248,6 @@ class VirtualGPU : public device::VirtualDevice, public CALGSLContext { void releaseKernel(CALimage calImage); void flush(amd::Command* list = NULL, bool wait = false); - bool terminate() { return true; } //! Returns GPU device object associated with this kernel const Device& dev() const { return gpuDevice_; } diff --git a/projects/clr/rocclr/device/pal/palvirtual.hpp b/projects/clr/rocclr/device/pal/palvirtual.hpp index e85778a9f6..930591519a 100644 --- a/projects/clr/rocclr/device/pal/palvirtual.hpp +++ b/projects/clr/rocclr/device/pal/palvirtual.hpp @@ -351,7 +351,6 @@ class VirtualGPU : public device::VirtualDevice { void releaseMemory(GpuMemoryReference* mem); void flush(amd::Command* list = nullptr, bool wait = false); - bool terminate() { return true; } //! Returns GPU device object associated with this kernel const Device& dev() const { return gpuDevice_; } diff --git a/projects/clr/rocclr/device/rocm/rocdevice.cpp b/projects/clr/rocclr/device/rocm/rocdevice.cpp index 5c535d0af8..40adf2208e 100644 --- a/projects/clr/rocclr/device/rocm/rocdevice.cpp +++ b/projects/clr/rocclr/device/rocm/rocdevice.cpp @@ -235,15 +235,9 @@ Device::~Device() { delete xferWrite_; // Destroy transfer queue - if (xferQueue_ && xferQueue_->terminate()) { - delete xferQueue_; - xferQueue_ = nullptr; - } + delete xferQueue_; - if (blitProgram_) { - delete blitProgram_; - blitProgram_ = nullptr; - } + delete blitProgram_; if (context_ != nullptr) { context_->release(); diff --git a/projects/clr/rocclr/device/rocm/rocvirtual.hpp b/projects/clr/rocclr/device/rocm/rocvirtual.hpp index b1c79fd3f1..c6813e7283 100644 --- a/projects/clr/rocclr/device/rocm/rocvirtual.hpp +++ b/projects/clr/rocclr/device/rocm/rocvirtual.hpp @@ -199,7 +199,6 @@ class VirtualGPU : public device::VirtualDevice { ~VirtualGPU(); bool create(); - bool terminate() { return true; } const Device& dev() const { return roc_device_; } void profilingBegin(amd::Command& command, bool drmProfiling = false); diff --git a/projects/clr/rocclr/platform/commandqueue.hpp b/projects/clr/rocclr/platform/commandqueue.hpp index 11dc7115b6..fc83dacb56 100644 --- a/projects/clr/rocclr/platform/commandqueue.hpp +++ b/projects/clr/rocclr/platform/commandqueue.hpp @@ -167,9 +167,7 @@ class HostQueue : public CommandQueue { virtualDevice_ = queue->device().createVirtualDevice(queue); if (virtualDevice_ != NULL) { queue->loop(virtualDevice_); - if (virtualDevice_->terminate()) { - delete virtualDevice_; - } + delete virtualDevice_; } else { acceptingCommands_ = false; queue->flush();