[llvm] bc0c89d - [AMDGPU] More cleanup after D117544. NFC.

[Jay Foad via llvm-commits]

Author: Jay Foad
Date: 2022-11-22T21:15:22Z
New Revision: bc0c89d3d85329df59551a92936e90b7433ee91a

URL: https://github.com/llvm/llvm-project/commit/bc0c89d3d85329df59551a92936e90b7433ee91a
DIFF: https://github.com/llvm/llvm-project/commit/bc0c89d3d85329df59551a92936e90b7433ee91a.diff

LOG: [AMDGPU] More cleanup after D117544. NFC.

Added: 
    

Modified: 
    llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp b/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp
index 626799e190817..3ccd09449dc7a 100644
--- a/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp
+++ b/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp
@@ -1508,20 +1508,18 @@ bool WaitcntBrackets::merge(const WaitcntBrackets &Other) {
     for (int J = 0; J <= VgprUB; J++)
       StrictDom |= mergeScore(M, VgprScores[T][J], Other.VgprScores[T][J]);
 
-    if (T == VM_CNT) {
-      for (int J = 0; J <= VgprUB; J++) {
-        unsigned char NewVmemTypes = VgprVmemTypes[J] | Other.VgprVmemTypes[J];
-        StrictDom |= NewVmemTypes != VgprVmemTypes[J];
-        VgprVmemTypes[J] = NewVmemTypes;
-      }
-    }
-
     if (T == LGKM_CNT) {
       for (int J = 0; J <= SgprUB; J++)
         StrictDom |= mergeScore(M, SgprScores[J], Other.SgprScores[J]);
     }
   }
 
+  for (int J = 0; J <= VgprUB; J++) {
+    unsigned char NewVmemTypes = VgprVmemTypes[J] | Other.VgprVmemTypes[J];
+    StrictDom |= NewVmemTypes != VgprVmemTypes[J];
+    VgprVmemTypes[J] = NewVmemTypes;
+  }
+
   return StrictDom;
 }