From 62baa4df5faa6f31cabe3c18d6f92caf823f4d79 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Thu, 15 Feb 2024 16:52:48 +0200 Subject: [PATCH] intel/clc: lower temp function/shader variables together Signed-off-by: Lionel Landwerlin Acked-by: Caio Oliveira Fixes: 4fd7495c69 ("intel/clc: add ability to output NIR") Part-of: --- src/intel/compiler/brw_kernel.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/intel/compiler/brw_kernel.c b/src/intel/compiler/brw_kernel.c index 2a7340ac70a..89749cf62c1 100644 --- a/src/intel/compiler/brw_kernel.c +++ b/src/intel/compiler/brw_kernel.c @@ -582,7 +582,8 @@ brw_nir_from_spirv(void *mem_ctx, const uint32_t *spirv, size_t spirv_size) nir->scratch_size = 0; NIR_PASS_V(nir, nir_lower_vars_to_explicit_types, - nir_var_mem_shared | nir_var_function_temp | nir_var_mem_global | nir_var_mem_constant, + nir_var_mem_shared | nir_var_function_temp | nir_var_shader_temp | + nir_var_mem_global | nir_var_mem_constant, glsl_get_cl_type_size_align); // Lower memcpy - needs to wait until types are sized @@ -605,7 +606,7 @@ brw_nir_from_spirv(void *mem_ctx, const uint32_t *spirv, size_t spirv_size) NIR_PASS_V(nir, nir_lower_memcpy); NIR_PASS_V(nir, nir_lower_explicit_io, - nir_var_mem_shared | nir_var_function_temp | nir_var_uniform, + nir_var_mem_shared | nir_var_function_temp | nir_var_shader_temp | nir_var_uniform, nir_address_format_32bit_offset_as_64bit); NIR_PASS_V(nir, nir_lower_system_values); @@ -617,7 +618,6 @@ brw_nir_from_spirv(void *mem_ctx, const uint32_t *spirv, size_t spirv_size) nir->scratch_size = 0; nir->info.shared_size = 0; NIR_PASS_V(nir, nir_lower_vars_to_explicit_types, - nir_var_shader_temp | nir_var_function_temp | nir_var_mem_shared | nir_var_mem_global | nir_var_mem_constant, glsl_get_cl_type_size_align); if (nir->constant_data_size > 0) {