From b34136ea8537ea422babb1dfdc75f2a95273333e Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Wed, 27 Sep 2017 18:06:46 +0000
Subject: Revert "Merging r312337:"

This reverts commit r314324.

I unintentionally deleted most of the svn:mergeinfo for the release_50
branch with this commit.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_50@314326 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Target/AMDGPU/GCNHazardRecognizer.cpp | 13 ++++---------
 test/CodeGen/AMDGPU/hazard.mir            | 31 -------------------------------
 2 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 test/CodeGen/AMDGPU/hazard.mir

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();
 }
diff --git a/test/CodeGen/AMDGPU/hazard.mir b/test/CodeGen/AMDGPU/hazard.mir
deleted file mode 100644
index d495a327e9e3..000000000000
--- a/test/CodeGen/AMDGPU/hazard.mir
+++ /dev/null
@@ -1,31 +0,0 @@
-# RUN: llc -march=amdgcn -mcpu=tonga -verify-machineinstrs -run-pass post-RA-hazard-rec %s -o - | FileCheck -check-prefix=GCN -check-prefix=VI %s
-# RUN: llc -march=amdgcn -mcpu=gfx900 -verify-machineinstrs -run-pass post-RA-hazard-rec %s -o - | FileCheck -check-prefix=GCN -check-prefix=GFX9 %s
-
-# GCN:    bb.0.entry:
-# GCN:      %m0 = S_MOV_B32
-# GFX9:     S_NOP 0
-# VI-NOT:   S_NOP_0
-# GCN:      V_INTERP_P1_F32
-
----
-name:            hazard_implicit_def
-alignment:       0
-exposesReturnsTwice: false
-legalized:       false
-regBankSelected: false
-selected:        false
-tracksRegLiveness: true
-registers:
-liveins:
-  - { reg: '%sgpr7', virtual-reg: '' }
-  - { reg: '%vgpr4', virtual-reg: '' }
-body:             |
-  bb.0.entry:
-    liveins: %sgpr7, %vgpr4
-
-    %m0 = S_MOV_B32 killed %sgpr7
-    %vgpr5 = IMPLICIT_DEF
-    %vgpr0 = V_INTERP_P1_F32 killed %vgpr4, 0, 0, implicit %m0, implicit %exec
-    SI_RETURN_TO_EPILOG killed %vgpr5, killed %vgpr0
-
-...
-- 
cgit v1.2.3