Author: hans
Date: Wed Aug 10 12:34:17 2016
New Revision: 278248
URL: http://llvm.org/viewvc/llvm-project?rev=278248&view=rev
Log:
Merging r278234 and r278235:
------------------------------------------------------------------------
r278234 | joey | 2016-08-10 08:57:02 -0700 (Wed, 10 Aug 2016) | 5 lines
[OpenCL] Change block descriptor address space to constant.
The block descriptor is a GlobalVariable in the LLVM IR, so it shouldn't be
in the private address space.
------------------------------------------------------------------------
------------------------------------------------------------------------
r278235 | joey | 2016-08-10 09:04:14 -0700 (Wed, 10 Aug 2016) | 2 lines
[OpenCL] Fix typo in test that I accidentally introduced in my previous commit.
------------------------------------------------------------------------
Modified:
cfe/branches/release_39/ (props changed)
cfe/branches/release_39/lib/CodeGen/CGBlocks.cpp
cfe/branches/release_39/test/CodeGenOpenCL/cl20-device-side-enqueue.cl
Propchange: cfe/branches/release_39/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 10 12:34:17 2016
@@ -1,4 +1,4 @@
/cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:275880,275967,276102,276350,276361,276473,276653,276716,276887,276891,276979,276983,277095,277138,277141,277221,277307,277743,277796-277797,277866,277889,277900,278139
+/cfe/trunk:275880,275967,276102,276350,276361,276473,276653,276716,276887,276891,276979,276983,277095,277138,277141,277221,277307,277743,277796-277797,277866,277889,277900,278139,278234-278235
/cfe/trunk/test:170344
/cfe/trunk/test/SemaTemplate:126920
Modified: cfe/branches/release_39/lib/CodeGen/CGBlocks.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/branches/release_39/lib/CodeGen/CGBlocks.cpp?rev=278248&r1=278247&r2=278248&view=diff
==============================================================================
--- cfe/branches/release_39/lib/CodeGen/CGBlocks.cpp (original)
+++ cfe/branches/release_39/lib/CodeGen/CGBlocks.cpp Wed Aug 10 12:34:17 2016
@@ -125,10 +125,15 @@ static llvm::Constant *buildBlockDescrip
llvm::Constant *init = llvm::ConstantStruct::getAnon(elements);
+ unsigned AddrSpace = 0;
+ if (C.getLangOpts().OpenCL)
+ AddrSpace = C.getTargetAddressSpace(LangAS::opencl_constant);
llvm::GlobalVariable *global =
new llvm::GlobalVariable(CGM.getModule(), init->getType(), true,
llvm::GlobalValue::InternalLinkage,
- init, "__block_descriptor_tmp");
+ init, "__block_descriptor_tmp", nullptr,
+ llvm::GlobalValue::NotThreadLocal,
+ AddrSpace);
return llvm::ConstantExpr::getBitCast(global, CGM.getBlockDescriptorType());
}
@@ -927,7 +932,10 @@ llvm::Type *CodeGenModule::getBlockDescr
UnsignedLongTy, UnsignedLongTy, nullptr);
// Now form a pointer to that.
- BlockDescriptorType = llvm::PointerType::getUnqual(BlockDescriptorType);
+ unsigned AddrSpace = 0;
+ if (getLangOpts().OpenCL)
+ AddrSpace = getContext().getTargetAddressSpace(LangAS::opencl_constant);
+ BlockDescriptorType = llvm::PointerType::get(BlockDescriptorType, AddrSpace);
return BlockDescriptorType;
}
Modified: cfe/branches/release_39/test/CodeGenOpenCL/cl20-device-side-enqueue.cl
URL:
http://llvm.org/viewvc/llvm-project/cfe/branches/release_39/test/CodeGenOpenCL/cl20-device-side-enqueue.cl?rev=278248&r1=278247&r2=278248&view=diff
==============================================================================
--- cfe/branches/release_39/test/CodeGenOpenCL/cl20-device-side-enqueue.cl
(original)
+++ cfe/branches/release_39/test/CodeGenOpenCL/cl20-device-side-enqueue.cl Wed
Aug 10 12:34:17 2016
@@ -21,7 +21,7 @@ kernel void device_side_enqueue(global i
// CHECK: [[DEF_Q:%[0-9]+]] = load %opencl.queue_t*, %opencl.queue_t**
%default_queue
// CHECK: [[FLAGS:%[0-9]+]] = load i32, i32* %flags
// CHECK: [[NDR:%[0-9]+]] = load %opencl.ndrange_t*, %opencl.ndrange_t**
%ndrange
- // CHECK: [[BL:%[0-9]+]] = bitcast <{ i8*, i32, i32, i8*,
%struct.__block_descriptor*, i32{{.*}}, i32{{.*}}, i32{{.*}} }>* %block to void
()*
+ // CHECK: [[BL:%[0-9]+]] = bitcast <{ i8*, i32, i32, i8*,
%struct.__block_descriptor addrspace(3)*, i32{{.*}}, i32{{.*}}, i32{{.*}} }>*
%block to void ()*
// CHECK: [[BL_I8:%[0-9]+]] = bitcast void ()* [[BL]] to i8*
// CHECK: call i32 @__enqueue_kernel_basic(%opencl.queue_t* [[DEF_Q]], i32
[[FLAGS]], %opencl.ndrange_t* [[NDR]], i8* [[BL_I8]])
enqueue_kernel(default_queue, flags, ndrange,
@@ -32,7 +32,7 @@ kernel void device_side_enqueue(global i
// CHECK: [[DEF_Q:%[0-9]+]] = load %opencl.queue_t*, %opencl.queue_t**
%default_queue
// CHECK: [[FLAGS:%[0-9]+]] = load i32, i32* %flags
// CHECK: [[NDR:%[0-9]+]] = load %opencl.ndrange_t*, %opencl.ndrange_t**
%ndrange
- // CHECK: [[BL:%[0-9]+]] = bitcast <{ i8*, i32, i32, i8*,
%struct.__block_descriptor*, i32{{.*}}, i32{{.*}}, i32{{.*}} }>* %block3 to
void ()*
+ // CHECK: [[BL:%[0-9]+]] = bitcast <{ i8*, i32, i32, i8*,
%struct.__block_descriptor addrspace(3)*, i32{{.*}}, i32{{.*}}, i32{{.*}} }>*
%block3 to void ()*
// CHECK: [[BL_I8:%[0-9]+]] = bitcast void ()* [[BL]] to i8*
// CHECK: call i32 @__enqueue_kernel_basic_events(%opencl.queue_t*
[[DEF_Q]], i32 [[FLAGS]], %opencl.ndrange_t* [[NDR]], i32 2,
%opencl.clk_event_t** %event_wait_list, %opencl.clk_event_t** %clk_event, i8*
[[BL_I8]])
enqueue_kernel(default_queue, flags, ndrange, 2, &event_wait_list,
&clk_event,
@@ -43,7 +43,7 @@ kernel void device_side_enqueue(global i
// CHECK: [[DEF_Q:%[0-9]+]] = load %opencl.queue_t*, %opencl.queue_t**
%default_queue
// CHECK: [[FLAGS:%[0-9]+]] = load i32, i32* %flags
// CHECK: [[NDR:%[0-9]+]] = load %opencl.ndrange_t*, %opencl.ndrange_t**
%ndrange
- // CHECK: call i32 (%opencl.queue_t*, i32, %opencl.ndrange_t*, i8*, i32,
...) @__enqueue_kernel_vaargs(%opencl.queue_t* [[DEF_Q]], i32 [[FLAGS]],
%opencl.ndrange_t* [[NDR]], i8* bitcast ({ i8**, i32, i32, i8*,
%struct.__block_descriptor* }* @__block_literal_global{{(.[0-9]+)?}} to i8*),
i32 1, i32 256)
+ // CHECK: call i32 (%opencl.queue_t*, i32, %opencl.ndrange_t*, i8*, i32,
...) @__enqueue_kernel_vaargs(%opencl.queue_t* [[DEF_Q]], i32 [[FLAGS]],
%opencl.ndrange_t* [[NDR]], i8* bitcast ({ i8**, i32, i32, i8*,
%struct.__block_descriptor addrspace(3)* }*
@__block_literal_global{{(.[0-9]+)?}} to i8*), i32 1, i32 256)
enqueue_kernel(default_queue, flags, ndrange,
^(local void *p) {
return;
@@ -54,7 +54,7 @@ kernel void device_side_enqueue(global i
// CHECK: [[FLAGS:%[0-9]+]] = load i32, i32* %flags
// CHECK: [[NDR:%[0-9]+]] = load %opencl.ndrange_t*, %opencl.ndrange_t**
%ndrange
// CHECK: [[SIZE:%[0-9]+]] = zext i8 {{%[0-9]+}} to i32
- // CHECK: call i32 (%opencl.queue_t*, i32, %opencl.ndrange_t*, i8*, i32,
...) @__enqueue_kernel_vaargs(%opencl.queue_t* [[DEF_Q]], i32 [[FLAGS]],
%opencl.ndrange_t* [[NDR]], i8* bitcast ({ i8**, i32, i32, i8*,
%struct.__block_descriptor* }* @__block_literal_global{{(.[0-9]+)?}} to i8*),
i32 1, i32 [[SIZE]])
+ // CHECK: call i32 (%opencl.queue_t*, i32, %opencl.ndrange_t*, i8*, i32,
...) @__enqueue_kernel_vaargs(%opencl.queue_t* [[DEF_Q]], i32 [[FLAGS]],
%opencl.ndrange_t* [[NDR]], i8* bitcast ({ i8**, i32, i32, i8*,
%struct.__block_descriptor addrspace(3)* }*
@__block_literal_global{{(.[0-9]+)?}} to i8*), i32 1, i32 [[SIZE]])
enqueue_kernel(default_queue, flags, ndrange,
^(local void *p) {
return;
@@ -65,7 +65,7 @@ kernel void device_side_enqueue(global i
// CHECK: [[FLAGS:%[0-9]+]] = load i32, i32* %flags
// CHECK: [[NDR:%[0-9]+]] = load %opencl.ndrange_t*, %opencl.ndrange_t**
%ndrange
// CHECK: [[AD:%arraydecay[0-9]*]] = getelementptr inbounds [1 x
%opencl.clk_event_t*], [1 x %opencl.clk_event_t*]* %event_wait_list2, i32 0,
i32 0
- // CHECK: call i32 (%opencl.queue_t*, i32, %opencl.ndrange_t*, i32,
%opencl.clk_event_t**, %opencl.clk_event_t**, i8*, i32, ...)
@__enqueue_kernel_events_vaargs(%opencl.queue_t* [[DEF_Q]], i32 [[FLAGS]],
%opencl.ndrange_t* [[NDR]], i32 2, %opencl.clk_event_t** [[AD]],
%opencl.clk_event_t** %clk_event, i8* bitcast ({ i8**, i32, i32, i8*,
%struct.__block_descriptor* }* @__block_literal_global{{(.[0-9]+)?}} to i8*),
i32 1, i32 256)
+ // CHECK: call i32 (%opencl.queue_t*, i32, %opencl.ndrange_t*, i32,
%opencl.clk_event_t**, %opencl.clk_event_t**, i8*, i32, ...)
@__enqueue_kernel_events_vaargs(%opencl.queue_t* [[DEF_Q]], i32 [[FLAGS]],
%opencl.ndrange_t* [[NDR]], i32 2, %opencl.clk_event_t** [[AD]],
%opencl.clk_event_t** %clk_event, i8* bitcast ({ i8**, i32, i32, i8*,
%struct.__block_descriptor addrspace(3)* }*
@__block_literal_global{{(.[0-9]+)?}} to i8*), i32 1, i32 256)
enqueue_kernel(default_queue, flags, ndrange, 2, event_wait_list2,
&clk_event,
^(local void *p) {
return;
@@ -77,7 +77,7 @@ kernel void device_side_enqueue(global i
// CHECK: [[NDR:%[0-9]+]] = load %opencl.ndrange_t*, %opencl.ndrange_t**
%ndrange
// CHECK: [[AD:%arraydecay[0-9]*]] = getelementptr inbounds [1 x
%opencl.clk_event_t*], [1 x %opencl.clk_event_t*]* %event_wait_list2, i32 0,
i32 0
// CHECK: [[SIZE:%[0-9]+]] = zext i8 {{%[0-9]+}} to i32
- // CHECK: call i32 (%opencl.queue_t*, i32, %opencl.ndrange_t*, i32,
%opencl.clk_event_t**, %opencl.clk_event_t**, i8*, i32, ...)
@__enqueue_kernel_events_vaargs(%opencl.queue_t* [[DEF_Q]], i32 [[FLAGS]],
%opencl.ndrange_t* [[NDR]], i32 2, %opencl.clk_event_t** [[AD]],
%opencl.clk_event_t** %clk_event, i8* bitcast ({ i8**, i32, i32, i8*,
%struct.__block_descriptor* }* @__block_literal_global{{(.[0-9]+)?}} to i8*),
i32 1, i32 [[SIZE]])
+ // CHECK: call i32 (%opencl.queue_t*, i32, %opencl.ndrange_t*, i32,
%opencl.clk_event_t**, %opencl.clk_event_t**, i8*, i32, ...)
@__enqueue_kernel_events_vaargs(%opencl.queue_t* [[DEF_Q]], i32 [[FLAGS]],
%opencl.ndrange_t* [[NDR]], i32 2, %opencl.clk_event_t** [[AD]],
%opencl.clk_event_t** %clk_event, i8* bitcast ({ i8**, i32, i32, i8*,
%struct.__block_descriptor addrspace(3)* }*
@__block_literal_global{{(.[0-9]+)?}} to i8*), i32 1, i32 [[SIZE]])
enqueue_kernel(default_queue, flags, ndrange, 2, event_wait_list2,
&clk_event,
^(local void *p) {
return;
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
