[PATCH] D46324: [BranchFolding] Allow hoisting to block with a single conditional branch.

Geoff Berry via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Mon May 14 10:37:32 PDT 2018


This revision was automatically updated to reflect the committed changes.
Closed by commit rL332265: [BranchFolding] Allow hoisting to block with a single conditional branch. (authored by gberry, committed by ).

Repository:
  rL LLVM

https://reviews.llvm.org/D46324

Files:
  llvm/trunk/lib/CodeGen/BranchFolding.cpp
  llvm/trunk/test/CodeGen/AArch64/branch-folder-oneinst.mir


Index: llvm/trunk/test/CodeGen/AArch64/branch-folder-oneinst.mir
===================================================================
--- llvm/trunk/test/CodeGen/AArch64/branch-folder-oneinst.mir
+++ llvm/trunk/test/CodeGen/AArch64/branch-folder-oneinst.mir
@@ -0,0 +1,29 @@
+# RUN: llc -o - %s -mtriple=aarch64 -run-pass branch-folder | FileCheck %s
+# Check that BranchFolding pass is able to hoist a common instruction into a block with a single branch instruction.
+name: func
+tracksRegLiveness: true
+body: |
+  bb.0:
+    ; CHECK-LABEL: name: func
+    ; CHECK-LABEL: bb.0:
+    ; CHECK: $x0 = ADDXri $x0, 1, 0
+    ; CHECK: CBZX $x1, %bb.2
+    liveins: $x1
+    CBZX $x1, %bb.2
+
+  bb.1:
+    ; CHECK-LABEL: bb.1:
+    ; CHECK-NOT: $x0 = ADDXri $x0, 1, 0
+    liveins: $x0
+    $x0 = ADDXri $x0, 1, 0
+    $x0 = ADDXri $x0, 2, 0
+    RET_ReallyLR implicit $x0
+
+  bb.2:
+    ; CHECK-LABEL: bb.2:
+    ; CHECK-NOT: $x0 = ADDXri $x0, 1, 0
+    liveins: $x0
+    $x0 = ADDXri $x0, 1, 0
+    $x0 = ADDXri $x0, 3, 0
+    RET_ReallyLR implicit $x0
+...
Index: llvm/trunk/lib/CodeGen/BranchFolding.cpp
===================================================================
--- llvm/trunk/lib/CodeGen/BranchFolding.cpp
+++ llvm/trunk/lib/CodeGen/BranchFolding.cpp
@@ -1915,8 +1915,12 @@
 
   if (Uses.empty())
     return Loc;
+  // If the terminator is the only instruction in the block and Uses is not
+  // empty (or we would have returned above), we can still safely hoist
+  // instructions just before the terminator as long as the Defs/Uses are not
+  // violated (which is checked in HoistCommonCodeInSuccs).
   if (Loc == MBB->begin())
-    return MBB->end();
+    return Loc;
 
   // The terminator is probably a conditional branch, try not to separate the
   // branch from condition setting instruction.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D46324.146640.patch
Type: text/x-patch
Size: 1815 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180514/1618a0c0/attachment.bin>


More information about the llvm-commits mailing list