Skip to content

[MachineLICM] Don't allow hoisting invariant loads across mem barrier… #9798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[MachineLICM] Don't allow hoisting invariant loads across mem barrier… #9798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion llvm/lib/CodeGen/MachineLICM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1474,7 +1474,7 @@ void MachineLICMBase::InitializeLoadsHoistableLoops() {
if (!AllowedToHoistLoads[Loop])
continue;
for (auto &MI : *MBB) {
if (!MI.mayStore() && !MI.isCall() &&
if (!MI.isLoadFoldBarrier() && !MI.mayStore() && !MI.isCall() &&
!(MI.mayLoad() && MI.hasOrderedMemoryRef()))
continue;
for (MachineLoop *L = Loop; L != nullptr; L = L->getParentLoop())
Expand Down
29 changes: 29 additions & 0 deletions llvm/test/CodeGen/AArch64/machine-licm-hoist-load.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,35 @@ for.exit: ; preds = %for.body
ret i64 %spec.select
}

@a = external local_unnamed_addr global i32, align 4

; Make sure the load is not hoisted out of the loop across memory barriers.
define i32 @load_between_memory_barriers() {
; CHECK-LABEL: load_between_memory_barriers:
; CHECK: // %bb.0:
; CHECK-NEXT: adrp x8, :got:a
; CHECK-NEXT: ldr x8, [x8, :got_lo12:a]
; CHECK-NEXT: .LBB8_1: // %loop
; CHECK-NEXT: // =>This Inner Loop Header: Depth=1
; CHECK-NEXT: //MEMBARRIER
; CHECK-NEXT: ldr w0, [x8]
; CHECK-NEXT: //MEMBARRIER
; CHECK-NEXT: cbz w0, .LBB8_1
; CHECK-NEXT: // %bb.2: // %exit
; CHECK-NEXT: ret
br label %loop

loop:
fence syncscope("singlethread") acq_rel
%l = load i32, ptr @a, align 4
fence syncscope("singlethread") acq_rel
%c = icmp eq i32 %l, 0
br i1 %c, label %loop, label %exit

exit:
ret i32 %l
}

declare i32 @bcmp(ptr, ptr, i64)
declare i32 @memcmp(ptr, ptr, i64)
declare void @func()
4 changes: 2 additions & 2 deletions llvm/test/CodeGen/Mips/lcb5.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ if.end: ; preds = %if.then, %entry
}

; ci: .ent z3
; ci: bteqz $BB6_3
; ci: bteqz $BB6_2
; ci: .end z3

; Function Attrs: nounwind optsize
Expand All @@ -210,7 +210,7 @@ if.end: ; preds = %if.then, %entry

; ci: .ent z4
; ci: btnez $BB7_1 # 16 bit inst
; ci: jal $BB7_3 # branch
; ci: jal $BB7_2 # branch
; ci: nop
; ci: $BB7_1:
; ci: .p2align 2
Expand Down