Thanks! -----Original Message----- From: hwennb...@google.com [mailto:hwennb...@google.com] On Behalf Of Hans Wennborg Sent: 08 August 2016 17:40 To: Anastasia Stulova Cc: Alexey Bader; cfe-commits@lists.llvm.org; nd Subject: Re: r277743 - [OpenCL] Added underscores to the names of 'to_addr' OpenCL built-ins.
Okay, merged in r278019. Cheers, Hans On Fri, Aug 5, 2016 at 9:36 AM, Anastasia Stulova <anastasia.stul...@arm.com> wrote: > Hans, > > If still possible could we merge this into 3.9. It contains just a minor > renaming but it makes all those new OpenCL Builtins usable. > > Thanks, > Anastasia > > -----Original Message----- > From: cfe-commits [mailto:cfe-commits-boun...@lists.llvm.org] On > Behalf Of Alexey Bader via cfe-commits > Sent: 04 August 2016 19:06 > To: cfe-commits@lists.llvm.org > Subject: r277743 - [OpenCL] Added underscores to the names of 'to_addr' > OpenCL built-ins. > > Author: bader > Date: Thu Aug 4 13:06:27 2016 > New Revision: 277743 > > URL: http://llvm.org/viewvc/llvm-project?rev=277743&view=rev > Log: > [OpenCL] Added underscores to the names of 'to_addr' OpenCL built-ins. > > Summary: > In order to re-define OpenCL built-in functions 'to_{private,local,global}' > in OpenCL run-time library LLVM names must be different from the clang > built-in function names. > > Reviewers: yaxunl, Anastasia > > Subscribers: cfe-commits > > Differential Revision: https://reviews.llvm.org/D23120 > > Modified: > cfe/trunk/lib/CodeGen/CGBuiltin.cpp > cfe/trunk/test/CodeGenOpenCL/to_addr_builtin.cl > > Modified: cfe/trunk/lib/CodeGen/CGBuiltin.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGBuiltin.cp > p?rev=277743&r1=277742&r2=277743&view=diff > ====================================================================== > ======== > --- cfe/trunk/lib/CodeGen/CGBuiltin.cpp (original) > +++ cfe/trunk/lib/CodeGen/CGBuiltin.cpp Thu Aug 4 13:06:27 2016 > @@ -2209,8 +2209,9 @@ RValue CodeGenFunction::EmitBuiltinExpr( > NewArg = Builder.CreateAddrSpaceCast(Arg0, NewArgT); > else > NewArg = Builder.CreateBitOrPointerCast(Arg0, NewArgT); > - auto NewCall = Builder.CreateCall(CGM.CreateRuntimeFunction(FTy, > - E->getDirectCallee()->getName()), {NewArg}); > + auto NewName = std::string("__") + E->getDirectCallee()->getName().str(); > + auto NewCall = > + Builder.CreateCall(CGM.CreateRuntimeFunction(FTy, NewName), > + {NewArg}); > return RValue::get(Builder.CreateBitOrPointerCast(NewCall, > ConvertType(E->getType()))); > } > > Modified: cfe/trunk/test/CodeGenOpenCL/to_addr_builtin.cl > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCL/to_ad > dr_builtin.cl?rev=277743&r1=277742&r2=277743&view=diff > ====================================================================== > ======== > --- cfe/trunk/test/CodeGenOpenCL/to_addr_builtin.cl (original) > +++ cfe/trunk/test/CodeGenOpenCL/to_addr_builtin.cl Thu Aug 4 > +++ 13:06:27 > +++ 2016 > @@ -14,74 +14,74 @@ void test(void) { > generic int *gen; > > //CHECK: %[[ARG:.*]] = addrspacecast i32 addrspace(1)* %{{.*}} to > i8 addrspace(4)* > - //CHECK: %[[RET:.*]] = call i8 addrspace(1)* @to_global(i8 > addrspace(4)* %[[ARG]]) > + //CHECK: %[[RET:.*]] = call i8 addrspace(1)* @__to_global(i8 > + addrspace(4)* %[[ARG]]) > //CHECK: %{{.*}} = bitcast i8 addrspace(1)* %[[RET]] to i32 addrspace(1)* > glob = to_global(glob); > > //CHECK: %[[ARG:.*]] = addrspacecast i32 addrspace(3)* %{{.*}} to > i8 addrspace(4)* > - //CHECK: %[[RET:.*]] = call i8 addrspace(1)* @to_global(i8 > addrspace(4)* %[[ARG]]) > + //CHECK: %[[RET:.*]] = call i8 addrspace(1)* @__to_global(i8 > + addrspace(4)* %[[ARG]]) > //CHECK: %{{.*}} = bitcast i8 addrspace(1)* %[[RET]] to i32 addrspace(1)* > glob = to_global(loc); > > //CHECK: %[[ARG:.*]] = addrspacecast i32* %{{.*}} to i8 > addrspace(4)* > - //CHECK: %[[RET:.*]] = call i8 addrspace(1)* @to_global(i8 > addrspace(4)* %[[ARG]]) > + //CHECK: %[[RET:.*]] = call i8 addrspace(1)* @__to_global(i8 > + addrspace(4)* %[[ARG]]) > //CHECK: %{{.*}} = bitcast i8 addrspace(1)* %[[RET]] to i32 addrspace(1)* > glob = to_global(priv); > > //CHECK: %[[ARG:.*]] = bitcast i32 addrspace(4)* %{{.*}} to i8 > addrspace(4)* > - //CHECK: %[[RET:.*]] = call i8 addrspace(1)* @to_global(i8 > addrspace(4)* %[[ARG]]) > + //CHECK: %[[RET:.*]] = call i8 addrspace(1)* @__to_global(i8 > + addrspace(4)* %[[ARG]]) > //CHECK: %{{.*}} = bitcast i8 addrspace(1)* %[[RET]] to i32 addrspace(1)* > glob = to_global(gen); > > //CHECK: %[[ARG:.*]] = addrspacecast i32 addrspace(1)* %{{.*}} to > i8 addrspace(4)* > - //CHECK: %[[RET:.*]] = call i8 addrspace(3)* @to_local(i8 > addrspace(4)* %[[ARG]]) > + //CHECK: %[[RET:.*]] = call i8 addrspace(3)* @__to_local(i8 > + addrspace(4)* %[[ARG]]) > //CHECK: %{{.*}} = bitcast i8 addrspace(3)* %[[RET]] to i32 addrspace(3)* > loc = to_local(glob); > > //CHECK: %[[ARG:.*]] = addrspacecast i32 addrspace(3)* %{{.*}} to > i8 addrspace(4)* > - //CHECK: %[[RET:.*]] = call i8 addrspace(3)* @to_local(i8 > addrspace(4)* %[[ARG]]) > + //CHECK: %[[RET:.*]] = call i8 addrspace(3)* @__to_local(i8 > + addrspace(4)* %[[ARG]]) > //CHECK: %{{.*}} = bitcast i8 addrspace(3)* %[[RET]] to i32 addrspace(3)* > loc = to_local(loc); > > //CHECK: %[[ARG:.*]] = addrspacecast i32* %{{.*}} to i8 > addrspace(4)* > - //CHECK: %[[RET:.*]] = call i8 addrspace(3)* @to_local(i8 > addrspace(4)* %[[ARG]]) > + //CHECK: %[[RET:.*]] = call i8 addrspace(3)* @__to_local(i8 > + addrspace(4)* %[[ARG]]) > //CHECK: %{{.*}} = bitcast i8 addrspace(3)* %[[RET]] to i32 addrspace(3)* > loc = to_local(priv); > > //CHECK: %[[ARG:.*]] = bitcast i32 addrspace(4)* %{{.*}} to i8 > addrspace(4)* > - //CHECK: %[[RET:.*]] = call i8 addrspace(3)* @to_local(i8 > addrspace(4)* %[[ARG]]) > + //CHECK: %[[RET:.*]] = call i8 addrspace(3)* @__to_local(i8 > + addrspace(4)* %[[ARG]]) > //CHECK: %{{.*}} = bitcast i8 addrspace(3)* %[[RET]] to i32 addrspace(3)* > loc = to_local(gen); > > //CHECK: %[[ARG:.*]] = addrspacecast i32 addrspace(1)* %{{.*}} to > i8 addrspace(4)* > - //CHECK: %[[RET:.*]] = call i8* @to_private(i8 addrspace(4)* > %[[ARG]]) > + //CHECK: %[[RET:.*]] = call i8* @__to_private(i8 addrspace(4)* > + %[[ARG]]) > //CHECK: %{{.*}} = bitcast i8* %[[RET]] to i32* > priv = to_private(glob); > > //CHECK: %[[ARG:.*]] = addrspacecast i32 addrspace(3)* %{{.*}} to > i8 addrspace(4)* > - //CHECK: %[[RET:.*]] = call i8* @to_private(i8 addrspace(4)* > %[[ARG]]) > + //CHECK: %[[RET:.*]] = call i8* @__to_private(i8 addrspace(4)* > + %[[ARG]]) > //CHECK: %{{.*}} = bitcast i8* %[[RET]] to i32* > priv = to_private(loc); > > //CHECK: %[[ARG:.*]] = addrspacecast i32* %{{.*}} to i8 > addrspace(4)* > - //CHECK: %[[RET:.*]] = call i8* @to_private(i8 addrspace(4)* > %[[ARG]]) > + //CHECK: %[[RET:.*]] = call i8* @__to_private(i8 addrspace(4)* > + %[[ARG]]) > //CHECK: %{{.*}} = bitcast i8* %[[RET]] to i32* > priv = to_private(priv); > > //CHECK: %[[ARG:.*]] = bitcast i32 addrspace(4)* %{{.*}} to i8 > addrspace(4)* > - //CHECK: %[[RET:.*]] = call i8* @to_private(i8 addrspace(4)* > %[[ARG]]) > + //CHECK: %[[RET:.*]] = call i8* @__to_private(i8 addrspace(4)* > + %[[ARG]]) > //CHECK: %{{.*}} = bitcast i8* %[[RET]] to i32* > priv = to_private(gen); > > //CHECK: %[[ARG:.*]] = addrspacecast %[[A]]* %{{.*}} to i8 > addrspace(4)* > - //CHECK: %[[RET:.*]] = call i8 addrspace(1)* @to_global(i8 > addrspace(4)* %[[ARG]]) > + //CHECK: %[[RET:.*]] = call i8 addrspace(1)* @__to_global(i8 > + addrspace(4)* %[[ARG]]) > //CHECK: %{{.*}} = bitcast i8 addrspace(1)* %[[RET]] to %[[A]] > addrspace(1)* > PA pA; > GA gA = to_global(pA); > > //CHECK-NOT: addrspacecast > //CHECK-NOT: bitcast > - //CHECK: call i8 addrspace(1)* @to_global(i8 addrspace(4)* %{{.*}}) > + //CHECK: call i8 addrspace(1)* @__to_global(i8 addrspace(4)* > + %{{.*}}) > //CHECK-NOT: addrspacecast > //CHECK-NOT: bitcast > generic void *gen_v; > > > _______________________________________________ > cfe-commits mailing list > cfe-commits@lists.llvm.org > http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
