maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[BranchFolding] Set correct mem refs (2nd try) 

This is a recommit of r257253 which was reverted in r257270.
Previous testcase can make failure on some targets due to using opt with O3 option.

Original Summary:
Merge MBBICommon and MBBI's MMOs.

Differential Revision: http://reviews.llvm.org/D15990

llvm-svn: 257317
This commit is contained in:
Junmo Park 2016-01-11 07:15:38 +00:00
parent 4439631009
commit 7ceec0b82f
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/lib/CodeGen/BranchFolding.cpp
View File

@ -780,7 +780,7 @@ removeMMOsFromMemoryOperations(MachineBasicBlock::iterator MBBIStartPos,
assert(MBBICommon->isIdenticalTo(&*MBBI) && "Expected matching MIIs!");
if (MBBICommon->mayLoad() || MBBICommon->mayStore())
MBBICommon->setMemRefs(MBBI->mergeMemRefsWith(*MBBI));
MBBICommon->setMemRefs(MBBICommon->mergeMemRefsWith(*MBBI));
++MBBI;
++MBBICommon;

33
llvm/test/CodeGen/AArch64/branch-folder-merge-mmos.ll Normal file
View File

@ -0,0 +1,33 @@
; RUN: llc -march=aarch64 -mtriple=aarch64-none-linux-gnu -stop-after branch-folder -o /dev/null < %s | FileCheck %s
target datalayout = "e-m:e-i64:64-i128:128-n32:64-S128"
; Function Attrs: norecurse nounwind
define void @foo(i32 %a, i32 %b, float* nocapture %foo_arr) #0 {
; CHECK: (load 4 from %ir.arrayidx1.{{i[1-2]}}), (load 4 from %ir.arrayidx1.{{i[1-2]}})
entry:
%cmp = icmp sgt i32 %a, 0
br i1 %cmp, label %if.then, label %if.end
if.then: ; preds = %entry
%0 = load float, float* %foo_arr, align 4
%arrayidx1.i1 = getelementptr inbounds float, float* %foo_arr, i64 1
%1 = load float, float* %arrayidx1.i1, align 4
%sub.i = fsub float %0, %1
store float %sub.i, float* %foo_arr, align 4
br label %if.end3
if.end: ; preds = %entry
%cmp1 = icmp sgt i32 %b, 0
br i1 %cmp1, label %if.then2, label %if.end3
if.then2: ; preds = %if.end
%2 = load float, float* %foo_arr, align 4
%arrayidx1.i2 = getelementptr inbounds float, float* %foo_arr, i64 1
%3 = load float, float* %arrayidx1.i2, align 4
%sub.i3 = fsub float %2, %3
store float %sub.i3, float* %foo_arr, align 4
br label %if.end3
if.end3: ; preds = %if.then2, %if.end, %if.then
ret void
}