From 2affdc5f585d5d6d27b42120b4d0765b4b26ff85 Mon Sep 17 00:00:00 2001 From: Oualid Khelifi Date: Mon, 17 Jun 2024 17:14:38 +0100 Subject: [PATCH] Limit buffers sizes to leave some memory for the platform Some conformance tests use directly the size returned by the runtime for max memory size to allocate buffers. This doesn't leave enough memory for the system to run the tests. Change-Id: If49ce62baffe9d72e5a7a6cad85f0164c9dd881d --- test_common/harness/deviceInfo.cpp | 39 +++++ test_common/harness/deviceInfo.h | 12 ++ .../allocations/allocation_functions.cpp | 18 +-- test_conformance/allocations/main.cpp | 25 +-- test_conformance/api/test_api_min_max.cpp | 145 +++++++----------- test_conformance/api/test_kernels.cpp | 4 +- test_conformance/images/clGetInfo/test_1D.cpp | 9 +- .../images/clGetInfo/test_1D_2D_array.cpp | 18 ++- test_conformance/images/clGetInfo/test_2D.cpp | 9 +- test_conformance/images/clGetInfo/test_3D.cpp | 9 +- 10 files changed, 146 insertions(+), 142 deletions(-) diff --git a/test_common/harness/deviceInfo.cpp b/test_common/harness/deviceInfo.cpp index 97ab8c8553..5b1e7e030e 100644 --- a/test_common/harness/deviceInfo.cpp +++ b/test_common/harness/deviceInfo.cpp @@ -132,3 +132,42 @@ size_t get_max_param_size(cl_device_id device) } return ret; } + +static cl_ulong get_device_info_max_size(cl_device_id device, + cl_device_info info, + unsigned int divisor) +{ + cl_ulong max_size; + + if (divisor == 0) + { + throw std::runtime_error("Allocation divisor should not be 0\n"); + } + + if (clGetDeviceInfo(device, info, sizeof(max_size), &max_size, NULL) + != CL_SUCCESS) + { + throw std::runtime_error("clGetDeviceInfo failed\n"); + } + return max_size / divisor; +} + +cl_ulong get_device_info_max_mem_alloc_size(cl_device_id device, + unsigned int divisor) +{ + return get_device_info_max_size(device, CL_DEVICE_MAX_MEM_ALLOC_SIZE, + divisor); +} + +cl_ulong get_device_info_global_mem_size(cl_device_id device, + unsigned int divisor) +{ + return get_device_info_max_size(device, CL_DEVICE_GLOBAL_MEM_SIZE, divisor); +} + +cl_ulong get_device_info_max_constant_buffer_size(cl_device_id device, + unsigned int divisor) +{ + return get_device_info_max_size(device, CL_DEVICE_MAX_CONSTANT_BUFFER_SIZE, + divisor); +} diff --git a/test_common/harness/deviceInfo.h b/test_common/harness/deviceInfo.h index 912dd198ac..c56f8b58cf 100644 --- a/test_common/harness/deviceInfo.h +++ b/test_common/harness/deviceInfo.h @@ -51,4 +51,16 @@ std::string get_device_name(cl_device_id device); // Returns the maximum size in bytes for Kernel Parameters size_t get_max_param_size(cl_device_id device); +/* We need to use a portion of available alloc size, + * divide it to leave some memory for the platform. */ +#define MAX_DEVICE_MEMORY_SIZE_DIVISOR (2) + +/* Get max allocation size. */ +cl_ulong get_device_info_max_mem_alloc_size(cl_device_id device, + unsigned int divisor = 1); +cl_ulong get_device_info_global_mem_size(cl_device_id device, + unsigned int divisor = 1); +cl_ulong get_device_info_max_constant_buffer_size(cl_device_id device, + unsigned int divisor = 1); + #endif // _deviceInfo_h diff --git a/test_conformance/allocations/allocation_functions.cpp b/test_conformance/allocations/allocation_functions.cpp index ec0c83a17e..28c4ef01a0 100644 --- a/test_conformance/allocations/allocation_functions.cpp +++ b/test_conformance/allocations/allocation_functions.cpp @@ -188,27 +188,15 @@ int allocate_size(cl_context context, cl_command_queue *queue, // one we don't end up returning a garbage value *number_of_mems = 0; - error = clGetDeviceInfo(device_id, CL_DEVICE_MAX_MEM_ALLOC_SIZE, - sizeof(max_individual_allocation_size), - &max_individual_allocation_size, NULL); - test_error_abort(error, - "clGetDeviceInfo failed for CL_DEVICE_MAX_MEM_ALLOC_SIZE"); - error = clGetDeviceInfo(device_id, CL_DEVICE_GLOBAL_MEM_SIZE, - sizeof(global_mem_size), &global_mem_size, NULL); - test_error_abort(error, - "clGetDeviceInfo failed for CL_DEVICE_GLOBAL_MEM_SIZE"); + max_individual_allocation_size = + get_device_info_max_mem_alloc_size(device_id); + global_mem_size = get_device_info_global_mem_size(device_id); if (global_mem_size > (cl_ulong)SIZE_MAX) { global_mem_size = (cl_ulong)SIZE_MAX; } - // log_info("Device reports CL_DEVICE_MAX_MEM_ALLOC_SIZE=%llu bytes (%gMB), - // CL_DEVICE_GLOBAL_MEM_SIZE=%llu bytes (%gMB).\n", - // max_individual_allocation_size, - // toMB(max_individual_allocation_size), global_mem_size, - // toMB(global_mem_size)); - if (size_to_allocate > global_mem_size) { log_error("Can not allocate more than the global memory size.\n"); diff --git a/test_conformance/allocations/main.cpp b/test_conformance/allocations/main.cpp index 65d2699f3b..80a5ed2e1f 100644 --- a/test_conformance/allocations/main.cpp +++ b/test_conformance/allocations/main.cpp @@ -24,8 +24,10 @@ typedef long long unsigned llu; +#define REDUCTION_PERCENTAGE_DEFAULT 50 + int g_repetition_count = 1; -int g_reduction_percentage = 100; +int g_reduction_percentage = REDUCTION_PERCENTAGE_DEFAULT; int g_write_allocations = 1; int g_multiple_allocations = 0; int g_execute_kernel = 1; @@ -44,24 +46,9 @@ test_status init_cl(cl_device_id device) { int error; - error = clGetDeviceInfo(device, CL_DEVICE_MAX_MEM_ALLOC_SIZE, - sizeof(g_max_individual_allocation_size), - &g_max_individual_allocation_size, NULL); - if (error) - { - print_error(error, - "clGetDeviceInfo failed for CL_DEVICE_MAX_MEM_ALLOC_SIZE"); - return TEST_FAIL; - } - error = - clGetDeviceInfo(device, CL_DEVICE_GLOBAL_MEM_SIZE, - sizeof(g_global_mem_size), &g_global_mem_size, NULL); - if (error) - { - print_error(error, - "clGetDeviceInfo failed for CL_DEVICE_GLOBAL_MEM_SIZE"); - return TEST_FAIL; - } + g_max_individual_allocation_size = + get_device_info_max_mem_alloc_size(device); + g_global_mem_size = get_device_info_global_mem_size(device); log_info("Device reports CL_DEVICE_MAX_MEM_ALLOC_SIZE=%llu bytes (%gMB), " "CL_DEVICE_GLOBAL_MEM_SIZE=%llu bytes (%gMB).\n", diff --git a/test_conformance/api/test_api_min_max.cpp b/test_conformance/api/test_api_min_max.cpp index 3ced8927a2..d4ac753988 100644 --- a/test_conformance/api/test_api_min_max.cpp +++ b/test_conformance/api/test_api_min_max.cpp @@ -112,6 +112,8 @@ const char *sample_const_max_arg_kernel_pattern = "\n" "}\n"; +#define MAX_REDUCTION_FACTOR 4 + int test_min_max_thread_dimensions(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements) { @@ -564,7 +566,7 @@ int test_min_max_mem_alloc_size(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements) { int error; - cl_ulong maxAllocSize, memSize, minSizeToTry; + cl_ulong maxAllocSize, memSize, minSizeToTry, currentSize; clMemWrapper memHdl; cl_ulong requiredAllocSize; @@ -574,85 +576,58 @@ int test_min_max_mem_alloc_size(cl_device_id deviceID, cl_context context, else requiredAllocSize = 128 * 1024 * 1024; - /* Get the max mem alloc size */ - error = clGetDeviceInfo(deviceID, CL_DEVICE_MAX_MEM_ALLOC_SIZE, - sizeof(maxAllocSize), &maxAllocSize, NULL); - test_error(error, "Unable to get max mem alloc size from device"); - - error = clGetDeviceInfo(deviceID, CL_DEVICE_GLOBAL_MEM_SIZE, - sizeof(memSize), &memSize, NULL); - test_error(error, "Unable to get global memory size from device"); + /* Get the max mem alloc size, limit the alloc to half of the available + * memory */ + maxAllocSize = get_device_info_max_mem_alloc_size( + deviceID, MAX_DEVICE_MEMORY_SIZE_DIVISOR); + memSize = get_device_info_global_mem_size(deviceID, + MAX_DEVICE_MEMORY_SIZE_DIVISOR); - if (memSize > (cl_ulong)SIZE_MAX) + if (memSize < maxAllocSize) { - memSize = (cl_ulong)SIZE_MAX; + log_info("Global memory size is less than max allocation size, using " + "that.\n"); + maxAllocSize = memSize; } - if (maxAllocSize < requiredAllocSize) + if (memSize > (cl_ulong)SIZE_MAX) { - log_error("ERROR: Reported max allocation size is less than required " - "%lldMB! (%llu or %lluMB, from a total mem size of %lldMB)\n", - (requiredAllocSize / 1024) / 1024, maxAllocSize, - (maxAllocSize / 1024) / 1024, (memSize / 1024) / 1024); - return -1; + memSize = (cl_ulong)SIZE_MAX; } - requiredAllocSize = ((memSize / 4) > (1024 * 1024 * 1024)) - ? 1024 * 1024 * 1024 - : memSize / 4; - - if (gIsEmbedded) - requiredAllocSize = (requiredAllocSize < 1 * 1024 * 1024) - ? 1 * 1024 * 1024 - : requiredAllocSize; - else - requiredAllocSize = (requiredAllocSize < 128 * 1024 * 1024) - ? 128 * 1024 * 1024 - : requiredAllocSize; - if (maxAllocSize < requiredAllocSize) { - log_error( - "ERROR: Reported max allocation size is less than required of " - "total memory! (%llu or %lluMB, from a total mem size of %lluMB)\n", - maxAllocSize, (maxAllocSize / 1024) / 1024, - (requiredAllocSize / 1024) / 1024); + log_error("ERROR: Reported max allocation size is less than required"); return -1; } log_info("Reported max allocation size of %lld bytes (%gMB) and global mem " "size of %lld bytes (%gMB).\n", - maxAllocSize, maxAllocSize / (1024.0 * 1024.0), requiredAllocSize, - requiredAllocSize / (1024.0 * 1024.0)); - - if (memSize < maxAllocSize) - { - log_info("Global memory size is less than max allocation size, using " - "that.\n"); - maxAllocSize = memSize; - } + maxAllocSize, maxAllocSize / (1024.0 * 1024.0), memSize, + memSize / (1024.0 * 1024.0)); minSizeToTry = maxAllocSize / 16; - while (maxAllocSize > (maxAllocSize / 4)) + currentSize = maxAllocSize; + while (currentSize >= maxAllocSize / MAX_REDUCTION_FACTOR) { log_info("Trying to create a buffer of size of %lld bytes (%gMB).\n", - maxAllocSize, (double)maxAllocSize / (1024.0 * 1024.0)); - memHdl = clCreateBuffer(context, CL_MEM_READ_ONLY, (size_t)maxAllocSize, + currentSize, (double)currentSize / (1024.0 * 1024.0)); + memHdl = clCreateBuffer(context, CL_MEM_READ_ONLY, (size_t)currentSize, NULL, &error); if (error == CL_MEM_OBJECT_ALLOCATION_FAILURE || error == CL_OUT_OF_RESOURCES || error == CL_OUT_OF_HOST_MEMORY) { log_info("\tAllocation failed at size of %lld bytes (%gMB).\n", - maxAllocSize, (double)maxAllocSize / (1024.0 * 1024.0)); - maxAllocSize -= minSizeToTry; + currentSize, (double)currentSize / (1024.0 * 1024.0)); + currentSize -= minSizeToTry; continue; } test_error(error, "clCreateBuffer failed for maximum sized buffer."); return 0; } - log_error("Failed to allocate even %lld bytes (%gMB).\n", maxAllocSize, - (double)maxAllocSize / (1024.0 * 1024.0)); + log_error("Failed to allocate even %lld bytes (%gMB).\n", currentSize, + (double)currentSize / (1024.0 * 1024.0)); return -1; } @@ -709,9 +684,8 @@ int test_min_max_image_2d_width(cl_device_id deviceID, cl_context context, } /* Verify that we can actually allocate an image that large */ - error = clGetDeviceInfo(deviceID, CL_DEVICE_MAX_MEM_ALLOC_SIZE, - sizeof(maxAllocSize), &maxAllocSize, NULL); - test_error(error, "Unable to get CL_DEVICE_MAX_MEM_ALLOC_SIZE."); + maxAllocSize = get_device_info_max_mem_alloc_size( + deviceID, MAX_DEVICE_MEMORY_SIZE_DIVISOR); if ((cl_ulong)maxDimension * 1 * 4 > maxAllocSize) { log_error("Can not allocate a large enough image (min size: %lld " @@ -787,9 +761,8 @@ int test_min_max_image_2d_height(cl_device_id deviceID, cl_context context, } /* Verify that we can actually allocate an image that large */ - error = clGetDeviceInfo(deviceID, CL_DEVICE_MAX_MEM_ALLOC_SIZE, - sizeof(maxAllocSize), &maxAllocSize, NULL); - test_error(error, "Unable to get CL_DEVICE_MAX_MEM_ALLOC_SIZE."); + maxAllocSize = get_device_info_max_mem_alloc_size( + deviceID, MAX_DEVICE_MEMORY_SIZE_DIVISOR); if ((cl_ulong)maxDimension * 1 * 4 > maxAllocSize) { log_error("Can not allocate a large enough image (min size: %lld " @@ -855,9 +828,8 @@ int test_min_max_image_3d_width(cl_device_id deviceID, cl_context context, } /* Verify that we can actually allocate an image that large */ - error = clGetDeviceInfo(deviceID, CL_DEVICE_MAX_MEM_ALLOC_SIZE, - sizeof(maxAllocSize), &maxAllocSize, NULL); - test_error(error, "Unable to get CL_DEVICE_MAX_MEM_ALLOC_SIZE."); + maxAllocSize = get_device_info_max_mem_alloc_size( + deviceID, MAX_DEVICE_MEMORY_SIZE_DIVISOR); if ((cl_ulong)maxDimension * 2 * 4 > maxAllocSize) { log_error("Can not allocate a large enough image (min size: %lld " @@ -924,9 +896,8 @@ int test_min_max_image_3d_height(cl_device_id deviceID, cl_context context, } /* Verify that we can actually allocate an image that large */ - error = clGetDeviceInfo(deviceID, CL_DEVICE_MAX_MEM_ALLOC_SIZE, - sizeof(maxAllocSize), &maxAllocSize, NULL); - test_error(error, "Unable to get CL_DEVICE_MAX_MEM_ALLOC_SIZE."); + maxAllocSize = get_device_info_max_mem_alloc_size( + deviceID, MAX_DEVICE_MEMORY_SIZE_DIVISOR); if ((cl_ulong)maxDimension * 2 * 4 > maxAllocSize) { log_error("Can not allocate a large enough image (min size: %lld " @@ -994,9 +965,8 @@ int test_min_max_image_3d_depth(cl_device_id deviceID, cl_context context, } /* Verify that we can actually allocate an image that large */ - error = clGetDeviceInfo(deviceID, CL_DEVICE_MAX_MEM_ALLOC_SIZE, - sizeof(maxAllocSize), &maxAllocSize, NULL); - test_error(error, "Unable to get CL_DEVICE_MAX_MEM_ALLOC_SIZE."); + maxAllocSize = get_device_info_max_mem_alloc_size( + deviceID, MAX_DEVICE_MEMORY_SIZE_DIVISOR); if ((cl_ulong)maxDimension * 1 * 4 > maxAllocSize) { log_error("Can not allocate a large enough image (min size: %lld " @@ -1063,9 +1033,8 @@ int test_min_max_image_array_size(cl_device_id deviceID, cl_context context, } /* Verify that we can actually allocate an image that large */ - error = clGetDeviceInfo(deviceID, CL_DEVICE_MAX_MEM_ALLOC_SIZE, - sizeof(maxAllocSize), &maxAllocSize, NULL); - test_error(error, "Unable to get CL_DEVICE_MAX_MEM_ALLOC_SIZE."); + maxAllocSize = get_device_info_max_mem_alloc_size( + deviceID, MAX_DEVICE_MEMORY_SIZE_DIVISOR); if ((cl_ulong)maxDimension * 1 * 4 > maxAllocSize) { log_error("Can not allocate a large enough image (min size: %lld " @@ -1105,10 +1074,9 @@ int test_min_max_image_buffer_size(cl_device_id deviceID, cl_context context, PASSIVE_REQUIRE_IMAGE_SUPPORT(deviceID); - /* Get the max memory allocation size */ - error = clGetDeviceInfo(deviceID, CL_DEVICE_MAX_MEM_ALLOC_SIZE, - sizeof(maxAllocSize), &maxAllocSize, NULL); - test_error(error, "Unable to get CL_DEVICE_MAX_MEM_ALLOC_SIZE."); + /* Get the max memory allocation size, divide it */ + maxAllocSize = get_device_info_max_mem_alloc_size( + deviceID, MAX_DEVICE_MEMORY_SIZE_DIVISOR); /* Get the max image array width */ error = @@ -1559,7 +1527,6 @@ int test_min_max_samplers(cl_device_id deviceID, cl_context context, return 0; } -#define PASSING_FRACTION 4 int test_min_max_constant_buffer_size(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements) { @@ -1575,9 +1542,8 @@ int test_min_max_constant_buffer_size(cl_device_id deviceID, cl_context context, MTdata d; /* Verify our test buffer won't be bigger than allowed */ - error = clGetDeviceInfo(deviceID, CL_DEVICE_MAX_CONSTANT_BUFFER_SIZE, - sizeof(maxSize), &maxSize, 0); - test_error(error, "Unable to get max constant buffer size"); + maxSize = get_device_info_max_constant_buffer_size( + deviceID, MAX_DEVICE_MEMORY_SIZE_DIVISOR); if ((0 == gIsEmbedded && maxSize < 64L * 1024L) || maxSize < 1L * 1024L) { @@ -1589,16 +1555,14 @@ int test_min_max_constant_buffer_size(cl_device_id deviceID, cl_context context, log_info("Reported max constant buffer size of %lld bytes.\n", maxSize); - // Limit test buffer size to 1/8 of CL_DEVICE_GLOBAL_MEM_SIZE - error = clGetDeviceInfo(deviceID, CL_DEVICE_GLOBAL_MEM_SIZE, - sizeof(maxGlobalSize), &maxGlobalSize, 0); - test_error(error, "Unable to get CL_DEVICE_GLOBAL_MEM_SIZE"); + /* We have four buffers allocations */ + maxGlobalSize = get_device_info_global_mem_size( + deviceID, MAX_DEVICE_MEMORY_SIZE_DIVISOR * 4); - if (maxSize > maxGlobalSize / 8) maxSize = maxGlobalSize / 8; + if (maxSize > maxGlobalSize) maxSize = maxGlobalSize; - error = clGetDeviceInfo(deviceID, CL_DEVICE_MAX_MEM_ALLOC_SIZE, - sizeof(maxAllocSize), &maxAllocSize, 0); - test_error(error, "Unable to get CL_DEVICE_MAX_MEM_ALLOC_SIZE "); + maxAllocSize = get_device_info_max_mem_alloc_size( + deviceID, MAX_DEVICE_MEMORY_SIZE_DIVISOR); if (maxSize > maxAllocSize) maxSize = maxAllocSize; @@ -1615,7 +1579,7 @@ int test_min_max_constant_buffer_size(cl_device_id deviceID, cl_context context, currentSize = maxSize; int allocPassed = 0; d = init_genrand(gRandomSeed); - while (!allocPassed && currentSize >= maxSize / PASSING_FRACTION) + while (!allocPassed && currentSize >= maxSize / MAX_REDUCTION_FACTOR) { log_info("Attempting to allocate constant buffer of size %lld bytes\n", maxSize); @@ -1741,7 +1705,7 @@ int test_min_max_constant_buffer_size(cl_device_id deviceID, cl_context context, if (allocPassed) { - if (currentSize < maxSize / PASSING_FRACTION) + if (currentSize < maxSize / MAX_REDUCTION_FACTOR) { log_error("Failed to allocate at least 1/8 of the reported " "constant size.\n"); @@ -1808,10 +1772,9 @@ int test_min_max_constant_args(cl_device_id deviceID, cl_context context, return -1; } - error = clGetDeviceInfo(deviceID, CL_DEVICE_MAX_CONSTANT_BUFFER_SIZE, - sizeof(maxSize), &maxSize, 0); - test_error(error, "Unable to get max constant buffer size"); - individualBufferSize = (maxSize / 2) / maxArgs; + maxSize = get_device_info_max_constant_buffer_size( + deviceID, MAX_DEVICE_MEMORY_SIZE_DIVISOR); + individualBufferSize = ((int)maxSize / 2) / maxArgs; log_info( "Reported max constant arg count of %u and max constant buffer " diff --git a/test_conformance/api/test_kernels.cpp b/test_conformance/api/test_kernels.cpp index d25410ba2f..82bebabc9d 100644 --- a/test_conformance/api/test_kernels.cpp +++ b/test_conformance/api/test_kernels.cpp @@ -389,8 +389,8 @@ int test_set_kernel_arg_constant(cl_device_id deviceID, cl_context context, cl_c std::vector randomTestDataB(num_elements); /* Verify our test buffer won't be bigger than allowed */ - error = clGetDeviceInfo( deviceID, CL_DEVICE_MAX_CONSTANT_BUFFER_SIZE, sizeof( maxSize ), &maxSize, 0 ); - test_error( error, "Unable to get max constant buffer size" ); + maxSize = get_device_info_max_constant_buffer_size( + deviceID, MAX_DEVICE_MEMORY_SIZE_DIVISOR); if (maxSize < sizeof(cl_int) * num_elements) { log_error( "ERROR: Unable to test constant argument to kernel: max size of constant buffer is reported as %d!\n", (int)maxSize ); diff --git a/test_conformance/images/clGetInfo/test_1D.cpp b/test_conformance/images/clGetInfo/test_1D.cpp index 7e044856f3..0037716ddc 100644 --- a/test_conformance/images/clGetInfo/test_1D.cpp +++ b/test_conformance/images/clGetInfo/test_1D.cpp @@ -40,13 +40,16 @@ int test_get_image_info_1D( cl_device_id device, cl_context context, cl_image_fo pixelSize = get_pixel_size( imageInfo.format ); int error = clGetDeviceInfo( device, CL_DEVICE_IMAGE2D_MAX_WIDTH, sizeof( maxWidth ), &maxWidth, NULL ); - error |= clGetDeviceInfo( device, CL_DEVICE_MAX_MEM_ALLOC_SIZE, sizeof( maxAllocSize ), &maxAllocSize, NULL ); - error |= clGetDeviceInfo( device, CL_DEVICE_GLOBAL_MEM_SIZE, sizeof( memSize ), &memSize, NULL ); test_error( error, "Unable to get max image 1D size from device" ); + /* Reduce the size used by the test by half */ + maxAllocSize = get_device_info_max_mem_alloc_size( + device, MAX_DEVICE_MEMORY_SIZE_DIVISOR); + memSize = + get_device_info_global_mem_size(device, MAX_DEVICE_MEMORY_SIZE_DIVISOR); + if (memSize > (cl_ulong)SIZE_MAX) { memSize = (cl_ulong)SIZE_MAX; - maxAllocSize = (cl_ulong)SIZE_MAX; } if( gTestSmallImages ) diff --git a/test_conformance/images/clGetInfo/test_1D_2D_array.cpp b/test_conformance/images/clGetInfo/test_1D_2D_array.cpp index c35bf22b1c..750497d62a 100644 --- a/test_conformance/images/clGetInfo/test_1D_2D_array.cpp +++ b/test_conformance/images/clGetInfo/test_1D_2D_array.cpp @@ -38,13 +38,16 @@ int test_get_image_info_1D_array( cl_device_id device, cl_context context, cl_im int error = clGetDeviceInfo( device, CL_DEVICE_IMAGE2D_MAX_WIDTH, sizeof( maxWidth ), &maxWidth, NULL ); error |= clGetDeviceInfo( device, CL_DEVICE_IMAGE_MAX_ARRAY_SIZE, sizeof( maxArraySize ), &maxArraySize, NULL ); - error |= clGetDeviceInfo( device, CL_DEVICE_MAX_MEM_ALLOC_SIZE, sizeof( maxAllocSize ), &maxAllocSize, NULL ); - error |= clGetDeviceInfo( device, CL_DEVICE_GLOBAL_MEM_SIZE, sizeof( memSize ), &memSize, NULL ); test_error( error, "Unable to get max image 1D array size from device" ); + /* Reduce the size used by the test by half */ + maxAllocSize = get_device_info_max_mem_alloc_size( + device, MAX_DEVICE_MEMORY_SIZE_DIVISOR); + memSize = + get_device_info_global_mem_size(device, MAX_DEVICE_MEMORY_SIZE_DIVISOR); + if (memSize > (cl_ulong)SIZE_MAX) { memSize = (cl_ulong)SIZE_MAX; - maxAllocSize = (cl_ulong)SIZE_MAX; } if( gTestSmallImages ) @@ -163,13 +166,16 @@ int test_get_image_info_2D_array( cl_device_id device, cl_context context, cl_im int error = clGetDeviceInfo( device, CL_DEVICE_IMAGE2D_MAX_WIDTH, sizeof( maxWidth ), &maxWidth, NULL ); error |= clGetDeviceInfo( device, CL_DEVICE_IMAGE2D_MAX_HEIGHT, sizeof( maxHeight ), &maxHeight, NULL ); error |= clGetDeviceInfo( device, CL_DEVICE_IMAGE_MAX_ARRAY_SIZE, sizeof( maxArraySize ), &maxArraySize, NULL ); - error |= clGetDeviceInfo( device, CL_DEVICE_MAX_MEM_ALLOC_SIZE, sizeof( maxAllocSize ), &maxAllocSize, NULL ); - error |= clGetDeviceInfo( device, CL_DEVICE_GLOBAL_MEM_SIZE, sizeof( memSize ), &memSize, NULL ); test_error( error, "Unable to get max image 1D array size from device" ); + /* Reduce the size used by the test by half */ + maxAllocSize = get_device_info_max_mem_alloc_size( + device, MAX_DEVICE_MEMORY_SIZE_DIVISOR); + memSize = + get_device_info_global_mem_size(device, MAX_DEVICE_MEMORY_SIZE_DIVISOR); + if (memSize > (cl_ulong)SIZE_MAX) { memSize = (cl_ulong)SIZE_MAX; - maxAllocSize = (cl_ulong)SIZE_MAX; } if( gTestSmallImages ) diff --git a/test_conformance/images/clGetInfo/test_2D.cpp b/test_conformance/images/clGetInfo/test_2D.cpp index 12c1202678..e8e57a2282 100644 --- a/test_conformance/images/clGetInfo/test_2D.cpp +++ b/test_conformance/images/clGetInfo/test_2D.cpp @@ -302,13 +302,16 @@ int test_get_image_info_2D( cl_device_id device, cl_context context, cl_image_fo int error = clGetDeviceInfo( device, CL_DEVICE_IMAGE2D_MAX_WIDTH, sizeof( maxWidth ), &maxWidth, NULL ); error |= clGetDeviceInfo( device, CL_DEVICE_IMAGE2D_MAX_HEIGHT, sizeof( maxHeight ), &maxHeight, NULL ); - error |= clGetDeviceInfo( device, CL_DEVICE_MAX_MEM_ALLOC_SIZE, sizeof( maxAllocSize ), &maxAllocSize, NULL ); - error |= clGetDeviceInfo( device, CL_DEVICE_GLOBAL_MEM_SIZE, sizeof( memSize ), &memSize, NULL ); test_error( error, "Unable to get max image 2D width or max image 3D height or max memory allocation size or global memory size from device" ); + /* Reduce the size used by the test by half */ + maxAllocSize = get_device_info_max_mem_alloc_size( + device, MAX_DEVICE_MEMORY_SIZE_DIVISOR); + memSize = + get_device_info_global_mem_size(device, MAX_DEVICE_MEMORY_SIZE_DIVISOR); + if (memSize > (cl_ulong)SIZE_MAX) { memSize = (cl_ulong)SIZE_MAX; - maxAllocSize = (cl_ulong)SIZE_MAX; } if( gTestSmallImages ) diff --git a/test_conformance/images/clGetInfo/test_3D.cpp b/test_conformance/images/clGetInfo/test_3D.cpp index e1261863cc..1ec7bfbc69 100644 --- a/test_conformance/images/clGetInfo/test_3D.cpp +++ b/test_conformance/images/clGetInfo/test_3D.cpp @@ -41,13 +41,16 @@ int test_get_image_info_3D( cl_device_id device, cl_context context, cl_image_fo int error = clGetDeviceInfo( device, CL_DEVICE_IMAGE3D_MAX_WIDTH, sizeof( maxWidth ), &maxWidth, NULL ); error |= clGetDeviceInfo( device, CL_DEVICE_IMAGE3D_MAX_HEIGHT, sizeof( maxHeight ), &maxHeight, NULL ); error |= clGetDeviceInfo( device, CL_DEVICE_IMAGE3D_MAX_DEPTH, sizeof( maxDepth ), &maxDepth, NULL ); - error |= clGetDeviceInfo( device, CL_DEVICE_MAX_MEM_ALLOC_SIZE, sizeof( maxAllocSize ), &maxAllocSize, NULL ); - error |= clGetDeviceInfo( device, CL_DEVICE_GLOBAL_MEM_SIZE, sizeof( memSize ), &memSize, NULL ); test_error( error, "Unable to get max image 3D size from device" ); + /* Reduce the size used by the test by half */ + maxAllocSize = get_device_info_max_mem_alloc_size( + device, MAX_DEVICE_MEMORY_SIZE_DIVISOR); + memSize = + get_device_info_global_mem_size(device, MAX_DEVICE_MEMORY_SIZE_DIVISOR); + if (memSize > (cl_ulong)SIZE_MAX) { memSize = (cl_ulong)SIZE_MAX; - maxAllocSize = (cl_ulong)SIZE_MAX; } if( gTestSmallImages )