[llvm-commits] [llvm] r139495 - in /llvm/trunk: lib/Target/XCore/XCoreISelDAGToDAG.cpp test/CodeGen/XCore/licm-ldwcp.ll

[Richard Osborne]

Author: friedgold
Date: Mon Sep 12 09:43:23 2011
New Revision: 139495

URL: http://llvm.org/viewvc/llvm-project?rev=139495&view=rev
Log:
Associate a MemOperand with LDWCP nodes introduced during ISel.

This information is required if we want LDWCP to be hoisted out of loops.

Added:
    llvm/trunk/test/CodeGen/XCore/licm-ldwcp.ll
Modified:
    llvm/trunk/lib/Target/XCore/XCoreISelDAGToDAG.cpp

Modified: llvm/trunk/lib/Target/XCore/XCoreISelDAGToDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/XCore/XCoreISelDAGToDAG.cpp?rev=139495&r1=139494&r2=139495&view=diff
==============================================================================
--- llvm/trunk/lib/Target/XCore/XCoreISelDAGToDAG.cpp (original)
+++ llvm/trunk/lib/Target/XCore/XCoreISelDAGToDAG.cpp Mon Sep 12 09:43:23 2011
@@ -169,9 +169,14 @@
         CurDAG->getTargetConstantPool(ConstantInt::get(
                               Type::getInt32Ty(*CurDAG->getContext()), Val),
                                       TLI.getPointerTy());
-      return CurDAG->getMachineNode(XCore::LDWCP_lru6, dl, MVT::i32, 
-                                    MVT::Other, CPIdx, 
-                                    CurDAG->getEntryNode());
+      SDNode *node = CurDAG->getMachineNode(XCore::LDWCP_lru6, dl, MVT::i32,
+                                            MVT::Other, CPIdx,
+                                            CurDAG->getEntryNode());
+      MachineSDNode::mmo_iterator MemOp = MF->allocateMemRefsArray(1);
+      MemOp[0] = MF->getMachineMemOperand(
+        MachinePointerInfo::getConstantPool(), MachineMemOperand::MOLoad, 4, 4);      
+      cast<MachineSDNode>(node)->setMemRefs(MemOp, MemOp + 1);
+      return node;
     }
     break;
   }

Added: llvm/trunk/test/CodeGen/XCore/licm-ldwcp.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/XCore/licm-ldwcp.ll?rev=139495&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/XCore/licm-ldwcp.ll (added)
+++ llvm/trunk/test/CodeGen/XCore/licm-ldwcp.ll Mon Sep 12 09:43:23 2011
@@ -0,0 +1,18 @@
+; RUN: llc < %s -march=xcore -asm-verbose=0 | FileCheck %s
+
+; MachineLICM should hoist the LDWCP out of the loop.
+
+; CHECK: f:
+; CHECK-NEXT: ldw [[REG:r[0-9]+]], cp[.LCPI0_0]
+; CHECK-NEXT: .LBB0_1:
+; CHECK-NEXT: stw [[REG]], r0[0]
+; CHECK-NEXT: bu .LBB0_1
+
+define void @f(i32* nocapture %p) noreturn nounwind {
+entry:
+  br label %bb
+
+bb:                                               ; preds = %bb, %entry
+  volatile store i32 525509670, i32* %p, align 4
+  br label %bb
+}