diff --git a/src/gallium/frontends/rusticl/api/device.rs b/src/gallium/frontends/rusticl/api/device.rs index 379023d51df..d25dad96742 100644 --- a/src/gallium/frontends/rusticl/api/device.rs +++ b/src/gallium/frontends/rusticl/api/device.rs @@ -30,7 +30,7 @@ const SPIRV_SUPPORT: [cl_name_version; 7] = [ mk_cl_version_ext(1, 5, 0, "SPIR-V"), mk_cl_version_ext(1, 6, 0, "SPIR-V"), ]; -type ClDevIdpAccelProps = cl_device_integer_dot_product_acceleration_properties_khr; +type ClDevIdpAccelProps = cl_device_integer_dot_product_acceleration_properties; #[cl_info_entrypoint(clGetDeviceInfo)] unsafe impl CLInfo for cl_device_id { @@ -116,14 +116,14 @@ unsafe impl CLInfo for cl_device_id { CL_DEVICE_IMAGE3D_MAX_HEIGHT => v.write::(dev.image_3d_size()), CL_DEVICE_IMAGE3D_MAX_WIDTH => v.write::(dev.image_3d_size()), CL_DEVICE_IMAGE3D_MAX_DEPTH => v.write::(dev.image_3d_size()), - CL_DEVICE_INTEGER_DOT_PRODUCT_CAPABILITIES_KHR => { - v.write::( - (CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_PACKED_KHR - | CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_KHR) + CL_DEVICE_INTEGER_DOT_PRODUCT_CAPABILITIES => { + v.write::( + (CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_PACKED + | CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT) .into(), ) } - CL_DEVICE_INTEGER_DOT_PRODUCT_ACCELERATION_PROPERTIES_8BIT_KHR => v + CL_DEVICE_INTEGER_DOT_PRODUCT_ACCELERATION_PROPERTIES_8BIT => v .write::({ let pack = dev.pack_32_4x8_supported(); let sdot = dev.sdot_4x8_supported() && pack; @@ -141,7 +141,7 @@ unsafe impl CLInfo for cl_device_id { sudot_sat.into(), ) }), - CL_DEVICE_INTEGER_DOT_PRODUCT_ACCELERATION_PROPERTIES_4x8BIT_PACKED_KHR => { + CL_DEVICE_INTEGER_DOT_PRODUCT_ACCELERATION_PROPERTIES_4x8BIT_PACKED => { v.write::({ IdpAccelProps::new( dev.sdot_4x8_supported().into(), @@ -167,12 +167,10 @@ unsafe impl CLInfo for cl_device_id { CL_DEVICE_LOCAL_MEM_SIZE => v.write::(dev.local_mem_size()), // TODO add query for CL_LOCAL vs CL_GLOBAL CL_DEVICE_LOCAL_MEM_TYPE => v.write::(CL_GLOBAL), - CL_DEVICE_LUID_KHR => v.write::<[cl_uchar; CL_LUID_SIZE_KHR as usize]>( + CL_DEVICE_LUID => v.write::<[cl_uchar; CL_LUID_SIZE as usize]>( dev.screen().device_luid().unwrap_or_default(), ), - CL_DEVICE_LUID_VALID_KHR => { - v.write::(dev.screen().device_luid().is_some().into()) - } + CL_DEVICE_LUID_VALID => v.write::(dev.screen().device_luid().is_some().into()), CL_DEVICE_MAX_CLOCK_FREQUENCY => v.write::(dev.max_clock_freq()), CL_DEVICE_MAX_COMPUTE_UNITS => v.write::(dev.max_compute_units()), // TODO atm implemented as mem_const @@ -197,8 +195,8 @@ unsafe impl CLInfo for cl_device_id { }), CL_DEVICE_MAX_SAMPLERS => v.write::(dev.max_samplers()), CL_DEVICE_MAX_WORK_GROUP_SIZE => v.write::(dev.max_threads_per_block()), + CL_DEVICE_MAX_WORK_GROUP_SIZES => v.write::<&[usize]>(&dev.max_block_sizes()), CL_DEVICE_MAX_WORK_ITEM_DIMENSIONS => v.write::(dev.max_grid_dimensions()), - CL_DEVICE_MAX_WORK_ITEM_SIZES => v.write::<&[usize]>(&dev.max_block_sizes()), CL_DEVICE_MAX_WRITE_IMAGE_ARGS => v.write::(dev.caps.max_write_images), CL_DEVICE_MEM_BASE_ADDR_ALIGN => v.write::(dev.mem_base_addr_align_bits()), CL_DEVICE_MIN_DATA_TYPE_ALIGN_SIZE => { @@ -212,7 +210,7 @@ unsafe impl CLInfo for cl_device_id { CL_DEVICE_NATIVE_VECTOR_WIDTH_INT => v.write::(1), CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG => v.write::(1), CL_DEVICE_NATIVE_VECTOR_WIDTH_SHORT => v.write::(1), - CL_DEVICE_NODE_MASK_KHR => { + CL_DEVICE_NODE_MASK => { v.write::(dev.screen().device_node_mask().unwrap_or_default()) } CL_DEVICE_NON_UNIFORM_WORK_GROUP_SUPPORT => v.write::(false), @@ -298,15 +296,15 @@ unsafe impl CLInfo for cl_device_id { CL_DEVICE_SINGLE_FP_CONFIG => v.write::( (CL_FP_ROUND_TO_NEAREST | CL_FP_INF_NAN) as cl_device_fp_config, ), - CL_DEVICE_SPIRV_CAPABILITIES_KHR => { + CL_DEVICE_SPIRV_CAPABILITIES => { v.write_iter::(dev.spirv_caps_vec.iter().map(|&cap| cap as _)) } - CL_DEVICE_SPIRV_EXTENDED_INSTRUCTION_SETS_KHR => { + CL_DEVICE_SPIRV_EXTENDED_INSTRUCTION_SETS => { // use static memory as we hand out pointers to the values here. static instr_sets: [&CStr; 1] = [c"OpenCL.std"]; v.write_iter::<*const c_char>(instr_sets.iter().map(|str| str.as_ptr())) } - CL_DEVICE_SPIRV_EXTENSIONS_KHR => { + CL_DEVICE_SPIRV_EXTENSIONS => { v.write_iter::<*const c_char>(dev.spirv_extensions.iter().map(|str| str.as_ptr())) } CL_DEVICE_SUB_GROUP_INDEPENDENT_FORWARD_PROGRESS => v.write::(false), @@ -335,13 +333,13 @@ unsafe impl CLInfo for cl_device_id { // OpenCL device. v.write::((dev.device_type & !CL_DEVICE_TYPE_DEFAULT).into()) } - CL_DEVICE_UUID_KHR => v.write::<[cl_uchar; CL_UUID_SIZE_KHR as usize]>( + CL_DEVICE_UUID => v.write::<[cl_uchar; CL_UUID_SIZE as usize]>( dev.screen().device_uuid().unwrap_or_default(), ), CL_DEVICE_VENDOR => v.write::<&CStr>(dev.screen().device_vendor()), CL_DEVICE_VENDOR_ID => v.write::(dev.vendor_id()), CL_DEVICE_VERSION => v.write::<&str>(&format!("OpenCL {} ", dev.cl_version.api_str())), - CL_DRIVER_UUID_KHR => v.write::<[cl_char; CL_UUID_SIZE_KHR as usize]>( + CL_DRIVER_UUID => v.write::<[cl_char; CL_UUID_SIZE as usize]>( dev.screen().driver_uuid().unwrap_or_default(), ), CL_DRIVER_VERSION => v.write::<&CStr>(unsafe { CStr::from_ptr(mesa_version_string()) }), diff --git a/src/gallium/frontends/rusticl/api/types.rs b/src/gallium/frontends/rusticl/api/types.rs index 859f9e1ad1f..dae49a8ea4d 100644 --- a/src/gallium/frontends/rusticl/api/types.rs +++ b/src/gallium/frontends/rusticl/api/types.rs @@ -378,7 +378,7 @@ where #[allow(non_snake_case)] pub mod IdpAccelProps { use rusticl_opencl_gen::cl_bool; - use rusticl_opencl_gen::cl_device_integer_dot_product_acceleration_properties_khr; + use rusticl_opencl_gen::cl_device_integer_dot_product_acceleration_properties; pub fn new( signed_accelerated: cl_bool, unsigned_accelerated: cl_bool, @@ -386,8 +386,8 @@ pub mod IdpAccelProps { accumulating_saturating_signed_accelerated: cl_bool, accumulating_saturating_unsigned_accelerated: cl_bool, accumulating_saturating_mixed_signedness_accelerated: cl_bool, - ) -> cl_device_integer_dot_product_acceleration_properties_khr { - cl_device_integer_dot_product_acceleration_properties_khr { + ) -> cl_device_integer_dot_product_acceleration_properties { + cl_device_integer_dot_product_acceleration_properties { signed_accelerated, unsigned_accelerated, mixed_signedness_accelerated, diff --git a/src/gallium/frontends/rusticl/api/util.rs b/src/gallium/frontends/rusticl/api/util.rs index c901f113ef4..4a8ef5de48c 100644 --- a/src/gallium/frontends/rusticl/api/util.rs +++ b/src/gallium/frontends/rusticl/api/util.rs @@ -298,7 +298,7 @@ cl_prop_for_type!(cl_ulong); cl_prop_for_type!(isize); cl_prop_for_type!(usize); -cl_prop_for_type!(cl_device_integer_dot_product_acceleration_properties_khr); +cl_prop_for_type!(cl_device_integer_dot_product_acceleration_properties); cl_prop_for_type!(cl_device_pci_bus_info_khr); cl_prop_for_type!(cl_image_format); cl_prop_for_type!(cl_name_version);