[PATCH] D31030: [AMDGPU] Fix bug in S_MOVREL check (PR32248)

Simon Pilgrim via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Thu Mar 16 06:52:41 PDT 2017


RKSimon created this revision.
Herald added subscribers: tpr, dstuttard, tony-tye, yaxunl, nhaehnle, wdng, kzhuravl.

https://bugs.llvm.org/show_bug.cgi?id=32248

Fix the isSMovRel check to correctly test for an opcode instead of using the opcode directly as a condition - resulting in an always true result.


Repository:
  rL LLVM

https://reviews.llvm.org/D31030

Files:
  lib/Target/AMDGPU/GCNHazardRecognizer.cpp
  test/CodeGen/AMDGPU/inserted-wait-states.mir


Index: test/CodeGen/AMDGPU/inserted-wait-states.mir
===================================================================
--- test/CodeGen/AMDGPU/inserted-wait-states.mir
+++ test/CodeGen/AMDGPU/inserted-wait-states.mir
@@ -453,22 +453,18 @@
 
 # GCN-LABEL: bb.0:
 # GCN: S_MOV_B32
-# GFX9: S_NOP
 # GCN-NEXT: V_INTERP_P1_F32
 
 # GCN-LABEL: bb.1:
 # GCN: S_MOV_B32
-# GFX9: S_NOP
 # GCN-NEXT: V_INTERP_P2_F32
 
 # GCN-LABEL: bb.2:
 # GCN: S_MOV_B32
-# GFX9: S_NOP
 # GCN-NEXT: V_INTERP_P1_F32_16bank
 
 # GCN-LABEL: bb.3:
 # GCN: S_MOV_B32
-# GFX9: S_NOP
 # GCN-NEXT: V_INTERP_MOV_F32
 
 name: v_interp
Index: lib/Target/AMDGPU/GCNHazardRecognizer.cpp
===================================================================
--- lib/Target/AMDGPU/GCNHazardRecognizer.cpp
+++ lib/Target/AMDGPU/GCNHazardRecognizer.cpp
@@ -72,8 +72,8 @@
 }
 
 static bool isSMovRel(unsigned Opcode) {
-  return Opcode == AMDGPU::S_MOVRELS_B32 || AMDGPU::S_MOVRELS_B64 ||
-         Opcode == AMDGPU::S_MOVRELD_B32 || AMDGPU::S_MOVRELD_B64;
+  return Opcode == AMDGPU::S_MOVRELS_B32 || Opcode == AMDGPU::S_MOVRELS_B64 ||
+         Opcode == AMDGPU::S_MOVRELD_B32 || Opcode == AMDGPU::S_MOVRELD_B64;
 }
 
 static bool isVInterp(unsigned Opcode) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D31030.91996.patch
Type: text/x-patch
Size: 1251 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170316/53f9bda3/attachment.bin>


More information about the llvm-commits mailing list