Merge pull request o3de#17581 from jhmueller-huawei/multi-device-resources-dispatchitem-fence-fixes

Multi-device resources: DispatchItem and Fence fixes

Author: jhmueller-huawei

Gems/Atom/RHI/Code/Include/Atom/RHI/MultiDeviceDispatchItem.h

@@ -100,9 +100,17 @@ namespace AZ::RHI
             return m_deviceDispatchItems.at(deviceIndex);
         }
 
+        //! Retrieve arguments specifing a dispatch type.
+        const MultiDeviceDispatchArguments& GetArguments() const
+        {
+            return m_arguments;
+        }
+
         //! Arguments specific to a dispatch type.
         void SetArguments(const MultiDeviceDispatchArguments& arguments)
         {
+            m_arguments = arguments;
+
             for (auto& [deviceIndex, dispatchItem] : m_deviceDispatchItems)
             {
                 dispatchItem.m_arguments = arguments.GetDeviceDispatchArguments(deviceIndex);
@@ -162,6 +170,8 @@ namespace AZ::RHI
     private:
         //! A DeviceMask denoting on which devices a device-specific DispatchItem should be generated
         MultiDevice::DeviceMask m_deviceMask{ MultiDevice::DefaultDevice };
+        //! Caching the arguments for the corresponding getter.
+        MultiDeviceDispatchArguments m_arguments;
         //! A map of all device-specific DispatchItem, indexed by the device index
         AZStd::unordered_map<int, DispatchItem> m_deviceDispatchItems;
     };

Gems/Atom/RHI/Code/Include/Atom/RHI/MultiDeviceFence.h

@@ -29,28 +29,18 @@ namespace AZ::RHI
         //! passes on the initial FenceState to each Fence
         ResultCode Init(MultiDevice::DeviceMask deviceMask, FenceState initialState);
 
-        //! Waits on m_waitThread and shuts down all device-specific fences.
+        //! Shuts down all device-specific fences.
         void Shutdown() override final;
 
         //! Signals the device-specific fences managed by this class
         RHI::ResultCode SignalOnCpu();
 
-        //! Waits (blocks) for all device-specific fences managed by this class
-        RHI::ResultCode WaitOnCpu() const;
-
         //! Resets the device-specific fences.
         RHI::ResultCode Reset();
 
         using SignalCallback = AZStd::function<void()>;
 
-        //! Spawns a dedicated thread to wait on all device-specific fences. The provided callback
-        //! is invoked when the fences complete.
-        ResultCode WaitOnCpuAsync(SignalCallback callback);
-
     protected:
         bool ValidateIsInitialized() const;
-
-        //! This can be used to asynchronously wait on all fences by calling WaitOnCpuAsync
-        AZStd::thread m_waitThread;
     };
 } // namespace AZ::RHI

Gems/Atom/RHI/Code/Source/RHI/MultiDeviceFence.cpp

@@ -69,11 +69,6 @@ namespace AZ::RHI
     {
         if (IsInitialized())
         {
-            if (m_waitThread.joinable())
-            {
-                m_waitThread.join();
-            }
-
             IterateObjects<Fence>([]([[maybe_unused]] auto deviceIndex, auto deviceFence)
             {
                 deviceFence->Shutdown();
@@ -96,54 +91,6 @@ namespace AZ::RHI
         });
     }
 
-    ResultCode MultiDeviceFence::WaitOnCpu() const
-    {
-        if (!ValidateIsInitialized())
-        {
-            return ResultCode::InvalidOperation;
-        }
-
-        return IterateObjects<Fence>([]([[maybe_unused]] auto deviceIndex, auto deviceFence)
-        {
-            return deviceFence->WaitOnCpu();
-        });
-    }
-
-    ResultCode MultiDeviceFence::WaitOnCpuAsync(SignalCallback callback)
-    {
-        if (!ValidateIsInitialized())
-        {
-            return ResultCode::InvalidOperation;
-        }
-
-        if (!callback)
-        {
-            AZ_Error("MultiDeviceFence", false, "Callback is null.");
-            return ResultCode::InvalidOperation;
-        }
-
-        if (m_waitThread.joinable())
-        {
-            m_waitThread.join();
-        }
-
-        AZStd::thread_desc threadDesc{ "MultiDeviceFence WaitOnCpu Thread" };
-
-        m_waitThread = AZStd::thread(
-            threadDesc,
-            [this, callback]()
-            {
-                ResultCode resultCode = WaitOnCpu();
-                if (resultCode != ResultCode::Success)
-                {
-                    AZ_Error("MultiDeviceFence", false, "Failed to call WaitOnCpu in async thread.");
-                }
-                callback();
-            });
-
-        return ResultCode::Success;
-    }
-
     ResultCode MultiDeviceFence::Reset()
     {
         if (!ValidateIsInitialized())