Skip to content

[AArch64][FastISel] Fallback on atomic stlr/cas with non-reg operands. #133987

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.

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 12 additions & 6 deletions llvm/lib/Target/AArch64/AArch64FastISel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2190,6 +2190,8 @@ bool AArch64FastISel::selectStore(const Instruction *I) {
if (isReleaseOrStronger(Ord)) {
// The STLR addressing mode only supports a base reg; pass that directly.
Register AddrReg = getRegForValue(PtrV);
if (!AddrReg)
return false;
return emitStoreRelease(VT, SrcReg, AddrReg,
createMachineMemOperandFor(I));
}
Expand Down Expand Up @@ -5070,12 +5072,16 @@ bool AArch64FastISel::selectAtomicCmpXchg(const AtomicCmpXchgInst *I) {

const MCInstrDesc &II = TII.get(Opc);

const Register AddrReg = constrainOperandRegClass(
II, getRegForValue(I->getPointerOperand()), II.getNumDefs());
const Register DesiredReg = constrainOperandRegClass(
II, getRegForValue(I->getCompareOperand()), II.getNumDefs() + 1);
const Register NewReg = constrainOperandRegClass(
II, getRegForValue(I->getNewValOperand()), II.getNumDefs() + 2);
Register AddrReg = getRegForValue(I->getPointerOperand());
Register DesiredReg = getRegForValue(I->getCompareOperand());
Register NewReg = getRegForValue(I->getNewValOperand());

if (!AddrReg || !DesiredReg || !NewReg)
return false;

AddrReg = constrainOperandRegClass(II, AddrReg, II.getNumDefs());
DesiredReg = constrainOperandRegClass(II, DesiredReg, II.getNumDefs() + 1);
NewReg = constrainOperandRegClass(II, NewReg, II.getNumDefs() + 2);

const Register ResultReg1 = createResultReg(ResRC);
const Register ResultReg2 = createResultReg(&AArch64::GPR32RegClass);
Expand Down
50 changes: 50 additions & 0 deletions llvm/test/CodeGen/AArch64/fast-isel-atomic-fallback.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
; RUN: llc -mtriple=arm64_32-apple-darwin -O0 -fast-isel -verify-machineinstrs \
; RUN: -aarch64-enable-atomic-cfg-tidy=0 -aarch64-enable-collect-loh=0 \
; RUN: < %s | FileCheck %s

; FastISel doesn't support cstexprs as operands here, but make
; sure it knows to fallback, at least.

define void @atomic_store_cstexpr_addr(i32 %val) #0 {
; CHECK-LABEL: atomic_store_cstexpr_addr:
; CHECK: ; %bb.0:
; CHECK-NEXT: adrp x8, _g@PAGE
; CHECK-NEXT: add x8, x8, _g@PAGEOFF
; CHECK-NEXT: ; kill: def $w1 killed $w8 killed $x8
; CHECK-NEXT: adrp x8, _g@PAGE
; CHECK-NEXT: add x8, x8, _g@PAGEOFF
; CHECK-NEXT: stlr w0, [x8]
; CHECK-NEXT: ret
store atomic i32 %val, ptr inttoptr (i32 ptrtoint (ptr @g to i32) to ptr) release, align 4
ret void
}

define i32 @cmpxchg_cstexpr_addr(i32 %cmp, i32 %new, ptr %ps) #0 {
; CHECK-LABEL: cmpxchg_cstexpr_addr:
; CHECK: ; %bb.0:
; CHECK-NEXT: mov w8, w0
; CHECK-NEXT: adrp x10, _g@PAGE
; CHECK-NEXT: add x10, x10, _g@PAGEOFF
; CHECK-NEXT: LBB1_1: ; =>This Inner Loop Header: Depth=1
; CHECK-NEXT: ldaxr w0, [x10]
; CHECK-NEXT: cmp w0, w8
; CHECK-NEXT: b.ne LBB1_3
; CHECK-NEXT: ; %bb.2: ; in Loop: Header=BB1_1 Depth=1
; CHECK-NEXT: stlxr w9, w1, [x10]
; CHECK-NEXT: cbnz w9, LBB1_1
; CHECK-NEXT: LBB1_3:
; CHECK-NEXT: subs w8, w0, w8
; CHECK-NEXT: cset w8, eq
; CHECK-NEXT: ; kill: def $w1 killed $w8
; CHECK-NEXT: str w8, [x2]
; CHECK-NEXT: ret
%tmp0 = cmpxchg ptr inttoptr (i32 ptrtoint (ptr @g to i32) to ptr), i32 %cmp, i32 %new seq_cst seq_cst
%tmp1 = extractvalue { i32, i1 } %tmp0, 0
%tmp2 = extractvalue { i32, i1 } %tmp0, 1
%tmp3 = zext i1 %tmp2 to i32
store i32 %tmp3, ptr %ps
ret i32 %tmp1
}

@g = global i32 0
Loading