[llvm-commits] [llvm] r147024 - in /llvm/trunk: lib/Target/Mips/MipsInstrInfo.td test/CodeGen/Mips/swzero.ll

[Akira Hatanaka]

Author: ahatanak
Date: Tue Dec 20 18:31:10 2011
New Revision: 147024

URL: http://llvm.org/viewvc/llvm-project?rev=147024&view=rev
Log:
Fix bug in zero-store peephole pattern reported in pr11615.

The patch and test case were originally written by Mans Rullgard.


Added:
    llvm/trunk/test/CodeGen/Mips/swzero.ll
Modified:
    llvm/trunk/lib/Target/Mips/MipsInstrInfo.td

Modified: llvm/trunk/lib/Target/Mips/MipsInstrInfo.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsInstrInfo.td?rev=147024&r1=147023&r2=147024&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsInstrInfo.td (original)
+++ llvm/trunk/lib/Target/Mips/MipsInstrInfo.td Tue Dec 20 18:31:10 2011
@@ -1022,10 +1022,14 @@
 }
 
 // peepholes
-def : Pat<(store (i32 0), addr:$dst), (SW ZERO, addr:$dst)>,
-      Requires<[NotN64]>;
-def : Pat<(store (i32 0), addr:$dst), (SW_P8 ZERO, addr:$dst)>,
-      Requires<[IsN64]>;
+let Predicates = [NotN64] in {
+  def : Pat<(store_a (i32 0), addr:$dst), (SW ZERO, addr:$dst)>;
+  def : Pat<(store_u (i32 0), addr:$dst), (USW ZERO, addr:$dst)>;
+}
+let Predicates = [IsN64] in {
+  def : Pat<(store_a (i32 0), addr:$dst), (SW_P8 ZERO, addr:$dst)>;
+  def : Pat<(store_u (i32 0), addr:$dst), (USW_P8 ZERO, addr:$dst)>;
+}
 
 // brcond patterns
 multiclass BrcondPats<RegisterClass RC, Instruction BEQOp, Instruction BNEOp,

Added: llvm/trunk/test/CodeGen/Mips/swzero.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/swzero.ll?rev=147024&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/Mips/swzero.ll (added)
+++ llvm/trunk/test/CodeGen/Mips/swzero.ll Tue Dec 20 18:31:10 2011
@@ -0,0 +1,19 @@
+; RUN: llc -march=mipsel < %s | FileCheck %s
+
+%struct.unaligned = type <{ i32 }>
+
+define void @zero_u(%struct.unaligned* nocapture %p) nounwind {
+entry:
+; CHECK: usw $zero
+  %x = getelementptr inbounds %struct.unaligned* %p, i32 0, i32 0
+  store i32 0, i32* %x, align 1
+  ret void
+}
+
+define void @zero_a(i32* nocapture %p) nounwind {
+entry:
+; CHECK: sw $zero
+  store i32 0, i32* %p, align 4
+  ret void
+}
+