[PATCH] D18181: [mips][microMIPS] Delay slot filler modifications

[Hrvoje Varga via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL264147: [mips][microMIPS] Delay slot filler modifications (authored by hvarga).

Changed prior to commit:
  http://reviews.llvm.org/D18181?vs=50716&id=51396#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D18181

Files:
  llvm/trunk/lib/Target/Mips/MipsDelaySlotFiller.cpp
  llvm/trunk/test/CodeGen/Mips/micromips-delay-slot.ll

Index: llvm/trunk/test/CodeGen/Mips/micromips-delay-slot.ll
===================================================================
--- llvm/trunk/test/CodeGen/Mips/micromips-delay-slot.ll
+++ llvm/trunk/test/CodeGen/Mips/micromips-delay-slot.ll
@@ -1,5 +1,7 @@
 ; RUN: llc -march=mipsel -mcpu=mips32r2 -mattr=+micromips \
 ; RUN:   -relocation-model=static -O2 < %s | FileCheck %s
+; RUN: llc -march=mipsel -mcpu=mips32r6 -mattr=+micromips \
+; RUN:   -relocation-model=static -O2 < %s | FileCheck %s -check-prefix=CHECK-MMR6
 
 ; Function Attrs: nounwind
 define i32 @foo(i32 signext %a) #0 {
@@ -16,3 +18,5 @@
 
 ; CHECK:      jals
 ; CHECK-NEXT: sll16
+; CHECK-MMR6: jal
+; CHECK-MMR6-NOT: sll16
Index: llvm/trunk/lib/Target/Mips/MipsDelaySlotFiller.cpp
===================================================================
--- llvm/trunk/lib/Target/Mips/MipsDelaySlotFiller.cpp
+++ llvm/trunk/lib/Target/Mips/MipsDelaySlotFiller.cpp
@@ -562,6 +562,12 @@
   bool InMicroMipsMode = STI.inMicroMipsMode();
   const MipsInstrInfo *TII = STI.getInstrInfo();
 
+  if (InMicroMipsMode && STI.hasMips32r6()) {
+    // This is microMIPS32r6 or microMIPS64r6 processor. Delay slot for
+    // branching instructions is not needed.
+    return Changed;
+  }
+
   for (Iter I = MBB.begin(); I != MBB.end(); ++I) {
     if (!hasUnoccupiedSlot(&*I))
       continue;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D18181.51396.patch
Type: text/x-patch
Size: 1352 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160323/cc4bab95/attachment.bin>