[llvm] r257253 - [BranchFolding] Set correct mem refs

[Michael Zolotukhin via llvm-commits]

Hi,

This commit breaks buildbots (see e.g. http://lab.llvm.org:8080/green/job/clang-stage2-cmake-RgSan_check/1053/console <http://lab.llvm.org:8080/green/job/clang-stage2-cmake-RgSan_check/1053/console>), could you please revert and recommit when the issue is fixed?

Thanks,
Michael

> On Jan 8, 2016, at 11:30 PM, Junmo Park via llvm-commits <llvm-commits at lists.llvm.org> wrote:
> 
> Author: flyingforyou
> Date: Sat Jan  9 01:30:13 2016
> New Revision: 257253
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=257253&view=rev
> Log:
> [BranchFolding] Set correct mem refs
> 
> Merge MBBICommon and MBBI's MMOs.
> 
> Differential Revision: http://reviews.llvm.org/D15990
> 
> Added:
>    llvm/trunk/test/CodeGen/AArch64/branch-folder-merge-mmos.ll
> Modified:
>    llvm/trunk/lib/CodeGen/BranchFolding.cpp
> 
> Modified: llvm/trunk/lib/CodeGen/BranchFolding.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/BranchFolding.cpp?rev=257253&r1=257252&r2=257253&view=diff
> ==============================================================================
> --- llvm/trunk/lib/CodeGen/BranchFolding.cpp (original)
> +++ llvm/trunk/lib/CodeGen/BranchFolding.cpp Sat Jan  9 01:30:13 2016
> @@ -780,7 +780,7 @@ removeMMOsFromMemoryOperations(MachineBa
>     assert(MBBICommon->isIdenticalTo(&*MBBI) && "Expected matching MIIs!");
> 
>     if (MBBICommon->mayLoad() || MBBICommon->mayStore())
> -      MBBICommon->setMemRefs(MBBI->mergeMemRefsWith(*MBBI));
> +      MBBICommon->setMemRefs(MBBICommon->mergeMemRefsWith(*MBBI));
> 
>     ++MBBI;
>     ++MBBICommon;
> 
> Added: llvm/trunk/test/CodeGen/AArch64/branch-folder-merge-mmos.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AArch64/branch-folder-merge-mmos.ll?rev=257253&view=auto
> ==============================================================================
> --- llvm/trunk/test/CodeGen/AArch64/branch-folder-merge-mmos.ll (added)
> +++ llvm/trunk/test/CodeGen/AArch64/branch-folder-merge-mmos.ll Sat Jan  9 01:30:13 2016
> @@ -0,0 +1,53 @@
> +; RUN: opt < %s -O3 | llc -march=aarch64 -mtriple=aarch64-none-linux-gnu -stop-after branch-folder -o /dev/null | FileCheck %s
> +target datalayout = "e-m:e-i64:64-i128:128-n32:64-S128"
> +
> +; Function Attrs: nounwind
> +define void @test(float* %test_arr) #0 {
> +entry:
> +  %test_arr.addr = alloca float*, align 8
> +  store float* %test_arr, float** %test_arr.addr, align 8
> +  %0 = load float*, float** %test_arr.addr, align 8
> +  %arrayidx = getelementptr inbounds float, float* %0, i64 0
> +  %1 = load float, float* %arrayidx, align 4
> +  %2 = load float*, float** %test_arr.addr, align 8
> +  %arrayidx1 = getelementptr inbounds float, float* %2, i64 1
> +  %3 = load float, float* %arrayidx1, align 4
> +  %sub = fsub float %1, %3
> +  %4 = load float*, float** %test_arr.addr, align 8
> +  %arrayidx2 = getelementptr inbounds float, float* %4, i64 0
> +  store float %sub, float* %arrayidx2, align 4
> +  ret void
> +}
> +
> +; Function Attrs: nounwind
> +define void @foo(i32 %a, i32 %b, float* %foo_arr) #0 {
> +; CHECK: (load 4 from %ir.arrayidx1.i2), (load 4 from %ir.arrayidx1.i)
> +entry:
> +  %a.addr = alloca i32, align 4
> +  %b.addr = alloca i32, align 4
> +  %foo_arr.addr = alloca float*, align 8
> +  store i32 %a, i32* %a.addr, align 4
> +  store i32 %b, i32* %b.addr, align 4
> +  store float* %foo_arr, float** %foo_arr.addr, align 8
> +  %0 = load i32, i32* %a.addr, align 4
> +  %cmp = icmp sgt i32 %0, 0
> +  br i1 %cmp, label %if.then, label %if.end
> +
> +if.then:                                          ; preds = %entry
> +  %1 = load float*, float** %foo_arr.addr, align 8
> +  call void @test(float* %1)
> +  br label %if.end3
> +
> +if.end:                                           ; preds = %entry
> +  %2 = load i32, i32* %b.addr, align 4
> +  %cmp1 = icmp sgt i32 %2, 0
> +  br i1 %cmp1, label %if.then2, label %if.end3
> +
> +if.then2:                                         ; preds = %if.end
> +  %3 = load float*, float** %foo_arr.addr, align 8
> +  call void @test(float* %3)
> +  br label %if.end3
> +
> +if.end3:                                          ; preds = %if.then, %if.then2, %if.end
> +  ret void
> +}
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160109/87d68e21/attachment.html>