Refactor scratch handler function

Separate the event handler and scratch handler portions of the code into
separate functions.

Change-Id: Ifdb7461e816b0f2d3c1c0a74d6f020b4d6fc736c

runtime/hsa-runtime/core/inc/amd_aql_queue.h

@@ -239,9 +239,13 @@ class AqlQueue : public core::Queue, private core::LocalSignal, public core::Doo
   /// @brief Halt the queue without destroying it or fencing memory.
   void Suspend();
 
+  /// @brief Handle insufficient scratch
+  void HandleInsufficientScratch(hsa_signal_value_t& error_code, hsa_signal_value_t& waitVal,
+                                 bool& changeWait);
+
   /// @brief Handler for hardware queue events.
   template <bool HandleExceptions>
-  static bool DynamicScratchHandler(hsa_signal_value_t error_code, void* arg);
+  static bool DynamicQueueEventsHandler(hsa_signal_value_t error_code, void* arg);
 
   /// @brief Handler for KFD exceptions.
   static bool ExceptionHandler(hsa_signal_value_t error_code, void* arg);