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

[AtomicExpand] Allow libcall expansion for non-zero address spaces (try 2) 

Restore a reverted commit, with the silly mistake fixed.  Sorry for the previous breakage.  

Be consistent about how we treat atomics in non-zero address spaces.  If we get to the backend, we tend to lower them as if in address space 0.  Do the same if we need to insert a libcall instead.

Differential Revision: https://reviews.llvm.org/D58760

llvm-svn: 355540
This commit is contained in:
Philip Reames 2019-03-06 19:27:13 +00:00
parent eacde7d2b0
commit 9549f7560f
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
llvm/lib/CodeGen/AtomicExpandPass.cpp
View File

@ -1691,8 +1691,14 @@ bool AtomicExpand::expandAtomicOpToLibcall(
}
// 'ptr' argument.
Value *PtrVal =
Builder.CreateBitCast(PointerOperand, Type::getInt8PtrTy(Ctx));
// note: This assumes all address spaces share a common libfunc
// implementation and that addresses are convertable. For systems without
// that property, we'd need to extend this mechanism to support AS-specific
// families of atomic intrinsics.
auto PtrTypeAS = PointerOperand->getType()->getPointerAddressSpace();
Value *PtrVal = Builder.CreateBitCast(PointerOperand,
Type::getInt8PtrTy(Ctx, PtrTypeAS));
PtrVal = Builder.CreateAddrSpaceCast(PtrVal, Type::getInt8PtrTy(Ctx));
Args.push_back(PtrVal);
// 'expected' argument, if present.

34
llvm/test/Transforms/AtomicExpand/X86/expand-atomic-libcall.ll Normal file
View File

@ -0,0 +1,34 @@
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
; RUN: opt -S -mtriple=i686-linux-gnu -atomic-expand %s | FileCheck %s
define i256 @atomic_load256_libcall(i256* %ptr) nounwind {
; CHECK-LABEL: @atomic_load256_libcall(
; CHECK-NEXT: [[TMP1:%.*]] = bitcast i256* [[PTR:%.*]] to i8*
; CHECK-NEXT: [[TMP2:%.*]] = alloca i256, align 8
; CHECK-NEXT: [[TMP3:%.*]] = bitcast i256* [[TMP2]] to i8*
; CHECK-NEXT: call void @llvm.lifetime.start.p0i8(i64 32, i8* [[TMP3]])
; CHECK-NEXT: call void @__atomic_load(i64 32, i8* [[TMP1]], i8* [[TMP3]], i32 0)
; CHECK-NEXT: [[TMP4:%.*]] = load i256, i256* [[TMP2]], align 8
; CHECK-NEXT: call void @llvm.lifetime.end.p0i8(i64 32, i8* [[TMP3]])
; CHECK-NEXT: ret i256 [[TMP4]]
;
%result = load atomic i256, i256* %ptr unordered, align 16
ret i256 %result
}
define i256 @atomic_load256_libcall_as1(i256 addrspace(1)* %ptr) nounwind {
; CHECK-LABEL: @atomic_load256_libcall_as1(
; CHECK-NEXT: [[TMP1:%.*]] = bitcast i256 addrspace(1)* [[PTR:%.*]] to i8 addrspace(1)*
; CHECK-NEXT: [[TMP2:%.*]] = addrspacecast i8 addrspace(1)* [[TMP1]] to i8*
; CHECK-NEXT: [[TMP3:%.*]] = alloca i256, align 8
; CHECK-NEXT: [[TMP4:%.*]] = bitcast i256* [[TMP3]] to i8*
; CHECK-NEXT: call void @llvm.lifetime.start.p0i8(i64 32, i8* [[TMP4]])
; CHECK-NEXT: call void @__atomic_load(i64 32, i8* [[TMP2]], i8* [[TMP4]], i32 0)
; CHECK-NEXT: [[TMP5:%.*]] = load i256, i256* [[TMP3]], align 8
; CHECK-NEXT: call void @llvm.lifetime.end.p0i8(i64 32, i8* [[TMP4]])
; CHECK-NEXT: ret i256 [[TMP5]]
;
%result = load atomic i256, i256 addrspace(1)* %ptr unordered, align 16
ret i256 %result
}