Index: lib/Target/AMDGPU/SIInstrInfo.cpp
===================================================================
--- lib/Target/AMDGPU/SIInstrInfo.cpp
+++ lib/Target/AMDGPU/SIInstrInfo.cpp
@@ -3617,13 +3617,13 @@
 bool SIInstrInfo::isLowLatencyInstruction(const MachineInstr &MI) const {
   unsigned Opc = MI.getOpcode();
 
-  return isSMRD(Opc);
+  return isSMRD(Opc) || isDS(Opc);
 }
 
 bool SIInstrInfo::isHighLatencyInstruction(const MachineInstr &MI) const {
   unsigned Opc = MI.getOpcode();
 
-  return isMUBUF(Opc) || isMTBUF(Opc) || isMIMG(Opc);
+  return isMUBUF(Opc) || isMTBUF(Opc) || isMIMG(Opc) || isFLAT(Opc);
 }
 
 unsigned SIInstrInfo::isStackAccess(const MachineInstr &MI,