if (dev.address_bits() == 32u) {
spirv_options.shared_addr_format = nir_address_format_32bit_offset;
spirv_options.global_addr_format = nir_address_format_32bit_global;
- spirv_options.temp_addr_format = nir_address_format_32bit_global;
+ spirv_options.temp_addr_format = nir_address_format_32bit_offset;
+ spirv_options.constant_addr_format = nir_address_format_32bit_global;
} else {
spirv_options.shared_addr_format = nir_address_format_32bit_offset_as_64bit;
spirv_options.global_addr_format = nir_address_format_64bit_global;
- spirv_options.temp_addr_format = nir_address_format_64bit_global;
+ spirv_options.temp_addr_format = nir_address_format_32bit_offset_as_64bit;
+ spirv_options.constant_addr_format = nir_address_format_64bit_global;
}
spirv_options.caps.address = true;
spirv_options.caps.float64 = true;
spirv_options.caps.int64 = true;
spirv_options.caps.kernel = true;
spirv_options.caps.int64_atomics = dev.has_int64_atomics();
- spirv_options.constant_as_global = true;
spirv_options.debug.func = &debug_function;
spirv_options.debug.private_data = &r_log;
nir_validate_shader(nir, "clover after function inlining");
- NIR_PASS_V(nir, nir_lower_variable_initializers,
- static_cast<nir_variable_mode>(~nir_var_function_temp));
+ NIR_PASS_V(nir, nir_lower_variable_initializers, ~nir_var_function_temp);
// copy propagate to prepare for lower_explicit_io
NIR_PASS_V(nir, nir_split_var_copies);
offset += glsl_get_cl_size(var->type);
}
- NIR_PASS_V(nir, nir_lower_vars_to_explicit_types, nir_var_mem_shared,
+ NIR_PASS_V(nir, nir_lower_mem_constant_vars,
+ glsl_get_cl_type_size_align);
+ NIR_PASS_V(nir, nir_lower_vars_to_explicit_types,
+ nir_var_mem_shared | nir_var_function_temp,
glsl_get_cl_type_size_align);
- /* use offsets for uniform and shared memory */
+ /* use offsets for kernel inputs (uniform) */
NIR_PASS_V(nir, nir_lower_explicit_io, nir_var_uniform,
+ nir->info.cs.ptr_size == 64 ?
+ nir_address_format_32bit_offset_as_64bit :
nir_address_format_32bit_offset);
+ NIR_PASS_V(nir, nir_lower_explicit_io, nir_var_mem_constant,
+ spirv_options.constant_addr_format);
NIR_PASS_V(nir, nir_lower_explicit_io, nir_var_mem_shared,
spirv_options.shared_addr_format);
+ NIR_PASS_V(nir, nir_lower_explicit_io, nir_var_function_temp,
+ spirv_options.temp_addr_format);
+
NIR_PASS_V(nir, nir_lower_explicit_io, nir_var_mem_global,
spirv_options.global_addr_format);
+ NIR_PASS_V(nir, nir_remove_dead_variables, nir_var_all, NULL);
+
if (compiler_options->lower_int64_options)
NIR_PASS_V(nir, nir_lower_int64);