[PATCH][Clang] Fix invalid address space generation for clk_event_t

Author: AlexeySotkin

CMakeLists.txt

@@ -81,7 +81,7 @@ set(TARGET_NAME ${COMMON_CLANG_LIBRARY_NAME}${BUILD_PLATFORM} )
 if(NOT USE_PREBUILT_LLVM)
     set(TARGET_BRANCH "ocl-open-70")
     set(CLANG_SOURCE_DIR ${LLVM_SOURCE_DIR}/tools/clang)
-    set(CLANG_BASE_REVISION e44b4e4240e03c24f5479f81235519493823c27b)
+    set(CLANG_BASE_REVISION 4519e2637fcc4bf6e3049a0a80e6a5e7b97667cb)
 
     set(SPIRV_SOURCE_DIR ${LLVM_SOURCE_DIR}/projects/llvm-spirv)
     set(SPIRV_BASE_REVISION 4d62009e2225024abd481ca982ec3d63304df3f0)

patches/clang/0005-OpenCL-Fix-invalid-address-space-generation-for-clk_.patch

@@ -0,0 +1,70 @@
+From c7ee1afbc6399023296cddeab2b53ed55a123de4 Mon Sep 17 00:00:00 2001
+From: Alexey Sotkin <[email protected]>
+Date: Wed, 14 Nov 2018 09:40:05 +0000
+Subject: [PATCH] [OpenCL] Fix invalid address space generation for clk_event_t
+
+Summary:
+Addrspace(32) was generated when putting 0 in clk_event_t * event_ret
+parameter for enqueue_kernel function.
+
+Patch by Viktoria Maksimova
+
+Reviewers: Anastasia, yaxunl, AlexeySotkin
+
+Reviewed By:  Anastasia, AlexeySotkin
+
+Subscribers: cfe-commits
+
+Differential Revision: https://reviews.llvm.org/D53809
+
+git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@346838 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ lib/CodeGen/CGBuiltin.cpp                      | 4 +++-
+ test/CodeGenOpenCL/cl20-device-side-enqueue.cl | 9 ++++++++-
+ 2 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/lib/CodeGen/CGBuiltin.cpp b/lib/CodeGen/CGBuiltin.cpp
+index 0770c20..cd074af 100644
+--- a/lib/CodeGen/CGBuiltin.cpp
++++ b/lib/CodeGen/CGBuiltin.cpp
+@@ -3400,7 +3400,9 @@ RValue CodeGenFunction::EmitBuiltinExpr(const FunctionDecl *FD,
+       llvm::Value *ClkEvent = EmitScalarExpr(E->getArg(5));
+       // Convert to generic address space.
+       EventList = Builder.CreatePointerCast(EventList, EventPtrTy);
+-      ClkEvent = Builder.CreatePointerCast(ClkEvent, EventPtrTy);
++      ClkEvent = ClkEvent->getType()->isIntegerTy()
++                   ? Builder.CreateBitOrPointerCast(ClkEvent, EventPtrTy)
++                   : Builder.CreatePointerCast(ClkEvent, EventPtrTy);
+       auto Info =
+           CGM.getOpenCLRuntime().emitOpenCLEnqueuedBlock(*this, E->getArg(6));
+       llvm::Value *Kernel =
+diff --git a/test/CodeGenOpenCL/cl20-device-side-enqueue.cl b/test/CodeGenOpenCL/cl20-device-side-enqueue.cl
+index d74a1df..120a426 100644
+--- a/test/CodeGenOpenCL/cl20-device-side-enqueue.cl
++++ b/test/CodeGenOpenCL/cl20-device-side-enqueue.cl
+@@ -79,6 +79,13 @@ kernel void device_side_enqueue(global int *a, global int *b, int i) {
+                    a[i] = b[i];
+                  });
+ 
++  // COMMON-LABEL: call i32 @__enqueue_kernel_basic_events
++  // COMMON-SAME: (%opencl.queue_t{{.*}}* {{%[0-9]+}}, i32 {{%[0-9]+}}, %struct.ndrange_t* {{.*}}, i32 1, %opencl.clk_event_t{{.*}}* addrspace(4)* {{%[0-9]+}}, %opencl.clk_event_t{{.*}}* addrspace(4)* null,
++  enqueue_kernel(default_queue, flags, ndrange, 1, &event_wait_list, 0,
++                 ^(void) {
++                   return;
++                 });
++
+   // Emits global block literal [[BLG1]] and block kernel [[INVGK1]].
+   // COMMON: [[DEF_Q:%[0-9]+]] = load %opencl.queue_t{{.*}}*, %opencl.queue_t{{.*}}** %default_queue
+   // COMMON: [[FLAGS:%[0-9]+]] = load i32, i32* %flags
+@@ -336,7 +343,7 @@ kernel void device_side_enqueue(global int *a, global int *b, int i) {
+ // COMMON: define internal spir_kernel void [[INVGK5]](i8 addrspace(4)*{{.*}}, i8 addrspace(3)*{{.*}})
+ // COMMON: define internal spir_kernel void [[INVGK6]](i8 addrspace(4)*, i8 addrspace(3)*, i8 addrspace(3)*, i8 addrspace(3)*) #{{[0-9]+}} {
+ // COMMON: entry:
+-// COMMON:  call void @__device_side_enqueue_block_invoke_8(i8 addrspace(4)* %0, i8 addrspace(3)* %1, i8 addrspace(3)* %2, i8 addrspace(3)* %3)
++// COMMON:  call void @__device_side_enqueue_block_invoke_9(i8 addrspace(4)* %0, i8 addrspace(3)* %1, i8 addrspace(3)* %2, i8 addrspace(3)* %3)
+ // COMMON:  ret void
+ // COMMON: }
+ // COMMON: define internal spir_kernel void [[INVGK7]](i8 addrspace(4)*{{.*}}, i8 addrspace(3)*{{.*}})
+-- 
+1.8.3.1
+