1 files changed, 4 insertions, 9 deletions
diff --git a/lib/Target/AMDGPU/GCNHazardRecognizer.cpp b/lib/Target/AMDGPU/GCNHazardRecognizer.cpp
index 025397b1eac0..cd9e7fb04f16 100644
--- a/lib/Target/AMDGPU/GCNHazardRecognizer.cpp
+++ b/lib/Target/AMDGPU/GCNHazardRecognizer.cpp
@@ -218,17 +218,12 @@ void GCNHazardRecognizer::RecedeCycle() {
 
 int GCNHazardRecognizer::getWaitStatesSince(
     function_ref<bool(MachineInstr *)> IsHazard) {
-  int WaitStates = 0;
+  int WaitStates = -1;
   for (MachineInstr *MI : EmittedInstrs) {
-    if (MI) {
-      if (IsHazard(MI))
-        return WaitStates;
-
-      unsigned Opcode = MI->getOpcode();
-      if (Opcode == AMDGPU::DBG_VALUE || Opcode == AMDGPU::IMPLICIT_DEF)
-        continue;
-    }
     ++WaitStates;
+    if (!MI || !IsHazard(MI))
+      continue;
+    return WaitStates;
   }
   return std::numeric_limits<int>::max();
 }