[llvm] 8549087 - AMDGPU: Skip all meta instructions in hazard recognizer

[Matt Arsenault via llvm-commits]

Author: Matt Arsenault
Date: 2020-09-09T19:45:40-04:00
New Revision: 85490874b23ba1337210dbcb700b258ffb751b78

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

LOG: AMDGPU: Skip all meta instructions in hazard recognizer

This was not adding a necessary nop due to thinking the kill counted.

Added: 
    llvm/test/CodeGen/AMDGPU/hazard-recognizer-meta-insts.mir

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

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/AMDGPU/GCNHazardRecognizer.cpp b/llvm/lib/Target/AMDGPU/GCNHazardRecognizer.cpp
index d897127812b9..67db397b19f6 100644
--- a/llvm/lib/Target/AMDGPU/GCNHazardRecognizer.cpp
+++ b/llvm/lib/Target/AMDGPU/GCNHazardRecognizer.cpp
@@ -368,7 +368,7 @@ static int getWaitStatesSince(GCNHazardRecognizer::IsHazardFn IsHazard,
     if (IsHazard(&*I))
       return WaitStates;
 
-    if (I->isInlineAsm() || I->isImplicitDef() || I->isDebugInstr())
+    if (I->isInlineAsm() || I->isMetaInstruction())
       continue;
 
     WaitStates += SIInstrInfo::getNumWaitStates(*I);

diff  --git a/llvm/test/CodeGen/AMDGPU/hazard-recognizer-meta-insts.mir b/llvm/test/CodeGen/AMDGPU/hazard-recognizer-meta-insts.mir
new file mode 100644
index 000000000000..e59db4fead3d
--- /dev/null
+++ b/llvm/test/CodeGen/AMDGPU/hazard-recognizer-meta-insts.mir
@@ -0,0 +1,41 @@
+# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
+# RUN: llc -march=amdgcn -mcpu=gfx906 -run-pass=post-RA-hazard-rec -o - %s | FileCheck -check-prefix=GFX9 %s
+
+# Make sure the kill is skipped for hazard purposes, so the nop is
+# correctly inserted.
+
+---
+
+name: global_store_dwordx4_data_hazard_kill
+
+body:             |
+  bb.0:
+    liveins: $vgpr0_vgpr1, $vgpr2_vgpr3_vgpr4_vgpr5
+    ; GFX9-LABEL: name: global_store_dwordx4_data_hazard_kill
+    ; GFX9: GLOBAL_STORE_DWORDX4 $vgpr0_vgpr1, $vgpr2_vgpr3_vgpr4_vgpr5, 0, 0, 0, 0, implicit $exec
+    ; GFX9: $vgpr2 = KILL
+    ; GFX9: S_NOP 0
+    ; GFX9: $vgpr2 = V_MOV_B32_e32 0, implicit $exec
+    GLOBAL_STORE_DWORDX4 $vgpr0_vgpr1, $vgpr2_vgpr3_vgpr4_vgpr5, 0, 0, 0, 0, implicit $exec
+    $vgpr2 = KILL
+    $vgpr2 = V_MOV_B32_e32 0, implicit $exec
+
+...
+
+---
+
+name: global_store_dwordx3_data_hazard_kill
+
+body:             |
+  bb.0:
+    liveins: $vgpr0_vgpr1, $vgpr2_vgpr3_vgpr4
+    ; GFX9-LABEL: name: global_store_dwordx3_data_hazard_kill
+    ; GFX9: GLOBAL_STORE_DWORDX3 $vgpr0_vgpr1, $vgpr2_vgpr3_vgpr4, 0, 0, 0, 0, implicit $exec
+    ; GFX9: $vgpr2 = KILL
+    ; GFX9: S_NOP 0
+    ; GFX9: $vgpr2 = V_MOV_B32_e32 0, implicit $exec
+    GLOBAL_STORE_DWORDX3 $vgpr0_vgpr1, $vgpr2_vgpr3_vgpr4, 0, 0, 0, 0, implicit $exec
+    $vgpr2 = KILL
+    $vgpr2 = V_MOV_B32_e32 0, implicit $exec
+
+...