mirror of
https://github.com/KhronosGroup/OpenCL-CTS.git
synced 2026-03-19 06:09:01 +00:00
Re-enabling narrowing errors (#1144)
Fixes narrowing conversion build errors in test_common Removing disable of narrowing errors in main CMakeLists.txt and moving it down to specific test_conformance suite's CMakeLists.txt where there are many more build errors revealed from this fix. Fixes a few simple issues under test_conformance in the process. Contributes #787 Signed-off-by: Ellen Norris-Thompson <ellen.norris-thompson@arm.com> --------- Signed-off-by: Ellen Norris-Thompson <ellen.norris-thompson@arm.com>
This commit is contained in:
@@ -353,7 +353,8 @@ int test_device_set(size_t deviceCount, size_t queueCount, cl_device_id *devices
|
||||
}
|
||||
|
||||
|
||||
int init_device_partition_test(cl_device_id parentDevice, cl_uint &maxComputeUnits, cl_uint &maxSubDevices)
|
||||
int init_device_partition_test(cl_device_id parentDevice,
|
||||
cl_uint &maxComputeUnits, cl_uint &maxSubDevices)
|
||||
{
|
||||
int err = clGetDeviceInfo(parentDevice, CL_DEVICE_MAX_COMPUTE_UNITS, sizeof(maxComputeUnits), &maxComputeUnits, NULL);
|
||||
test_error( err, "Unable to get maximal number of compute units" );
|
||||
@@ -449,14 +450,21 @@ int test_partition_of_device(cl_device_id deviceID, cl_context context, cl_comma
|
||||
|
||||
#define PROPERTY_TYPES 8
|
||||
cl_device_partition_property partitionProp[PROPERTY_TYPES][5] = {
|
||||
{ CL_DEVICE_PARTITION_EQUALLY, maxComputeUnits / 2, 0, 0, 0 } ,
|
||||
{ CL_DEVICE_PARTITION_BY_COUNTS, 1, maxComputeUnits - 1, CL_DEVICE_PARTITION_BY_COUNTS_LIST_END, 0 } ,
|
||||
{ CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN, CL_DEVICE_AFFINITY_DOMAIN_NUMA, 0, 0, 0 } ,
|
||||
{ CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN, CL_DEVICE_AFFINITY_DOMAIN_L4_CACHE, 0, 0, 0 } ,
|
||||
{ CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN, CL_DEVICE_AFFINITY_DOMAIN_L3_CACHE, 0, 0, 0 } ,
|
||||
{ CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN, CL_DEVICE_AFFINITY_DOMAIN_L2_CACHE, 0, 0, 0 } ,
|
||||
{ CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN, CL_DEVICE_AFFINITY_DOMAIN_L1_CACHE, 0, 0, 0 } ,
|
||||
{ CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN, CL_DEVICE_AFFINITY_DOMAIN_NEXT_PARTITIONABLE, 0, 0, 0 }
|
||||
{ CL_DEVICE_PARTITION_EQUALLY, (cl_int)maxComputeUnits / 2, 0, 0, 0 },
|
||||
{ CL_DEVICE_PARTITION_BY_COUNTS, 1, (cl_int)maxComputeUnits - 1,
|
||||
CL_DEVICE_PARTITION_BY_COUNTS_LIST_END, 0 },
|
||||
{ CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN,
|
||||
CL_DEVICE_AFFINITY_DOMAIN_NUMA, 0, 0, 0 },
|
||||
{ CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN,
|
||||
CL_DEVICE_AFFINITY_DOMAIN_L4_CACHE, 0, 0, 0 },
|
||||
{ CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN,
|
||||
CL_DEVICE_AFFINITY_DOMAIN_L3_CACHE, 0, 0, 0 },
|
||||
{ CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN,
|
||||
CL_DEVICE_AFFINITY_DOMAIN_L2_CACHE, 0, 0, 0 },
|
||||
{ CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN,
|
||||
CL_DEVICE_AFFINITY_DOMAIN_L1_CACHE, 0, 0, 0 },
|
||||
{ CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN,
|
||||
CL_DEVICE_AFFINITY_DOMAIN_NEXT_PARTITIONABLE, 0, 0, 0 }
|
||||
};
|
||||
|
||||
// loop thru each type, creating sub-devices for each type
|
||||
|
||||
Reference in New Issue
Block a user