Runtime: fix some max/alignment values.

Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
Reviewed-by: "Yang, Rong R" <rong.r.yang@intel.com>

diff --git a/src/cl_device_id.c b/src/cl_device_id.c
index 16b343d..108cfdf 100644 (file)
--- a/src/cl_device_id.c
+++ b/src/cl_device_id.c
@@ -288,7 +288,7 @@ cl_get_kernel_workgroup_info(cl_device_id device,
 
   switch (param_name) {
     DECL_FIELD(WORK_GROUP_SIZE, wg_sz)
-      DECL_FIELD(COMPILE_WORK_GROUP_SIZE, compile_wg_sz)
+    DECL_FIELD(COMPILE_WORK_GROUP_SIZE, compile_wg_sz)
     default: return CL_INVALID_VALUE;
   };
 }

diff --git a/src/cl_driver.h b/src/cl_driver.h
index 0e9b487..1b18e87 100644 (file)
--- a/src/cl_driver.h
+++ b/src/cl_driver.h
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include "cl_driver_type.h"
 /* Various limitations we should remove actually */
-#define GEN_MAX_SURFACES 128
+#define GEN_MAX_SURFACES 256
 #define GEN_MAX_SAMPLERS 16
 
 /**************************************************************************

diff --git a/src/cl_gt_device.h b/src/cl_gt_device.h
index 23adce7..73db606 100644 (file)
--- a/src/cl_gt_device.h
+++ b/src/cl_gt_device.h
@@ -46,8 +46,8 @@
 .image3d_max_height = 8192,
 .image3d_max_depth = 2048,
 .max_samplers = 16,
-.mem_base_addr_align = sizeof(cl_uint) * 8,
-.min_data_type_align_size = sizeof(cl_uint),
+.mem_base_addr_align = sizeof(cl_long) * 16 * 8,
+.min_data_type_align_size = sizeof(cl_long) * 16,
 .single_fp_config = 0, /* XXX */
 .global_mem_cache_type = CL_READ_WRITE_CACHE,
 .global_mem_size = 128 * 1024 * 1024,

diff --git a/src/intel/intel_gpgpu.c b/src/intel/intel_gpgpu.c
index b9bf2f9..31290a6 100644 (file)
--- a/src/intel/intel_gpgpu.c
+++ b/src/intel/intel_gpgpu.c
@@ -69,7 +69,7 @@ typedef struct intel_event {
 /* We can bind only a limited number of buffers */
 enum { max_buf_n = 128 };
 
-enum { max_img_n = 32 };
+enum { max_img_n = 128};
 
 enum {max_sampler_n = 16 };
 
@@ -872,7 +872,7 @@ intel_gpgpu_bind_sampler(intel_gpgpu_t *gpgpu, uint32_t *samplers, size_t sample
 {
   int index;
 #ifdef GEN7_SAMPLER_CLAMP_BORDER_WORKAROUND
-  assert(sampler_sz <= GEN_MAX_SAMPLERS/2);
+  //assert(sampler_sz <= GEN_MAX_SAMPLERS/2);
 #else
   assert(sampler_sz <= GEN_MAX_SAMPLERS);
 #endif