1
0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-23 03:02:36 +01:00

[NVVM] Remove noduplicate attribute from synchronizing intrinsics.

Summary:
I've completed my audit of all the code that looks at noduplicate and
added handling of convergent where appropriate, so we no longer need
noduplicate on these intrinsics.

Reviewers: jholewinski

Subscribers: llvm-commits, jholewinski

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

llvm-svn: 264107
This commit is contained in:
Justin Lebar 2016-03-22 22:08:01 +00:00
parent 981c18bd80
commit 6826e09a40
2 changed files with 7 additions and 11 deletions

View File

@ -729,20 +729,16 @@ def llvm_anyi64ptr_ty : LLVMAnyPointerType<llvm_i64_ty>; // (space)i64*
[IntrReadWriteArgMem, NoCapture<0>]>;
// Bar.Sync
//
// TODO: Remove NoDuplicate here after fixing up LLVM to handle convergent
// properly. See discussion in http://reviews.llvm.org/D16941 and
// http://reviews.llvm.org/D12246.
def int_cuda_syncthreads : GCCBuiltin<"__syncthreads">,
Intrinsic<[], [], [IntrNoDuplicate, IntrConvergent]>;
Intrinsic<[], [], [IntrConvergent]>;
def int_nvvm_barrier0 : GCCBuiltin<"__nvvm_bar0">,
Intrinsic<[], [], [IntrNoDuplicate, IntrConvergent]>;
Intrinsic<[], [], [IntrConvergent]>;
def int_nvvm_barrier0_popc : GCCBuiltin<"__nvvm_bar0_popc">,
Intrinsic<[llvm_i32_ty], [llvm_i32_ty], [IntrNoDuplicate, IntrConvergent]>;
Intrinsic<[llvm_i32_ty], [llvm_i32_ty], [IntrConvergent]>;
def int_nvvm_barrier0_and : GCCBuiltin<"__nvvm_bar0_and">,
Intrinsic<[llvm_i32_ty], [llvm_i32_ty], [IntrNoDuplicate, IntrConvergent]>;
Intrinsic<[llvm_i32_ty], [llvm_i32_ty], [IntrConvergent]>;
def int_nvvm_barrier0_or : GCCBuiltin<"__nvvm_bar0_or">,
Intrinsic<[llvm_i32_ty], [llvm_i32_ty], [IntrNoDuplicate, IntrConvergent]>;
Intrinsic<[llvm_i32_ty], [llvm_i32_ty], [IntrConvergent]>;
// Membar
def int_nvvm_membar_cta : GCCBuiltin<"__nvvm_membar_cta">,

View File

@ -1,9 +1,9 @@
; RUN: llvm-as < %s | llvm-dis | FileCheck %s
; Make sure LLVM knows about the convergent and noduplicate attributes on the
; Make sure LLVM knows about the convergent attribute on the
; llvm.cuda.syncthreads intrinsic.
declare void @llvm.cuda.syncthreads()
; CHECK: declare void @llvm.cuda.syncthreads() #[[ATTRNUM:[0-9]+]]
; CHECK: attributes #[[ATTRNUM]] = { convergent noduplicate nounwind }
; CHECK: attributes #[[ATTRNUM]] = { convergent nounwind }