From 4295f574d142b4c96df72fa330214ffae4dfcda0 Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 22 Aug 2014 11:05:20 -0400 Subject: [PATCH] P4 to Git Change 1069294 by bsumner@bsumner-lin-opencl on 2014/08/22 10:56:33 ECR #304775 - fix bug 10248 where patching the local mem pointer hadn't been previously accounted for Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_kernel.h#22 edit ... //depot/stg/opencl/drivers/opencl/library/x86/common/src/misc/workitem.cl#23 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpucommand.cpp#63 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpucommand.hpp#36 edit [ROCm/clr commit: 7908fc9e5736809f7ef7a181ce8a45bfb30a226d] --- projects/clr/opencl/api/opencl/amdocl/cl_kernel.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/clr/opencl/api/opencl/amdocl/cl_kernel.h b/projects/clr/opencl/api/opencl/amdocl/cl_kernel.h index e927ce7f93..5ebb5eb68c 100644 --- a/projects/clr/opencl/api/opencl/amdocl/cl_kernel.h +++ b/projects/clr/opencl/api/opencl/amdocl/cl_kernel.h @@ -18,8 +18,10 @@ struct clk_thread_info_block_t // of 16 when compiling 64 bit struct clk_builtins_t const * builtins; - void* local_mem_base; + void * local_mem_base; + void * local_scratch; const void * table_base; + size_t pad; uint work_dim; size_t global_offset[4]; /*dim0,dim1,dim2,invalid(dim<0||dim>2)*/