[llvm] [AMDGPU] Refactor GFX11 VALU Mask Hazard Waitcnt Merging (PR #169213)

[Carl Ritson via llvm-commits]

================
@@ -464,6 +577,11 @@ class AMDGPUWaitSGPRHazards {
     MRI = &MF.getRegInfo();
     DsNopCount = ST->isWave64() ? WAVE64_NOPS : WAVE32_NOPS;
 
+    // VALU mask write hazards have already been handled, but this pass
+    // performs a forward scan to optimize them.
+    if (ST->hasVALUMaskWriteHazard())
+      return ST->isWave64() ? runWaitMerging(MF) : false;
----------------
perlfu wrote:

Mutually exclusive. GFX12 and GFX11 respectively.

https://github.com/llvm/llvm-project/pull/169213