From 15257b65c6d8e1b8885d7ac3c7a428f5c86a6f04 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Sun, 16 Jun 2024 16:32:01 -0400 Subject: [PATCH] treewide: use nir_metadata_control_flow Via Coccinelle patch: @@ @@ -nir_metadata_block_index | nir_metadata_dominance +nir_metadata_control_flow ...plus some manual fixups for call sites missed by coccinelle. Signed-off-by: Alyssa Rosenzweig Reviewed-by: Faith Ekstrand Acked-by: Karol Herbst Acked-by: Juan A. Suarez Romero [broadcom] Acked-by: Vasily Khoruzhick [lima] Part-of: --- src/amd/common/ac_nir.c | 9 ++-- src/amd/common/ac_nir_lower_esgs_io_to_mem.c | 2 +- src/amd/common/ac_nir_lower_global_access.c | 2 +- .../common/ac_nir_lower_image_opcodes_cdna.c | 3 +- src/amd/common/ac_nir_lower_ngg.c | 4 +- src/amd/common/ac_nir_lower_ps.c | 2 +- src/amd/common/ac_nir_lower_resinfo.c | 3 +- src/amd/common/ac_nir_lower_subdword_loads.c | 3 +- src/amd/common/ac_nir_lower_tess_io_to_mem.c | 2 +- src/amd/common/ac_nir_lower_tex.c | 4 +- src/amd/common/ac_nir_opt_outputs.c | 3 +- .../nir/radv_nir_apply_pipeline_layout.c | 2 +- .../vulkan/nir/radv_nir_export_multiview.c | 2 +- src/amd/vulkan/nir/radv_nir_lower_abi.c | 2 +- .../nir/radv_nir_lower_hit_attrib_derefs.c | 3 +- .../nir/radv_nir_lower_intrinsics_early.c | 2 +- src/amd/vulkan/nir/radv_nir_lower_io.c | 3 +- .../radv_nir_lower_primitive_shading_rate.c | 2 +- .../vulkan/nir/radv_nir_lower_view_index.c | 2 +- .../nir/radv_nir_lower_viewport_to_zero.c | 2 +- src/amd/vulkan/nir/radv_nir_lower_vs_inputs.c | 3 +- src/amd/vulkan/nir/radv_nir_rt_shader.c | 5 +- src/asahi/compiler/agx_compile.c | 4 +- src/asahi/compiler/agx_nir_lower_address.c | 4 +- .../compiler/agx_nir_lower_cull_distance.c | 6 +-- .../compiler/agx_nir_lower_discard_zs_emit.c | 8 ++-- .../compiler/agx_nir_lower_frag_sidefx.c | 3 +- .../compiler/agx_nir_lower_sample_mask.c | 6 +-- .../compiler/agx_nir_lower_shared_bitsize.c | 4 +- src/asahi/compiler/agx_nir_lower_subgroups.c | 4 +- src/asahi/lib/agx_bg_eot.c | 5 +- src/asahi/lib/agx_nir_lower_alpha.c | 6 +-- src/asahi/lib/agx_nir_lower_gs.c | 42 +++++++---------- src/asahi/lib/agx_nir_lower_ia.c | 6 +-- src/asahi/lib/agx_nir_lower_msaa.c | 8 ++-- .../lib/agx_nir_lower_sample_intrinsics.c | 5 +- src/asahi/lib/agx_nir_lower_tess.c | 6 +-- src/asahi/lib/agx_nir_lower_texture.c | 17 ++++--- src/asahi/lib/agx_nir_lower_uvs.c | 4 +- src/asahi/lib/agx_nir_lower_vbo.c | 4 +- src/asahi/lib/agx_nir_prolog_epilog.c | 35 +++++--------- .../compiler/v3d_nir_lower_image_load_store.c | 3 +- src/broadcom/compiler/v3d_nir_lower_io.c | 3 +- .../compiler/v3d_nir_lower_line_smooth.c | 3 +- .../v3d_nir_lower_load_store_bitsize.c | 6 +-- .../compiler/v3d_nir_lower_logic_ops.c | 3 +- src/broadcom/compiler/v3d_nir_lower_scratch.c | 3 +- src/broadcom/compiler/vir.c | 9 ++-- src/broadcom/vulkan/v3dv_pipeline.c | 6 +-- src/compiler/glsl/gl_nir_link_varyings.c | 3 +- src/compiler/glsl/gl_nir_linker.c | 5 +- src/compiler/glsl/gl_nir_lower_atomics.c | 3 +- src/compiler/glsl/gl_nir_lower_buffers.c | 3 +- src/compiler/glsl/gl_nir_lower_images.c | 3 +- .../gl_nir_lower_named_interface_blocks.c | 3 +- .../glsl/gl_nir_lower_samplers_as_deref.c | 3 +- src/compiler/nir/nir.c | 3 +- src/compiler/nir/nir_deref.c | 20 ++++---- src/compiler/nir/nir_from_ssa.c | 6 +-- src/compiler/nir/nir_group_loads.c | 3 +- src/compiler/nir/nir_inline_uniforms.c | 3 +- src/compiler/nir/nir_legacy.c | 3 +- src/compiler/nir/nir_linking_helpers.c | 3 +- src/compiler/nir/nir_lower_alpha_test.c | 3 +- src/compiler/nir/nir_lower_alu.c | 3 +- src/compiler/nir/nir_lower_alu_width.c | 2 +- src/compiler/nir/nir_lower_amul.c | 3 +- .../nir/nir_lower_array_deref_of_vec.c | 3 +- src/compiler/nir/nir_lower_atomics_to_ssbo.c | 3 +- src/compiler/nir/nir_lower_bit_size.c | 6 +-- src/compiler/nir/nir_lower_bitmap.c | 3 +- src/compiler/nir/nir_lower_blend.c | 6 +-- src/compiler/nir/nir_lower_bool_to_bitsize.c | 3 +- src/compiler/nir/nir_lower_bool_to_float.c | 3 +- src/compiler/nir/nir_lower_bool_to_int32.c | 3 +- src/compiler/nir/nir_lower_cl_images.c | 6 +-- .../nir/nir_lower_clamp_color_outputs.c | 3 +- .../nir/nir_lower_clip_cull_distance_arrays.c | 10 ++-- src/compiler/nir/nir_lower_clip_disable.c | 3 +- src/compiler/nir/nir_lower_clip_halfz.c | 3 +- .../nir/nir_lower_const_arrays_to_uniforms.c | 3 +- .../nir/nir_lower_convert_alu_types.c | 6 +-- src/compiler/nir/nir_lower_double_ops.c | 3 +- src/compiler/nir/nir_lower_drawpixels.c | 3 +- src/compiler/nir/nir_lower_fb_read.c | 3 +- src/compiler/nir/nir_lower_flrp.c | 3 +- .../nir/nir_lower_frag_coord_to_pixel_coord.c | 2 +- src/compiler/nir/nir_lower_fragcolor.c | 3 +- src/compiler/nir/nir_lower_frexp.c | 3 +- .../nir/nir_lower_global_vars_to_local.c | 3 +- src/compiler/nir/nir_lower_image.c | 3 +- .../nir/nir_lower_image_atomics_to_global.c | 3 +- .../nir/nir_lower_input_attachments.c | 3 +- src/compiler/nir/nir_lower_int_to_float.c | 3 +- src/compiler/nir/nir_lower_interpolation.c | 3 +- src/compiler/nir/nir_lower_io.c | 8 ++-- src/compiler/nir/nir_lower_io_to_scalar.c | 6 +-- .../nir/nir_lower_io_to_temporaries.c | 3 +- src/compiler/nir/nir_lower_io_to_vector.c | 5 +- .../nir/nir_lower_is_helper_invocation.c | 3 +- .../nir/nir_lower_load_const_to_scalar.c | 3 +- src/compiler/nir/nir_lower_locals_to_regs.c | 3 +- src/compiler/nir/nir_lower_mediump.c | 20 +++----- .../nir/nir_lower_mem_access_bit_sizes.c | 3 +- src/compiler/nir/nir_lower_memcpy.c | 3 +- src/compiler/nir/nir_lower_memory_model.c | 2 +- src/compiler/nir/nir_lower_packing.c | 2 +- .../nir/nir_lower_passthrough_edgeflags.c | 6 +-- src/compiler/nir/nir_lower_patch_vertices.c | 3 +- src/compiler/nir/nir_lower_phis_to_scalar.c | 3 +- src/compiler/nir/nir_lower_pntc_ytransform.c | 3 +- src/compiler/nir/nir_lower_point_size.c | 3 +- src/compiler/nir/nir_lower_point_size_mov.c | 2 +- .../nir/nir_lower_readonly_images_to_tex.c | 3 +- .../nir/nir_lower_reg_intrinsics_to_ssa.c | 6 +-- src/compiler/nir/nir_lower_robust_access.c | 2 +- src/compiler/nir/nir_lower_samplers.c | 3 +- src/compiler/nir/nir_lower_scratch.c | 3 +- src/compiler/nir/nir_lower_shader_calls.c | 24 ++++------ src/compiler/nir/nir_lower_single_sampled.c | 3 +- src/compiler/nir/nir_lower_ssbo.c | 3 +- src/compiler/nir/nir_lower_tess_coord_z.c | 3 +- src/compiler/nir/nir_lower_tex.c | 3 +- src/compiler/nir/nir_lower_texcoord_replace.c | 3 +- .../nir/nir_lower_texcoord_replace_late.c | 2 +- src/compiler/nir/nir_lower_two_sided_color.c | 3 +- src/compiler/nir/nir_lower_undef_to_zero.c | 3 +- src/compiler/nir/nir_lower_uniforms_to_ubo.c | 3 +- src/compiler/nir/nir_lower_var_copies.c | 3 +- .../nir/nir_lower_variable_initializers.c | 3 +- src/compiler/nir/nir_lower_vars_to_ssa.c | 3 +- src/compiler/nir/nir_lower_vec3_to_vec4.c | 3 +- src/compiler/nir/nir_lower_vec_to_regs.c | 3 +- .../nir/nir_lower_viewport_transform.c | 3 +- src/compiler/nir/nir_lower_wpos_center.c | 3 +- src/compiler/nir/nir_lower_wpos_ytransform.c | 3 +- src/compiler/nir/nir_lower_wrmasks.c | 3 +- .../nir/nir_move_vec_src_uses_to_dest.c | 3 +- .../nir/nir_normalize_cubemap_coords.c | 3 +- src/compiler/nir/nir_opt_access.c | 14 +++--- src/compiler/nir/nir_opt_barriers.c | 6 +-- src/compiler/nir/nir_opt_combine_stores.c | 3 +- src/compiler/nir/nir_opt_comparison_pre.c | 3 +- src/compiler/nir/nir_opt_constant_folding.c | 3 +- src/compiler/nir/nir_opt_copy_prop_vars.c | 3 +- src/compiler/nir/nir_opt_copy_propagate.c | 3 +- src/compiler/nir/nir_opt_cse.c | 3 +- src/compiler/nir/nir_opt_dce.c | 3 +- src/compiler/nir/nir_opt_dead_write_vars.c | 3 +- src/compiler/nir/nir_opt_find_array_copies.c | 3 +- src/compiler/nir/nir_opt_fragdepth.c | 3 +- src/compiler/nir/nir_opt_gcm.c | 6 +-- src/compiler/nir/nir_opt_idiv_const.c | 3 +- src/compiler/nir/nir_opt_if.c | 6 +-- src/compiler/nir/nir_opt_intrinsics.c | 3 +- src/compiler/nir/nir_opt_large_constants.c | 3 +- .../nir/nir_opt_load_store_vectorize.c | 8 ++-- src/compiler/nir/nir_opt_memcpy.c | 3 +- src/compiler/nir/nir_opt_move.c | 3 +- .../nir/nir_opt_move_discards_to_top.c | 3 +- src/compiler/nir/nir_opt_mqsad.c | 2 +- src/compiler/nir/nir_opt_offsets.c | 3 +- src/compiler/nir/nir_opt_phi_precision.c | 3 +- src/compiler/nir/nir_opt_preamble.c | 3 +- src/compiler/nir/nir_opt_ray_queries.c | 3 +- src/compiler/nir/nir_opt_reassociate_bfi.c | 3 +- .../nir/nir_opt_rematerialize_compares.c | 6 +-- src/compiler/nir/nir_opt_remove_phis.c | 3 +- src/compiler/nir/nir_opt_reuse_constants.c | 3 +- src/compiler/nir/nir_opt_shrink_stores.c | 3 +- src/compiler/nir/nir_opt_shrink_vectors.c | 3 +- src/compiler/nir/nir_opt_sink.c | 4 +- src/compiler/nir/nir_opt_undef.c | 3 +- src/compiler/nir/nir_opt_varyings.c | 6 +-- src/compiler/nir/nir_opt_vectorize.c | 3 +- src/compiler/nir/nir_phi_builder.c | 3 +- src/compiler/nir/nir_propagate_invariant.c | 3 +- src/compiler/nir/nir_remove_dead_variables.c | 3 +- src/compiler/nir/nir_repair_ssa.c | 6 +-- src/compiler/nir/nir_scale_fdiv.c | 3 +- src/compiler/nir/nir_search.c | 3 +- .../nir/nir_split_per_member_structs.c | 3 +- src/compiler/nir/nir_split_var_copies.c | 3 +- src/compiler/nir/nir_split_vars.c | 9 ++-- src/compiler/nir/nir_to_lcssa.c | 3 +- src/freedreno/ir3/ir3_nir.c | 2 +- .../ir3/ir3_nir_analyze_ubo_ranges.c | 4 +- src/freedreno/ir3/ir3_nir_lower_64b.c | 2 +- .../ir3/ir3_nir_lower_driver_params_to_ubo.c | 2 +- src/freedreno/ir3/ir3_nir_lower_io_offsets.c | 2 +- src/freedreno/ir3/ir3_nir_lower_layer_id.c | 2 +- src/freedreno/ir3/ir3_nir_lower_tess.c | 2 +- .../ir3/ir3_nir_lower_tex_prefetch.c | 2 +- .../ir3/ir3_nir_move_varying_inputs.c | 2 +- src/freedreno/ir3/ir3_nir_opt_preamble.c | 3 +- .../vulkan/tu_nir_lower_multiview.cc | 3 +- src/gallium/auxiliary/nir/nir_to_tgsi.c | 6 +-- .../drivers/asahi/agx_nir_lower_bindings.c | 3 +- .../drivers/asahi/agx_nir_lower_point_size.c | 6 +-- .../drivers/asahi/agx_nir_lower_sysvals.c | 6 +-- src/gallium/drivers/asahi/agx_state.c | 9 ++-- src/gallium/drivers/crocus/crocus_program.c | 3 +- .../drivers/d3d12/d3d12_lower_image_casts.c | 2 +- .../drivers/d3d12/d3d12_lower_point_sprite.c | 3 +- src/gallium/drivers/d3d12/d3d12_nir_passes.c | 28 +++++------ .../etnaviv/etnaviv_nir_lower_source_mods.c | 3 +- .../etnaviv/etnaviv_nir_lower_texture.c | 2 +- src/gallium/drivers/iris/iris_program.c | 3 +- .../lima/ir/lima_nir_duplicate_consts.c | 3 +- .../lima/ir/lima_nir_duplicate_intrinsic.c | 3 +- .../drivers/lima/ir/lima_nir_lower_txp.c | 3 +- .../lima/ir/lima_nir_split_load_input.c | 3 +- .../panfrost/pan_nir_lower_res_indices.c | 2 +- .../drivers/panfrost/pan_nir_lower_sysvals.c | 2 +- .../pan_nir_remove_fragcolor_stores.c | 2 +- src/gallium/drivers/r300/compiler/nir_to_rc.c | 3 +- src/gallium/drivers/r300/compiler/r300_nir.c | 3 +- .../r300/compiler/r500_nir_lower_fcsel.c | 3 +- src/gallium/drivers/r600/sfn/sfn_nir.cpp | 3 +- .../drivers/r600/sfn/sfn_nir_lower_64bit.cpp | 2 +- .../sfn/sfn_nir_lower_fs_out_to_vector.cpp | 2 +- .../r600/sfn/sfn_nir_vectorize_vs_inputs.c | 2 +- .../drivers/radeonsi/si_nir_lower_abi.c | 2 +- .../drivers/radeonsi/si_nir_lower_resource.c | 2 +- .../drivers/radeonsi/si_nir_lower_vs_inputs.c | 2 +- src/gallium/drivers/radeonsi/si_nir_optim.c | 3 +- src/gallium/drivers/radeonsi/si_shader.c | 10 ++-- src/gallium/drivers/v3d/v3d_program.c | 6 +-- src/gallium/drivers/vc4/vc4_nir_lower_blend.c | 3 +- src/gallium/drivers/vc4/vc4_nir_lower_io.c | 3 +- src/gallium/drivers/zink/zink_compiler.c | 8 ++-- .../frontends/lavapipe/lvp_inline_uniforms.c | 3 +- .../frontends/lavapipe/lvp_lower_exec_graph.c | 4 +- .../lavapipe/lvp_lower_vulkan_resource.c | 2 +- .../lavapipe/lvp_ray_tracing_pipeline.c | 6 +-- src/intel/blorp/blorp_brw.c | 2 +- src/intel/blorp/blorp_elk.c | 2 +- src/intel/compiler/brw_fs.cpp | 5 +- src/intel/compiler/brw_kernel.c | 3 +- src/intel/compiler/brw_mesh.cpp | 15 ++---- src/intel/compiler/brw_nir.c | 8 ++-- .../brw_nir_lower_alpha_to_coverage.c | 3 +- .../compiler/brw_nir_lower_cs_intrinsics.c | 2 +- .../compiler/brw_nir_lower_rt_intrinsics.c | 3 +- .../compiler/brw_nir_lower_shader_calls.c | 6 +-- src/intel/compiler/brw_nir_rt.c | 3 +- src/intel/compiler/elk/elk_fs.cpp | 5 +- src/intel/compiler/elk/elk_nir.c | 8 ++-- .../elk/elk_nir_attribute_workarounds.c | 3 +- .../elk/elk_nir_lower_alpha_to_coverage.c | 3 +- .../elk/elk_nir_lower_cs_intrinsics.c | 2 +- .../intel_nir_blockify_uniform_loads.c | 3 +- .../intel_nir_clamp_image_1d_2d_array_sizes.c | 3 +- .../intel_nir_clamp_per_vertex_loads.c | 6 +-- .../compiler/intel_nir_lower_conversions.c | 3 +- ...tel_nir_lower_non_uniform_resource_intel.c | 6 +-- src/intel/compiler/intel_nir_lower_printf.c | 3 +- .../intel_nir_lower_shading_rate_output.c | 3 +- src/intel/compiler/intel_nir_lower_sparse.c | 3 +- .../compiler/intel_nir_opt_peephole_ffma.c | 3 +- .../intel_nir_opt_peephole_imul32x16.c | 3 +- src/intel/vulkan/anv_internal_kernels.c | 2 +- .../vulkan/anv_nir_apply_pipeline_layout.c | 6 +-- .../anv_nir_lower_load_patch_vertices_in.c | 3 +- src/intel/vulkan/anv_nir_lower_multiview.c | 3 +- .../vulkan/anv_nir_lower_resource_intel.c | 3 +- src/intel/vulkan/anv_pipeline.c | 3 +- .../anv_nir_apply_pipeline_layout.c | 6 +-- .../vulkan_hasvk/anv_nir_lower_multiview.c | 3 +- .../anv_nir_lower_ycbcr_textures.c | 3 +- src/mesa/state_tracker/st_atifs_to_nir.c | 4 +- src/mesa/state_tracker/st_nir_lower_builtin.c | 3 +- src/mesa/state_tracker/st_nir_lower_fog.c | 6 +-- .../st_nir_lower_position_invariant.c | 3 +- .../st_nir_lower_tex_src_plane.c | 3 +- src/microsoft/clc/clc_nir.c | 3 +- src/microsoft/compiler/dxil_nir.c | 47 ++++++++----------- src/microsoft/compiler/dxil_nir_tess.c | 4 +- src/microsoft/spirv_to_dxil/dxil_spirv_nir.c | 28 ++++------- .../dxil_spirv_nir_lower_bindless.c | 8 ++-- src/nouveau/codegen/nv50_ir_from_nir.cpp | 5 +- src/nouveau/compiler/nak_nir.c | 9 ++-- .../compiler/nak_nir_lower_fs_inputs.c | 2 +- src/nouveau/compiler/nak_nir_lower_tex.c | 3 +- src/nouveau/compiler/nak_nir_lower_vtg_io.c | 3 +- src/nouveau/vulkan/nvk_codegen.c | 4 +- .../vulkan/nvk_nir_lower_descriptors.c | 9 ++-- src/panfrost/compiler/bifrost_compile.c | 10 ++-- src/panfrost/lib/pan_blend.c | 7 ++- src/panfrost/lib/pan_blitter.c | 2 +- src/panfrost/midgard/midgard_compile.c | 2 +- src/panfrost/midgard/midgard_errata_lod.c | 2 +- .../midgard/midgard_nir_lower_image_bitsize.c | 2 +- src/panfrost/midgard/midgard_nir_type_csel.c | 2 +- src/panfrost/midgard/nir_fuse_io_16.c | 2 +- src/panfrost/util/pan_lower_framebuffer.c | 2 +- .../util/pan_lower_helper_invocation.c | 2 +- src/panfrost/util/pan_lower_image_index.c | 2 +- src/panfrost/util/pan_lower_image_ms.c | 2 +- src/panfrost/util/pan_lower_sample_position.c | 2 +- src/panfrost/util/pan_lower_store_component.c | 2 +- src/panfrost/util/pan_lower_writeout.c | 2 +- src/panfrost/util/pan_lower_xfb.c | 2 +- .../bifrost/panvk_vX_nir_lower_descriptors.c | 5 +- src/panfrost/vulkan/panvk_vX_blend.c | 2 +- src/panfrost/vulkan/panvk_vX_shader.c | 2 +- src/vulkan/runtime/vk_nir_convert_ycbcr.c | 3 +- 307 files changed, 510 insertions(+), 836 deletions(-) diff --git a/src/amd/common/ac_nir.c b/src/amd/common/ac_nir.c index 070148cadcc..1c2845ce41e 100644 --- a/src/amd/common/ac_nir.c +++ b/src/amd/common/ac_nir.c @@ -191,7 +191,7 @@ ac_nir_lower_intrinsics_to_args(nir_shader *shader, const enum amd_gfx_level gfx }; return nir_shader_instructions_pass(shader, lower_intrinsic_to_arg, - nir_metadata_block_index | nir_metadata_dominance, &state); + nir_metadata_control_flow, &state); } void @@ -935,7 +935,7 @@ ac_nir_lower_legacy_vs(nir_shader *nir, bool force_vrs) { nir_function_impl *impl = nir_shader_get_entrypoint(nir); - nir_metadata preserved = nir_metadata_block_index | nir_metadata_dominance; + nir_metadata preserved = nir_metadata_control_flow; nir_builder b = nir_builder_at(nir_after_impl(impl)); @@ -1334,7 +1334,7 @@ ac_nir_lower_legacy_gs(nir_shader *nir, } nir_shader_instructions_pass(nir, lower_legacy_gs_intrinsic, - nir_metadata_block_index | nir_metadata_dominance, &s); + nir_metadata_control_flow, &s); nir_function_impl *impl = nir_shader_get_entrypoint(nir); @@ -1501,7 +1501,8 @@ ac_nir_opt_pack_half(nir_shader *shader, enum amd_gfx_level gfx_level) } bool progress = nir_shader_instructions_pass(shader, split_pack_half, - nir_metadata_block_index | nir_metadata_dominance, &gfx_level); + nir_metadata_control_flow, + &gfx_level); if (set_mode && progress) { exec_mode &= ~(FLOAT_CONTROLS_ROUNDING_MODE_RTE_FP16 | FLOAT_CONTROLS_ROUNDING_MODE_RTE_FP64); diff --git a/src/amd/common/ac_nir_lower_esgs_io_to_mem.c b/src/amd/common/ac_nir_lower_esgs_io_to_mem.c index 4d6fadbbbdb..6453b23c6de 100644 --- a/src/amd/common/ac_nir_lower_esgs_io_to_mem.c +++ b/src/amd/common/ac_nir_lower_esgs_io_to_mem.c @@ -323,7 +323,7 @@ ac_nir_lower_es_outputs_to_mem(nir_shader *shader, }; nir_shader_intrinsics_pass(shader, lower_es_output_store, - nir_metadata_block_index | nir_metadata_dominance, + nir_metadata_control_flow, &state); } diff --git a/src/amd/common/ac_nir_lower_global_access.c b/src/amd/common/ac_nir_lower_global_access.c index 48f2453b600..50bd8161dd9 100644 --- a/src/amd/common/ac_nir_lower_global_access.c +++ b/src/amd/common/ac_nir_lower_global_access.c @@ -143,5 +143,5 @@ bool ac_nir_lower_global_access(nir_shader *shader) { return nir_shader_intrinsics_pass(shader, process_instr, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } diff --git a/src/amd/common/ac_nir_lower_image_opcodes_cdna.c b/src/amd/common/ac_nir_lower_image_opcodes_cdna.c index f84330eb9dc..a1586224df3 100644 --- a/src/amd/common/ac_nir_lower_image_opcodes_cdna.c +++ b/src/amd/common/ac_nir_lower_image_opcodes_cdna.c @@ -482,7 +482,6 @@ static bool lower_image_opcodes(nir_builder *b, nir_instr *instr, void *data) bool ac_nir_lower_image_opcodes(nir_shader *nir) { return nir_shader_instructions_pass(nir, lower_image_opcodes, - nir_metadata_dominance | - nir_metadata_block_index, + nir_metadata_control_flow, NULL); } diff --git a/src/amd/common/ac_nir_lower_ngg.c b/src/amd/common/ac_nir_lower_ngg.c index 2800fb3fec8..43e99ff07e7 100644 --- a/src/amd/common/ac_nir_lower_ngg.c +++ b/src/amd/common/ac_nir_lower_ngg.c @@ -725,7 +725,7 @@ static void remove_culling_shader_outputs(nir_shader *culling_shader, lower_ngg_nogs_state *s) { nir_shader_instructions_pass(culling_shader, remove_culling_shader_output, - nir_metadata_block_index | nir_metadata_dominance, s); + nir_metadata_control_flow, s); /* Remove dead code resulting from the deleted outputs. */ bool progress; @@ -836,7 +836,7 @@ static void remove_extra_pos_outputs(nir_shader *shader, lower_ngg_nogs_state *s) { nir_shader_instructions_pass(shader, remove_extra_pos_output, - nir_metadata_block_index | nir_metadata_dominance, + nir_metadata_control_flow, s); } diff --git a/src/amd/common/ac_nir_lower_ps.c b/src/amd/common/ac_nir_lower_ps.c index dfd7d3730b2..64cc8f80d0e 100644 --- a/src/amd/common/ac_nir_lower_ps.c +++ b/src/amd/common/ac_nir_lower_ps.c @@ -876,7 +876,7 @@ ac_nir_lower_ps(nir_shader *nir, const ac_nir_lower_ps_options *options) create_interp_param(b, &state); nir_shader_instructions_pass(nir, lower_ps_intrinsic, - nir_metadata_block_index | nir_metadata_dominance, + nir_metadata_control_flow, &state); /* Must be after lower_ps_intrinsic() to prevent it lower added intrinsic here. */ diff --git a/src/amd/common/ac_nir_lower_resinfo.c b/src/amd/common/ac_nir_lower_resinfo.c index cef3dccb42c..4fcf2616751 100644 --- a/src/amd/common/ac_nir_lower_resinfo.c +++ b/src/amd/common/ac_nir_lower_resinfo.c @@ -369,7 +369,6 @@ static bool lower_resinfo(nir_builder *b, nir_instr *instr, void *data) bool ac_nir_lower_resinfo(nir_shader *nir, enum amd_gfx_level gfx_level) { return nir_shader_instructions_pass(nir, lower_resinfo, - nir_metadata_dominance | - nir_metadata_block_index, + nir_metadata_control_flow, &gfx_level); } diff --git a/src/amd/common/ac_nir_lower_subdword_loads.c b/src/amd/common/ac_nir_lower_subdword_loads.c index 73429ae3f18..e4cb9f73312 100644 --- a/src/amd/common/ac_nir_lower_subdword_loads.c +++ b/src/amd/common/ac_nir_lower_subdword_loads.c @@ -220,6 +220,5 @@ bool ac_nir_lower_subdword_loads(nir_shader *nir, ac_nir_lower_subdword_options options) { return nir_shader_instructions_pass(nir, lower_subdword_loads, - nir_metadata_dominance | - nir_metadata_block_index, &options); + nir_metadata_control_flow, &options); } diff --git a/src/amd/common/ac_nir_lower_tess_io_to_mem.c b/src/amd/common/ac_nir_lower_tess_io_to_mem.c index 3a0acddc70b..a016a0fce02 100644 --- a/src/amd/common/ac_nir_lower_tess_io_to_mem.c +++ b/src/amd/common/ac_nir_lower_tess_io_to_mem.c @@ -966,7 +966,7 @@ ac_nir_lower_ls_outputs_to_mem(nir_shader *shader, }; nir_shader_intrinsics_pass(shader, lower_ls_output_store, - nir_metadata_block_index | nir_metadata_dominance, + nir_metadata_control_flow, &state); } diff --git a/src/amd/common/ac_nir_lower_tex.c b/src/amd/common/ac_nir_lower_tex.c index 4c1d1446e7b..ea266c09f75 100644 --- a/src/amd/common/ac_nir_lower_tex.c +++ b/src/amd/common/ac_nir_lower_tex.c @@ -499,13 +499,13 @@ ac_nir_lower_tex(nir_shader *nir, const ac_nir_lower_tex_options *options) bool divergent_discard = false; if (move_coords_from_divergent_cf(&state, impl, &impl->body, &divergent_discard, false)) - nir_metadata_preserve(impl, nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); else nir_metadata_preserve(impl, nir_metadata_all); } progress |= nir_shader_instructions_pass( - nir, lower_tex, nir_metadata_block_index | nir_metadata_dominance, (void *)options); + nir, lower_tex, nir_metadata_control_flow, (void *)options); return progress; } diff --git a/src/amd/common/ac_nir_opt_outputs.c b/src/amd/common/ac_nir_opt_outputs.c index b7aea686bca..45b9381c30b 100644 --- a/src/amd/common/ac_nir_opt_outputs.c +++ b/src/amd/common/ac_nir_opt_outputs.c @@ -301,8 +301,7 @@ bool ac_nir_optimize_outputs(nir_shader *nir, bool sprite_tex_disallowed, } if (progress) { - nir_metadata_preserve(impl, nir_metadata_dominance | - nir_metadata_block_index); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/amd/vulkan/nir/radv_nir_apply_pipeline_layout.c b/src/amd/vulkan/nir/radv_nir_apply_pipeline_layout.c index 9902d4d6e2d..80e5bc98e1b 100644 --- a/src/amd/vulkan/nir/radv_nir_apply_pipeline_layout.c +++ b/src/amd/vulkan/nir/radv_nir_apply_pipeline_layout.c @@ -513,6 +513,6 @@ radv_nir_apply_pipeline_layout(nir_shader *shader, struct radv_device *device, c } } - nir_metadata_preserve(function->impl, nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_preserve(function->impl, nir_metadata_control_flow); } } diff --git a/src/amd/vulkan/nir/radv_nir_export_multiview.c b/src/amd/vulkan/nir/radv_nir_export_multiview.c index 83ec52839bf..24630e7498e 100644 --- a/src/amd/vulkan/nir/radv_nir_export_multiview.c +++ b/src/amd/vulkan/nir/radv_nir_export_multiview.c @@ -83,7 +83,7 @@ radv_nir_export_multiview(nir_shader *nir) } if (progress) - nir_metadata_preserve(impl, nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); else nir_metadata_preserve(impl, nir_metadata_all); diff --git a/src/amd/vulkan/nir/radv_nir_lower_abi.c b/src/amd/vulkan/nir/radv_nir_lower_abi.c index 13b884980f5..4b8f7159236 100644 --- a/src/amd/vulkan/nir/radv_nir_lower_abi.c +++ b/src/amd/vulkan/nir/radv_nir_lower_abi.c @@ -572,5 +572,5 @@ radv_nir_lower_abi(nir_shader *shader, enum amd_gfx_level gfx_level, const struc state.gsvs_ring[i] = load_gsvs_ring(&b, &state, i); } - nir_shader_intrinsics_pass(shader, lower_abi_instr, nir_metadata_dominance | nir_metadata_block_index, &state); + nir_shader_intrinsics_pass(shader, lower_abi_instr, nir_metadata_control_flow, &state); } diff --git a/src/amd/vulkan/nir/radv_nir_lower_hit_attrib_derefs.c b/src/amd/vulkan/nir/radv_nir_lower_hit_attrib_derefs.c index 2cc5f61d876..d229fe3ba48 100644 --- a/src/amd/vulkan/nir/radv_nir_lower_hit_attrib_derefs.c +++ b/src/amd/vulkan/nir/radv_nir_lower_hit_attrib_derefs.c @@ -118,8 +118,7 @@ radv_nir_lower_rt_vars(nir_shader *shader, nir_variable_mode mode, uint32_t base .base_offset = base_offset, }; - progress |= nir_shader_instructions_pass(shader, lower_hit_attrib_deref, - nir_metadata_block_index | nir_metadata_dominance, &args); + progress |= nir_shader_instructions_pass(shader, lower_hit_attrib_deref, nir_metadata_control_flow, &args); if (progress) { nir_remove_dead_derefs(shader); diff --git a/src/amd/vulkan/nir/radv_nir_lower_intrinsics_early.c b/src/amd/vulkan/nir/radv_nir_lower_intrinsics_early.c index e078a04406c..43eb3e8c792 100644 --- a/src/amd/vulkan/nir/radv_nir_lower_intrinsics_early.c +++ b/src/amd/vulkan/nir/radv_nir_lower_intrinsics_early.c @@ -50,7 +50,7 @@ radv_nir_lower_intrinsics_early(nir_shader *nir, bool lower_view_index_to_zero) } if (progress) - nir_metadata_preserve(entry, nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_preserve(entry, nir_metadata_control_flow); else nir_metadata_preserve(entry, nir_metadata_all); diff --git a/src/amd/vulkan/nir/radv_nir_lower_io.c b/src/amd/vulkan/nir/radv_nir_lower_io.c index 82d7e0a3da3..ae108dca36e 100644 --- a/src/amd/vulkan/nir/radv_nir_lower_io.c +++ b/src/amd/vulkan/nir/radv_nir_lower_io.c @@ -186,6 +186,5 @@ radv_nir_lower_draw_id_to_zero_callback(struct nir_builder *b, nir_intrinsic_ins bool radv_nir_lower_draw_id_to_zero(nir_shader *shader) { - return nir_shader_intrinsics_pass(shader, radv_nir_lower_draw_id_to_zero_callback, - nir_metadata_block_index | nir_metadata_dominance, NULL); + return nir_shader_intrinsics_pass(shader, radv_nir_lower_draw_id_to_zero_callback, nir_metadata_control_flow, NULL); } diff --git a/src/amd/vulkan/nir/radv_nir_lower_primitive_shading_rate.c b/src/amd/vulkan/nir/radv_nir_lower_primitive_shading_rate.c index 3a3cbe238dd..a98a8280346 100644 --- a/src/amd/vulkan/nir/radv_nir_lower_primitive_shading_rate.c +++ b/src/amd/vulkan/nir/radv_nir_lower_primitive_shading_rate.c @@ -85,7 +85,7 @@ radv_nir_lower_primitive_shading_rate(nir_shader *nir, enum amd_gfx_level gfx_le } if (progress) - nir_metadata_preserve(impl, nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); else nir_metadata_preserve(impl, nir_metadata_all); diff --git a/src/amd/vulkan/nir/radv_nir_lower_view_index.c b/src/amd/vulkan/nir/radv_nir_lower_view_index.c index 366f462e8a4..e9eb424741f 100644 --- a/src/amd/vulkan/nir/radv_nir_lower_view_index.c +++ b/src/amd/vulkan/nir/radv_nir_lower_view_index.c @@ -68,7 +68,7 @@ radv_nir_lower_view_index(nir_shader *nir, bool per_primitive) } if (progress) - nir_metadata_preserve(entry, nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_preserve(entry, nir_metadata_control_flow); else nir_metadata_preserve(entry, nir_metadata_all); diff --git a/src/amd/vulkan/nir/radv_nir_lower_viewport_to_zero.c b/src/amd/vulkan/nir/radv_nir_lower_viewport_to_zero.c index 56d4ef09745..3045a4ee39f 100644 --- a/src/amd/vulkan/nir/radv_nir_lower_viewport_to_zero.c +++ b/src/amd/vulkan/nir/radv_nir_lower_viewport_to_zero.c @@ -43,7 +43,7 @@ radv_nir_lower_viewport_to_zero(nir_shader *nir) } if (progress) - nir_metadata_preserve(impl, nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); else nir_metadata_preserve(impl, nir_metadata_all); diff --git a/src/amd/vulkan/nir/radv_nir_lower_vs_inputs.c b/src/amd/vulkan/nir/radv_nir_lower_vs_inputs.c index a5002de5eda..2e5818fbc11 100644 --- a/src/amd/vulkan/nir/radv_nir_lower_vs_inputs.c +++ b/src/amd/vulkan/nir/radv_nir_lower_vs_inputs.c @@ -405,6 +405,5 @@ radv_nir_lower_vs_inputs(nir_shader *shader, const struct radv_shader_stage *vs_ .gpu_info = gpu_info, }; - return nir_shader_intrinsics_pass(shader, lower_vs_input_instr, nir_metadata_dominance | nir_metadata_block_index, - &state); + return nir_shader_intrinsics_pass(shader, lower_vs_input_instr, nir_metadata_control_flow, &state); } diff --git a/src/amd/vulkan/nir/radv_nir_rt_shader.c b/src/amd/vulkan/nir/radv_nir_rt_shader.c index b9b2ee3b9a0..9b62582c4b6 100644 --- a/src/amd/vulkan/nir/radv_nir_rt_shader.c +++ b/src/amd/vulkan/nir/radv_nir_rt_shader.c @@ -158,7 +158,7 @@ lower_rt_derefs(nir_shader *shader) } if (progress) - nir_metadata_preserve(impl, nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); else nir_metadata_preserve(impl, nir_metadata_all); @@ -879,8 +879,7 @@ radv_nir_lower_rt_io(nir_shader *nir, bool monolithic, uint32_t payload_offset) nir_lower_vars_to_explicit_types(nir, nir_var_function_temp, glsl_get_natural_size_align_bytes); nir->scratch_size = scratch_size; - nir_shader_intrinsics_pass(nir, radv_lower_payload_arg_to_offset, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_shader_intrinsics_pass(nir, radv_lower_payload_arg_to_offset, nir_metadata_control_flow, NULL); } NIR_PASS(_, nir, radv_nir_lower_ray_payload_derefs, payload_offset); diff --git a/src/asahi/compiler/agx_compile.c b/src/asahi/compiler/agx_compile.c index e18f7531063..19620c2c401 100644 --- a/src/asahi/compiler/agx_compile.c +++ b/src/asahi/compiler/agx_compile.c @@ -3311,7 +3311,7 @@ agx_preprocess_nir(nir_shader *nir, const nir_shader *libagx) NIR_PASS(_, nir, nir_lower_flrp, 16 | 32 | 64, false); NIR_PASS(_, nir, agx_lower_sincos); NIR_PASS(_, nir, nir_shader_intrinsics_pass, agx_lower_front_face, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); NIR_PASS(_, nir, agx_nir_lower_subgroups); NIR_PASS(_, nir, nir_lower_phis_to_scalar, true); @@ -3406,7 +3406,7 @@ agx_compile_shader_nir(nir_shader *nir, struct agx_shader_key *key, NIR_PASS(_, nir, nir_opt_constant_folding); NIR_PASS(_, nir, nir_shader_intrinsics_pass, lower_load_from_texture_handle, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); info->push_count = key->reserved_preamble; agx_optimize_nir(nir, key->secondary ? NULL : &info->push_count); diff --git a/src/asahi/compiler/agx_nir_lower_address.c b/src/asahi/compiler/agx_nir_lower_address.c index c999b3280c9..b54689c8966 100644 --- a/src/asahi/compiler/agx_nir_lower_address.c +++ b/src/asahi/compiler/agx_nir_lower_address.c @@ -348,6 +348,6 @@ pass(struct nir_builder *b, nir_intrinsic_instr *intr, void *data) bool agx_nir_lower_address(nir_shader *shader) { - return nir_shader_intrinsics_pass( - shader, pass, nir_metadata_block_index | nir_metadata_dominance, NULL); + return nir_shader_intrinsics_pass(shader, pass, nir_metadata_control_flow, + NULL); } diff --git a/src/asahi/compiler/agx_nir_lower_cull_distance.c b/src/asahi/compiler/agx_nir_lower_cull_distance.c index 701ce67d1b8..4120622ba67 100644 --- a/src/asahi/compiler/agx_nir_lower_cull_distance.c +++ b/src/asahi/compiler/agx_nir_lower_cull_distance.c @@ -78,8 +78,7 @@ agx_nir_lower_cull_distance_vs(nir_shader *s) assert(s->info.stage == MESA_SHADER_VERTEX || s->info.stage == MESA_SHADER_TESS_EVAL); - nir_shader_intrinsics_pass( - s, lower_write, nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_shader_intrinsics_pass(s, lower_write, nir_metadata_control_flow, NULL); s->info.outputs_written |= BITFIELD64_RANGE(VARYING_SLOT_CULL_PRIMITIVE, @@ -124,7 +123,6 @@ agx_nir_lower_cull_distance_fs(nir_shader *s, unsigned nr_distances) DIV_ROUND_UP(nr_distances, 4)); s->info.fs.uses_discard = true; - nir_metadata_preserve(b->impl, - nir_metadata_dominance | nir_metadata_block_index); + nir_metadata_preserve(b->impl, nir_metadata_control_flow); return true; } diff --git a/src/asahi/compiler/agx_nir_lower_discard_zs_emit.c b/src/asahi/compiler/agx_nir_lower_discard_zs_emit.c index c929be96c25..579b9ad5910 100644 --- a/src/asahi/compiler/agx_nir_lower_discard_zs_emit.c +++ b/src/asahi/compiler/agx_nir_lower_discard_zs_emit.c @@ -111,9 +111,8 @@ agx_nir_lower_discard(nir_shader *s) if (!s->info.fs.uses_discard) return false; - return nir_shader_intrinsics_pass( - s, lower_discard, nir_metadata_block_index | nir_metadata_dominance, - NULL); + return nir_shader_intrinsics_pass(s, lower_discard, + nir_metadata_control_flow, NULL); } static bool @@ -134,8 +133,7 @@ agx_nir_lower_zs_emit(nir_shader *s) } if (progress) { - nir_metadata_preserve( - impl, nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/asahi/compiler/agx_nir_lower_frag_sidefx.c b/src/asahi/compiler/agx_nir_lower_frag_sidefx.c index d9cb8937418..54011928f54 100644 --- a/src/asahi/compiler/agx_nir_lower_frag_sidefx.c +++ b/src/asahi/compiler/agx_nir_lower_frag_sidefx.c @@ -89,8 +89,7 @@ agx_nir_lower_frag_sidefx(nir_shader *s) return false; bool done = false; - nir_shader_intrinsics_pass( - s, pass, nir_metadata_block_index | nir_metadata_dominance, &done); + nir_shader_intrinsics_pass(s, pass, nir_metadata_control_flow, &done); /* If there's no render targets written, just put the write at the end */ if (!done) { diff --git a/src/asahi/compiler/agx_nir_lower_sample_mask.c b/src/asahi/compiler/agx_nir_lower_sample_mask.c index f76b549fa01..747c115e299 100644 --- a/src/asahi/compiler/agx_nir_lower_sample_mask.c +++ b/src/asahi/compiler/agx_nir_lower_sample_mask.c @@ -217,12 +217,10 @@ agx_nir_lower_sample_mask(nir_shader *shader) return false; } - nir_metadata_preserve(impl, - nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); nir_shader_intrinsics_pass(shader, lower_discard_to_sample_mask_0, - nir_metadata_block_index | nir_metadata_dominance, - NULL); + nir_metadata_control_flow, NULL); return true; } diff --git a/src/asahi/compiler/agx_nir_lower_shared_bitsize.c b/src/asahi/compiler/agx_nir_lower_shared_bitsize.c index 6f91f8358f2..b2fd193c581 100644 --- a/src/asahi/compiler/agx_nir_lower_shared_bitsize.c +++ b/src/asahi/compiler/agx_nir_lower_shared_bitsize.c @@ -32,6 +32,6 @@ pass(struct nir_builder *b, nir_intrinsic_instr *intr, UNUSED void *data) bool agx_nir_lower_shared_bitsize(nir_shader *shader) { - return nir_shader_intrinsics_pass( - shader, pass, nir_metadata_block_index | nir_metadata_dominance, NULL); + return nir_shader_intrinsics_pass(shader, pass, nir_metadata_control_flow, + NULL); } diff --git a/src/asahi/compiler/agx_nir_lower_subgroups.c b/src/asahi/compiler/agx_nir_lower_subgroups.c index 8efa5a423ed..8ed85d90583 100644 --- a/src/asahi/compiler/agx_nir_lower_subgroups.c +++ b/src/asahi/compiler/agx_nir_lower_subgroups.c @@ -217,8 +217,8 @@ agx_nir_lower_subgroups(nir_shader *s) bool progress = nir_lower_subgroups(s, &opts); /* Then do AGX-only lowerings on top */ - progress |= nir_shader_intrinsics_pass( - s, lower, nir_metadata_block_index | nir_metadata_dominance, NULL); + progress |= + nir_shader_intrinsics_pass(s, lower, nir_metadata_control_flow, NULL); return progress; } diff --git a/src/asahi/lib/agx_bg_eot.c b/src/asahi/lib/agx_bg_eot.c index b3442763b24..f9551df6c73 100644 --- a/src/asahi/lib/agx_bg_eot.c +++ b/src/asahi/lib/agx_bg_eot.c @@ -40,9 +40,8 @@ agx_compile_bg_eot_shader(struct agx_bg_eot_cache *cache, nir_shader *shader, agx_nir_lower_multisampled_image_store(shader); agx_nir_lower_texture(shader); - nir_shader_intrinsics_pass( - shader, lower_tex_handle_to_u0, - nir_metadata_dominance | nir_metadata_block_index, NULL); + nir_shader_intrinsics_pass(shader, lower_tex_handle_to_u0, + nir_metadata_control_flow, NULL); } key->libagx = cache->dev->libagx; diff --git a/src/asahi/lib/agx_nir_lower_alpha.c b/src/asahi/lib/agx_nir_lower_alpha.c index 9b533e6decb..58eeebe3f4e 100644 --- a/src/asahi/lib/agx_nir_lower_alpha.c +++ b/src/asahi/lib/agx_nir_lower_alpha.c @@ -68,8 +68,7 @@ agx_nir_lower_alpha_to_coverage(nir_shader *shader, uint8_t nr_samples) /* Discard samples that aren't covered */ nir_discard_agx(b, nir_inot(b, mask)); shader->info.fs.uses_discard = true; - nir_metadata_preserve(impl, - nir_metadata_dominance | nir_metadata_block_index); + nir_metadata_preserve(impl, nir_metadata_control_flow); return true; } @@ -119,8 +118,7 @@ agx_nir_lower_alpha_to_one(nir_shader *shader) } if (progress) { - nir_metadata_preserve(impl, - nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/asahi/lib/agx_nir_lower_gs.c b/src/asahi/lib/agx_nir_lower_gs.c index 3aea48d297f..567aab61da4 100644 --- a/src/asahi/lib/agx_nir_lower_gs.c +++ b/src/asahi/lib/agx_nir_lower_gs.c @@ -360,9 +360,8 @@ lower_prolog_id(nir_builder *b, nir_intrinsic_instr *intr, void *data) bool agx_nir_lower_sw_vs_id(nir_shader *s) { - return nir_shader_intrinsics_pass( - s, lower_prolog_id, nir_metadata_dominance | nir_metadata_block_index, - NULL); + return nir_shader_intrinsics_pass(s, lower_prolog_id, + nir_metadata_control_flow, NULL); } static bool @@ -409,10 +408,10 @@ agx_nir_create_geometry_count_shader(nir_shader *gs, const nir_shader *libagx, } NIR_PASS(_, shader, nir_shader_intrinsics_pass, lower_gs_count_instr, - nir_metadata_block_index | nir_metadata_dominance, state); + nir_metadata_control_flow, state); NIR_PASS(_, shader, nir_shader_intrinsics_pass, lower_id, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); agx_preprocess_nir(shader, libagx); return shader; @@ -553,8 +552,7 @@ strip_side_effects_from_rast(nir_shader *s, bool *side_effects_for_rast) progress = false; any = false; NIR_PASS(progress, clone, nir_shader_intrinsics_pass, - strip_side_effect_from_rast, - nir_metadata_block_index | nir_metadata_dominance, &any); + strip_side_effect_from_rast, nir_metadata_control_flow, &any); NIR_PASS(progress, clone, nir_opt_dce); NIR_PASS(progress, clone, nir_opt_dead_cf); @@ -573,8 +571,7 @@ strip_side_effects_from_rast(nir_shader *s, bool *side_effects_for_rast) progress = false; any = false; NIR_PASS(progress, s, nir_shader_intrinsics_pass, - strip_side_effect_from_rast, - nir_metadata_block_index | nir_metadata_dominance, &any); + strip_side_effect_from_rast, nir_metadata_control_flow, &any); NIR_PASS(progress, s, nir_opt_dce); NIR_PASS(progress, s, nir_opt_dead_cf); @@ -677,8 +674,7 @@ agx_nir_create_gs_rast_shader(const nir_shader *gs, const nir_shader *libagx, } nir_shader_intrinsics_pass(shader, lower_to_gs_rast, - nir_metadata_block_index | nir_metadata_dominance, - &rast_state); + nir_metadata_control_flow, &rast_state); b->cursor = nir_after_impl(b->impl); @@ -1229,8 +1225,7 @@ agx_nir_lower_gs_instancing(nir_shader *gs) /* Use the loop counter as the invocation ID each iteration */ nir_shader_intrinsics_pass(gs, rewrite_invocation_id, - nir_metadata_block_index | nir_metadata_dominance, - index); + nir_metadata_control_flow, index); } static void @@ -1283,13 +1278,12 @@ agx_nir_lower_gs(nir_shader *gs, const nir_shader *libagx, nir_function_impl *impl = nir_shader_get_entrypoint(gs); nir_builder b = nir_builder_at(nir_before_impl(impl)); - nir_shader_intrinsics_pass( - gs, rewrite_invocation_id, - nir_metadata_block_index | nir_metadata_dominance, nir_imm_int(&b, 0)); + nir_shader_intrinsics_pass(gs, rewrite_invocation_id, + nir_metadata_control_flow, nir_imm_int(&b, 0)); } NIR_PASS(_, gs, nir_shader_intrinsics_pass, lower_gs_inputs, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); /* Lower geometry shader writes to contain all of the required counts, so we * know where in the various buffers we should write vertices. @@ -1350,7 +1344,7 @@ agx_nir_lower_gs(nir_shader *gs, const nir_shader *libagx, *gs_copy = agx_nir_create_gs_rast_shader(gs, libagx, &side_effects_for_rast); NIR_PASS(_, gs, nir_shader_intrinsics_pass, lower_id, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); link_libagx(gs, libagx); @@ -1392,7 +1386,7 @@ agx_nir_lower_gs(nir_shader *gs, const nir_shader *libagx, } NIR_PASS(_, gs, nir_shader_instructions_pass, agx_lower_output_to_var, - nir_metadata_block_index | nir_metadata_dominance, &state); + nir_metadata_control_flow, &state); NIR_PASS(_, gs, nir_shader_intrinsics_pass, lower_gs_instr, nir_metadata_none, &gs_state); @@ -1427,8 +1421,7 @@ agx_nir_lower_gs(nir_shader *gs, const nir_shader *libagx, do { progress = false; NIR_PASS(progress, gs, nir_shader_intrinsics_pass, - strip_side_effect_from_main, - nir_metadata_block_index | nir_metadata_dominance, NULL); + strip_side_effect_from_main, nir_metadata_control_flow, NULL); NIR_PASS(progress, gs, nir_opt_dce); NIR_PASS(progress, gs, nir_opt_dead_cf); @@ -1442,7 +1435,7 @@ agx_nir_lower_gs(nir_shader *gs, const nir_shader *libagx, NIR_PASS(_, gs, nir_opt_move, ~0); NIR_PASS(_, gs, nir_shader_intrinsics_pass, lower_id, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); /* Create auxiliary programs */ *pre_gs = agx_nir_create_pre_gs( @@ -1513,9 +1506,8 @@ agx_nir_lower_vs_before_gs(struct nir_shader *vs, bool progress = false; /* Lower vertex stores to memory stores */ - progress |= nir_shader_intrinsics_pass( - vs, lower_vs_before_gs, nir_metadata_block_index | nir_metadata_dominance, - NULL); + progress |= nir_shader_intrinsics_pass(vs, lower_vs_before_gs, + nir_metadata_control_flow, NULL); /* Link libagx, used in lower_vs_before_gs */ if (progress) diff --git a/src/asahi/lib/agx_nir_lower_ia.c b/src/asahi/lib/agx_nir_lower_ia.c index 28c692d1997..d2e79474997 100644 --- a/src/asahi/lib/agx_nir_lower_ia.c +++ b/src/asahi/lib/agx_nir_lower_ia.c @@ -67,7 +67,7 @@ lower_vertex_id(nir_builder *b, nir_intrinsic_instr *intr, void *data) bool agx_nir_lower_index_buffer(nir_shader *s, unsigned index_size_B, bool patches) { - return nir_shader_intrinsics_pass( - s, lower_vertex_id, nir_metadata_block_index | nir_metadata_dominance, - &(struct state){index_size_B, patches}); + return nir_shader_intrinsics_pass(s, lower_vertex_id, + nir_metadata_control_flow, + &(struct state){index_size_B, patches}); } diff --git a/src/asahi/lib/agx_nir_lower_msaa.c b/src/asahi/lib/agx_nir_lower_msaa.c index 282421775be..3eb22a770d7 100644 --- a/src/asahi/lib/agx_nir_lower_msaa.c +++ b/src/asahi/lib/agx_nir_lower_msaa.c @@ -50,9 +50,8 @@ lower_to_per_sample(nir_builder *b, nir_intrinsic_instr *intr, void *data) bool agx_nir_lower_to_per_sample(nir_shader *shader) { - return nir_shader_intrinsics_pass( - shader, lower_to_per_sample, - nir_metadata_block_index | nir_metadata_dominance, NULL); + return nir_shader_intrinsics_pass(shader, lower_to_per_sample, + nir_metadata_control_flow, NULL); } static bool @@ -112,8 +111,7 @@ agx_nir_wrap_per_sample_loop(nir_shader *shader, uint8_t nr_samples) /* Use the loop variable for the active sampple mask each iteration */ nir_shader_intrinsics_pass(shader, lower_active_samples, - nir_metadata_block_index | nir_metadata_dominance, - bit); + nir_metadata_control_flow, bit); return true; } diff --git a/src/asahi/lib/agx_nir_lower_sample_intrinsics.c b/src/asahi/lib/agx_nir_lower_sample_intrinsics.c index 40a5e46d8a1..4f8452852f4 100644 --- a/src/asahi/lib/agx_nir_lower_sample_intrinsics.c +++ b/src/asahi/lib/agx_nir_lower_sample_intrinsics.c @@ -206,7 +206,6 @@ bool agx_nir_lower_sample_intrinsics(nir_shader *shader, bool ignore_sample_mask_without_msaa) { - return nir_shader_intrinsics_pass( - shader, lower, nir_metadata_block_index | nir_metadata_dominance, - &ignore_sample_mask_without_msaa); + return nir_shader_intrinsics_pass(shader, lower, nir_metadata_control_flow, + &ignore_sample_mask_without_msaa); } diff --git a/src/asahi/lib/agx_nir_lower_tess.c b/src/asahi/lib/agx_nir_lower_tess.c index ecc59625d88..653c685e33d 100644 --- a/src/asahi/lib/agx_nir_lower_tess.c +++ b/src/asahi/lib/agx_nir_lower_tess.c @@ -201,8 +201,7 @@ link_libagx(nir_shader *nir, const nir_shader *libagx) bool agx_nir_lower_tcs(nir_shader *tcs, const struct nir_shader *libagx) { - nir_shader_intrinsics_pass( - tcs, lower_tcs, nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_shader_intrinsics_pass(tcs, lower_tcs, nir_metadata_control_flow, NULL); link_libagx(tcs, libagx); return true; @@ -261,8 +260,7 @@ agx_nir_lower_tes(nir_shader *tes, const nir_shader *libagx) nir_lower_tess_coord_z( tes, tes->info.tess._primitive_mode == TESS_PRIMITIVE_TRIANGLES); - nir_shader_intrinsics_pass( - tes, lower_tes, nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_shader_intrinsics_pass(tes, lower_tes, nir_metadata_control_flow, NULL); /* Points mode renders as points, make sure we write point size for the HW */ if (tes->info.tess.point_mode && diff --git a/src/asahi/lib/agx_nir_lower_texture.c b/src/asahi/lib/agx_nir_lower_texture.c index 2bf6af64c6d..e6fa26f9090 100644 --- a/src/asahi/lib/agx_nir_lower_texture.c +++ b/src/asahi/lib/agx_nir_lower_texture.c @@ -693,7 +693,7 @@ agx_nir_lower_texture_early(nir_shader *s, bool support_lod_bias) bool progress = false; NIR_PASS(progress, s, nir_shader_intrinsics_pass, lower_robustness, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); nir_lower_tex_options lower_tex_options = { .lower_txp = ~0, @@ -717,7 +717,7 @@ agx_nir_lower_texture_early(nir_shader *s, bool support_lod_bias) */ if (support_lod_bias) { NIR_PASS(progress, s, nir_shader_instructions_pass, lower_sampler_bias, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } return progress; @@ -740,14 +740,14 @@ agx_nir_lower_texture(nir_shader *s) * different fencing than other image operations. */ NIR_PASS(progress, s, nir_shader_intrinsics_pass, fence_image, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); NIR_PASS(progress, s, nir_lower_image_atomics_to_global); NIR_PASS(progress, s, nir_shader_intrinsics_pass, legalize_image_lod, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); NIR_PASS(progress, s, nir_shader_intrinsics_pass, lower_images, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); NIR_PASS(progress, s, nir_legalize_16bit_sampler_srcs, tex_constraints); /* Fold constants after nir_legalize_16bit_sampler_srcs so we can detect 0 in @@ -762,7 +762,7 @@ agx_nir_lower_texture(nir_shader *s) NIR_PASS(progress, s, nir_shader_instructions_pass, lower_regular_texture, nir_metadata_none, NULL); NIR_PASS(progress, s, nir_shader_instructions_pass, lower_tex_crawl, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); return progress; } @@ -792,9 +792,8 @@ lower_multisampled_store(nir_builder *b, nir_intrinsic_instr *intr, bool agx_nir_lower_multisampled_image_store(nir_shader *s) { - return nir_shader_intrinsics_pass( - s, lower_multisampled_store, - nir_metadata_block_index | nir_metadata_dominance, NULL); + return nir_shader_intrinsics_pass(s, lower_multisampled_store, + nir_metadata_control_flow, NULL); } /* diff --git a/src/asahi/lib/agx_nir_lower_uvs.c b/src/asahi/lib/agx_nir_lower_uvs.c index f5f39e7e2e2..285bd94c4d2 100644 --- a/src/asahi/lib/agx_nir_lower_uvs.c +++ b/src/asahi/lib/agx_nir_lower_uvs.c @@ -148,7 +148,7 @@ agx_nir_lower_uvs(nir_shader *s, struct agx_unlinked_uvs_layout *layout) /* Determine the unlinked UVS layout */ NIR_PASS(progress, s, nir_shader_intrinsics_pass, gather_components, - nir_metadata_block_index | nir_metadata_dominance, layout); + nir_metadata_control_flow, layout); unsigned sizes[UVS_NUM_GROUP] = { [UVS_POSITION] = 4, @@ -179,7 +179,7 @@ agx_nir_lower_uvs(nir_shader *s, struct agx_unlinked_uvs_layout *layout) /* Now lower in terms of the unlinked layout */ struct ctx ctx = {.layout = layout}; NIR_PASS(progress, s, nir_shader_intrinsics_pass, lower, - nir_metadata_block_index | nir_metadata_dominance, &ctx); + nir_metadata_control_flow, &ctx); if (ctx.layer || ctx.viewport) { write_layer_viewport_sysval(&ctx); diff --git a/src/asahi/lib/agx_nir_lower_vbo.c b/src/asahi/lib/agx_nir_lower_vbo.c index 8f58603547f..e54ba2393c3 100644 --- a/src/asahi/lib/agx_nir_lower_vbo.c +++ b/src/asahi/lib/agx_nir_lower_vbo.c @@ -306,6 +306,6 @@ agx_nir_lower_vbo(nir_shader *shader, struct agx_attribute *attribs, assert(shader->info.stage == MESA_SHADER_VERTEX); struct ctx ctx = {.attribs = attribs, .rs = robustness}; - return nir_shader_intrinsics_pass( - shader, pass, nir_metadata_block_index | nir_metadata_dominance, &ctx); + return nir_shader_intrinsics_pass(shader, pass, nir_metadata_control_flow, + &ctx); } diff --git a/src/asahi/lib/agx_nir_prolog_epilog.c b/src/asahi/lib/agx_nir_prolog_epilog.c index 05e1e307ab0..94aa9468760 100644 --- a/src/asahi/lib/agx_nir_prolog_epilog.c +++ b/src/asahi/lib/agx_nir_prolog_epilog.c @@ -50,8 +50,7 @@ agx_nir_lower_poly_stipple(nir_shader *s) nir_demote_if(b, nir_ieq_imm(b, bit, 0)); s->info.fs.uses_discard = true; - nir_metadata_preserve(b->impl, - nir_metadata_dominance | nir_metadata_block_index); + nir_metadata_preserve(b->impl, nir_metadata_control_flow); return true; } @@ -177,8 +176,7 @@ agx_nir_vs_prolog(nir_builder *b, const void *key_) /* Finally, lower uniforms according to our ABI */ unsigned nr = DIV_ROUND_UP(BITSET_LAST_BIT(key->component_mask), 4); nir_shader_intrinsics_pass(b->shader, lower_non_monolithic_uniforms, - nir_metadata_dominance | nir_metadata_block_index, - &nr); + nir_metadata_control_flow, &nr); b->shader->info.io_lowered = true; } @@ -214,10 +212,9 @@ bool agx_nir_lower_vs_input_to_prolog(nir_shader *s, BITSET_WORD *attrib_components_read) { - return nir_shader_intrinsics_pass( - s, lower_input_to_prolog, - nir_metadata_dominance | nir_metadata_block_index, - attrib_components_read); + return nir_shader_intrinsics_pass(s, lower_input_to_prolog, + nir_metadata_control_flow, + attrib_components_read); } static bool @@ -253,9 +250,8 @@ lower_tests_zs(nir_shader *s, bool value) if (!s->info.fs.uses_discard) return false; - return nir_shader_intrinsics_pass( - s, lower_tests_zs_intr, nir_metadata_dominance | nir_metadata_block_index, - &value); + return nir_shader_intrinsics_pass(s, lower_tests_zs_intr, + nir_metadata_control_flow, &value); } static inline bool @@ -443,8 +439,7 @@ agx_nir_fs_epilog(nir_builder *b, const void *key_) /* Finally, lower uniforms according to our ABI */ nir_shader_intrinsics_pass(b->shader, lower_non_monolithic_uniforms, - nir_metadata_dominance | nir_metadata_block_index, - NULL); + nir_metadata_control_flow, NULL); /* There is no shader part after the epilog, so we're always responsible for * running our own tests, unless the fragment shader forced early tests. @@ -576,8 +571,7 @@ agx_nir_lower_fs_output_to_epilog(nir_shader *s, struct lower_epilog_ctx ctx = {.info = out}; nir_shader_intrinsics_pass(s, lower_output_to_epilog, - nir_metadata_dominance | nir_metadata_block_index, - &ctx); + nir_metadata_control_flow, &ctx); if (ctx.masked_samples) { nir_builder b = @@ -601,9 +595,8 @@ agx_nir_lower_fs_output_to_epilog(nir_shader *s, bool agx_nir_lower_fs_active_samples_to_register(nir_shader *s) { - return nir_shader_intrinsics_pass( - s, lower_active_samples_to_register, - nir_metadata_dominance | nir_metadata_block_index, NULL); + return nir_shader_intrinsics_pass(s, lower_active_samples_to_register, + nir_metadata_control_flow, NULL); } static bool @@ -620,8 +613,7 @@ agx_nir_lower_stats_fs(nir_shader *s) nir_def *addr = nir_load_stat_query_address_agx(b, .base = query); nir_global_atomic(b, 32, addr, samples, .atomic_op = nir_atomic_op_iadd); - nir_metadata_preserve(b->impl, - nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_preserve(b->impl, nir_metadata_control_flow); return true; } @@ -656,8 +648,7 @@ agx_nir_fs_prolog(nir_builder *b, const void *key_) NIR_PASS(_, b->shader, agx_nir_lower_discard_zs_emit); NIR_PASS(_, b->shader, agx_nir_lower_sample_mask); NIR_PASS(_, b->shader, nir_shader_intrinsics_pass, - lower_non_monolithic_uniforms, - nir_metadata_dominance | nir_metadata_block_index, NULL); + lower_non_monolithic_uniforms, nir_metadata_control_flow, NULL); NIR_PASS(_, b->shader, lower_tests_zs, key->run_zs_tests); b->shader->info.io_lowered = true; diff --git a/src/broadcom/compiler/v3d_nir_lower_image_load_store.c b/src/broadcom/compiler/v3d_nir_lower_image_load_store.c index 9a651bfc6a7..ce14b5d60a6 100644 --- a/src/broadcom/compiler/v3d_nir_lower_image_load_store.c +++ b/src/broadcom/compiler/v3d_nir_lower_image_load_store.c @@ -453,6 +453,5 @@ v3d_nir_lower_image_load_store(nir_shader *s, struct v3d_compile *c) { return nir_shader_intrinsics_pass(s, v3d_nir_lower_image_load_store_cb, - nir_metadata_block_index | - nir_metadata_dominance, c); + nir_metadata_control_flow, c); } diff --git a/src/broadcom/compiler/v3d_nir_lower_io.c b/src/broadcom/compiler/v3d_nir_lower_io.c index a8f35f138dd..6142df3bfca 100644 --- a/src/broadcom/compiler/v3d_nir_lower_io.c +++ b/src/broadcom/compiler/v3d_nir_lower_io.c @@ -652,8 +652,7 @@ v3d_nir_lower_io(nir_shader *s, struct v3d_compile *c) } nir_metadata_preserve(impl, - nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_control_flow); } v3d_nir_lower_io_update_output_var_base(c, &state); diff --git a/src/broadcom/compiler/v3d_nir_lower_line_smooth.c b/src/broadcom/compiler/v3d_nir_lower_line_smooth.c index 05b5224bc52..b4d512c6a19 100644 --- a/src/broadcom/compiler/v3d_nir_lower_line_smooth.c +++ b/src/broadcom/compiler/v3d_nir_lower_line_smooth.c @@ -166,8 +166,7 @@ v3d_nir_lower_line_smooth(nir_shader *s) if (progress) { nir_metadata_preserve(impl, - nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/broadcom/compiler/v3d_nir_lower_load_store_bitsize.c b/src/broadcom/compiler/v3d_nir_lower_load_store_bitsize.c index df3fb33d2ba..b4ad014f652 100644 --- a/src/broadcom/compiler/v3d_nir_lower_load_store_bitsize.c +++ b/src/broadcom/compiler/v3d_nir_lower_load_store_bitsize.c @@ -225,8 +225,7 @@ v3d_nir_lower_load_store_bitsize(nir_shader *s) }; bool res = nir_shader_intrinsics_pass(s, lower_load_store_bitsize, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); res |= nir_lower_mem_access_bit_sizes(s, &lower_options); return res; @@ -236,7 +235,6 @@ bool v3d_nir_lower_global_2x32(nir_shader *s) { return nir_shader_intrinsics_pass(s, lower_global_2x32, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/broadcom/compiler/v3d_nir_lower_logic_ops.c b/src/broadcom/compiler/v3d_nir_lower_logic_ops.c index f6bdac1bd20..f15f7fe46e5 100644 --- a/src/broadcom/compiler/v3d_nir_lower_logic_ops.c +++ b/src/broadcom/compiler/v3d_nir_lower_logic_ops.c @@ -410,8 +410,7 @@ v3d_nir_lower_logic_ops(nir_shader *s, struct v3d_compile *c) if (progress) { nir_metadata_preserve(impl, - nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); diff --git a/src/broadcom/compiler/v3d_nir_lower_scratch.c b/src/broadcom/compiler/v3d_nir_lower_scratch.c index c65a96dcb2e..9649d7e7d6a 100644 --- a/src/broadcom/compiler/v3d_nir_lower_scratch.c +++ b/src/broadcom/compiler/v3d_nir_lower_scratch.c @@ -80,6 +80,5 @@ bool v3d_nir_lower_scratch(nir_shader *s) { return nir_shader_intrinsics_pass(s, v3d_nir_lower_scratch_cb, - nir_metadata_block_index | - nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } diff --git a/src/broadcom/compiler/vir.c b/src/broadcom/compiler/vir.c index 9b190aced36..d751de653d4 100644 --- a/src/broadcom/compiler/vir.c +++ b/src/broadcom/compiler/vir.c @@ -676,8 +676,7 @@ static bool v3d_nir_lower_null_pointers(nir_shader *s) { return nir_shader_intrinsics_pass(s, v3d_nir_lower_null_pointers_cb, - nir_metadata_block_index | - nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } static void @@ -1518,8 +1517,7 @@ v3d_nir_sort_constant_ubo_loads(nir_shader *s, struct v3d_compile *c) v3d_nir_sort_constant_ubo_loads_block(c, block); } nir_metadata_preserve(impl, - nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_control_flow); } return c->sorted_any_ubo_loads; } @@ -1616,8 +1614,7 @@ v3d_nir_lower_subgroup_intrinsics(nir_shader *s, struct v3d_compile *c) progress |= lower_subgroup_intrinsics(c, block, &b); nir_metadata_preserve(impl, - nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_control_flow); } return progress; } diff --git a/src/broadcom/vulkan/v3dv_pipeline.c b/src/broadcom/vulkan/v3dv_pipeline.c index 3699a4322d8..c985552d0ac 100644 --- a/src/broadcom/vulkan/v3dv_pipeline.c +++ b/src/broadcom/vulkan/v3dv_pipeline.c @@ -887,8 +887,7 @@ lower_pipeline_layout_info(nir_shader *shader, }; progress = nir_shader_instructions_pass(shader, lower_pipeline_layout_cb, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &state); *needs_default_sampler_state = state.needs_default_sampler_state; @@ -921,8 +920,7 @@ v3d_nir_lower_point_coord(nir_shader *s) { assert(s->info.stage == MESA_SHADER_FRAGMENT); return nir_shader_intrinsics_pass(s, lower_point_coord_cb, - nir_metadata_block_index | - nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } static void diff --git a/src/compiler/glsl/gl_nir_link_varyings.c b/src/compiler/glsl/gl_nir_link_varyings.c index 5e2b13e68cc..dd598508489 100644 --- a/src/compiler/glsl/gl_nir_link_varyings.c +++ b/src/compiler/glsl/gl_nir_link_varyings.c @@ -3475,8 +3475,7 @@ fixup_vars_lowered_to_temp(nir_shader *shader, nir_variable_mode mode) if (mode == nir_var_shader_in && shader->info.stage == MESA_SHADER_FRAGMENT) { (void) nir_shader_instructions_pass(shader, replace_unused_interpolate_at_with_undef, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/compiler/glsl/gl_nir_linker.c b/src/compiler/glsl/gl_nir_linker.c index 43a3b1b4888..acdc24bfd17 100644 --- a/src/compiler/glsl/gl_nir_linker.c +++ b/src/compiler/glsl/gl_nir_linker.c @@ -1138,7 +1138,7 @@ gl_nir_add_point_size(nir_shader *nir) nir->info.outputs_written |= VARYING_BIT_PSIZ; /* We always modify the entrypoint */ - nir_metadata_preserve(impl, nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); return true; } @@ -1174,8 +1174,7 @@ gl_nir_zero_initialize_clip_distance(nir_shader *nir) if (clip_dist1) zero_array_members(&b, clip_dist1); - nir_metadata_preserve(impl, nir_metadata_dominance | - nir_metadata_block_index); + nir_metadata_preserve(impl, nir_metadata_control_flow); return true; } diff --git a/src/compiler/glsl/gl_nir_lower_atomics.c b/src/compiler/glsl/gl_nir_lower_atomics.c index 7f4b171eaec..7ffe997981e 100644 --- a/src/compiler/glsl/gl_nir_lower_atomics.c +++ b/src/compiler/glsl/gl_nir_lower_atomics.c @@ -179,7 +179,6 @@ gl_nir_lower_atomics(nir_shader *shader, }; return nir_shader_instructions_pass(shader, gl_nir_lower_atomics_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &data); } diff --git a/src/compiler/glsl/gl_nir_lower_buffers.c b/src/compiler/glsl/gl_nir_lower_buffers.c index 59126f02369..5d5ffd545e1 100644 --- a/src/compiler/glsl/gl_nir_lower_buffers.c +++ b/src/compiler/glsl/gl_nir_lower_buffers.c @@ -313,8 +313,7 @@ lower_buffer_interface_derefs_impl(nir_function_impl *impl, } if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/glsl/gl_nir_lower_images.c b/src/compiler/glsl/gl_nir_lower_images.c index 86ba3d8f7a8..3770e911593 100644 --- a/src/compiler/glsl/gl_nir_lower_images.c +++ b/src/compiler/glsl/gl_nir_lower_images.c @@ -109,7 +109,6 @@ bool gl_nir_lower_images(nir_shader *shader, bool bindless_only) { return nir_shader_instructions_pass(shader, lower_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &bindless_only); } diff --git a/src/compiler/glsl/gl_nir_lower_named_interface_blocks.c b/src/compiler/glsl/gl_nir_lower_named_interface_blocks.c index 3377e3e9046..79c419a3978 100644 --- a/src/compiler/glsl/gl_nir_lower_named_interface_blocks.c +++ b/src/compiler/glsl/gl_nir_lower_named_interface_blocks.c @@ -307,8 +307,7 @@ lower_named_interface_blocks(struct gl_linked_shader *sh) state.mem_ctx = mem_ctx; state.interface_namespace = interface_namespace; nir_shader_intrinsics_pass(sh->Program->nir, flatten_named_interface_derefs, - nir_metadata_block_index | - nir_metadata_dominance, &state); + nir_metadata_control_flow, &state); /* Third pass: Mark now lowered blks as ordinary globals to be dead code * eliminated. Also use this oppotunity to set the compact flag where diff --git a/src/compiler/glsl/gl_nir_lower_samplers_as_deref.c b/src/compiler/glsl/gl_nir_lower_samplers_as_deref.c index 2d45c257e6f..a7327f49fdf 100644 --- a/src/compiler/glsl/gl_nir_lower_samplers_as_deref.c +++ b/src/compiler/glsl/gl_nir_lower_samplers_as_deref.c @@ -362,8 +362,7 @@ gl_nir_lower_samplers_as_deref(nir_shader *shader, _mesa_key_string_equal); bool progress = nir_shader_instructions_pass(shader, lower_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &state); if (progress) { diff --git a/src/compiler/nir/nir.c b/src/compiler/nir/nir.c index 619d509e4f2..3bdc706f6c4 100644 --- a/src/compiler/nir/nir.c +++ b/src/compiler/nir/nir.c @@ -2058,8 +2058,7 @@ nir_function_impl_lower_instructions(nir_function_impl *impl, { nir_builder b = nir_builder_create(impl); - nir_metadata preserved = nir_metadata_block_index | - nir_metadata_dominance; + nir_metadata preserved = nir_metadata_control_flow; bool progress = false; nir_cursor iter = nir_before_impl(impl); diff --git a/src/compiler/nir/nir_deref.c b/src/compiler/nir/nir_deref.c index f0f5f140130..5d239756fc5 100644 --- a/src/compiler/nir/nir_deref.c +++ b/src/compiler/nir/nir_deref.c @@ -394,8 +394,7 @@ nir_remove_dead_derefs_impl(nir_function_impl *impl) } if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } @@ -453,10 +452,9 @@ void nir_fixup_deref_modes(nir_shader *shader) { nir_shader_instructions_pass(shader, nir_fixup_deref_modes_instr, - nir_metadata_block_index | - nir_metadata_dominance | - nir_metadata_live_defs | - nir_metadata_instr_index, + nir_metadata_control_flow | + nir_metadata_live_defs | + nir_metadata_instr_index, NULL); } @@ -497,10 +495,9 @@ void nir_fixup_deref_types(nir_shader *shader) { nir_shader_instructions_pass(shader, nir_fixup_deref_types_instr, - nir_metadata_block_index | - nir_metadata_dominance | - nir_metadata_live_defs | - nir_metadata_instr_index, + nir_metadata_control_flow | + nir_metadata_live_defs | + nir_metadata_instr_index, NULL); } @@ -1548,8 +1545,7 @@ nir_opt_deref_impl(nir_function_impl *impl) } if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_from_ssa.c b/src/compiler/nir/nir_from_ssa.c index d7bf90a6b4e..10f1d2e27b8 100644 --- a/src/compiler/nir/nir_from_ssa.c +++ b/src/compiler/nir/nir_from_ssa.c @@ -1051,8 +1051,7 @@ nir_convert_from_ssa_impl(nir_function_impl *impl, } /* Mark metadata as dirty before we ask for liveness analysis */ - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); nir_metadata_require(impl, nir_metadata_instr_index | nir_metadata_live_defs | @@ -1072,8 +1071,7 @@ nir_convert_from_ssa_impl(nir_function_impl *impl, resolve_parallel_copies_block(block, &state); } - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); /* Clean up dead instructions and the hash tables */ nir_instr_free_list(&state.dead_instrs); diff --git a/src/compiler/nir/nir_group_loads.c b/src/compiler/nir/nir_group_loads.c index 27c77e762b2..eae6431643e 100644 --- a/src/compiler/nir/nir_group_loads.c +++ b/src/compiler/nir/nir_group_loads.c @@ -475,8 +475,7 @@ nir_group_loads(nir_shader *shader, nir_load_grouping grouping, process_block(block, grouping, max_distance); } - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance | + nir_metadata_preserve(impl, nir_metadata_control_flow | nir_metadata_loop_analysis); } } diff --git a/src/compiler/nir/nir_inline_uniforms.c b/src/compiler/nir/nir_inline_uniforms.c index 64e12699fdb..fee010a9d6e 100644 --- a/src/compiler/nir/nir_inline_uniforms.c +++ b/src/compiler/nir/nir_inline_uniforms.c @@ -465,8 +465,7 @@ nir_inline_uniforms(nir_shader *shader, unsigned num_uniforms, } } - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } } } diff --git a/src/compiler/nir/nir_legacy.c b/src/compiler/nir/nir_legacy.c index 3ed1b2a3fd8..29596942e98 100644 --- a/src/compiler/nir/nir_legacy.c +++ b/src/compiler/nir/nir_legacy.c @@ -328,8 +328,7 @@ nir_legacy_trivialize(nir_shader *s, bool fuse_fabs) * chase registers recursively, allowing registers to be trivialized easier. */ if (nir_shader_instructions_pass(s, fuse_mods_with_registers, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &fuse_fabs)) { /* If we made progress, we likely left dead loads. Clean them up. */ NIR_PASS_V(s, nir_opt_dce); diff --git a/src/compiler/nir/nir_linking_helpers.c b/src/compiler/nir/nir_linking_helpers.c index eef0cdf101f..b9c4a67c1c8 100644 --- a/src/compiler/nir/nir_linking_helpers.c +++ b/src/compiler/nir/nir_linking_helpers.c @@ -167,8 +167,7 @@ nir_remove_unused_io_vars(nir_shader *shader, nir_function_impl *impl = nir_shader_get_entrypoint(shader); if (progress) { - nir_metadata_preserve(impl, nir_metadata_dominance | - nir_metadata_block_index); + nir_metadata_preserve(impl, nir_metadata_control_flow); nir_fixup_deref_modes(shader); } else { nir_metadata_preserve(impl, nir_metadata_all); diff --git a/src/compiler/nir/nir_lower_alpha_test.c b/src/compiler/nir/nir_lower_alpha_test.c index 40931e97f55..c02dabc921a 100644 --- a/src/compiler/nir/nir_lower_alpha_test.c +++ b/src/compiler/nir/nir_lower_alpha_test.c @@ -103,7 +103,6 @@ nir_lower_alpha_test(nir_shader *shader, enum compare_func func, }; return nir_shader_intrinsics_pass(shader, lower, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &state); } diff --git a/src/compiler/nir/nir_lower_alu.c b/src/compiler/nir/nir_lower_alu.c index 023a474ad57..cc58b181e3d 100644 --- a/src/compiler/nir/nir_lower_alu.c +++ b/src/compiler/nir/nir_lower_alu.c @@ -231,7 +231,6 @@ nir_lower_alu(nir_shader *shader) return false; return nir_shader_instructions_pass(shader, lower_alu_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/compiler/nir/nir_lower_alu_width.c b/src/compiler/nir/nir_lower_alu_width.c index 7d1f8a98d59..b73e4f2bdb2 100644 --- a/src/compiler/nir/nir_lower_alu_width.c +++ b/src/compiler/nir/nir_lower_alu_width.c @@ -493,6 +493,6 @@ bool nir_lower_alu_vec8_16_srcs(nir_shader *shader) { return nir_shader_instructions_pass(shader, lower_alu_vec8_16_src, - nir_metadata_block_index | nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/compiler/nir/nir_lower_amul.c b/src/compiler/nir/nir_lower_amul.c index 7e3ccea2f55..f95adc45b30 100644 --- a/src/compiler/nir/nir_lower_amul.c +++ b/src/compiler/nir/nir_lower_amul.c @@ -269,8 +269,7 @@ nir_lower_amul(nir_shader *shader, } } - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } return state.progress; diff --git a/src/compiler/nir/nir_lower_array_deref_of_vec.c b/src/compiler/nir/nir_lower_array_deref_of_vec.c index 2a8549eb8c2..e8d15626bc1 100644 --- a/src/compiler/nir/nir_lower_array_deref_of_vec.c +++ b/src/compiler/nir/nir_lower_array_deref_of_vec.c @@ -127,8 +127,7 @@ nir_lower_array_deref_of_vec_impl(nir_function_impl *impl, } if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_lower_atomics_to_ssbo.c b/src/compiler/nir/nir_lower_atomics_to_ssbo.c index 6447b73d503..440b122e86e 100644 --- a/src/compiler/nir/nir_lower_atomics_to_ssbo.c +++ b/src/compiler/nir/nir_lower_atomics_to_ssbo.c @@ -196,8 +196,7 @@ nir_lower_atomics_to_ssbo(nir_shader *shader, unsigned offset_align_state) } } - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } if (progress) { diff --git a/src/compiler/nir/nir_lower_bit_size.c b/src/compiler/nir/nir_lower_bit_size.c index 14340b0b7d7..178104967d5 100644 --- a/src/compiler/nir/nir_lower_bit_size.c +++ b/src/compiler/nir/nir_lower_bit_size.c @@ -285,8 +285,7 @@ lower_impl(nir_function_impl *impl, } if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } @@ -362,7 +361,6 @@ bool nir_lower_64bit_phis(nir_shader *shader) { return nir_shader_instructions_pass(shader, lower_64bit_phi_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/compiler/nir/nir_lower_bitmap.c b/src/compiler/nir/nir_lower_bitmap.c index df669d986c7..3e6a7832d28 100644 --- a/src/compiler/nir/nir_lower_bitmap.c +++ b/src/compiler/nir/nir_lower_bitmap.c @@ -106,8 +106,7 @@ lower_bitmap_impl(nir_function_impl *impl, lower_bitmap(impl->function->shader, &b, options); - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } bool diff --git a/src/compiler/nir/nir_lower_blend.c b/src/compiler/nir/nir_lower_blend.c index 60c7b9e5abc..df37ae8cdef 100644 --- a/src/compiler/nir/nir_lower_blend.c +++ b/src/compiler/nir/nir_lower_blend.c @@ -645,13 +645,11 @@ nir_lower_blend(nir_shader *shader, const nir_lower_blend_options *options) struct ctx ctx = { .options = options }; bool progress = nir_shader_intrinsics_pass(shader, consume_dual_stores, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, ctx.src1); progress |= nir_shader_intrinsics_pass(shader, nir_lower_blend_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &ctx); return progress; } diff --git a/src/compiler/nir/nir_lower_bool_to_bitsize.c b/src/compiler/nir/nir_lower_bool_to_bitsize.c index d1347b19758..ab3e3eb8ed1 100644 --- a/src/compiler/nir/nir_lower_bool_to_bitsize.c +++ b/src/compiler/nir/nir_lower_bool_to_bitsize.c @@ -413,7 +413,6 @@ bool nir_lower_bool_to_bitsize(nir_shader *shader) { return nir_shader_instructions_pass(shader, nir_lower_bool_to_bitsize_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/compiler/nir/nir_lower_bool_to_float.c b/src/compiler/nir/nir_lower_bool_to_float.c index 702bc404111..95397062982 100644 --- a/src/compiler/nir/nir_lower_bool_to_float.c +++ b/src/compiler/nir/nir_lower_bool_to_float.c @@ -261,7 +261,6 @@ nir_lower_bool_to_float(nir_shader *shader, bool has_fcsel_ne) }; return nir_shader_instructions_pass(shader, nir_lower_bool_to_float_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &data); } diff --git a/src/compiler/nir/nir_lower_bool_to_int32.c b/src/compiler/nir/nir_lower_bool_to_int32.c index 8d4b57b6f31..b404d03406d 100644 --- a/src/compiler/nir/nir_lower_bool_to_int32.c +++ b/src/compiler/nir/nir_lower_bool_to_int32.c @@ -228,8 +228,7 @@ nir_lower_bool_to_int32(nir_shader *shader) progress |= nir_shader_instructions_pass(shader, nir_lower_bool_to_int32_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); return progress; } diff --git a/src/compiler/nir/nir_lower_cl_images.c b/src/compiler/nir/nir_lower_cl_images.c index 13063593aad..a9969de1281 100644 --- a/src/compiler/nir/nir_lower_cl_images.c +++ b/src/compiler/nir/nir_lower_cl_images.c @@ -84,8 +84,7 @@ nir_dedup_inline_samplers(nir_shader *nir) exec_list_make_empty(&inline_samplers); nir_shader_instructions_pass(nir, nir_dedup_inline_samplers_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &inline_samplers); /* If we found any inline samplers in the instructions pass, they'll now be @@ -287,8 +286,7 @@ nir_lower_cl_images(nir_shader *shader, bool lower_image_derefs, bool lower_samp } if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_lower_clamp_color_outputs.c b/src/compiler/nir/nir_lower_clamp_color_outputs.c index 37e40f89a28..17afa82716d 100644 --- a/src/compiler/nir/nir_lower_clamp_color_outputs.c +++ b/src/compiler/nir/nir_lower_clamp_color_outputs.c @@ -93,7 +93,6 @@ bool nir_lower_clamp_color_outputs(nir_shader *shader) { return nir_shader_instructions_pass(shader, lower_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, shader); } diff --git a/src/compiler/nir/nir_lower_clip_cull_distance_arrays.c b/src/compiler/nir/nir_lower_clip_cull_distance_arrays.c index 3ddab7f5d81..7cf548b1c7c 100644 --- a/src/compiler/nir/nir_lower_clip_cull_distance_arrays.c +++ b/src/compiler/nir/nir_lower_clip_cull_distance_arrays.c @@ -369,8 +369,7 @@ lower_distance_to_vec4(nir_shader *shader, struct lower_distance_state *state) /* Replace derefs */ nir_shader_intrinsics_pass(shader, replace_with_derefs_to_vec4, - nir_metadata_block_index | - nir_metadata_dominance, state); + nir_metadata_control_flow, state); /* Mark now lowered vars as ordinary globals to be dead code eliminated. * Also clear the compact flag to avoid issues with validation. @@ -518,10 +517,9 @@ nir_lower_clip_cull_distance_arrays(nir_shader *nir) nir_foreach_function_impl(impl, nir) { if (progress) { nir_metadata_preserve(impl, - nir_metadata_block_index | - nir_metadata_dominance | - nir_metadata_live_defs | - nir_metadata_loop_analysis); + nir_metadata_control_flow | + nir_metadata_live_defs | + nir_metadata_loop_analysis); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_lower_clip_disable.c b/src/compiler/nir/nir_lower_clip_disable.c index da30eb8b48f..fef7e5f6a15 100644 --- a/src/compiler/nir/nir_lower_clip_disable.c +++ b/src/compiler/nir/nir_lower_clip_disable.c @@ -174,7 +174,6 @@ nir_lower_clip_disable(nir_shader *shader, unsigned clip_plane_enable) return nir_shader_intrinsics_pass(shader, shader->info.io_lowered ? lower_clip_plane_store_io : lower_clip_plane_store, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &clip_plane_enable); } diff --git a/src/compiler/nir/nir_lower_clip_halfz.c b/src/compiler/nir/nir_lower_clip_halfz.c index 2b049cc7c5d..f0b78db0b67 100644 --- a/src/compiler/nir/nir_lower_clip_halfz.c +++ b/src/compiler/nir/nir_lower_clip_halfz.c @@ -60,7 +60,6 @@ nir_lower_clip_halfz(nir_shader *shader) return; nir_shader_intrinsics_pass(shader, lower_pos_write, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/compiler/nir/nir_lower_const_arrays_to_uniforms.c b/src/compiler/nir/nir_lower_const_arrays_to_uniforms.c index 7a292b3690c..0a594a15834 100644 --- a/src/compiler/nir/nir_lower_const_arrays_to_uniforms.c +++ b/src/compiler/nir/nir_lower_const_arrays_to_uniforms.c @@ -407,8 +407,7 @@ nir_lower_const_arrays_to_uniforms(nir_shader *shader, } } - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); ralloc_free(var_infos); _mesa_hash_table_destroy(const_array_vars, NULL); diff --git a/src/compiler/nir/nir_lower_convert_alu_types.c b/src/compiler/nir/nir_lower_convert_alu_types.c index 140df2b0e1f..429e58891f5 100644 --- a/src/compiler/nir/nir_lower_convert_alu_types.c +++ b/src/compiler/nir/nir_lower_convert_alu_types.c @@ -94,8 +94,7 @@ opt_simplify_convert_alu_types_impl(nir_function_impl *impl) } if (lowered_instr) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } @@ -142,8 +141,7 @@ lower_convert_alu_types_impl(nir_function_impl *impl, } if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_lower_double_ops.c b/src/compiler/nir/nir_lower_double_ops.c index d4bcff83237..40c5b945f27 100644 --- a/src/compiler/nir/nir_lower_double_ops.c +++ b/src/compiler/nir/nir_lower_double_ops.c @@ -871,8 +871,7 @@ nir_lower_doubles_impl(nir_function_impl *impl, */ nir_opt_deref_impl(impl); } else if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_lower_drawpixels.c b/src/compiler/nir/nir_lower_drawpixels.c index a5a9dcba883..3f0874a8634 100644 --- a/src/compiler/nir/nir_lower_drawpixels.c +++ b/src/compiler/nir/nir_lower_drawpixels.c @@ -254,7 +254,6 @@ nir_lower_drawpixels(nir_shader *shader, assert(shader->info.stage == MESA_SHADER_FRAGMENT); return nir_shader_instructions_pass(shader, lower_drawpixels_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &state); } diff --git a/src/compiler/nir/nir_lower_fb_read.c b/src/compiler/nir/nir_lower_fb_read.c index 57f4a658cf5..cd2bbc2d27b 100644 --- a/src/compiler/nir/nir_lower_fb_read.c +++ b/src/compiler/nir/nir_lower_fb_read.c @@ -87,7 +87,6 @@ nir_lower_fb_read(nir_shader *shader) assert(shader->info.stage == MESA_SHADER_FRAGMENT); return nir_shader_intrinsics_pass(shader, nir_lower_fb_read_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/compiler/nir/nir_lower_flrp.c b/src/compiler/nir/nir_lower_flrp.c index fe3f6c0f1f6..7f17ea071ce 100644 --- a/src/compiler/nir/nir_lower_flrp.c +++ b/src/compiler/nir/nir_lower_flrp.c @@ -634,8 +634,7 @@ lower_flrp_impl(nir_function_impl *impl, } } - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } /** diff --git a/src/compiler/nir/nir_lower_frag_coord_to_pixel_coord.c b/src/compiler/nir/nir_lower_frag_coord_to_pixel_coord.c index db97c7f1941..fea6a670b7d 100644 --- a/src/compiler/nir/nir_lower_frag_coord_to_pixel_coord.c +++ b/src/compiler/nir/nir_lower_frag_coord_to_pixel_coord.c @@ -29,6 +29,6 @@ bool nir_lower_frag_coord_to_pixel_coord(nir_shader *shader) { return nir_shader_intrinsics_pass(shader, lower, - nir_metadata_block_index | nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/compiler/nir/nir_lower_fragcolor.c b/src/compiler/nir/nir_lower_fragcolor.c index 36bb787c004..37fcae65a12 100644 --- a/src/compiler/nir/nir_lower_fragcolor.c +++ b/src/compiler/nir/nir_lower_fragcolor.c @@ -97,7 +97,6 @@ nir_lower_fragcolor(nir_shader *shader, unsigned max_draw_buffers) return false; return nir_shader_intrinsics_pass(shader, lower_fragcolor_intrin, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &max_draw_buffers); } diff --git a/src/compiler/nir/nir_lower_frexp.c b/src/compiler/nir/nir_lower_frexp.c index 31a9e830b4f..98078f8e3c4 100644 --- a/src/compiler/nir/nir_lower_frexp.c +++ b/src/compiler/nir/nir_lower_frexp.c @@ -189,7 +189,6 @@ bool nir_lower_frexp(nir_shader *shader) { return nir_shader_instructions_pass(shader, lower_frexp_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/compiler/nir/nir_lower_global_vars_to_local.c b/src/compiler/nir/nir_lower_global_vars_to_local.c index 589a7be5f8f..fb185191208 100644 --- a/src/compiler/nir/nir_lower_global_vars_to_local.c +++ b/src/compiler/nir/nir_lower_global_vars_to_local.c @@ -88,8 +88,7 @@ nir_lower_global_vars_to_local(nir_shader *shader) exec_node_remove(&var->node); var->data.mode = nir_var_function_temp; exec_list_push_tail(&impl->locals, &var->node); - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance | + nir_metadata_preserve(impl, nir_metadata_control_flow | nir_metadata_live_defs); progress = true; } diff --git a/src/compiler/nir/nir_lower_image.c b/src/compiler/nir/nir_lower_image.c index 6e034c3605c..c5ad1a8ee8d 100644 --- a/src/compiler/nir/nir_lower_image.c +++ b/src/compiler/nir/nir_lower_image.c @@ -218,7 +218,6 @@ bool nir_lower_image(nir_shader *nir, const nir_lower_image_options *options) { return nir_shader_intrinsics_pass(nir, lower_image_intrin, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, (void *)options); } diff --git a/src/compiler/nir/nir_lower_image_atomics_to_global.c b/src/compiler/nir/nir_lower_image_atomics_to_global.c index 0de3d82d1b5..7d747f232c2 100644 --- a/src/compiler/nir/nir_lower_image_atomics_to_global.c +++ b/src/compiler/nir/nir_lower_image_atomics_to_global.c @@ -98,7 +98,6 @@ bool nir_lower_image_atomics_to_global(nir_shader *shader) { return nir_shader_intrinsics_pass(shader, lower, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/compiler/nir/nir_lower_input_attachments.c b/src/compiler/nir/nir_lower_input_attachments.c index bc92b1c6a44..44b02a75646 100644 --- a/src/compiler/nir/nir_lower_input_attachments.c +++ b/src/compiler/nir/nir_lower_input_attachments.c @@ -215,7 +215,6 @@ nir_lower_input_attachments(nir_shader *shader, assert(shader->info.stage == MESA_SHADER_FRAGMENT); return nir_shader_instructions_pass(shader, lower_input_attachments_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, (void *)options); } diff --git a/src/compiler/nir/nir_lower_int_to_float.c b/src/compiler/nir/nir_lower_int_to_float.c index 72fe6d8f53a..68c8c85ac94 100644 --- a/src/compiler/nir/nir_lower_int_to_float.c +++ b/src/compiler/nir/nir_lower_int_to_float.c @@ -299,8 +299,7 @@ nir_lower_int_to_float_impl(nir_function_impl *impl) } if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_lower_interpolation.c b/src/compiler/nir/nir_lower_interpolation.c index 5f0af1c906d..aea5d897833 100644 --- a/src/compiler/nir/nir_lower_interpolation.c +++ b/src/compiler/nir/nir_lower_interpolation.c @@ -125,7 +125,6 @@ bool nir_lower_interpolation(nir_shader *shader, nir_lower_interpolation_options options) { return nir_shader_instructions_pass(shader, nir_lower_interpolation_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &options); } diff --git a/src/compiler/nir/nir_lower_io.c b/src/compiler/nir/nir_lower_io.c index 26e3812d3c0..cdd18eda7ad 100644 --- a/src/compiler/nir/nir_lower_io.c +++ b/src/compiler/nir/nir_lower_io.c @@ -2487,8 +2487,7 @@ nir_lower_vars_to_explicit_types_impl(nir_function_impl *impl, } if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance | + nir_metadata_preserve(impl, nir_metadata_control_flow | nir_metadata_live_defs | nir_metadata_loop_analysis); } else { @@ -3042,7 +3041,7 @@ nir_io_add_const_offset_to_base(nir_shader *nir, nir_variable_mode modes) } progress |= impl_progress; if (impl_progress) - nir_metadata_preserve(impl, nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); else nir_metadata_preserve(impl, nir_metadata_all); } @@ -3123,8 +3122,7 @@ nir_lower_color_inputs(nir_shader *nir) } if (progress) { - nir_metadata_preserve(impl, nir_metadata_dominance | - nir_metadata_block_index); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_lower_io_to_scalar.c b/src/compiler/nir/nir_lower_io_to_scalar.c index a09f68b981a..45f68c396c5 100644 --- a/src/compiler/nir/nir_lower_io_to_scalar.c +++ b/src/compiler/nir/nir_lower_io_to_scalar.c @@ -315,8 +315,7 @@ nir_lower_io_to_scalar(nir_shader *shader, nir_variable_mode mask, nir_instr_fil }; return nir_shader_instructions_pass(shader, nir_lower_io_to_scalar_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &state); } @@ -564,8 +563,7 @@ nir_lower_io_to_scalar_early(nir_shader *shader, nir_variable_mode mask) bool progress = nir_shader_instructions_pass(shader, nir_lower_io_to_scalar_early_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &state); /* Remove old input from the shaders inputs list */ diff --git a/src/compiler/nir/nir_lower_io_to_temporaries.c b/src/compiler/nir/nir_lower_io_to_temporaries.c index 942a72eaccd..43908949166 100644 --- a/src/compiler/nir/nir_lower_io_to_temporaries.c +++ b/src/compiler/nir/nir_lower_io_to_temporaries.c @@ -368,8 +368,7 @@ nir_lower_io_to_temporaries(nir_shader *shader, nir_function_impl *entrypoint, if (outputs) emit_output_copies_impl(&state, impl); - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } exec_list_append(&shader->variables, &state.old_inputs); diff --git a/src/compiler/nir/nir_lower_io_to_vector.c b/src/compiler/nir/nir_lower_io_to_vector.c index 3a90989d60a..9dfb01f6913 100644 --- a/src/compiler/nir/nir_lower_io_to_vector.c +++ b/src/compiler/nir/nir_lower_io_to_vector.c @@ -597,8 +597,7 @@ nir_lower_io_to_vector_impl(nir_function_impl *impl, nir_variable_mode modes) util_dynarray_fini(&demote_vars); if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } return progress; @@ -688,7 +687,7 @@ nir_vectorize_tess_levels_impl(nir_function_impl *impl) } if (progress) - nir_metadata_preserve(impl, nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); else nir_metadata_preserve(impl, nir_metadata_all); diff --git a/src/compiler/nir/nir_lower_is_helper_invocation.c b/src/compiler/nir/nir_lower_is_helper_invocation.c index 666371f503e..8f0ea993e06 100644 --- a/src/compiler/nir/nir_lower_is_helper_invocation.c +++ b/src/compiler/nir/nir_lower_is_helper_invocation.c @@ -112,7 +112,6 @@ nir_lower_is_helper_invocation(nir_shader *shader) nir_store_deref(&b, is_helper_deref, started_as_helper, 1); return nir_shader_intrinsics_pass(shader, lower_load_and_store_is_helper, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, is_helper_deref); } diff --git a/src/compiler/nir/nir_lower_load_const_to_scalar.c b/src/compiler/nir/nir_lower_load_const_to_scalar.c index 080022ca732..b4923c1b0bf 100644 --- a/src/compiler/nir/nir_lower_load_const_to_scalar.c +++ b/src/compiler/nir/nir_lower_load_const_to_scalar.c @@ -76,8 +76,7 @@ nir_lower_load_const_to_scalar_impl(nir_function_impl *impl) } if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_lower_locals_to_regs.c b/src/compiler/nir/nir_lower_locals_to_regs.c index 472a5147230..280ae6cd981 100644 --- a/src/compiler/nir/nir_lower_locals_to_regs.c +++ b/src/compiler/nir/nir_lower_locals_to_regs.c @@ -298,8 +298,7 @@ impl(nir_function_impl *impl, uint8_t bool_bitsize) lower_locals_to_regs_block(block, &state); } - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); _mesa_hash_table_destroy(state.regs_table, NULL); diff --git a/src/compiler/nir/nir_lower_mediump.c b/src/compiler/nir/nir_lower_mediump.c index 498ff7e8a0e..9b9b936e75d 100644 --- a/src/compiler/nir/nir_lower_mediump.c +++ b/src/compiler/nir/nir_lower_mediump.c @@ -145,8 +145,7 @@ nir_recompute_io_bases(nir_shader *nir, nir_variable_mode modes) } if (changed) { - nir_metadata_preserve(impl, nir_metadata_dominance | - nir_metadata_block_index); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } @@ -284,8 +283,7 @@ nir_lower_mediump_io(nir_shader *nir, nir_variable_mode modes, nir_recompute_io_bases(nir, modes); if (changed) { - nir_metadata_preserve(impl, nir_metadata_dominance | - nir_metadata_block_index); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } @@ -346,8 +344,7 @@ nir_force_mediump_io(nir_shader *nir, nir_variable_mode modes, } if (changed) { - nir_metadata_preserve(impl, nir_metadata_dominance | - nir_metadata_block_index); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } @@ -392,8 +389,7 @@ nir_unpack_16bit_varying_slots(nir_shader *nir, nir_variable_mode modes) nir_recompute_io_bases(nir, modes); if (changed) { - nir_metadata_preserve(impl, nir_metadata_dominance | - nir_metadata_block_index); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } @@ -559,8 +555,7 @@ nir_lower_mediump_vars_impl(nir_function_impl *impl, nir_variable_mode modes, } if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } @@ -695,8 +690,7 @@ nir_legalize_16bit_sampler_srcs(nir_shader *nir, nir_tex_src_type_constraints constraints) { return nir_shader_instructions_pass(nir, legalize_16bit_sampler_srcs, - nir_metadata_dominance | - nir_metadata_block_index, + nir_metadata_control_flow, constraints); } @@ -1106,6 +1100,6 @@ nir_opt_16bit_tex_image(nir_shader *nir, { return nir_shader_instructions_pass(nir, opt_16bit_tex_image, - nir_metadata_block_index | nir_metadata_dominance, + nir_metadata_control_flow, options); } diff --git a/src/compiler/nir/nir_lower_mem_access_bit_sizes.c b/src/compiler/nir/nir_lower_mem_access_bit_sizes.c index c5a79231079..755f449526a 100644 --- a/src/compiler/nir/nir_lower_mem_access_bit_sizes.c +++ b/src/compiler/nir/nir_lower_mem_access_bit_sizes.c @@ -474,7 +474,6 @@ nir_lower_mem_access_bit_sizes(nir_shader *shader, const nir_lower_mem_access_bit_sizes_options *options) { return nir_shader_instructions_pass(shader, lower_mem_access_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, (void *)options); } diff --git a/src/compiler/nir/nir_lower_memcpy.c b/src/compiler/nir/nir_lower_memcpy.c index 7c1dc91ab95..9c4557faaea 100644 --- a/src/compiler/nir/nir_lower_memcpy.c +++ b/src/compiler/nir/nir_lower_memcpy.c @@ -178,8 +178,7 @@ lower_memcpy_impl(nir_function_impl *impl) if (found_non_const_memcpy) { nir_metadata_preserve(impl, nir_metadata_none); } else if (found_const_memcpy) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_lower_memory_model.c b/src/compiler/nir/nir_lower_memory_model.c index 81fbcf4203c..95d9f4e9526 100644 --- a/src/compiler/nir/nir_lower_memory_model.c +++ b/src/compiler/nir/nir_lower_memory_model.c @@ -241,7 +241,7 @@ nir_lower_memory_model(nir_shader *shader) progress |= lower_make_available(cf_node, &modes); if (progress) - nir_metadata_preserve(impl, nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); else nir_metadata_preserve(impl, nir_metadata_all); diff --git a/src/compiler/nir/nir_lower_packing.c b/src/compiler/nir/nir_lower_packing.c index 4365d5c14ce..fd58bf8b106 100644 --- a/src/compiler/nir/nir_lower_packing.c +++ b/src/compiler/nir/nir_lower_packing.c @@ -189,5 +189,5 @@ bool nir_lower_pack(nir_shader *shader) { return nir_shader_instructions_pass(shader, lower_pack_instr, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } diff --git a/src/compiler/nir/nir_lower_passthrough_edgeflags.c b/src/compiler/nir/nir_lower_passthrough_edgeflags.c index 9ae4e4244e0..81d3913c30c 100644 --- a/src/compiler/nir/nir_lower_passthrough_edgeflags.c +++ b/src/compiler/nir/nir_lower_passthrough_edgeflags.c @@ -69,8 +69,7 @@ lower_impl(nir_function_impl *impl) .src_type = nir_type_float32, .write_mask = 0x1); - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); return; } @@ -85,8 +84,7 @@ lower_impl(nir_function_impl *impl) def = nir_load_var(&b, in); nir_store_var(&b, out, def, 0xf); - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } bool diff --git a/src/compiler/nir/nir_lower_patch_vertices.c b/src/compiler/nir/nir_lower_patch_vertices.c index eb94f680cff..4280251bbe8 100644 --- a/src/compiler/nir/nir_lower_patch_vertices.c +++ b/src/compiler/nir/nir_lower_patch_vertices.c @@ -92,8 +92,7 @@ nir_lower_patch_vertices(nir_shader *nir, } if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } } diff --git a/src/compiler/nir/nir_lower_phis_to_scalar.c b/src/compiler/nir/nir_lower_phis_to_scalar.c index ea9a73eef3a..f48292b5bf8 100644 --- a/src/compiler/nir/nir_lower_phis_to_scalar.c +++ b/src/compiler/nir/nir_lower_phis_to_scalar.c @@ -271,8 +271,7 @@ lower_phis_to_scalar_impl(nir_function_impl *impl, bool lower_all) progress = lower_phis_to_scalar_block(block, &state) || progress; } - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); nir_instr_free_list(&state.dead_instrs); diff --git a/src/compiler/nir/nir_lower_pntc_ytransform.c b/src/compiler/nir/nir_lower_pntc_ytransform.c index 9ccd03d7747..f1b29729c07 100644 --- a/src/compiler/nir/nir_lower_pntc_ytransform.c +++ b/src/compiler/nir/nir_lower_pntc_ytransform.c @@ -120,8 +120,7 @@ nir_lower_pntc_ytransform(nir_shader *shader, nir_foreach_block(block, impl) { lower_pntc_ytransform_block(&state, block); } - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } return state.pntc_transform != NULL; diff --git a/src/compiler/nir/nir_lower_point_size.c b/src/compiler/nir/nir_lower_point_size.c index b92cfcfb654..f91df81d130 100644 --- a/src/compiler/nir/nir_lower_point_size.c +++ b/src/compiler/nir/nir_lower_point_size.c @@ -84,7 +84,6 @@ nir_lower_point_size(nir_shader *s, float min, float max) float minmax[] = { min, max }; return nir_shader_intrinsics_pass(s, lower_point_size_intrin, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, minmax); } diff --git a/src/compiler/nir/nir_lower_point_size_mov.c b/src/compiler/nir/nir_lower_point_size_mov.c index 00ee290054b..a951996396b 100644 --- a/src/compiler/nir/nir_lower_point_size_mov.c +++ b/src/compiler/nir/nir_lower_point_size_mov.c @@ -99,7 +99,7 @@ nir_lower_point_size_mov(nir_shader *shader, bool progress = false; - nir_metadata preserved = nir_metadata_dominance | nir_metadata_block_index; + nir_metadata preserved = nir_metadata_control_flow; nir_variable *in = nir_state_variable_create(shader, glsl_vec4_type(), "gl_PointSizeClampedMESA", pointsize_state_tokens); diff --git a/src/compiler/nir/nir_lower_readonly_images_to_tex.c b/src/compiler/nir/nir_lower_readonly_images_to_tex.c index 43a1271ba75..9dd0ffc2473 100644 --- a/src/compiler/nir/nir_lower_readonly_images_to_tex.c +++ b/src/compiler/nir/nir_lower_readonly_images_to_tex.c @@ -225,7 +225,6 @@ nir_lower_readonly_images_to_tex(nir_shader *shader, bool per_variable) { struct readonly_image_lower_options options = { per_variable }; return nir_shader_instructions_pass(shader, lower_readonly_image_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &options); } diff --git a/src/compiler/nir/nir_lower_reg_intrinsics_to_ssa.c b/src/compiler/nir/nir_lower_reg_intrinsics_to_ssa.c index 8edddbf01f3..5dd7262222e 100644 --- a/src/compiler/nir/nir_lower_reg_intrinsics_to_ssa.c +++ b/src/compiler/nir/nir_lower_reg_intrinsics_to_ssa.c @@ -133,8 +133,7 @@ nir_lower_reg_intrinsics_to_ssa_impl(nir_function_impl *impl) return false; } - nir_metadata_require(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_require(impl, nir_metadata_control_flow); nir_index_ssa_defs(impl); void *dead_ctx = ralloc_context(NULL); @@ -172,8 +171,7 @@ nir_lower_reg_intrinsics_to_ssa_impl(nir_function_impl *impl) ralloc_free(dead_ctx); - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); return true; } diff --git a/src/compiler/nir/nir_lower_robust_access.c b/src/compiler/nir/nir_lower_robust_access.c index 4aefaf3652a..cdf103eed8f 100644 --- a/src/compiler/nir/nir_lower_robust_access.c +++ b/src/compiler/nir/nir_lower_robust_access.c @@ -236,6 +236,6 @@ bool nir_lower_robust_access(nir_shader *s, const nir_lower_robust_access_options *opts) { - return nir_shader_instructions_pass(s, lower, nir_metadata_block_index | nir_metadata_dominance, + return nir_shader_instructions_pass(s, lower, nir_metadata_control_flow, (void *)opts); } diff --git a/src/compiler/nir/nir_lower_samplers.c b/src/compiler/nir/nir_lower_samplers.c index bf31aebeea8..8d7b9b57509 100644 --- a/src/compiler/nir/nir_lower_samplers.c +++ b/src/compiler/nir/nir_lower_samplers.c @@ -145,7 +145,6 @@ bool nir_lower_samplers(nir_shader *shader) { return nir_shader_instructions_pass(shader, lower_sampler, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/compiler/nir/nir_lower_scratch.c b/src/compiler/nir/nir_lower_scratch.c index 98bb30ee8cb..50eecfff6e5 100644 --- a/src/compiler/nir/nir_lower_scratch.c +++ b/src/compiler/nir/nir_lower_scratch.c @@ -220,8 +220,7 @@ nir_lower_vars_to_scratch(nir_shader *shader, if (impl_progress) { progress = true; - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_lower_shader_calls.c b/src/compiler/nir/nir_lower_shader_calls.c index 624ede07a9f..cfa5d1e5814 100644 --- a/src/compiler/nir/nir_lower_shader_calls.c +++ b/src/compiler/nir/nir_lower_shader_calls.c @@ -58,8 +58,7 @@ move_system_values_to_top(nir_shader *shader) } if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } @@ -806,8 +805,7 @@ spill_ssa_defs_and_lower_shader_calls(nir_shader *shader, uint32_t num_calls, ralloc_free(mem_ctx); - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } static nir_instr * @@ -1415,8 +1413,7 @@ nir_lower_stack_to_scratch(nir_shader *shader, return nir_shader_instructions_pass(shader, lower_stack_instr_to_scratch, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &state); } @@ -1450,8 +1447,7 @@ static bool nir_opt_remove_respills(nir_shader *shader) { return nir_shader_intrinsics_pass(shader, opt_remove_respills_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } @@ -1594,8 +1590,7 @@ nir_opt_trim_stack_values(nir_shader *shader) } nir_metadata_preserve(impl, - progress ? (nir_metadata_dominance | - nir_metadata_block_index | + progress ? (nir_metadata_control_flow | nir_metadata_loop_analysis) : nir_metadata_all); @@ -1814,8 +1809,7 @@ nir_opt_stack_loads(nir_shader *shader) bool progress = false; nir_foreach_function_impl(impl, shader) { - nir_metadata_require(impl, nir_metadata_dominance | - nir_metadata_block_index); + nir_metadata_require(impl, nir_metadata_control_flow); bool func_progress = false; nir_foreach_block_safe(block, impl) { @@ -1841,8 +1835,7 @@ nir_opt_stack_loads(nir_shader *shader) } nir_metadata_preserve(impl, - func_progress ? (nir_metadata_block_index | - nir_metadata_dominance | + func_progress ? (nir_metadata_control_flow | nir_metadata_loop_analysis) : nir_metadata_all); @@ -1915,8 +1908,7 @@ static bool nir_split_stack_components(nir_shader *shader) { return nir_shader_intrinsics_pass(shader, split_stack_components_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/compiler/nir/nir_lower_single_sampled.c b/src/compiler/nir/nir_lower_single_sampled.c index 7aa2ad04c9c..2ac58c8395b 100644 --- a/src/compiler/nir/nir_lower_single_sampled.c +++ b/src/compiler/nir/nir_lower_single_sampled.c @@ -116,8 +116,7 @@ nir_lower_single_sampled(nir_shader *shader) SYSTEM_VALUE_BARYCENTRIC_LINEAR_CENTROID); return nir_shader_intrinsics_pass(shader, lower_single_sampled_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL) || progress; } diff --git a/src/compiler/nir/nir_lower_ssbo.c b/src/compiler/nir/nir_lower_ssbo.c index cf81665d066..ff86b6fe628 100644 --- a/src/compiler/nir/nir_lower_ssbo.c +++ b/src/compiler/nir/nir_lower_ssbo.c @@ -69,7 +69,6 @@ bool nir_lower_ssbo(nir_shader *shader) { return nir_shader_intrinsics_pass(shader, pass, - nir_metadata_dominance | - nir_metadata_block_index, + nir_metadata_control_flow, NULL); } diff --git a/src/compiler/nir/nir_lower_tess_coord_z.c b/src/compiler/nir/nir_lower_tess_coord_z.c index 88ae496f1a7..2814c7e2787 100644 --- a/src/compiler/nir/nir_lower_tess_coord_z.c +++ b/src/compiler/nir/nir_lower_tess_coord_z.c @@ -34,7 +34,6 @@ bool nir_lower_tess_coord_z(nir_shader *shader, bool triangles) { return nir_shader_intrinsics_pass(shader, lower_tess_coord_z, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &triangles); } diff --git a/src/compiler/nir/nir_lower_tex.c b/src/compiler/nir/nir_lower_tex.c index f49439ce9fc..b33e732eda2 100644 --- a/src/compiler/nir/nir_lower_tex.c +++ b/src/compiler/nir/nir_lower_tex.c @@ -1795,8 +1795,7 @@ nir_lower_tex_impl(nir_function_impl *impl, progress |= nir_lower_tex_block(block, &builder, options, compiler_options); } - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); return progress; } diff --git a/src/compiler/nir/nir_lower_texcoord_replace.c b/src/compiler/nir/nir_lower_texcoord_replace.c index 6695ccf8022..438eeb7bed5 100644 --- a/src/compiler/nir/nir_lower_texcoord_replace.c +++ b/src/compiler/nir/nir_lower_texcoord_replace.c @@ -124,8 +124,7 @@ nir_lower_texcoord_replace_impl(nir_function_impl *impl, } } - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } void diff --git a/src/compiler/nir/nir_lower_texcoord_replace_late.c b/src/compiler/nir/nir_lower_texcoord_replace_late.c index f232f8e0c92..22c13c6c0ba 100644 --- a/src/compiler/nir/nir_lower_texcoord_replace_late.c +++ b/src/compiler/nir/nir_lower_texcoord_replace_late.c @@ -98,7 +98,7 @@ nir_lower_texcoord_replace_late(nir_shader *s, unsigned coord_replace, s->info.inputs_read |= BITFIELD64_BIT(VARYING_SLOT_PNTC); nir_shader_instructions_pass(s, pass, - nir_metadata_block_index | nir_metadata_dominance, + nir_metadata_control_flow, &(struct opts){ .coord_replace = coord_replace, .point_coord_is_sysval = point_coord_is_sysval, diff --git a/src/compiler/nir/nir_lower_two_sided_color.c b/src/compiler/nir/nir_lower_two_sided_color.c index 37270e7ca53..b7972419797 100644 --- a/src/compiler/nir/nir_lower_two_sided_color.c +++ b/src/compiler/nir/nir_lower_two_sided_color.c @@ -204,7 +204,6 @@ nir_lower_two_sided_color(nir_shader *shader, bool face_sysval) return nir_shader_instructions_pass(shader, nir_lower_two_sided_color_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &state); } diff --git a/src/compiler/nir/nir_lower_undef_to_zero.c b/src/compiler/nir/nir_lower_undef_to_zero.c index d28ca037c93..829a3216389 100644 --- a/src/compiler/nir/nir_lower_undef_to_zero.c +++ b/src/compiler/nir/nir_lower_undef_to_zero.c @@ -58,7 +58,6 @@ bool nir_lower_undef_to_zero(nir_shader *shader) { return nir_shader_instructions_pass(shader, lower_undef_instr_to_zero, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/compiler/nir/nir_lower_uniforms_to_ubo.c b/src/compiler/nir/nir_lower_uniforms_to_ubo.c index 573f572b719..c8ff34bab29 100644 --- a/src/compiler/nir/nir_lower_uniforms_to_ubo.c +++ b/src/compiler/nir/nir_lower_uniforms_to_ubo.c @@ -129,8 +129,7 @@ nir_lower_uniforms_to_ubo(nir_shader *shader, bool dword_packed, bool load_vec4) progress = nir_shader_instructions_pass(shader, nir_lower_uniforms_to_ubo_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &state); if (progress) { diff --git a/src/compiler/nir/nir_lower_var_copies.c b/src/compiler/nir/nir_lower_var_copies.c index 19d8feec78a..3b74c91f29a 100644 --- a/src/compiler/nir/nir_lower_var_copies.c +++ b/src/compiler/nir/nir_lower_var_copies.c @@ -138,7 +138,6 @@ nir_lower_var_copies(nir_shader *shader) shader->info.var_copies_lowered = true; return nir_shader_intrinsics_pass(shader, lower_var_copies_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/compiler/nir/nir_lower_variable_initializers.c b/src/compiler/nir/nir_lower_variable_initializers.c index 0c536030877..6556a8638ed 100644 --- a/src/compiler/nir/nir_lower_variable_initializers.c +++ b/src/compiler/nir/nir_lower_variable_initializers.c @@ -122,8 +122,7 @@ nir_lower_variable_initializers(nir_shader *shader, nir_variable_mode modes) if (impl_progress) { progress = true; - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance | + nir_metadata_preserve(impl, nir_metadata_control_flow | nir_metadata_live_defs); } else { nir_metadata_preserve(impl, nir_metadata_all); diff --git a/src/compiler/nir/nir_lower_vars_to_ssa.c b/src/compiler/nir/nir_lower_vars_to_ssa.c index 505c232bf89..1a9bf42697e 100644 --- a/src/compiler/nir/nir_lower_vars_to_ssa.c +++ b/src/compiler/nir/nir_lower_vars_to_ssa.c @@ -863,8 +863,7 @@ nir_lower_vars_to_ssa_impl(nir_function_impl *impl) nir_phi_builder_finish(state.phi_builder); - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); ralloc_free(state.dead_ctx); diff --git a/src/compiler/nir/nir_lower_vec3_to_vec4.c b/src/compiler/nir/nir_lower_vec3_to_vec4.c index 59faf03453c..499c23a25f5 100644 --- a/src/compiler/nir/nir_lower_vec3_to_vec4.c +++ b/src/compiler/nir/nir_lower_vec3_to_vec4.c @@ -145,8 +145,7 @@ nir_lower_vec3_to_vec4(nir_shader *shader, nir_variable_mode modes) progress |= nir_shader_instructions_pass(shader, lower_vec3_to_vec4_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &modes); return progress; diff --git a/src/compiler/nir/nir_lower_vec_to_regs.c b/src/compiler/nir/nir_lower_vec_to_regs.c index 09985ca0d62..1974621516b 100644 --- a/src/compiler/nir/nir_lower_vec_to_regs.c +++ b/src/compiler/nir/nir_lower_vec_to_regs.c @@ -258,7 +258,6 @@ nir_lower_vec_to_regs(nir_shader *shader, nir_instr_writemask_filter_cb cb, }; return nir_shader_instructions_pass(shader, lower, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &data); } diff --git a/src/compiler/nir/nir_lower_viewport_transform.c b/src/compiler/nir/nir_lower_viewport_transform.c index f99fca1c94d..e5c2294428e 100644 --- a/src/compiler/nir/nir_lower_viewport_transform.c +++ b/src/compiler/nir/nir_lower_viewport_transform.c @@ -92,7 +92,6 @@ nir_lower_viewport_transform(nir_shader *shader) assert((shader->info.stage == MESA_SHADER_VERTEX) || (shader->info.stage == MESA_SHADER_GEOMETRY) || (shader->info.stage == MESA_SHADER_TESS_EVAL)); return nir_shader_intrinsics_pass(shader, lower_viewport_transform_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/compiler/nir/nir_lower_wpos_center.c b/src/compiler/nir/nir_lower_wpos_center.c index 438a792deee..5b73ae32b15 100644 --- a/src/compiler/nir/nir_lower_wpos_center.c +++ b/src/compiler/nir/nir_lower_wpos_center.c @@ -62,7 +62,6 @@ nir_lower_wpos_center(nir_shader *shader) assert(shader->info.stage == MESA_SHADER_FRAGMENT); return nir_shader_intrinsics_pass(shader, lower_wpos_center_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/compiler/nir/nir_lower_wpos_ytransform.c b/src/compiler/nir/nir_lower_wpos_ytransform.c index 737e9cad5a5..c53e86e19cd 100644 --- a/src/compiler/nir/nir_lower_wpos_ytransform.c +++ b/src/compiler/nir/nir_lower_wpos_ytransform.c @@ -357,7 +357,6 @@ nir_lower_wpos_ytransform(nir_shader *shader, return nir_shader_instructions_pass(shader, lower_wpos_ytransform_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &state); } diff --git a/src/compiler/nir/nir_lower_wrmasks.c b/src/compiler/nir/nir_lower_wrmasks.c index e608662147e..a0ff9df1026 100644 --- a/src/compiler/nir/nir_lower_wrmasks.c +++ b/src/compiler/nir/nir_lower_wrmasks.c @@ -226,7 +226,6 @@ nir_lower_wrmasks(nir_shader *shader, nir_instr_filter_cb cb, const void *data) return nir_shader_instructions_pass(shader, nir_lower_wrmasks_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &state); } diff --git a/src/compiler/nir/nir_move_vec_src_uses_to_dest.c b/src/compiler/nir/nir_move_vec_src_uses_to_dest.c index 176cc3f6177..fc62361cade 100644 --- a/src/compiler/nir/nir_move_vec_src_uses_to_dest.c +++ b/src/compiler/nir/nir_move_vec_src_uses_to_dest.c @@ -186,8 +186,7 @@ nir_move_vec_src_uses_to_dest_impl(nir_shader *shader, nir_function_impl *impl, progress |= move_vec_src_uses_to_dest_block(block, skip_const_srcs); } - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); return progress; } diff --git a/src/compiler/nir/nir_normalize_cubemap_coords.c b/src/compiler/nir/nir_normalize_cubemap_coords.c index f32df0717ac..5428fd516ff 100644 --- a/src/compiler/nir/nir_normalize_cubemap_coords.c +++ b/src/compiler/nir/nir_normalize_cubemap_coords.c @@ -68,7 +68,6 @@ bool nir_normalize_cubemap_coords(nir_shader *shader) { return nir_shader_instructions_pass(shader, normalize_cubemap_coords, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/compiler/nir/nir_opt_access.c b/src/compiler/nir/nir_opt_access.c index 86ada23a3c0..01aacec14be 100644 --- a/src/compiler/nir/nir_opt_access.c +++ b/src/compiler/nir/nir_opt_access.c @@ -279,10 +279,9 @@ opt_access_impl(struct access_state *state, if (progress) { nir_metadata_preserve(impl, - nir_metadata_block_index | - nir_metadata_dominance | - nir_metadata_live_defs | - nir_metadata_loop_analysis); + nir_metadata_control_flow | + nir_metadata_live_defs | + nir_metadata_loop_analysis); } return progress; @@ -326,10 +325,9 @@ nir_opt_access(nir_shader *shader, const nir_opt_access_options *options) /* If we make a change to the uniforms, update all the impls. */ if (var_progress) { nir_metadata_preserve(impl, - nir_metadata_block_index | - nir_metadata_dominance | - nir_metadata_live_defs | - nir_metadata_loop_analysis); + nir_metadata_control_flow | + nir_metadata_live_defs | + nir_metadata_loop_analysis); } } diff --git a/src/compiler/nir/nir_opt_barriers.c b/src/compiler/nir/nir_opt_barriers.c index 1566576ec2e..25f228e11ea 100644 --- a/src/compiler/nir/nir_opt_barriers.c +++ b/src/compiler/nir/nir_opt_barriers.c @@ -71,8 +71,7 @@ nir_opt_combine_barriers_impl(nir_function_impl *impl, } if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance | + nir_metadata_preserve(impl, nir_metadata_control_flow | nir_metadata_live_defs); } else { nir_metadata_preserve(impl, nir_metadata_all); @@ -236,8 +235,7 @@ nir_opt_barrier_modes(nir_shader *shader) nir_metadata_instr_index); if (nir_opt_barrier_modes_impl(impl)) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance | + nir_metadata_preserve(impl, nir_metadata_control_flow | nir_metadata_live_defs); progress = true; } else { diff --git a/src/compiler/nir/nir_opt_combine_stores.c b/src/compiler/nir/nir_opt_combine_stores.c index 2acb2b54077..a5acaae5c31 100644 --- a/src/compiler/nir/nir_opt_combine_stores.c +++ b/src/compiler/nir/nir_opt_combine_stores.c @@ -402,8 +402,7 @@ combine_stores_impl(struct combine_stores_state *state, nir_function_impl *impl) combine_stores_block(state, block); if (state->progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_opt_comparison_pre.c b/src/compiler/nir/nir_opt_comparison_pre.c index 614bc469086..e8b5b0c7914 100644 --- a/src/compiler/nir/nir_opt_comparison_pre.c +++ b/src/compiler/nir/nir_opt_comparison_pre.c @@ -385,8 +385,7 @@ nir_opt_comparison_pre_impl(nir_function_impl *impl) block_queue_finish(&bq); if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_opt_constant_folding.c b/src/compiler/nir/nir_opt_constant_folding.c index 13be864c0d7..ff3456f7fb0 100644 --- a/src/compiler/nir/nir_opt_constant_folding.c +++ b/src/compiler/nir/nir_opt_constant_folding.c @@ -399,8 +399,7 @@ nir_opt_constant_folding(nir_shader *shader) state.has_indirect_load_const = false; bool progress = nir_shader_instructions_pass(shader, try_fold_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &state); /* This doesn't free the constant data if there are no constant loads because diff --git a/src/compiler/nir/nir_opt_copy_prop_vars.c b/src/compiler/nir/nir_opt_copy_prop_vars.c index 436f56626f7..6d86f8598d1 100644 --- a/src/compiler/nir/nir_opt_copy_prop_vars.c +++ b/src/compiler/nir/nir_opt_copy_prop_vars.c @@ -1511,8 +1511,7 @@ nir_copy_prop_vars_impl(nir_function_impl *impl) copy_prop_vars_cf_node(&state, NULL, &impl->cf_node); if (state.progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_opt_copy_propagate.c b/src/compiler/nir/nir_opt_copy_propagate.c index b8cf05bae45..c1725d2287d 100644 --- a/src/compiler/nir/nir_opt_copy_propagate.c +++ b/src/compiler/nir/nir_opt_copy_propagate.c @@ -158,8 +158,7 @@ nir_copy_prop_impl(nir_function_impl *impl) } if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_opt_cse.c b/src/compiler/nir/nir_opt_cse.c index 147019e80e3..a47e2bb7ce1 100644 --- a/src/compiler/nir/nir_opt_cse.c +++ b/src/compiler/nir/nir_opt_cse.c @@ -49,8 +49,7 @@ nir_opt_cse_impl(nir_function_impl *impl) } if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_opt_dce.c b/src/compiler/nir/nir_opt_dce.c index 6b9935925e4..ab2642b29fd 100644 --- a/src/compiler/nir/nir_opt_dce.c +++ b/src/compiler/nir/nir_opt_dce.c @@ -238,8 +238,7 @@ nir_opt_dce_impl(nir_function_impl *impl) nir_instr_free_list(&dead_instrs); if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_opt_dead_write_vars.c b/src/compiler/nir/nir_opt_dead_write_vars.c index fe263528747..5f8f6373cac 100644 --- a/src/compiler/nir/nir_opt_dead_write_vars.c +++ b/src/compiler/nir/nir_opt_dead_write_vars.c @@ -236,8 +236,7 @@ remove_dead_write_vars_impl(void *mem_ctx, nir_shader *shader, nir_function_impl progress |= remove_dead_write_vars_local(mem_ctx, shader, block); if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_opt_find_array_copies.c b/src/compiler/nir/nir_opt_find_array_copies.c index 16b16fcac05..0389ac7fbf7 100644 --- a/src/compiler/nir/nir_opt_find_array_copies.c +++ b/src/compiler/nir/nir_opt_find_array_copies.c @@ -651,8 +651,7 @@ opt_find_array_copies_impl(nir_function_impl *impl) ralloc_free(s.dead_ctx); if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_opt_fragdepth.c b/src/compiler/nir/nir_opt_fragdepth.c index 7b74ba2635f..9c0fb17a7d6 100644 --- a/src/compiler/nir/nir_opt_fragdepth.c +++ b/src/compiler/nir/nir_opt_fragdepth.c @@ -111,8 +111,7 @@ nir_opt_fragdepth(nir_shader *shader) */ nir_instr_remove(&store_intrin->instr); - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance | + nir_metadata_preserve(impl, nir_metadata_control_flow | nir_metadata_loop_analysis | nir_metadata_instr_index); progress = true; diff --git a/src/compiler/nir/nir_opt_gcm.c b/src/compiler/nir/nir_opt_gcm.c index 1b9ae687ea9..4cc2b09c56d 100644 --- a/src/compiler/nir/nir_opt_gcm.c +++ b/src/compiler/nir/nir_opt_gcm.c @@ -797,8 +797,7 @@ weak_gvn(const nir_instr *a, const nir_instr *b) static bool opt_gcm_impl(nir_shader *shader, nir_function_impl *impl, bool value_number) { - nir_metadata_require(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_require(impl, nir_metadata_control_flow); nir_metadata_require(impl, nir_metadata_loop_analysis, shader->options->force_indirect_unrolling, shader->options->force_indirect_unrolling_sampler); @@ -859,8 +858,7 @@ opt_gcm_impl(nir_shader *shader, nir_function_impl *impl, bool value_number) ralloc_free(state.blocks); ralloc_free(state.instr_infos); - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance | + nir_metadata_preserve(impl, nir_metadata_control_flow | nir_metadata_loop_analysis); return state.progress; diff --git a/src/compiler/nir/nir_opt_idiv_const.c b/src/compiler/nir/nir_opt_idiv_const.c index ade23c31b2c..a40564aacdc 100644 --- a/src/compiler/nir/nir_opt_idiv_const.c +++ b/src/compiler/nir/nir_opt_idiv_const.c @@ -223,7 +223,6 @@ bool nir_opt_idiv_const(nir_shader *shader, unsigned min_bit_size) { return nir_shader_instructions_pass(shader, nir_opt_idiv_const_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &min_bit_size); } diff --git a/src/compiler/nir/nir_opt_if.c b/src/compiler/nir/nir_opt_if.c index 0d869125927..57bb9e869c8 100644 --- a/src/compiler/nir/nir_opt_if.c +++ b/src/compiler/nir/nir_opt_if.c @@ -1324,11 +1324,9 @@ nir_opt_if(nir_shader *shader, nir_opt_if_options options) nir_foreach_function_impl(impl, shader) { nir_builder b = nir_builder_create(impl); - nir_metadata_require(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_require(impl, nir_metadata_control_flow); progress = opt_if_safe_cf_list(&b, &impl->body, options); - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); bool preserve = true; diff --git a/src/compiler/nir/nir_opt_intrinsics.c b/src/compiler/nir/nir_opt_intrinsics.c index 34a54ae8d78..7ec89a1a60b 100644 --- a/src/compiler/nir/nir_opt_intrinsics.c +++ b/src/compiler/nir/nir_opt_intrinsics.c @@ -403,8 +403,7 @@ nir_opt_intrinsics(nir_shader *shader) nir_foreach_function_impl(impl, shader) { if (opt_intrinsics_impl(impl, shader->options)) { progress = true; - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_opt_large_constants.c b/src/compiler/nir/nir_opt_large_constants.c index 5cbde3b0e27..2eb0d7711d8 100644 --- a/src/compiler/nir/nir_opt_large_constants.c +++ b/src/compiler/nir/nir_opt_large_constants.c @@ -594,7 +594,6 @@ nir_opt_large_constants(nir_shader *shader, ralloc_free(var_infos); - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); return true; } diff --git a/src/compiler/nir/nir_opt_load_store_vectorize.c b/src/compiler/nir/nir_opt_load_store_vectorize.c index 068f7a78634..2d8f6326165 100644 --- a/src/compiler/nir/nir_opt_load_store_vectorize.c +++ b/src/compiler/nir/nir_opt_load_store_vectorize.c @@ -1463,9 +1463,8 @@ nir_opt_load_store_vectorize(nir_shader *shader, const nir_load_store_vectorize_ progress |= process_block(impl, ctx, block); nir_metadata_preserve(impl, - nir_metadata_block_index | - nir_metadata_dominance | - nir_metadata_live_defs); + nir_metadata_control_flow | + nir_metadata_live_defs); } ralloc_free(ctx); @@ -1496,8 +1495,7 @@ nir_opt_load_store_update_alignments(nir_shader *shader) { return nir_shader_intrinsics_pass(shader, opt_load_store_update_alignments_callback, - nir_metadata_block_index | - nir_metadata_dominance | + nir_metadata_control_flow | nir_metadata_live_defs | nir_metadata_instr_index, NULL); } diff --git a/src/compiler/nir/nir_opt_memcpy.c b/src/compiler/nir/nir_opt_memcpy.c index ad899514f37..3234fc794b2 100644 --- a/src/compiler/nir/nir_opt_memcpy.c +++ b/src/compiler/nir/nir_opt_memcpy.c @@ -275,8 +275,7 @@ opt_memcpy_impl(nir_function_impl *impl) _mesa_set_destroy(complex_vars, NULL); if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_opt_move.c b/src/compiler/nir/nir_opt_move.c index 63450908777..efdf344697b 100644 --- a/src/compiler/nir/nir_opt_move.c +++ b/src/compiler/nir/nir_opt_move.c @@ -135,8 +135,7 @@ nir_opt_move(nir_shader *shader, nir_move_options options) } if (impl_progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance | + nir_metadata_preserve(impl, nir_metadata_control_flow | nir_metadata_live_defs); progress = true; } else { diff --git a/src/compiler/nir/nir_opt_move_discards_to_top.c b/src/compiler/nir/nir_opt_move_discards_to_top.c index 4bd151e4fd9..f70a2807337 100644 --- a/src/compiler/nir/nir_opt_move_discards_to_top.c +++ b/src/compiler/nir/nir_opt_move_discards_to_top.c @@ -267,8 +267,7 @@ nir_opt_move_discards_to_top(nir_shader *shader) nir_foreach_function_impl(impl, shader) { if (opt_move_discards_to_top_impl(impl)) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); progress = true; } } diff --git a/src/compiler/nir/nir_opt_mqsad.c b/src/compiler/nir/nir_opt_mqsad.c index 140eb3bb9d8..e38d3c55311 100644 --- a/src/compiler/nir/nir_opt_mqsad.c +++ b/src/compiler/nir/nir_opt_mqsad.c @@ -135,7 +135,7 @@ nir_opt_mqsad(nir_shader *shader) } if (progress_impl) { - nir_metadata_preserve(impl, nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); progress = true; } else { nir_metadata_preserve(impl, nir_metadata_block_index); diff --git a/src/compiler/nir/nir_opt_offsets.c b/src/compiler/nir/nir_opt_offsets.c index 90f889d00ff..cfd9925331c 100644 --- a/src/compiler/nir/nir_opt_offsets.c +++ b/src/compiler/nir/nir_opt_offsets.c @@ -229,8 +229,7 @@ nir_opt_offsets(nir_shader *shader, const nir_opt_offsets_options *options) state.options = options; bool p = nir_shader_instructions_pass(shader, process_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &state); if (state.range_ht) diff --git a/src/compiler/nir/nir_opt_phi_precision.c b/src/compiler/nir/nir_opt_phi_precision.c index d1c74e09d9d..3b7f86bc4d5 100644 --- a/src/compiler/nir/nir_opt_phi_precision.c +++ b/src/compiler/nir/nir_opt_phi_precision.c @@ -460,8 +460,7 @@ nir_opt_phi_precision(nir_shader *shader) if (progress) { nir_metadata_preserve(impl, - nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_opt_preamble.c b/src/compiler/nir/nir_opt_preamble.c index f35f98ef56a..d7cb6ff464b 100644 --- a/src/compiler/nir/nir_opt_preamble.c +++ b/src/compiler/nir/nir_opt_preamble.c @@ -966,8 +966,7 @@ nir_opt_preamble(nir_shader *shader, const nir_opt_preamble_options *options, } nir_metadata_preserve(impl, - nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_control_flow); ralloc_free(remap_table); free(ctx.states); diff --git a/src/compiler/nir/nir_opt_ray_queries.c b/src/compiler/nir/nir_opt_ray_queries.c index 51aca177720..8e77a4d2b24 100644 --- a/src/compiler/nir/nir_opt_ray_queries.c +++ b/src/compiler/nir/nir_opt_ray_queries.c @@ -131,8 +131,7 @@ nir_opt_ray_queries(nir_shader *shader) bool progress = nir_shader_instructions_pass(shader, nir_replace_unread_queries_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, read_queries); /* Update the number of queries if some have been removed. */ diff --git a/src/compiler/nir/nir_opt_reassociate_bfi.c b/src/compiler/nir/nir_opt_reassociate_bfi.c index 8b68abe1f85..46e1979ec4d 100644 --- a/src/compiler/nir/nir_opt_reassociate_bfi.c +++ b/src/compiler/nir/nir_opt_reassociate_bfi.c @@ -136,8 +136,7 @@ nir_opt_reassociate_bfi(nir_shader *shader) { bool progress = nir_shader_instructions_pass(shader, nir_opt_reassociate_bfi_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); return progress; diff --git a/src/compiler/nir/nir_opt_rematerialize_compares.c b/src/compiler/nir/nir_opt_rematerialize_compares.c index 528ca2905da..baf4423dc0f 100644 --- a/src/compiler/nir/nir_opt_rematerialize_compares.c +++ b/src/compiler/nir/nir_opt_rematerialize_compares.c @@ -203,8 +203,7 @@ nir_opt_rematerialize_compares_impl(nir_shader *shader, nir_function_impl *impl) } if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } @@ -303,8 +302,7 @@ nir_opt_rematerialize_alu_impl(nir_shader *shader, nir_function_impl *impl) } if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_opt_remove_phis.c b/src/compiler/nir/nir_opt_remove_phis.c index 54b538fae40..05de7602af1 100644 --- a/src/compiler/nir/nir_opt_remove_phis.c +++ b/src/compiler/nir/nir_opt_remove_phis.c @@ -153,8 +153,7 @@ nir_opt_remove_phis_impl(nir_function_impl *impl) } if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_opt_reuse_constants.c b/src/compiler/nir/nir_opt_reuse_constants.c index 2e559253009..c67afe9e0d6 100644 --- a/src/compiler/nir/nir_opt_reuse_constants.c +++ b/src/compiler/nir/nir_opt_reuse_constants.c @@ -36,8 +36,7 @@ nir_opt_reuse_constants(nir_shader *shader) } if (func_progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); progress = true; } else { nir_metadata_preserve(impl, nir_metadata_all); diff --git a/src/compiler/nir/nir_opt_shrink_stores.c b/src/compiler/nir/nir_opt_shrink_stores.c index 4c9fcf10427..a39e60a2015 100644 --- a/src/compiler/nir/nir_opt_shrink_stores.c +++ b/src/compiler/nir/nir_opt_shrink_stores.c @@ -112,8 +112,7 @@ nir_opt_shrink_stores(nir_shader *shader, bool shrink_image_store) if (progress) { nir_metadata_preserve(impl, - nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_opt_shrink_vectors.c b/src/compiler/nir/nir_opt_shrink_vectors.c index 8e8da5e62ee..ce6239eb791 100644 --- a/src/compiler/nir/nir_opt_shrink_vectors.c +++ b/src/compiler/nir/nir_opt_shrink_vectors.c @@ -569,8 +569,7 @@ nir_opt_shrink_vectors(nir_shader *shader, bool shrink_start) if (progress) { nir_metadata_preserve(impl, - nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_opt_sink.c b/src/compiler/nir/nir_opt_sink.c index b83299ef2b9..8cdf0cecfab 100644 --- a/src/compiler/nir/nir_opt_sink.c +++ b/src/compiler/nir/nir_opt_sink.c @@ -257,7 +257,7 @@ nir_opt_sink(nir_shader *shader, nir_move_options options) nir_foreach_function_impl(impl, shader) { nir_metadata_require(impl, - nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_control_flow); nir_foreach_block_reverse(block, impl) { nir_foreach_instr_reverse_safe(instr, block) { @@ -283,7 +283,7 @@ nir_opt_sink(nir_shader *shader, nir_move_options options) } nir_metadata_preserve(impl, - nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_control_flow); } return progress; diff --git a/src/compiler/nir/nir_opt_undef.c b/src/compiler/nir/nir_opt_undef.c index 1d6e7de7e08..8f1962ae6ef 100644 --- a/src/compiler/nir/nir_opt_undef.c +++ b/src/compiler/nir/nir_opt_undef.c @@ -321,7 +321,6 @@ nir_opt_undef(nir_shader *shader) return nir_shader_instructions_pass(shader, nir_opt_undef_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &options); } diff --git a/src/compiler/nir/nir_opt_varyings.c b/src/compiler/nir/nir_opt_varyings.c index 0aded7fbc72..d235150fea0 100644 --- a/src/compiler/nir/nir_opt_varyings.c +++ b/src/compiler/nir/nir_opt_varyings.c @@ -4299,13 +4299,11 @@ nir_opt_varyings(nir_shader *producer, nir_shader *consumer, bool spirv, nir_metadata_preserve(linkage->producer_builder.impl, progress & nir_progress_producer ? - (nir_metadata_block_index | - nir_metadata_dominance) : + (nir_metadata_control_flow) : nir_metadata_all); nir_metadata_preserve(linkage->consumer_builder.impl, progress & nir_progress_consumer ? - (nir_metadata_block_index | - nir_metadata_dominance) : + (nir_metadata_control_flow) : nir_metadata_all); free_linkage(linkage); FREE(linkage); diff --git a/src/compiler/nir/nir_opt_vectorize.c b/src/compiler/nir/nir_opt_vectorize.c index d69442c0a9e..0d23927cc11 100644 --- a/src/compiler/nir/nir_opt_vectorize.c +++ b/src/compiler/nir/nir_opt_vectorize.c @@ -377,8 +377,7 @@ nir_opt_vectorize_impl(nir_function_impl *impl, filter, data); if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_phi_builder.c b/src/compiler/nir/nir_phi_builder.c index 8089b474009..04365a45fc5 100644 --- a/src/compiler/nir/nir_phi_builder.c +++ b/src/compiler/nir/nir_phi_builder.c @@ -95,8 +95,7 @@ nir_phi_builder_create(nir_function_impl *impl) pb->shader = impl->function->shader; pb->impl = impl; - assert(impl->valid_metadata & (nir_metadata_block_index | - nir_metadata_dominance)); + assert(impl->valid_metadata & (nir_metadata_control_flow)); pb->num_blocks = impl->num_blocks; pb->blocks = ralloc_array(pb, nir_block *, pb->num_blocks); diff --git a/src/compiler/nir/nir_propagate_invariant.c b/src/compiler/nir/nir_propagate_invariant.c index 2492794ca8e..abf9e5fb664 100644 --- a/src/compiler/nir/nir_propagate_invariant.c +++ b/src/compiler/nir/nir_propagate_invariant.c @@ -172,8 +172,7 @@ propagate_invariant_impl(nir_function_impl *impl, struct set *invariants) } if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance | + nir_metadata_preserve(impl, nir_metadata_control_flow | nir_metadata_live_defs); } else { nir_metadata_preserve(impl, nir_metadata_all); diff --git a/src/compiler/nir/nir_remove_dead_variables.c b/src/compiler/nir/nir_remove_dead_variables.c index 533c7ce2b46..d18cd7c43ed 100644 --- a/src/compiler/nir/nir_remove_dead_variables.c +++ b/src/compiler/nir/nir_remove_dead_variables.c @@ -208,8 +208,7 @@ nir_remove_dead_variables(nir_shader *shader, nir_variable_mode modes, nir_foreach_function_impl(impl, shader) { if (progress) { remove_dead_var_writes(shader); - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_repair_ssa.c b/src/compiler/nir/nir_repair_ssa.c index e69bf9bbf9e..2cb68f8a9b1 100644 --- a/src/compiler/nir/nir_repair_ssa.c +++ b/src/compiler/nir/nir_repair_ssa.c @@ -151,8 +151,7 @@ nir_repair_ssa_impl(nir_function_impl *impl) state.phi_builder = NULL; state.progress = false; - nir_metadata_require(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_require(impl, nir_metadata_control_flow); nir_foreach_block_unstructured(block, impl) { nir_foreach_instr_safe(instr, block) { @@ -161,8 +160,7 @@ nir_repair_ssa_impl(nir_function_impl *impl) } if (state.progress) - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); if (state.phi_builder) { nir_phi_builder_finish(state.phi_builder); diff --git a/src/compiler/nir/nir_scale_fdiv.c b/src/compiler/nir/nir_scale_fdiv.c index 6a2a1ae6e80..072f5f3a29a 100644 --- a/src/compiler/nir/nir_scale_fdiv.c +++ b/src/compiler/nir/nir_scale_fdiv.c @@ -73,7 +73,6 @@ bool nir_scale_fdiv(nir_shader *shader) { return nir_shader_instructions_pass(shader, nir_scale_fdiv_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/compiler/nir/nir_search.c b/src/compiler/nir/nir_search.c index fd56fa8266e..fb47750c2fa 100644 --- a/src/compiler/nir/nir_search.c +++ b/src/compiler/nir/nir_search.c @@ -943,8 +943,7 @@ nir_algebraic_impl(nir_function_impl *impl, util_dynarray_fini(&states); if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/compiler/nir/nir_split_per_member_structs.c b/src/compiler/nir/nir_split_per_member_structs.c index 17ee1079ccb..1c6b0c1d4f9 100644 --- a/src/compiler/nir/nir_split_per_member_structs.c +++ b/src/compiler/nir/nir_split_per_member_structs.c @@ -175,8 +175,7 @@ nir_split_per_member_structs(nir_shader *shader) } nir_shader_instructions_pass(shader, rewrite_deref_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, var_to_member_map); ralloc_free(dead_ctx); diff --git a/src/compiler/nir/nir_split_var_copies.c b/src/compiler/nir/nir_split_var_copies.c index 5aadc073575..fb180d2635f 100644 --- a/src/compiler/nir/nir_split_var_copies.c +++ b/src/compiler/nir/nir_split_var_copies.c @@ -104,7 +104,6 @@ bool nir_split_var_copies(nir_shader *shader) { return nir_shader_intrinsics_pass(shader, split_var_copies_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/compiler/nir/nir_split_vars.c b/src/compiler/nir/nir_split_vars.c index 3019718a3e5..b84656db914 100644 --- a/src/compiler/nir/nir_split_vars.c +++ b/src/compiler/nir/nir_split_vars.c @@ -380,8 +380,7 @@ nir_split_struct_vars(nir_shader *shader, nir_variable_mode modes) split_struct_derefs_impl(impl, var_field_map, modes, mem_ctx); - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); progress = true; } else { nir_metadata_preserve(impl, nir_metadata_all); @@ -972,8 +971,7 @@ nir_split_array_vars(nir_shader *shader, nir_variable_mode modes) split_array_copies_impl(impl, var_info_map, modes, mem_ctx); split_array_access_impl(impl, var_info_map, modes, mem_ctx); - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); progress = true; } else { nir_metadata_preserve(impl, nir_metadata_all); @@ -1732,8 +1730,7 @@ nir_shrink_vec_array_vars(nir_shader *shader, nir_variable_mode modes) if (globals_shrunk || locals_shrunk) { shrink_vec_var_access_impl(impl, var_usage_map, modes); - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); progress = true; } else { nir_metadata_preserve(impl, nir_metadata_all); diff --git a/src/compiler/nir/nir_to_lcssa.c b/src/compiler/nir/nir_to_lcssa.c index 653033ec1d0..22ce2d0886a 100644 --- a/src/compiler/nir/nir_to_lcssa.c +++ b/src/compiler/nir/nir_to_lcssa.c @@ -395,8 +395,7 @@ nir_convert_to_lcssa(nir_shader *shader, bool skip_invariants, bool skip_bool_in if (state->progress) { progress = true; - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/freedreno/ir3/ir3_nir.c b/src/freedreno/ir3/ir3_nir.c index a3426e86d41..d86d3918f51 100644 --- a/src/freedreno/ir3/ir3_nir.c +++ b/src/freedreno/ir3/ir3_nir.c @@ -403,7 +403,7 @@ ir3_nir_lower_array_sampler(nir_shader *shader) { return nir_shader_instructions_pass( shader, ir3_nir_lower_array_sampler_cb, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } void diff --git a/src/freedreno/ir3/ir3_nir_analyze_ubo_ranges.c b/src/freedreno/ir3/ir3_nir_analyze_ubo_ranges.c index 4982fdc8c24..cf9b4026ec5 100644 --- a/src/freedreno/ir3/ir3_nir_analyze_ubo_ranges.c +++ b/src/freedreno/ir3/ir3_nir_analyze_ubo_ranges.c @@ -706,7 +706,7 @@ ir3_nir_lower_const_global_loads(nir_shader *nir, struct ir3_shader_variant *v) } nir_metadata_preserve( - function->impl, nir_metadata_block_index | nir_metadata_dominance); + function->impl, nir_metadata_control_flow); } } } @@ -798,7 +798,7 @@ ir3_nir_lower_ubo_loads(nir_shader *nir, struct ir3_shader_variant *v) } nir_metadata_preserve( - function->impl, nir_metadata_block_index | nir_metadata_dominance); + function->impl, nir_metadata_control_flow); } } /* Update the num_ubos field for GL (first_ubo_is_default_ubo). With diff --git a/src/freedreno/ir3/ir3_nir_lower_64b.c b/src/freedreno/ir3/ir3_nir_lower_64b.c index 5d35743c626..8b5928965d9 100644 --- a/src/freedreno/ir3/ir3_nir_lower_64b.c +++ b/src/freedreno/ir3/ir3_nir_lower_64b.c @@ -389,7 +389,7 @@ ir3_nir_lower_64b_regs(nir_shader *shader) if (impl_progress) { nir_metadata_preserve( - impl, nir_metadata_block_index | nir_metadata_dominance); + impl, nir_metadata_control_flow); progress = true; } } diff --git a/src/freedreno/ir3/ir3_nir_lower_driver_params_to_ubo.c b/src/freedreno/ir3/ir3_nir_lower_driver_params_to_ubo.c index e650dc4c83d..3109c245720 100644 --- a/src/freedreno/ir3/ir3_nir_lower_driver_params_to_ubo.c +++ b/src/freedreno/ir3/ir3_nir_lower_driver_params_to_ubo.c @@ -75,7 +75,7 @@ ir3_nir_lower_driver_params_to_ubo(nir_shader *nir, { bool result = nir_shader_intrinsics_pass( nir, lower_driver_param_to_ubo, - nir_metadata_block_index | nir_metadata_dominance, ir3_const_state(v)); + nir_metadata_control_flow, ir3_const_state(v)); return result; } diff --git a/src/freedreno/ir3/ir3_nir_lower_io_offsets.c b/src/freedreno/ir3/ir3_nir_lower_io_offsets.c index dc2b88d2bfb..a04221597c3 100644 --- a/src/freedreno/ir3/ir3_nir_lower_io_offsets.c +++ b/src/freedreno/ir3/ir3_nir_lower_io_offsets.c @@ -297,7 +297,7 @@ lower_io_offsets_func(nir_function_impl *impl) if (progress) { nir_metadata_preserve(impl, - nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_control_flow); } return progress; diff --git a/src/freedreno/ir3/ir3_nir_lower_layer_id.c b/src/freedreno/ir3/ir3_nir_lower_layer_id.c index b36aeeff2fe..727054b4011 100644 --- a/src/freedreno/ir3/ir3_nir_lower_layer_id.c +++ b/src/freedreno/ir3/ir3_nir_lower_layer_id.c @@ -46,6 +46,6 @@ bool ir3_nir_lower_layer_id(nir_shader *shader) { assert(shader->info.stage == MESA_SHADER_FRAGMENT); return nir_shader_instructions_pass(shader, nir_lower_layer_id, - nir_metadata_block_index | nir_metadata_dominance, + nir_metadata_control_flow, NULL); } \ No newline at end of file diff --git a/src/freedreno/ir3/ir3_nir_lower_tess.c b/src/freedreno/ir3/ir3_nir_lower_tess.c index 48581701b4f..ba77ceabdc1 100644 --- a/src/freedreno/ir3/ir3_nir_lower_tess.c +++ b/src/freedreno/ir3/ir3_nir_lower_tess.c @@ -312,7 +312,7 @@ ir3_nir_lower_to_explicit_output(nir_shader *shader, lower_block_to_explicit_output(block, &b, &state); nir_metadata_preserve(impl, - nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_control_flow); v->output_size = state.map.stride; } diff --git a/src/freedreno/ir3/ir3_nir_lower_tex_prefetch.c b/src/freedreno/ir3/ir3_nir_lower_tex_prefetch.c index 271c46e91d5..a21a43b1f6a 100644 --- a/src/freedreno/ir3/ir3_nir_lower_tex_prefetch.c +++ b/src/freedreno/ir3/ir3_nir_lower_tex_prefetch.c @@ -223,7 +223,7 @@ lower_tex_prefetch_func(nir_function_impl *impl) if (progress) { nir_metadata_preserve(impl, - nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_control_flow); } return progress; diff --git a/src/freedreno/ir3/ir3_nir_move_varying_inputs.c b/src/freedreno/ir3/ir3_nir_move_varying_inputs.c index e1d862d62a5..18a1bab71bb 100644 --- a/src/freedreno/ir3/ir3_nir_move_varying_inputs.c +++ b/src/freedreno/ir3/ir3_nir_move_varying_inputs.c @@ -221,7 +221,7 @@ ir3_nir_move_varying_inputs(nir_shader *shader) if (progress) { nir_metadata_preserve( - function->impl, nir_metadata_block_index | nir_metadata_dominance); + function->impl, nir_metadata_control_flow); } } diff --git a/src/freedreno/ir3/ir3_nir_opt_preamble.c b/src/freedreno/ir3/ir3_nir_opt_preamble.c index 1fa9baf8f44..18677913e22 100644 --- a/src/freedreno/ir3/ir3_nir_opt_preamble.c +++ b/src/freedreno/ir3/ir3_nir_opt_preamble.c @@ -313,8 +313,7 @@ ir3_nir_opt_preamble(nir_shader *nir, struct ir3_shader_variant *v) return false; bool progress = nir_shader_intrinsics_pass(nir, set_speculate, - nir_metadata_block_index | - nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); nir_opt_preamble_options options = { .drawid_uniform = true, diff --git a/src/freedreno/vulkan/tu_nir_lower_multiview.cc b/src/freedreno/vulkan/tu_nir_lower_multiview.cc index 9651b9ff370..ec6fb2f5560 100644 --- a/src/freedreno/vulkan/tu_nir_lower_multiview.cc +++ b/src/freedreno/vulkan/tu_nir_lower_multiview.cc @@ -61,8 +61,7 @@ lower_multiview_mask(nir_shader *nir, uint32_t *mask) nir_def *src = nir_bcsel(&b, cmp, orig_src, nir_imm_float(&b, 0.)); nir_src_rewrite(&intrin->src[1], src); - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); return true; } } diff --git a/src/gallium/auxiliary/nir/nir_to_tgsi.c b/src/gallium/auxiliary/nir/nir_to_tgsi.c index be69b61b6af..a6c77ffa3c5 100644 --- a/src/gallium/auxiliary/nir/nir_to_tgsi.c +++ b/src/gallium/auxiliary/nir/nir_to_tgsi.c @@ -3573,8 +3573,7 @@ nir_to_tgsi_lower_64bit_to_vec2(nir_shader *s) { return nir_shader_instructions_pass(s, nir_to_tgsi_lower_64bit_to_vec2_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } @@ -3663,8 +3662,7 @@ nir_to_tgsi_lower_tex(nir_shader *s) { return nir_shader_instructions_pass(s, nir_to_tgsi_lower_tex_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/gallium/drivers/asahi/agx_nir_lower_bindings.c b/src/gallium/drivers/asahi/agx_nir_lower_bindings.c index 1a141c94f3e..1a81f1b3222 100644 --- a/src/gallium/drivers/asahi/agx_nir_lower_bindings.c +++ b/src/gallium/drivers/asahi/agx_nir_lower_bindings.c @@ -169,7 +169,6 @@ agx_nir_lower_bindings(nir_shader *shader, bool *uses_bindless_samplers) progress |= nir_opt_constant_folding(shader); progress |= nir_shader_instructions_pass( - shader, lower, nir_metadata_block_index | nir_metadata_dominance, - uses_bindless_samplers); + shader, lower, nir_metadata_control_flow, uses_bindless_samplers); return progress; } diff --git a/src/gallium/drivers/asahi/agx_nir_lower_point_size.c b/src/gallium/drivers/asahi/agx_nir_lower_point_size.c index 62ae7b8cac4..b918d2c3483 100644 --- a/src/gallium/drivers/asahi/agx_nir_lower_point_size.c +++ b/src/gallium/drivers/asahi/agx_nir_lower_point_size.c @@ -39,8 +39,7 @@ bool agx_nir_lower_point_size(nir_shader *nir, bool insert_write) { /* Lower existing point size write */ - if (nir_shader_intrinsics_pass( - nir, pass, nir_metadata_block_index | nir_metadata_dominance, NULL)) + if (nir_shader_intrinsics_pass(nir, pass, nir_metadata_control_flow, NULL)) return true; if (!insert_write) @@ -59,8 +58,7 @@ agx_nir_lower_point_size(nir_shader *nir, bool insert_write) .write_mask = nir_component_mask(1), .src_type = nir_type_float32); nir->info.outputs_written |= VARYING_BIT_PSIZ; - nir_metadata_preserve(b.impl, - nir_metadata_dominance | nir_metadata_block_index); + nir_metadata_preserve(b.impl, nir_metadata_control_flow); return true; } diff --git a/src/gallium/drivers/asahi/agx_nir_lower_sysvals.c b/src/gallium/drivers/asahi/agx_nir_lower_sysvals.c index a2375923b08..143606d0809 100644 --- a/src/gallium/drivers/asahi/agx_nir_lower_sysvals.c +++ b/src/gallium/drivers/asahi/agx_nir_lower_sysvals.c @@ -491,8 +491,7 @@ agx_nir_lower_sysvals(nir_shader *shader, enum pipe_shader_type desc_stage, shader->info.stage = desc_stage; bool progress = nir_shader_instructions_pass( - shader, lower_sysvals, nir_metadata_block_index | nir_metadata_dominance, - &lower_draw_params); + shader, lower_sysvals, nir_metadata_control_flow, &lower_draw_params); shader->info.stage = phys_stage; return progress; @@ -508,8 +507,7 @@ agx_nir_layout_uniforms(nir_shader *shader, .hw_stage = shader->info.stage, }; - nir_shader_intrinsics_pass(shader, record_loads, - nir_metadata_block_index | nir_metadata_dominance, + nir_shader_intrinsics_pass(shader, record_loads, nir_metadata_control_flow, &state); *push_size = lay_out_uniforms(compiled, &state); diff --git a/src/gallium/drivers/asahi/agx_state.c b/src/gallium/drivers/asahi/agx_state.c index a56804bc192..03746b4c024 100644 --- a/src/gallium/drivers/asahi/agx_state.c +++ b/src/gallium/drivers/asahi/agx_state.c @@ -1645,7 +1645,7 @@ agx_compile_variant(struct agx_device *dev, struct pipe_context *pctx, if (key->hw) { NIR_PASS(_, nir, agx_nir_lower_point_size, true); NIR_PASS(_, nir, nir_shader_intrinsics_pass, agx_nir_lower_clip_m1_1, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); NIR_PASS(_, nir, nir_lower_io_to_scalar, nir_var_shader_out, NULL, NULL); @@ -1734,7 +1734,7 @@ agx_compile_variant(struct agx_device *dev, struct pipe_context *pctx, NIR_PASS(_, gs_copy, agx_nir_lower_point_size, false); NIR_PASS(_, gs_copy, nir_shader_intrinsics_pass, agx_nir_lower_clip_m1_1, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); NIR_PASS(_, gs_copy, nir_lower_io_to_scalar, nir_var_shader_out, NULL, NULL); @@ -1883,8 +1883,7 @@ agx_shader_initialize(struct agx_device *dev, struct agx_uncompiled_shader *so, (nir->info.inputs_read & VARYING_BITS_TEX_ANY)) { NIR_PASS(_, nir, nir_shader_intrinsics_pass, - agx_nir_lower_point_sprite_zw, - nir_metadata_block_index | nir_metadata_dominance, NULL); + agx_nir_lower_point_sprite_zw, nir_metadata_control_flow, NULL); } if (nir->info.stage == MESA_SHADER_FRAGMENT) { @@ -2140,7 +2139,7 @@ build_fs_prolog(nir_builder *b, const void *key) agx_nir_fs_prolog(b, key); NIR_PASS(_, b->shader, nir_shader_intrinsics_pass, lower_fs_prolog_abi, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } static struct agx_linked_shader * diff --git a/src/gallium/drivers/crocus/crocus_program.c b/src/gallium/drivers/crocus/crocus_program.c index a7d444fc358..425cfff9aea 100644 --- a/src/gallium/drivers/crocus/crocus_program.c +++ b/src/gallium/drivers/crocus/crocus_program.c @@ -343,8 +343,7 @@ crocus_fix_edge_flags(nir_shader *nir) nir_fixup_deref_modes(nir); nir_foreach_function_impl(impl, nir) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance | + nir_metadata_preserve(impl, nir_metadata_control_flow | nir_metadata_live_defs | nir_metadata_loop_analysis); } diff --git a/src/gallium/drivers/d3d12/d3d12_lower_image_casts.c b/src/gallium/drivers/d3d12/d3d12_lower_image_casts.c index 5a40db5849c..279cc27cf50 100644 --- a/src/gallium/drivers/d3d12/d3d12_lower_image_casts.c +++ b/src/gallium/drivers/d3d12/d3d12_lower_image_casts.c @@ -248,7 +248,7 @@ bool d3d12_lower_image_casts(nir_shader *s, struct d3d12_image_format_conversion_info_arr *info) { bool progress = nir_shader_intrinsics_pass(s, lower_image_cast_instr, - nir_metadata_block_index | nir_metadata_dominance, + nir_metadata_control_flow, info); if (progress) { diff --git a/src/gallium/drivers/d3d12/d3d12_lower_point_sprite.c b/src/gallium/drivers/d3d12/d3d12_lower_point_sprite.c index c67069c83cb..98d8998fe1c 100644 --- a/src/gallium/drivers/d3d12/d3d12_lower_point_sprite.c +++ b/src/gallium/drivers/d3d12/d3d12_lower_point_sprite.c @@ -297,8 +297,7 @@ d3d12_lower_point_sprite(nir_shader *shader, } } - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } util_dynarray_fini(&state.output_writes); diff --git a/src/gallium/drivers/d3d12/d3d12_nir_passes.c b/src/gallium/drivers/d3d12/d3d12_nir_passes.c index 3f76705d1a6..c3a9f9da38a 100644 --- a/src/gallium/drivers/d3d12/d3d12_nir_passes.c +++ b/src/gallium/drivers/d3d12/d3d12_nir_passes.c @@ -101,8 +101,7 @@ d3d12_lower_yflip(nir_shader *nir) } } - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } } @@ -155,8 +154,7 @@ d3d12_lower_depth_range(nir_shader *nir) } } - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } } @@ -194,7 +192,7 @@ d3d12_lower_compute_state_vars(nir_shader *nir) assert(nir->info.stage == MESA_SHADER_COMPUTE); struct compute_state_vars vars = { 0 }; return nir_shader_instructions_pass(nir, lower_compute_state_vars, - nir_metadata_block_index | nir_metadata_dominance, &vars); + nir_metadata_control_flow, &vars); } static bool @@ -249,8 +247,7 @@ d3d12_lower_uint_cast(nir_shader *nir, bool is_signed) } } - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } } @@ -285,7 +282,7 @@ d3d12_lower_load_draw_params(struct nir_shader *nir) return false; return nir_shader_intrinsics_pass(nir, lower_load_draw_params, - nir_metadata_block_index | nir_metadata_dominance, + nir_metadata_control_flow, &draw_params); } @@ -315,7 +312,7 @@ d3d12_lower_load_patch_vertices_in(struct nir_shader *nir) return false; return nir_shader_intrinsics_pass(nir, lower_load_patch_vertices_in, - nir_metadata_block_index | nir_metadata_dominance, + nir_metadata_control_flow, &var); } @@ -417,8 +414,7 @@ d3d12_nir_invert_depth(nir_shader *shader, unsigned viewport_mask, bool clip_hal invert_depth_impl(&b, &state); } - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } } @@ -533,8 +529,7 @@ d3d12_lower_state_vars(nir_shader *nir, struct d3d12_shader *shader) } } - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } if (progress) { @@ -602,8 +597,7 @@ d3d12_add_missing_dual_src_target(struct nir_shader *s, nir_store_var(&b, out, zero, 0xf); } - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } void @@ -982,7 +976,7 @@ d3d12_split_needed_varyings(nir_shader *s) if (progress) { nir_shader_intrinsics_pass(s, split_varying_accesses, - nir_metadata_block_index | nir_metadata_dominance, + nir_metadata_control_flow, &state); } else { nir_shader_preserve_all_metadata(s); @@ -1041,6 +1035,6 @@ d3d12_write_0_to_new_varying(nir_shader *s, nir_variable *var) } } - nir_metadata_preserve(impl, nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } } diff --git a/src/gallium/drivers/etnaviv/etnaviv_nir_lower_source_mods.c b/src/gallium/drivers/etnaviv/etnaviv_nir_lower_source_mods.c index 27cc0ca3bab..533b1c6758f 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_nir_lower_source_mods.c +++ b/src/gallium/drivers/etnaviv/etnaviv_nir_lower_source_mods.c @@ -112,7 +112,6 @@ etna_nir_lower_to_source_mods(nir_shader *shader) return nir_shader_instructions_pass(shader, nir_lower_to_source_mods_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/gallium/drivers/etnaviv/etnaviv_nir_lower_texture.c b/src/gallium/drivers/etnaviv/etnaviv_nir_lower_texture.c index 9da28ba0411..692bfff6d49 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_nir_lower_texture.c +++ b/src/gallium/drivers/etnaviv/etnaviv_nir_lower_texture.c @@ -45,7 +45,7 @@ etna_nir_lower_texture(nir_shader *s, struct etna_shader_key *key) key->tex_swizzle); NIR_PASS(progress, s, nir_shader_instructions_pass, lower_txs, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); return progress; } diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c index c53da479723..8d8849ec976 100644 --- a/src/gallium/drivers/iris/iris_program.c +++ b/src/gallium/drivers/iris/iris_program.c @@ -836,8 +836,7 @@ iris_fix_edge_flags(nir_shader *nir) nir_fixup_deref_modes(nir); nir_foreach_function_impl(impl, nir) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance | + nir_metadata_preserve(impl, nir_metadata_control_flow | nir_metadata_live_defs | nir_metadata_loop_analysis); } diff --git a/src/gallium/drivers/lima/ir/lima_nir_duplicate_consts.c b/src/gallium/drivers/lima/ir/lima_nir_duplicate_consts.c index efe59fd9b50..23ed6f5cdbe 100644 --- a/src/gallium/drivers/lima/ir/lima_nir_duplicate_consts.c +++ b/src/gallium/drivers/lima/ir/lima_nir_duplicate_consts.c @@ -108,8 +108,7 @@ lima_nir_duplicate_load_consts_impl(nir_shader *shader, nir_function_impl *impl) } } - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } /* Duplicate load consts for every user. diff --git a/src/gallium/drivers/lima/ir/lima_nir_duplicate_intrinsic.c b/src/gallium/drivers/lima/ir/lima_nir_duplicate_intrinsic.c index 358352b3245..56f2a435154 100644 --- a/src/gallium/drivers/lima/ir/lima_nir_duplicate_intrinsic.c +++ b/src/gallium/drivers/lima/ir/lima_nir_duplicate_intrinsic.c @@ -119,8 +119,7 @@ lima_nir_duplicate_intrinsic_impl(nir_shader *shader, nir_function_impl *impl, } } - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } /* Duplicate load uniforms for every user. diff --git a/src/gallium/drivers/lima/ir/lima_nir_lower_txp.c b/src/gallium/drivers/lima/ir/lima_nir_lower_txp.c index 8ee6a4b3528..2e1710f4664 100644 --- a/src/gallium/drivers/lima/ir/lima_nir_lower_txp.c +++ b/src/gallium/drivers/lima/ir/lima_nir_lower_txp.c @@ -157,7 +157,6 @@ bool lima_nir_lower_txp(nir_shader *shader) { return nir_shader_instructions_pass(shader, lima_nir_lower_txp_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/gallium/drivers/lima/ir/lima_nir_split_load_input.c b/src/gallium/drivers/lima/ir/lima_nir_split_load_input.c index c061c88cdad..4f42ef26c8f 100644 --- a/src/gallium/drivers/lima/ir/lima_nir_split_load_input.c +++ b/src/gallium/drivers/lima/ir/lima_nir_split_load_input.c @@ -93,7 +93,6 @@ bool lima_nir_split_load_input(nir_shader *shader) { return nir_shader_instructions_pass(shader, lima_nir_split_load_input_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/gallium/drivers/panfrost/pan_nir_lower_res_indices.c b/src/gallium/drivers/panfrost/pan_nir_lower_res_indices.c index 627e3ac1ef8..b05798032fc 100644 --- a/src/gallium/drivers/panfrost/pan_nir_lower_res_indices.c +++ b/src/gallium/drivers/panfrost/pan_nir_lower_res_indices.c @@ -153,6 +153,6 @@ panfrost_nir_lower_res_indices(nir_shader *shader, return false; return nir_shader_instructions_pass( - shader, lower_instr, nir_metadata_block_index | nir_metadata_dominance, + shader, lower_instr, nir_metadata_control_flow, inputs); } \ No newline at end of file diff --git a/src/gallium/drivers/panfrost/pan_nir_lower_sysvals.c b/src/gallium/drivers/panfrost/pan_nir_lower_sysvals.c index da96cb51d4a..8b4a77abaef 100644 --- a/src/gallium/drivers/panfrost/pan_nir_lower_sysvals.c +++ b/src/gallium/drivers/panfrost/pan_nir_lower_sysvals.c @@ -198,7 +198,7 @@ panfrost_nir_lower_sysvals(nir_shader *shader, struct panfrost_sysvals *sysvals) memset(sysvals, 0, sizeof(*sysvals)); nir_shader_instructions_pass( - shader, lower, nir_metadata_block_index | nir_metadata_dominance, &ctx); + shader, lower, nir_metadata_control_flow, &ctx); _mesa_hash_table_u64_destroy(ctx.sysval_to_id); return true; diff --git a/src/gallium/drivers/panfrost/pan_nir_remove_fragcolor_stores.c b/src/gallium/drivers/panfrost/pan_nir_remove_fragcolor_stores.c index e77823e2c12..dd7d6fc0a67 100644 --- a/src/gallium/drivers/panfrost/pan_nir_remove_fragcolor_stores.c +++ b/src/gallium/drivers/panfrost/pan_nir_remove_fragcolor_stores.c @@ -46,5 +46,5 @@ bool panfrost_nir_remove_fragcolor_stores(nir_shader *s, unsigned nr_cbufs) { return nir_shader_intrinsics_pass( - s, pass, nir_metadata_block_index | nir_metadata_dominance, &nr_cbufs); + s, pass, nir_metadata_control_flow, &nr_cbufs); } diff --git a/src/gallium/drivers/r300/compiler/nir_to_rc.c b/src/gallium/drivers/r300/compiler/nir_to_rc.c index 7c76f778716..8917a95f097 100644 --- a/src/gallium/drivers/r300/compiler/nir_to_rc.c +++ b/src/gallium/drivers/r300/compiler/nir_to_rc.c @@ -2280,8 +2280,7 @@ nir_to_rc_lower_tex(nir_shader *s) { return nir_shader_instructions_pass(s, nir_to_rc_lower_tex_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/gallium/drivers/r300/compiler/r300_nir.c b/src/gallium/drivers/r300/compiler/r300_nir.c index ccb1ecaa6ba..1442f97ed84 100644 --- a/src/gallium/drivers/r300/compiler/r300_nir.c +++ b/src/gallium/drivers/r300/compiler/r300_nir.c @@ -197,8 +197,7 @@ r300_optimize_nir(struct nir_shader *s, struct pipe_screen *screen) NIR_PASS(progress, s, nir_opt_if, nir_opt_if_optimize_phi_true_false); if (is_r500) nir_shader_intrinsics_pass(s, set_speculate, - nir_metadata_block_index | - nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); NIR_PASS(progress, s, nir_opt_peephole_select, is_r500 ? 8 : ~0, true, true); if (s->info.stage == MESA_SHADER_FRAGMENT) { NIR_PASS(progress, s, r300_nir_lower_bool_to_float_fs); diff --git a/src/gallium/drivers/r300/compiler/r500_nir_lower_fcsel.c b/src/gallium/drivers/r300/compiler/r500_nir_lower_fcsel.c index 2f3ccb48c19..8feaac2a0b4 100644 --- a/src/gallium/drivers/r300/compiler/r500_nir_lower_fcsel.c +++ b/src/gallium/drivers/r300/compiler/r500_nir_lower_fcsel.c @@ -129,8 +129,7 @@ r300_nir_lower_fcsel_r500(nir_shader *shader) { bool progress = nir_shader_instructions_pass(shader, r300_nir_lower_fcsel_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); return progress; } diff --git a/src/gallium/drivers/r600/sfn/sfn_nir.cpp b/src/gallium/drivers/r600/sfn/sfn_nir.cpp index 1ec03ffd1b5..eff49b287e4 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_nir.cpp @@ -444,8 +444,7 @@ r600_nir_lower_atomics(nir_shader *shader) } return nir_shader_intrinsics_pass(shader, r600_lower_deref_instr, - nir_metadata_block_index | nir_metadata_dominance, - NULL); + nir_metadata_control_flow, NULL); } using r600::r600_lower_fs_out_to_vector; using r600::r600_lower_scratch_addresses; diff --git a/src/gallium/drivers/r600/sfn/sfn_nir_lower_64bit.cpp b/src/gallium/drivers/r600/sfn/sfn_nir_lower_64bit.cpp index 50831297417..16645f1e3e3 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir_lower_64bit.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_nir_lower_64bit.cpp @@ -1430,7 +1430,7 @@ r600_lower_64bit_to_vec2(nir_shader *s) { return nir_shader_instructions_pass(s, r600_lower_64bit_to_vec2_instr, - nir_metadata_block_index | nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/gallium/drivers/r600/sfn/sfn_nir_lower_fs_out_to_vector.cpp b/src/gallium/drivers/r600/sfn/sfn_nir_lower_fs_out_to_vector.cpp index c6374476314..279ab19c890 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir_lower_fs_out_to_vector.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_nir_lower_fs_out_to_vector.cpp @@ -133,7 +133,7 @@ NirLowerIOToVector::run(nir_function_impl *impl) bool progress = vectorize_block(&b, nir_start_block(impl)); if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/gallium/drivers/r600/sfn/sfn_nir_vectorize_vs_inputs.c b/src/gallium/drivers/r600/sfn/sfn_nir_vectorize_vs_inputs.c index d9328c7f52c..38031d59154 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir_vectorize_vs_inputs.c +++ b/src/gallium/drivers/r600/sfn/sfn_nir_vectorize_vs_inputs.c @@ -422,7 +422,7 @@ r600_vectorize_io_impl(nir_function_impl *impl) r600_vectorize_block(&b, nir_start_block(impl), instr_set, updated_vars); if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/gallium/drivers/radeonsi/si_nir_lower_abi.c b/src/gallium/drivers/radeonsi/si_nir_lower_abi.c index f1d91565d8f..99b9c4fd930 100644 --- a/src/gallium/drivers/radeonsi/si_nir_lower_abi.c +++ b/src/gallium/drivers/radeonsi/si_nir_lower_abi.c @@ -823,7 +823,7 @@ bool si_nir_lower_abi(nir_shader *nir, struct si_shader *shader, struct si_shade } nir_metadata preserved = progress ? - nir_metadata_dominance | nir_metadata_block_index : + nir_metadata_control_flow : nir_metadata_all; nir_metadata_preserve(impl, preserved); diff --git a/src/gallium/drivers/radeonsi/si_nir_lower_resource.c b/src/gallium/drivers/radeonsi/si_nir_lower_resource.c index 25b4008f897..ddd9ed9e1ac 100644 --- a/src/gallium/drivers/radeonsi/si_nir_lower_resource.c +++ b/src/gallium/drivers/radeonsi/si_nir_lower_resource.c @@ -596,6 +596,6 @@ bool si_nir_lower_resource(nir_shader *nir, struct si_shader *shader, }; return nir_shader_instructions_pass(nir, lower_resource_instr, - nir_metadata_dominance | nir_metadata_block_index, + nir_metadata_control_flow, &state); } diff --git a/src/gallium/drivers/radeonsi/si_nir_lower_vs_inputs.c b/src/gallium/drivers/radeonsi/si_nir_lower_vs_inputs.c index fb737ddb281..068d3065261 100644 --- a/src/gallium/drivers/radeonsi/si_nir_lower_vs_inputs.c +++ b/src/gallium/drivers/radeonsi/si_nir_lower_vs_inputs.c @@ -603,6 +603,6 @@ si_nir_lower_vs_inputs(nir_shader *nir, struct si_shader *shader, struct si_shad get_vertex_index_for_all_inputs(nir, &state); return nir_shader_intrinsics_pass(nir, lower_vs_input_instr, - nir_metadata_dominance | nir_metadata_block_index, + nir_metadata_control_flow, &state); } diff --git a/src/gallium/drivers/radeonsi/si_nir_optim.c b/src/gallium/drivers/radeonsi/si_nir_optim.c index fae3850d014..f881d08c2ac 100644 --- a/src/gallium/drivers/radeonsi/si_nir_optim.c +++ b/src/gallium/drivers/radeonsi/si_nir_optim.c @@ -162,8 +162,7 @@ si_nir_is_output_const_if_tex_is_const(nir_shader *shader, float *in, float *out /* Replace nir_tex_instr using texunit by vec4(v) */ nir_shader_instructions_pass(shader, replace_tex_by_imm, - nir_metadata_block_index | - nir_metadata_dominance, &p); + nir_metadata_control_flow, &p); /* Optimize the cloned shader */ bool progress; diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index c82537f3b3f..f621acb2d06 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -1694,8 +1694,7 @@ static bool si_nir_kill_outputs(nir_shader *nir, const union si_shader_key *key) } if (progress) { - nir_metadata_preserve(impl, nir_metadata_dominance | - nir_metadata_block_index); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } @@ -1778,8 +1777,7 @@ static bool si_nir_kill_ps_outputs(nir_shader *nir, const union si_shader_key *k { assert(nir->info.stage == MESA_SHADER_FRAGMENT); return nir_shader_instructions_pass(nir, kill_ps_outputs_cb, - nir_metadata_dominance | - nir_metadata_block_index, (void*)key); + nir_metadata_control_flow, (void*)key); } static bool clamp_vertex_color_instr(nir_builder *b, @@ -1815,7 +1813,7 @@ static bool si_nir_clamp_vertex_color(nir_shader *nir) return false; return nir_shader_intrinsics_pass(nir, clamp_vertex_color_instr, - nir_metadata_dominance | nir_metadata_block_index, + nir_metadata_control_flow, NULL); } @@ -2193,7 +2191,7 @@ static bool si_nir_lower_ps_color_input(nir_shader *nir, const union si_shader_k /* lower nir_load_color0/1 to use the color value. */ return nir_shader_instructions_pass(nir, lower_ps_load_color_intrinsic, - nir_metadata_block_index | nir_metadata_dominance, + nir_metadata_control_flow, colors) || progress; } diff --git a/src/gallium/drivers/v3d/v3d_program.c b/src/gallium/drivers/v3d/v3d_program.c index 5436411e65e..6ad09acb821 100644 --- a/src/gallium/drivers/v3d/v3d_program.c +++ b/src/gallium/drivers/v3d/v3d_program.c @@ -324,16 +324,14 @@ static bool v3d_nir_lower_uniform_offset_to_bytes(nir_shader *s) { return nir_shader_intrinsics_pass(s, lower_uniform_offset_to_bytes_cb, - nir_metadata_block_index | - nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } static bool v3d_nir_lower_textures(nir_shader *s) { return nir_shader_instructions_pass(s, lower_textures_cb, - nir_metadata_block_index | - nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } static void * diff --git a/src/gallium/drivers/vc4/vc4_nir_lower_blend.c b/src/gallium/drivers/vc4/vc4_nir_lower_blend.c index f0a93521b63..4c599542c39 100644 --- a/src/gallium/drivers/vc4/vc4_nir_lower_blend.c +++ b/src/gallium/drivers/vc4/vc4_nir_lower_blend.c @@ -596,8 +596,7 @@ vc4_nir_lower_blend(nir_shader *s, struct vc4_compile *c) } nir_metadata_preserve(impl, - nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_control_flow); } /* If we didn't do alpha-to-coverage on the output color, we still diff --git a/src/gallium/drivers/vc4/vc4_nir_lower_io.c b/src/gallium/drivers/vc4/vc4_nir_lower_io.c index 52b0a8475b5..7acaf2d9a6f 100644 --- a/src/gallium/drivers/vc4/vc4_nir_lower_io.c +++ b/src/gallium/drivers/vc4/vc4_nir_lower_io.c @@ -349,8 +349,7 @@ vc4_nir_lower_io_impl(struct vc4_compile *c, nir_function_impl *impl) vc4_nir_lower_io_instr(c, &b, instr); } - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); return true; } diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c index 9f6ea6adba7..ba4c071da11 100644 --- a/src/gallium/drivers/zink/zink_compiler.c +++ b/src/gallium/drivers/zink/zink_compiler.c @@ -1066,7 +1066,7 @@ static bool lower_64bit_pack(nir_shader *shader) { return nir_shader_instructions_pass(shader, lower_64bit_pack_instr, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } nir_shader * @@ -3690,7 +3690,9 @@ lower_zs_swizzle_tex(nir_shader *nir, const void *swizzle, bool shadow_only) /* We don't use nir_lower_tex to do our swizzling, because of this base_sampler_id. */ unsigned base_sampler_id = gl_shader_stage_is_compute(nir->info.stage) ? 0 : PIPE_MAX_SAMPLERS * nir->info.stage; struct lower_zs_swizzle_state state = {shadow_only, base_sampler_id, swizzle}; - return nir_shader_instructions_pass(nir, lower_zs_swizzle_tex_instr, nir_metadata_dominance | nir_metadata_block_index, (void*)&state); + return nir_shader_instructions_pass(nir, lower_zs_swizzle_tex_instr, + nir_metadata_control_flow, + (void*)&state); } static bool @@ -4123,7 +4125,7 @@ zink_shader_compile(struct zink_screen *screen, bool can_shobj, struct zink_shad nir_fixup_deref_modes(nir); NIR_PASS_V(nir, nir_remove_dead_variables, nir_var_shader_temp, NULL); NIR_PASS_V(nir, nir_shader_intrinsics_pass, remove_interpolate_at_sample, - nir_metadata_dominance | nir_metadata_block_index, NULL); + nir_metadata_control_flow, NULL); need_optimize = true; } diff --git a/src/gallium/frontends/lavapipe/lvp_inline_uniforms.c b/src/gallium/frontends/lavapipe/lvp_inline_uniforms.c index fb876e1e136..65714cddf6a 100644 --- a/src/gallium/frontends/lavapipe/lvp_inline_uniforms.c +++ b/src/gallium/frontends/lavapipe/lvp_inline_uniforms.c @@ -256,7 +256,6 @@ lvp_inline_uniforms(nir_shader *nir, const struct lvp_shader *shader, const uint } } - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } } diff --git a/src/gallium/frontends/lavapipe/lvp_lower_exec_graph.c b/src/gallium/frontends/lavapipe/lvp_lower_exec_graph.c index e702467a71f..1b4c44ec6dd 100644 --- a/src/gallium/frontends/lavapipe/lvp_lower_exec_graph.c +++ b/src/gallium/frontends/lavapipe/lvp_lower_exec_graph.c @@ -65,7 +65,7 @@ static bool lvp_lower_node_payload_derefs(nir_shader *nir) { return nir_shader_instructions_pass(nir, lvp_lower_node_payload_deref, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } static void @@ -126,7 +126,7 @@ static bool lvp_lower_exec_graph_intrinsics(nir_shader *nir) { return nir_shader_intrinsics_pass(nir, lvp_lower_node_payload_intrinsic, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } static void diff --git a/src/gallium/frontends/lavapipe/lvp_lower_vulkan_resource.c b/src/gallium/frontends/lavapipe/lvp_lower_vulkan_resource.c index 55593c3e2c1..c70af17b62a 100644 --- a/src/gallium/frontends/lavapipe/lvp_lower_vulkan_resource.c +++ b/src/gallium/frontends/lavapipe/lvp_lower_vulkan_resource.c @@ -232,7 +232,7 @@ void lvp_lower_pipeline_layout(const struct lvp_device *device, nir_shader *shader) { nir_shader_intrinsics_pass(shader, lower_load_ubo, - nir_metadata_block_index | nir_metadata_dominance, + nir_metadata_control_flow, layout); nir_shader_lower_instructions(shader, lower_vulkan_resource_index, lower_vri_instr, layout); } diff --git a/src/gallium/frontends/lavapipe/lvp_ray_tracing_pipeline.c b/src/gallium/frontends/lavapipe/lvp_ray_tracing_pipeline.c index 37cf69595f4..a7fd636d305 100644 --- a/src/gallium/frontends/lavapipe/lvp_ray_tracing_pipeline.c +++ b/src/gallium/frontends/lavapipe/lvp_ray_tracing_pipeline.c @@ -135,7 +135,7 @@ lvp_lower_ray_tracing_derefs(nir_shader *shader) } if (progress) - nir_metadata_preserve(impl, nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); else nir_metadata_preserve(impl, nir_metadata_all); @@ -189,7 +189,7 @@ lvp_compile_ray_tracing_stages(struct lvp_pipeline *pipeline, NIR_PASS(_, nir, nir_lower_explicit_io, nir_var_function_temp, nir_address_format_32bit_offset); NIR_PASS(_, nir, nir_shader_intrinsics_pass, lvp_move_ray_tracing_intrinsic, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); pipeline->rt.stages[i] = lvp_create_pipeline_nir(nir); if (!pipeline->rt.stages[i]) { @@ -1102,7 +1102,7 @@ lvp_compile_ray_tracing_pipeline(struct lvp_pipeline *pipeline, nir_address_format_32bit_offset); NIR_PASS(_, b->shader, nir_shader_intrinsics_pass, lvp_lower_ray_tracing_stack_base, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); /* We can not support dynamic stack sizes, assume the worst. */ b->shader->scratch_size += diff --git a/src/intel/blorp/blorp_brw.c b/src/intel/blorp/blorp_brw.c index 2f36c9740a1..23c2df408bf 100644 --- a/src/intel/blorp/blorp_brw.c +++ b/src/intel/blorp/blorp_brw.c @@ -140,7 +140,7 @@ blorp_compile_cs_brw(struct blorp_context *blorp, void *mem_ctx, NIR_PASS_V(nir, brw_nir_lower_cs_intrinsics, compiler->devinfo, cs_prog_data); NIR_PASS_V(nir, nir_shader_intrinsics_pass, lower_base_workgroup_id, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); struct brw_cs_prog_key cs_key; memset(&cs_key, 0, sizeof(cs_key)); diff --git a/src/intel/blorp/blorp_elk.c b/src/intel/blorp/blorp_elk.c index fe7464900e6..b86bfa3fb45 100644 --- a/src/intel/blorp/blorp_elk.c +++ b/src/intel/blorp/blorp_elk.c @@ -148,7 +148,7 @@ blorp_compile_cs_elk(struct blorp_context *blorp, void *mem_ctx, NIR_PASS_V(nir, elk_nir_lower_cs_intrinsics, compiler->devinfo, cs_prog_data); NIR_PASS_V(nir, nir_shader_intrinsics_pass, lower_base_workgroup_id, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); struct elk_cs_prog_key cs_key; memset(&cs_key, 0, sizeof(cs_key)); diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp index a0c9d8d07fe..c4126d694cf 100644 --- a/src/intel/compiler/brw_fs.cpp +++ b/src/intel/compiler/brw_fs.cpp @@ -3629,9 +3629,8 @@ brw_nir_move_interpolation_to_top(nir_shader *nir) progress = progress || impl_progress; - nir_metadata_preserve(impl, impl_progress ? (nir_metadata_block_index | - nir_metadata_dominance) - : nir_metadata_all); + nir_metadata_preserve(impl, impl_progress ? nir_metadata_control_flow + : nir_metadata_all); } return progress; diff --git a/src/intel/compiler/brw_kernel.c b/src/intel/compiler/brw_kernel.c index 1d4f7774a54..24b47fabdb4 100644 --- a/src/intel/compiler/brw_kernel.c +++ b/src/intel/compiler/brw_kernel.c @@ -232,8 +232,7 @@ lower_kernel_intrinsics(nir_shader *nir) } if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/intel/compiler/brw_mesh.cpp b/src/intel/compiler/brw_mesh.cpp index f7ef0fb0ea7..3095613ada4 100644 --- a/src/intel/compiler/brw_mesh.cpp +++ b/src/intel/compiler/brw_mesh.cpp @@ -216,8 +216,7 @@ brw_nir_adjust_task_payload_offsets(nir_shader *nir) { return nir_shader_intrinsics_pass(nir, brw_nir_adjust_task_payload_offsets_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } @@ -256,8 +255,7 @@ brw_nir_align_launch_mesh_workgroups(nir_shader *nir) { return nir_shader_intrinsics_pass(nir, brw_nir_align_launch_mesh_workgroups_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } @@ -1238,8 +1236,7 @@ brw_nir_initialize_mue(nir_shader *nir, if (remaining) { nir_metadata_preserve(entrypoint, nir_metadata_none); } else { - nir_metadata_preserve(entrypoint, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(entrypoint, nir_metadata_control_flow); } } @@ -1298,8 +1295,7 @@ brw_nir_adjust_offset_for_arrayed_indices(nir_shader *nir, const struct brw_mue_ { return nir_shader_intrinsics_pass(nir, brw_nir_adjust_offset_for_arrayed_indices_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, (void *)map); } @@ -1466,8 +1462,7 @@ brw_pack_primitive_indices(nir_shader *nir, void *data) state->packed_prim_indices->data.per_primitive = 1; return nir_shader_intrinsics_pass(nir, brw_pack_primitive_indices_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, data); } diff --git a/src/intel/compiler/brw_nir.c b/src/intel/compiler/brw_nir.c index 40ef84d5379..d139baed83c 100644 --- a/src/intel/compiler/brw_nir.c +++ b/src/intel/compiler/brw_nir.c @@ -617,14 +617,12 @@ brw_nir_lower_fs_inputs(nir_shader *nir, nir_lower_single_sampled(nir); } else if (key->persample_interp == BRW_ALWAYS) { nir_shader_intrinsics_pass(nir, lower_barycentric_per_sample, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } nir_shader_intrinsics_pass(nir, lower_barycentric_at_offset, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); /* This pass needs actual constants */ @@ -1173,7 +1171,7 @@ static bool brw_nir_zero_inputs(nir_shader *shader, uint64_t *zero_inputs) { return nir_shader_intrinsics_pass(shader, brw_nir_zero_inputs_instr, - nir_metadata_block_index | nir_metadata_dominance, + nir_metadata_control_flow, zero_inputs); } diff --git a/src/intel/compiler/brw_nir_lower_alpha_to_coverage.c b/src/intel/compiler/brw_nir_lower_alpha_to_coverage.c index aa322e03d9a..ec4849a81ab 100644 --- a/src/intel/compiler/brw_nir_lower_alpha_to_coverage.c +++ b/src/intel/compiler/brw_nir_lower_alpha_to_coverage.c @@ -183,8 +183,7 @@ brw_nir_lower_alpha_to_coverage(nir_shader *shader, nir_src_rewrite(&sample_mask_write->src[0], dither_mask); - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); return true; skip: diff --git a/src/intel/compiler/brw_nir_lower_cs_intrinsics.c b/src/intel/compiler/brw_nir_lower_cs_intrinsics.c index fdbe684aa02..06b9e674386 100644 --- a/src/intel/compiler/brw_nir_lower_cs_intrinsics.c +++ b/src/intel/compiler/brw_nir_lower_cs_intrinsics.c @@ -291,7 +291,7 @@ lower_cs_intrinsics_convert_impl(struct lower_intrinsics_state *state) } nir_metadata_preserve(state->impl, - nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_control_flow); } bool diff --git a/src/intel/compiler/brw_nir_lower_rt_intrinsics.c b/src/intel/compiler/brw_nir_lower_rt_intrinsics.c index d3653251b74..56edc0c9b49 100644 --- a/src/intel/compiler/brw_nir_lower_rt_intrinsics.c +++ b/src/intel/compiler/brw_nir_lower_rt_intrinsics.c @@ -350,8 +350,7 @@ lower_rt_intrinsics_impl(nir_function_impl *impl, nir_metadata_preserve(impl, progress ? nir_metadata_none : - (nir_metadata_block_index | - nir_metadata_dominance)); + (nir_metadata_control_flow)); } /** Lower ray-tracing system values and intrinsics diff --git a/src/intel/compiler/brw_nir_lower_shader_calls.c b/src/intel/compiler/brw_nir_lower_shader_calls.c index 739e6375023..b6d739c032a 100644 --- a/src/intel/compiler/brw_nir_lower_shader_calls.c +++ b/src/intel/compiler/brw_nir_lower_shader_calls.c @@ -117,8 +117,7 @@ brw_nir_lower_shader_returns(nir_shader *shader) } } - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } static void @@ -280,8 +279,7 @@ brw_nir_lower_shader_calls(nir_shader *shader, struct brw_bs_prog_key *key) nir_metadata_none, key); bool b = nir_shader_intrinsics_pass(shader, lower_shader_call_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); return a || b; } diff --git a/src/intel/compiler/brw_nir_rt.c b/src/intel/compiler/brw_nir_rt.c index 2a2304060a4..251602be29a 100644 --- a/src/intel/compiler/brw_nir_rt.c +++ b/src/intel/compiler/brw_nir_rt.c @@ -149,8 +149,7 @@ lower_rt_io_derefs(nir_shader *shader) } if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } diff --git a/src/intel/compiler/elk/elk_fs.cpp b/src/intel/compiler/elk/elk_fs.cpp index 4dcd263cf8a..15672063e59 100644 --- a/src/intel/compiler/elk/elk_fs.cpp +++ b/src/intel/compiler/elk/elk_fs.cpp @@ -6432,9 +6432,8 @@ elk_nir_move_interpolation_to_top(nir_shader *nir) progress = progress || impl_progress; - nir_metadata_preserve(impl, impl_progress ? (nir_metadata_block_index | - nir_metadata_dominance) - : nir_metadata_all); + nir_metadata_preserve(impl, impl_progress ? nir_metadata_control_flow + : nir_metadata_all); } return progress; diff --git a/src/intel/compiler/elk/elk_nir.c b/src/intel/compiler/elk/elk_nir.c index 639f600cdaa..392a169e9d6 100644 --- a/src/intel/compiler/elk/elk_nir.c +++ b/src/intel/compiler/elk/elk_nir.c @@ -529,14 +529,12 @@ elk_nir_lower_fs_inputs(nir_shader *nir, nir_lower_single_sampled(nir); } else if (key->persample_interp == ELK_ALWAYS) { nir_shader_intrinsics_pass(nir, lower_barycentric_per_sample, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } nir_shader_intrinsics_pass(nir, lower_barycentric_at_offset, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); /* This pass needs actual constants */ @@ -1048,7 +1046,7 @@ static bool elk_nir_zero_inputs(nir_shader *shader, uint64_t *zero_inputs) { return nir_shader_intrinsics_pass(shader, elk_nir_zero_inputs_instr, - nir_metadata_block_index | nir_metadata_dominance, + nir_metadata_control_flow, zero_inputs); } diff --git a/src/intel/compiler/elk/elk_nir_attribute_workarounds.c b/src/intel/compiler/elk/elk_nir_attribute_workarounds.c index a817a005f3c..13a0a91052e 100644 --- a/src/intel/compiler/elk/elk_nir_attribute_workarounds.c +++ b/src/intel/compiler/elk/elk_nir_attribute_workarounds.c @@ -126,7 +126,6 @@ elk_nir_apply_attribute_workarounds(nir_shader *shader, const uint8_t *attrib_wa_flags) { return nir_shader_instructions_pass(shader, apply_attr_wa_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, (void *)attrib_wa_flags); } diff --git a/src/intel/compiler/elk/elk_nir_lower_alpha_to_coverage.c b/src/intel/compiler/elk/elk_nir_lower_alpha_to_coverage.c index 0900d4d435a..59edd9f7481 100644 --- a/src/intel/compiler/elk/elk_nir_lower_alpha_to_coverage.c +++ b/src/intel/compiler/elk/elk_nir_lower_alpha_to_coverage.c @@ -183,8 +183,7 @@ elk_nir_lower_alpha_to_coverage(nir_shader *shader, nir_src_rewrite(&sample_mask_write->src[0], dither_mask); - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); return true; skip: diff --git a/src/intel/compiler/elk/elk_nir_lower_cs_intrinsics.c b/src/intel/compiler/elk/elk_nir_lower_cs_intrinsics.c index e57198ddbf6..7db29a98932 100644 --- a/src/intel/compiler/elk/elk_nir_lower_cs_intrinsics.c +++ b/src/intel/compiler/elk/elk_nir_lower_cs_intrinsics.c @@ -291,7 +291,7 @@ lower_cs_intrinsics_convert_impl(struct lower_intrinsics_state *state) } nir_metadata_preserve(state->impl, - nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_control_flow); } bool diff --git a/src/intel/compiler/intel_nir_blockify_uniform_loads.c b/src/intel/compiler/intel_nir_blockify_uniform_loads.c index 40dd87ebec6..75f1a7a921b 100644 --- a/src/intel/compiler/intel_nir_blockify_uniform_loads.c +++ b/src/intel/compiler/intel_nir_blockify_uniform_loads.c @@ -117,8 +117,7 @@ intel_nir_blockify_uniform_loads(nir_shader *shader, { return nir_shader_instructions_pass(shader, intel_nir_blockify_uniform_loads_instr, - nir_metadata_block_index | - nir_metadata_dominance | + nir_metadata_control_flow | nir_metadata_live_defs, (void *) devinfo); } diff --git a/src/intel/compiler/intel_nir_clamp_image_1d_2d_array_sizes.c b/src/intel/compiler/intel_nir_clamp_image_1d_2d_array_sizes.c index 2f2f907c5d1..4e126bbb616 100644 --- a/src/intel/compiler/intel_nir_clamp_image_1d_2d_array_sizes.c +++ b/src/intel/compiler/intel_nir_clamp_image_1d_2d_array_sizes.c @@ -138,7 +138,6 @@ intel_nir_clamp_image_1d_2d_array_sizes(nir_shader *shader) { return nir_shader_instructions_pass(shader, intel_nir_clamp_image_1d_2d_array_sizes_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/intel/compiler/intel_nir_clamp_per_vertex_loads.c b/src/intel/compiler/intel_nir_clamp_per_vertex_loads.c index b9fafa82f56..cd6c572377c 100644 --- a/src/intel/compiler/intel_nir_clamp_per_vertex_loads.c +++ b/src/intel/compiler/intel_nir_clamp_per_vertex_loads.c @@ -73,8 +73,7 @@ intel_nir_clamp_per_vertex_loads(nir_shader *shader) void *mem_ctx = ralloc_context(NULL); bool ret = nir_shader_intrinsics_pass(shader, clamp_per_vertex_loads_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, mem_ctx); ralloc_free(mem_ctx); @@ -102,7 +101,6 @@ bool intel_nir_lower_patch_vertices_in(nir_shader *shader, unsigned input_vertices) { return nir_shader_intrinsics_pass(shader, lower_patch_vertices_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &input_vertices); } diff --git a/src/intel/compiler/intel_nir_lower_conversions.c b/src/intel/compiler/intel_nir_lower_conversions.c index e0dde853349..ce8f8fdd79a 100644 --- a/src/intel/compiler/intel_nir_lower_conversions.c +++ b/src/intel/compiler/intel_nir_lower_conversions.c @@ -109,7 +109,6 @@ bool intel_nir_lower_conversions(nir_shader *shader) { return nir_shader_instructions_pass(shader, lower_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/intel/compiler/intel_nir_lower_non_uniform_resource_intel.c b/src/intel/compiler/intel_nir_lower_non_uniform_resource_intel.c index 78314897d82..84413ea3288 100644 --- a/src/intel/compiler/intel_nir_lower_non_uniform_resource_intel.c +++ b/src/intel/compiler/intel_nir_lower_non_uniform_resource_intel.c @@ -225,8 +225,7 @@ intel_nir_lower_non_uniform_resource_intel(nir_shader *shader) bool ret = nir_shader_instructions_pass(shader, intel_nir_lower_non_uniform_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &inst_array); ralloc_free(mem_ctx); @@ -309,8 +308,7 @@ intel_nir_cleanup_resource_intel(nir_shader *shader) bool ret = nir_shader_intrinsics_pass(shader, intel_nir_cleanup_resource_intel_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); ralloc_free(mem_ctx); diff --git a/src/intel/compiler/intel_nir_lower_printf.c b/src/intel/compiler/intel_nir_lower_printf.c index 39f7a52dab8..b3ed90ef8b5 100644 --- a/src/intel/compiler/intel_nir_lower_printf.c +++ b/src/intel/compiler/intel_nir_lower_printf.c @@ -61,7 +61,6 @@ bool intel_nir_lower_printf(nir_shader *nir) { return nir_shader_instructions_pass(nir, lower_printf_intrinsics, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/intel/compiler/intel_nir_lower_shading_rate_output.c b/src/intel/compiler/intel_nir_lower_shading_rate_output.c index 18c89f8bea0..5a72c247e40 100644 --- a/src/intel/compiler/intel_nir_lower_shading_rate_output.c +++ b/src/intel/compiler/intel_nir_lower_shading_rate_output.c @@ -103,6 +103,5 @@ bool intel_nir_lower_shading_rate_output(nir_shader *nir) { return nir_shader_intrinsics_pass(nir, lower_shading_rate_output_instr, - nir_metadata_block_index | - nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } diff --git a/src/intel/compiler/intel_nir_lower_sparse.c b/src/intel/compiler/intel_nir_lower_sparse.c index f7625c2dd0d..65dbc6bd4e6 100644 --- a/src/intel/compiler/intel_nir_lower_sparse.c +++ b/src/intel/compiler/intel_nir_lower_sparse.c @@ -241,7 +241,6 @@ bool intel_nir_lower_sparse_intrinsics(nir_shader *nir) { return nir_shader_instructions_pass(nir, lower_sparse_intrinsics, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/intel/compiler/intel_nir_opt_peephole_ffma.c b/src/intel/compiler/intel_nir_opt_peephole_ffma.c index 6b19f7eb65c..e895b9fc415 100644 --- a/src/intel/compiler/intel_nir_opt_peephole_ffma.c +++ b/src/intel/compiler/intel_nir_opt_peephole_ffma.c @@ -247,7 +247,6 @@ bool intel_nir_opt_peephole_ffma(nir_shader *shader) { return nir_shader_instructions_pass(shader, intel_nir_opt_peephole_ffma_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/intel/compiler/intel_nir_opt_peephole_imul32x16.c b/src/intel/compiler/intel_nir_opt_peephole_imul32x16.c index c42cc5a8b14..4fcda103d04 100644 --- a/src/intel/compiler/intel_nir_opt_peephole_imul32x16.c +++ b/src/intel/compiler/intel_nir_opt_peephole_imul32x16.c @@ -308,8 +308,7 @@ intel_nir_opt_peephole_imul32x16(nir_shader *shader) bool progress = nir_shader_instructions_pass(shader, intel_nir_opt_peephole_imul32x16_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &cb_data); _mesa_hash_table_destroy(cb_data.range_ht, NULL); diff --git a/src/intel/vulkan/anv_internal_kernels.c b/src/intel/vulkan/anv_internal_kernels.c index b4496cb51bb..4dced30d968 100644 --- a/src/intel/vulkan/anv_internal_kernels.c +++ b/src/intel/vulkan/anv_internal_kernels.c @@ -123,7 +123,7 @@ compile_shader(struct anv_device *device, }; NIR_PASS_V(nir, nir_lower_compute_system_values, &options); NIR_PASS_V(nir, nir_shader_intrinsics_pass, lower_base_workgroup_id, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } /* Reset sizes before gathering information */ diff --git a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c index 0658ce7c81a..c9e6e577edf 100644 --- a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c +++ b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c @@ -2384,8 +2384,7 @@ anv_nir_apply_pipeline_layout(nir_shader *shader, * intrinsics in that pass. */ nir_shader_instructions_pass(shader, lower_direct_buffer_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &state); /* We just got rid of all the direct access. Delete it so it's not in the @@ -2394,8 +2393,7 @@ anv_nir_apply_pipeline_layout(nir_shader *shader, nir_opt_dce(shader); nir_shader_instructions_pass(shader, apply_pipeline_layout, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &state); ralloc_free(mem_ctx); diff --git a/src/intel/vulkan/anv_nir_lower_load_patch_vertices_in.c b/src/intel/vulkan/anv_nir_lower_load_patch_vertices_in.c index a9e0fde6f2e..f66dc1bac36 100644 --- a/src/intel/vulkan/anv_nir_lower_load_patch_vertices_in.c +++ b/src/intel/vulkan/anv_nir_lower_load_patch_vertices_in.c @@ -60,7 +60,6 @@ bool anv_nir_lower_load_patch_vertices_in(nir_shader *shader) { return nir_shader_intrinsics_pass(shader, lower_patch_vertices_in_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/intel/vulkan/anv_nir_lower_multiview.c b/src/intel/vulkan/anv_nir_lower_multiview.c index b26dd6970db..98b3cdb72c2 100644 --- a/src/intel/vulkan/anv_nir_lower_multiview.c +++ b/src/intel/vulkan/anv_nir_lower_multiview.c @@ -299,8 +299,7 @@ anv_nir_lower_multiview(nir_shader *shader, uint32_t view_mask, } } - nir_metadata_preserve(entrypoint, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(entrypoint, nir_metadata_control_flow); return true; } diff --git a/src/intel/vulkan/anv_nir_lower_resource_intel.c b/src/intel/vulkan/anv_nir_lower_resource_intel.c index 92b18bf51b9..2f9690c230e 100644 --- a/src/intel/vulkan/anv_nir_lower_resource_intel.c +++ b/src/intel/vulkan/anv_nir_lower_resource_intel.c @@ -164,7 +164,6 @@ anv_nir_lower_resource_intel(nir_shader *shader, .device = device, }; return nir_shader_intrinsics_pass(shader, lower_resource_intel, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &state); } diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c index de9507bd508..ed5a7e6ccaf 100644 --- a/src/intel/vulkan/anv_pipeline.c +++ b/src/intel/vulkan/anv_pipeline.c @@ -1184,8 +1184,7 @@ anv_pipeline_lower_nir(struct anv_pipeline *pipeline, #if DEBUG_PRINTF_EXAMPLE if (stage->stage == MESA_SHADER_FRAGMENT) { nir_shader_intrinsics_pass(nir, print_ubo_load, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } #endif diff --git a/src/intel/vulkan_hasvk/anv_nir_apply_pipeline_layout.c b/src/intel/vulkan_hasvk/anv_nir_apply_pipeline_layout.c index 216696514fe..09aa51d372d 100644 --- a/src/intel/vulkan_hasvk/anv_nir_apply_pipeline_layout.c +++ b/src/intel/vulkan_hasvk/anv_nir_apply_pipeline_layout.c @@ -1455,8 +1455,7 @@ anv_nir_apply_pipeline_layout(nir_shader *shader, * intrinsics in that pass. */ nir_shader_instructions_pass(shader, lower_direct_buffer_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &state); /* We just got rid of all the direct access. Delete it so it's not in the @@ -1465,8 +1464,7 @@ anv_nir_apply_pipeline_layout(nir_shader *shader, nir_opt_dce(shader); nir_shader_instructions_pass(shader, apply_pipeline_layout, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &state); ralloc_free(mem_ctx); diff --git a/src/intel/vulkan_hasvk/anv_nir_lower_multiview.c b/src/intel/vulkan_hasvk/anv_nir_lower_multiview.c index 10ba8727835..ab31493863c 100644 --- a/src/intel/vulkan_hasvk/anv_nir_lower_multiview.c +++ b/src/intel/vulkan_hasvk/anv_nir_lower_multiview.c @@ -274,8 +274,7 @@ anv_nir_lower_multiview(nir_shader *shader, uint32_t view_mask) } } - nir_metadata_preserve(entrypoint, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(entrypoint, nir_metadata_control_flow); return true; } diff --git a/src/intel/vulkan_hasvk/anv_nir_lower_ycbcr_textures.c b/src/intel/vulkan_hasvk/anv_nir_lower_ycbcr_textures.c index 6120b013c53..36caf44ab7a 100644 --- a/src/intel/vulkan_hasvk/anv_nir_lower_ycbcr_textures.c +++ b/src/intel/vulkan_hasvk/anv_nir_lower_ycbcr_textures.c @@ -339,7 +339,6 @@ anv_nir_lower_ycbcr_textures(nir_shader *shader, { return nir_shader_instructions_pass(shader, anv_nir_lower_ycbcr_textures_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, (void *)layout); } diff --git a/src/mesa/state_tracker/st_atifs_to_nir.c b/src/mesa/state_tracker/st_atifs_to_nir.c index 8a1ebbdde97..7fd2a1402b3 100644 --- a/src/mesa/state_tracker/st_atifs_to_nir.c +++ b/src/mesa/state_tracker/st_atifs_to_nir.c @@ -542,6 +542,6 @@ st_nir_lower_atifs_samplers(struct nir_shader *s, const uint8_t *texture_index) } return nir_shader_instructions_pass(s, st_nir_lower_atifs_samplers_instr,\ - nir_metadata_block_index | - nir_metadata_dominance, (void *)texture_index); + nir_metadata_control_flow, + (void *)texture_index); } diff --git a/src/mesa/state_tracker/st_nir_lower_builtin.c b/src/mesa/state_tracker/st_nir_lower_builtin.c index 3d2f9c6c6dd..9bbc4f2b577 100644 --- a/src/mesa/state_tracker/st_nir_lower_builtin.c +++ b/src/mesa/state_tracker/st_nir_lower_builtin.c @@ -244,8 +244,7 @@ st_nir_lower_builtin(nir_shader *shader) progress |= nir_lower_indirect_var_derefs(shader, vars); if (nir_shader_intrinsics_pass(shader, lower_builtin_instr, - nir_metadata_block_index | - nir_metadata_dominance, NULL)) { + nir_metadata_control_flow, NULL)) { nir_remove_dead_derefs(shader); progress = true; } diff --git a/src/mesa/state_tracker/st_nir_lower_fog.c b/src/mesa/state_tracker/st_nir_lower_fog.c index 816f36ca9f0..3aa4ca578fa 100644 --- a/src/mesa/state_tracker/st_nir_lower_fog.c +++ b/src/mesa/state_tracker/st_nir_lower_fog.c @@ -117,8 +117,7 @@ st_nir_lower_fog(nir_shader *s, enum gl_fog_mode fog_mode, struct gl_program_par .paramList = paramList, }; nir_shader_instructions_pass(s, st_nir_lower_fog_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &state); } else { nir_variable *color_var = nir_find_variable_with_location(s, nir_var_shader_out, FRAG_RESULT_COLOR); @@ -142,8 +141,7 @@ st_nir_lower_fog(nir_shader *s, enum gl_fog_mode fog_mode, struct gl_program_par color = fog_result(&b, color, fog_mode, paramList); nir_store_var(&b, color_var, color, 0x7); - nir_metadata_preserve(b.impl, nir_metadata_block_index | - nir_metadata_dominance); } + nir_metadata_preserve(b.impl, nir_metadata_control_flow); } return true; } diff --git a/src/mesa/state_tracker/st_nir_lower_position_invariant.c b/src/mesa/state_tracker/st_nir_lower_position_invariant.c index 61ff161612c..0904e3838f1 100644 --- a/src/mesa/state_tracker/st_nir_lower_position_invariant.c +++ b/src/mesa/state_tracker/st_nir_lower_position_invariant.c @@ -50,8 +50,7 @@ st_nir_lower_position_invariant(struct nir_shader *s, bool aos, VARYING_SLOT_POS, glsl_vec4_type()), result, 0xf); s->info.outputs_written |= VARYING_BIT_POS; - nir_metadata_preserve(b.impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(b.impl, nir_metadata_control_flow); return true; } diff --git a/src/mesa/state_tracker/st_nir_lower_tex_src_plane.c b/src/mesa/state_tracker/st_nir_lower_tex_src_plane.c index feeacdc9826..a3408f8e9ed 100644 --- a/src/mesa/state_tracker/st_nir_lower_tex_src_plane.c +++ b/src/mesa/state_tracker/st_nir_lower_tex_src_plane.c @@ -173,6 +173,5 @@ st_nir_lower_tex_src_plane(struct nir_shader *shader, unsigned free_slots, assign_extra_samplers(&state, free_slots); return nir_shader_instructions_pass(shader, lower_tex_src_plane, - nir_metadata_block_index | - nir_metadata_dominance, &state); + nir_metadata_control_flow, &state); } diff --git a/src/microsoft/clc/clc_nir.c b/src/microsoft/clc/clc_nir.c index 76818573bfa..552214e7d26 100644 --- a/src/microsoft/clc/clc_nir.c +++ b/src/microsoft/clc/clc_nir.c @@ -338,7 +338,6 @@ bool clc_nir_lower_global_pointers_to_constants(nir_shader *nir) { return nir_shader_intrinsics_pass(nir, lower_deref_base_to_constant, - nir_metadata_block_index | - nir_metadata_dominance | + nir_metadata_control_flow | nir_metadata_loop_analysis, NULL); } diff --git a/src/microsoft/compiler/dxil_nir.c b/src/microsoft/compiler/dxil_nir.c index fdbc445df45..3f69c7d2807 100644 --- a/src/microsoft/compiler/dxil_nir.c +++ b/src/microsoft/compiler/dxil_nir.c @@ -417,9 +417,8 @@ dxil_nir_flatten_var_arrays(nir_shader *shader, nir_variable_mode modes) return false; nir_shader_intrinsics_pass(shader, flatten_var_arrays, - nir_metadata_block_index | - nir_metadata_dominance | - nir_metadata_loop_analysis, + nir_metadata_control_flow | + nir_metadata_loop_analysis, NULL); nir_remove_dead_derefs(shader); return true; @@ -600,9 +599,8 @@ dxil_nir_lower_var_bit_size(nir_shader *shader, nir_variable_mode modes, return false; nir_shader_intrinsics_pass(shader, lower_deref_bit_size, - nir_metadata_block_index | - nir_metadata_dominance | - nir_metadata_loop_analysis, + nir_metadata_control_flow | + nir_metadata_loop_analysis, NULL); nir_remove_dead_derefs(shader); return true; @@ -651,9 +649,8 @@ bool dxil_nir_remove_oob_array_accesses(nir_shader *shader) { return nir_shader_intrinsics_pass(shader, remove_oob_array_access, - nir_metadata_block_index | - nir_metadata_dominance | - nir_metadata_loop_analysis, + nir_metadata_control_flow | + nir_metadata_loop_analysis, NULL); } @@ -909,8 +906,7 @@ upcast_phi_impl(nir_function_impl *impl, unsigned min_bit_size) } if (progress) { - nir_metadata_preserve(impl, nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } else { nir_metadata_preserve(impl, nir_metadata_all); } @@ -1058,8 +1054,7 @@ dxil_nir_split_clip_cull_distance(nir_shader *shader) }; nir_shader_instructions_pass(shader, dxil_nir_split_clip_cull_distance_instr, - nir_metadata_block_index | - nir_metadata_dominance | + nir_metadata_control_flow | nir_metadata_loop_analysis, ¶ms); return params.new_var[0] != NULL || params.new_var[1] != NULL; @@ -1156,8 +1151,7 @@ dxil_nir_lower_double_math(nir_shader *shader) { return nir_shader_instructions_pass(shader, dxil_nir_lower_double_math_instr, - nir_metadata_block_index | - nir_metadata_dominance | + nir_metadata_control_flow | nir_metadata_loop_analysis, NULL); } @@ -1252,7 +1246,7 @@ bool dxil_nir_lower_system_values(nir_shader *shader) { return nir_shader_intrinsics_pass(shader, lower_system_values_impl, - nir_metadata_block_index | nir_metadata_dominance | nir_metadata_loop_analysis, + nir_metadata_control_flow | nir_metadata_loop_analysis, NULL); } @@ -1452,12 +1446,12 @@ dxil_nir_split_typed_samplers(nir_shader *nir) struct hash_table_u64 *hash_table = _mesa_hash_table_u64_create(NULL); bool progress = nir_shader_instructions_pass(nir, redirect_sampler_derefs, - nir_metadata_block_index | nir_metadata_dominance | nir_metadata_loop_analysis, hash_table); + nir_metadata_control_flow | nir_metadata_loop_analysis, hash_table); _mesa_hash_table_u64_clear(hash_table); progress |= nir_shader_instructions_pass(nir, redirect_texture_derefs, - nir_metadata_block_index | nir_metadata_dominance | nir_metadata_loop_analysis, hash_table); + nir_metadata_control_flow | nir_metadata_loop_analysis, hash_table); _mesa_hash_table_u64_destroy(hash_table); return progress; @@ -1499,7 +1493,7 @@ bool dxil_nir_lower_sysval_to_load_input(nir_shader *s, nir_variable **sysval_vars) { return nir_shader_intrinsics_pass(s, lower_sysval_to_load_input_impl, - nir_metadata_block_index | nir_metadata_dominance, + nir_metadata_control_flow, sysval_vars); } @@ -1905,7 +1899,7 @@ dxil_nir_ensure_position_writes(nir_shader *s) return false; return nir_shader_intrinsics_pass(s, update_writes, - nir_metadata_block_index | nir_metadata_dominance, + nir_metadata_control_flow, NULL); } @@ -2008,8 +2002,7 @@ bool dxil_nir_lower_num_subgroups(nir_shader *s) { return nir_shader_intrinsics_pass(s, lower_num_subgroups, - nir_metadata_block_index | - nir_metadata_dominance | + nir_metadata_control_flow | nir_metadata_loop_analysis, NULL); } @@ -2296,7 +2289,7 @@ bool dxil_nir_move_consts(nir_shader *s) { return nir_shader_instructions_pass(s, move_consts, - nir_metadata_block_index | nir_metadata_dominance, + nir_metadata_control_flow, NULL); } @@ -2800,7 +2793,7 @@ bool dxil_nir_lower_coherent_loads_and_stores(nir_shader *s) { return nir_shader_intrinsics_pass(s, lower_coherent_load_store, - nir_metadata_block_index | nir_metadata_dominance | nir_metadata_loop_analysis, + nir_metadata_control_flow | nir_metadata_loop_analysis, NULL); } @@ -2888,8 +2881,7 @@ dxil_nir_kill_undefined_varyings(nir_shader *shader, uint64_t prev_stage_written }; bool progress = nir_shader_instructions_pass(shader, kill_undefined_varyings, - nir_metadata_dominance | - nir_metadata_block_index | + nir_metadata_control_flow | nir_metadata_loop_analysis, (void *)&masks); if (progress) { @@ -2972,8 +2964,7 @@ dxil_nir_kill_unused_outputs(nir_shader *shader, uint64_t next_stage_read_mask, bool progress = nir_shader_instructions_pass(shader, kill_unused_outputs, - nir_metadata_dominance | - nir_metadata_block_index | + nir_metadata_control_flow | nir_metadata_loop_analysis, (void *)&masks); diff --git a/src/microsoft/compiler/dxil_nir_tess.c b/src/microsoft/compiler/dxil_nir_tess.c index 19e488eda92..af52517192f 100644 --- a/src/microsoft/compiler/dxil_nir_tess.c +++ b/src/microsoft/compiler/dxil_nir_tess.c @@ -54,7 +54,7 @@ remove_hs_intrinsics(nir_function_impl *impl) nir_instr_remove(instr); } } - nir_metadata_preserve(impl, nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_preserve(impl, nir_metadata_control_flow); } static void @@ -357,7 +357,7 @@ dxil_nir_fixup_tess_level_for_domain(nir_shader *nir) }; nir_shader_instructions_pass(nir, remove_tess_level_accesses, - nir_metadata_block_index | nir_metadata_dominance, &pass_data); + nir_metadata_control_flow, &pass_data); } } return progress; diff --git a/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c b/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c index 26e26ff8019..373aa3ab22b 100644 --- a/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c +++ b/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c @@ -296,9 +296,8 @@ dxil_spirv_nir_lower_shader_system_values(nir_shader *shader, const struct dxil_spirv_runtime_conf *conf) { return nir_shader_instructions_pass(shader, lower_shader_system_values, - nir_metadata_block_index | - nir_metadata_dominance | - nir_metadata_loop_analysis, + nir_metadata_control_flow | + nir_metadata_loop_analysis, (void *)conf); } @@ -393,9 +392,8 @@ dxil_spirv_nir_lower_load_push_constant(nir_shader *shader, .binding = binding, }; ret = nir_shader_instructions_pass(shader, lower_load_push_constant, - nir_metadata_block_index | - nir_metadata_dominance | - nir_metadata_loop_analysis, + nir_metadata_control_flow | + nir_metadata_loop_analysis, &data); *size = data.size; @@ -518,8 +516,7 @@ dxil_spirv_nir_lower_yz_flip(nir_shader *shader, }; return nir_shader_instructions_pass(shader, lower_yz_flip, - nir_metadata_block_index | - nir_metadata_dominance | + nir_metadata_control_flow | nir_metadata_loop_analysis, &data); } @@ -566,8 +563,7 @@ dxil_spirv_nir_discard_point_size_var(nir_shader *shader) return false; if (!nir_shader_intrinsics_pass(shader, discard_psiz_access, - nir_metadata_block_index | - nir_metadata_dominance | + nir_metadata_control_flow | nir_metadata_loop_analysis, NULL)) return false; @@ -642,8 +638,7 @@ dxil_spirv_write_pntc(nir_shader *nir, const struct dxil_spirv_runtime_conf *con data.pntc = nir_variable_create(nir, nir_var_shader_out, glsl_vec4_type(), "gl_PointCoord"); data.pntc->data.location = VARYING_SLOT_PNTC; nir_shader_instructions_pass(nir, write_pntc_with_pos, - nir_metadata_block_index | - nir_metadata_dominance | + nir_metadata_control_flow | nir_metadata_loop_analysis, &data); nir->info.outputs_written |= VARYING_BIT_PNTC; @@ -702,8 +697,7 @@ dxil_spirv_compute_pntc(nir_shader *nir) pos->data.sample = nir_find_variable_with_location(nir, nir_var_shader_in, VARYING_SLOT_PNTC)->data.sample; } nir_shader_intrinsics_pass(nir, lower_pntc_read, - nir_metadata_block_index | - nir_metadata_dominance | + nir_metadata_control_flow | nir_metadata_loop_analysis, pos); } @@ -751,8 +745,7 @@ lower_view_index_to_rt_layer(nir_shader *nir) { bool existing_write = nir_shader_intrinsics_pass(nir, lower_view_index_to_rt_layer_instr, - nir_metadata_block_index | - nir_metadata_dominance | + nir_metadata_control_flow | nir_metadata_loop_analysis, NULL); if (existing_write) @@ -765,8 +758,7 @@ lower_view_index_to_rt_layer(nir_shader *nir) if (nir->info.stage == MESA_SHADER_GEOMETRY) { nir_shader_instructions_pass(nir, add_layer_write, - nir_metadata_block_index | - nir_metadata_dominance | + nir_metadata_control_flow | nir_metadata_loop_analysis, var); } else { nir_function_impl *func = nir_shader_get_entrypoint(nir); diff --git a/src/microsoft/spirv_to_dxil/dxil_spirv_nir_lower_bindless.c b/src/microsoft/spirv_to_dxil/dxil_spirv_nir_lower_bindless.c index ad5232a6aee..e6716a2631d 100644 --- a/src/microsoft/spirv_to_dxil/dxil_spirv_nir_lower_bindless.c +++ b/src/microsoft/spirv_to_dxil/dxil_spirv_nir_lower_bindless.c @@ -223,9 +223,8 @@ dxil_spirv_nir_lower_bindless(nir_shader *nir, struct dxil_spirv_nir_lower_bindl bool ret = dxil_nir_guess_image_formats(nir); ret |= nir_shader_instructions_pass(nir, lower_bindless_instr, - nir_metadata_dominance | - nir_metadata_block_index | - nir_metadata_loop_analysis, + nir_metadata_control_flow | + nir_metadata_loop_analysis, options); ret |= nir_remove_dead_derefs(nir); @@ -310,8 +309,7 @@ bool dxil_spirv_nir_lower_buffer_device_address(nir_shader *nir) { return nir_shader_intrinsics_pass(nir, lower_buffer_device_address, - nir_metadata_block_index | - nir_metadata_dominance | + nir_metadata_control_flow | nir_metadata_loop_analysis, NULL); } diff --git a/src/nouveau/codegen/nv50_ir_from_nir.cpp b/src/nouveau/codegen/nv50_ir_from_nir.cpp index dd028311258..e10649869fb 100644 --- a/src/nouveau/codegen/nv50_ir_from_nir.cpp +++ b/src/nouveau/codegen/nv50_ir_from_nir.cpp @@ -89,7 +89,7 @@ nv50_nir_lower_load_user_clip_plane_cb(nir_builder *b, nir_intrinsic_instr *intr bool nv50_nir_lower_load_user_clip_plane(nir_shader *nir, struct nv50_ir_prog_info *info) { return nir_shader_intrinsics_pass(nir, nv50_nir_lower_load_user_clip_plane_cb, - nir_metadata_block_index | nir_metadata_dominance, + nir_metadata_control_flow, info); } @@ -3157,8 +3157,7 @@ nv_nir_move_stores_to_end(nir_shader *s) } } nir_metadata_preserve(impl, - nir_metadata_block_index | - nir_metadata_dominance); + nir_metadata_control_flow); } unsigned diff --git a/src/nouveau/compiler/nak_nir.c b/src/nouveau/compiler/nak_nir.c index ac5eb4d47e4..278cbbae6ed 100644 --- a/src/nouveau/compiler/nak_nir.c +++ b/src/nouveau/compiler/nak_nir.c @@ -346,8 +346,7 @@ static bool nak_nir_lower_subgroup_id(nir_shader *nir) { return nir_shader_intrinsics_pass(nir, nak_nir_lower_subgroup_id_intrin, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } @@ -722,8 +721,7 @@ nak_nir_lower_fs_outputs(nir_shader *nir) return false; bool progress = nir_shader_intrinsics_pass(nir, lower_fs_output_intrin, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); if (progress) { @@ -785,8 +783,7 @@ nak_nir_remove_barriers(nir_shader *nir) nir->info.uses_control_barrier = false; return nir_shader_intrinsics_pass(nir, nak_nir_remove_barrier_intrin, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/nouveau/compiler/nak_nir_lower_fs_inputs.c b/src/nouveau/compiler/nak_nir_lower_fs_inputs.c index 05032fddd6a..ff7d8594698 100644 --- a/src/nouveau/compiler/nak_nir_lower_fs_inputs.c +++ b/src/nouveau/compiler/nak_nir_lower_fs_inputs.c @@ -358,7 +358,7 @@ nak_nir_lower_fs_inputs(nir_shader *nir, .fs_key = fs_key, }; NIR_PASS_V(nir, nir_shader_intrinsics_pass, lower_fs_input_intrin, - nir_metadata_block_index | nir_metadata_dominance, + nir_metadata_control_flow, (void *)&fs_in_ctx); return true; diff --git a/src/nouveau/compiler/nak_nir_lower_tex.c b/src/nouveau/compiler/nak_nir_lower_tex.c index 8c5aeabf358..9bb4d64bfde 100644 --- a/src/nouveau/compiler/nak_nir_lower_tex.c +++ b/src/nouveau/compiler/nak_nir_lower_tex.c @@ -583,7 +583,6 @@ bool nak_nir_lower_tex(nir_shader *nir, const struct nak_compiler *nak) { return nir_shader_instructions_pass(nir, lower_tex_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, (void *)nak); } diff --git a/src/nouveau/compiler/nak_nir_lower_vtg_io.c b/src/nouveau/compiler/nak_nir_lower_vtg_io.c index b8657c53b92..02fc347ef26 100644 --- a/src/nouveau/compiler/nak_nir_lower_vtg_io.c +++ b/src/nouveau/compiler/nak_nir_lower_vtg_io.c @@ -252,7 +252,6 @@ bool nak_nir_lower_vtg_io(nir_shader *nir, const struct nak_compiler *nak) { return nir_shader_intrinsics_pass(nir, lower_vtg_io_intrin, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, NULL); } diff --git a/src/nouveau/vulkan/nvk_codegen.c b/src/nouveau/vulkan/nvk_codegen.c index 45e9818250a..a69103af024 100644 --- a/src/nouveau/vulkan/nvk_codegen.c +++ b/src/nouveau/vulkan/nvk_codegen.c @@ -117,7 +117,7 @@ nvk_cg_preprocess_nir(nir_shader *nir) if (nir->info.stage == MESA_SHADER_FRAGMENT) { NIR_PASS(_, nir, nir_shader_instructions_pass, lower_fragcoord_instr, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } nvk_cg_optimize_nir(nir); @@ -258,7 +258,7 @@ static void nak_cg_postprocess_nir(nir_shader *nir) { NIR_PASS(_, nir, nir_shader_intrinsics_pass, lower_image_size_to_txs, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); uint32_t indirect_mask = nir_var_function_temp; diff --git a/src/nouveau/vulkan/nvk_nir_lower_descriptors.c b/src/nouveau/vulkan/nvk_nir_lower_descriptors.c index 74a05e29f27..b83d3f1df9b 100644 --- a/src/nouveau/vulkan/nvk_nir_lower_descriptors.c +++ b/src/nouveau/vulkan/nvk_nir_lower_descriptors.c @@ -1356,20 +1356,17 @@ nvk_nir_lower_descriptors(nir_shader *nir, pass_lower_ubo = nir_shader_intrinsics_pass(nir, lower_load_ubo_intrin, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, (void *)&ctx); } bool pass_lower_descriptors = nir_shader_instructions_pass(nir, try_lower_descriptors_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, (void *)&ctx); bool pass_lower_ssbo = nir_shader_instructions_pass(nir, lower_ssbo_descriptor_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, (void *)&ctx); return pass_lower_ubo || pass_lower_descriptors || pass_lower_ssbo; } diff --git a/src/panfrost/compiler/bifrost_compile.c b/src/panfrost/compiler/bifrost_compile.c index 4778b028e15..10b3b2169a7 100644 --- a/src/panfrost/compiler/bifrost_compile.c +++ b/src/panfrost/compiler/bifrost_compile.c @@ -4571,7 +4571,7 @@ bi_optimize_nir(nir_shader *nir, unsigned gpu_id, bool is_blend) if (nir->info.stage == MESA_SHADER_FRAGMENT) { NIR_PASS_V(nir, nir_shader_intrinsics_pass, bifrost_nir_lower_blend_components, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } /* Backend scheduler is purely local, so do some global optimizations @@ -4790,7 +4790,7 @@ bifrost_nir_lower_load_output(nir_shader *nir) return nir_shader_intrinsics_pass( nir, bi_lower_load_output, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } static bool @@ -4930,7 +4930,7 @@ bifrost_preprocess_nir(nir_shader *nir, unsigned gpu_id) ~bi_fp32_varying_mask(nir), false); NIR_PASS_V(nir, nir_shader_intrinsics_pass, bi_lower_sample_mask_writes, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); NIR_PASS_V(nir, bifrost_nir_lower_load_output); } else if (nir->info.stage == MESA_SHADER_VERTEX) { @@ -4953,7 +4953,7 @@ bifrost_preprocess_nir(nir_shader *nir, unsigned gpu_id) NIR_PASS_V(nir, nir_shader_intrinsics_pass, bi_lower_load_push_const_with_dyn_offset, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); NIR_PASS_V(nir, nir_lower_ssbo); NIR_PASS_V(nir, pan_lower_sample_pos); @@ -5015,7 +5015,7 @@ bi_compile_variant_nir(nir_shader *nir, ctx->nir = nir = nir_shader_clone(ctx, nir); NIR_PASS_V(nir, nir_shader_instructions_pass, bifrost_nir_specialize_idvs, - nir_metadata_block_index | nir_metadata_dominance, &idvs); + nir_metadata_control_flow, &idvs); /* After specializing, clean up the mess */ bool progress = true; diff --git a/src/panfrost/lib/pan_blend.c b/src/panfrost/lib/pan_blend.c index 5d9d705290b..00ac86bbaae 100644 --- a/src/panfrost/lib/pan_blend.c +++ b/src/panfrost/lib/pan_blend.c @@ -788,9 +788,8 @@ inline_rt_conversion(nir_builder *b, nir_intrinsic_instr *intr, void *data) bool GENX(pan_inline_rt_conversion)(nir_shader *s, enum pipe_format *formats) { - return nir_shader_intrinsics_pass( - s, inline_rt_conversion, - nir_metadata_block_index | nir_metadata_dominance, formats); + return nir_shader_intrinsics_pass(s, inline_rt_conversion, + nir_metadata_control_flow, formats); } #endif @@ -857,7 +856,7 @@ GENX(pan_blend_get_shader_locked)(struct pan_blend_shader_cache *cache, GENX(pan_blend_create_shader)(state, src0_type, src1_type, rt); nir_shader_intrinsics_pass(nir, pan_inline_blend_constants, - nir_metadata_block_index | nir_metadata_dominance, + nir_metadata_control_flow, (void *)state->constants); /* Compile the NIR shader */ diff --git a/src/panfrost/lib/pan_blitter.c b/src/panfrost/lib/pan_blitter.c index 78d9920548c..cff61197ac4 100644 --- a/src/panfrost/lib/pan_blitter.c +++ b/src/panfrost/lib/pan_blitter.c @@ -661,7 +661,7 @@ pan_blitter_get_blit_shader(struct pan_blitter_cache *cache, if (PAN_ARCH == 4) { NIR_PASS_V(b.shader, nir_shader_intrinsics_pass, lower_sampler_parameters, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } GENX(pan_shader_compile)(b.shader, &inputs, &binary, &shader->info); diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c index 5d7d3cb5e29..e1c2b6157fc 100644 --- a/src/panfrost/midgard/midgard_compile.c +++ b/src/panfrost/midgard/midgard_compile.c @@ -271,7 +271,7 @@ midgard_nir_lower_global_load(nir_shader *shader) { return nir_shader_intrinsics_pass( shader, midgard_nir_lower_global_load_instr, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } static bool diff --git a/src/panfrost/midgard/midgard_errata_lod.c b/src/panfrost/midgard/midgard_errata_lod.c index bd9b370a966..f6f6d75f4eb 100644 --- a/src/panfrost/midgard/midgard_errata_lod.c +++ b/src/panfrost/midgard/midgard_errata_lod.c @@ -77,5 +77,5 @@ midgard_nir_lod_errata(nir_shader *shader) { return nir_shader_instructions_pass( shader, nir_lod_errata_instr, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } diff --git a/src/panfrost/midgard/midgard_nir_lower_image_bitsize.c b/src/panfrost/midgard/midgard_nir_lower_image_bitsize.c index 1a902a09e08..24acc9901ec 100644 --- a/src/panfrost/midgard/midgard_nir_lower_image_bitsize.c +++ b/src/panfrost/midgard/midgard_nir_lower_image_bitsize.c @@ -60,5 +60,5 @@ midgard_nir_lower_image_bitsize(nir_shader *shader) { return nir_shader_intrinsics_pass( shader, nir_lower_image_bitsize, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } diff --git a/src/panfrost/midgard/midgard_nir_type_csel.c b/src/panfrost/midgard/midgard_nir_type_csel.c index dbf94261c46..ebc699c2f46 100644 --- a/src/panfrost/midgard/midgard_nir_type_csel.c +++ b/src/panfrost/midgard/midgard_nir_type_csel.c @@ -38,7 +38,7 @@ midgard_nir_type_csel(nir_shader *shader) nir_gather_types(impl, float_types, NULL); nir_shader_instructions_pass( - shader, pass, nir_metadata_block_index | nir_metadata_dominance, + shader, pass, nir_metadata_control_flow, float_types); free(float_types); diff --git a/src/panfrost/midgard/nir_fuse_io_16.c b/src/panfrost/midgard/nir_fuse_io_16.c index a2928f8d8e9..18fd962e195 100644 --- a/src/panfrost/midgard/nir_fuse_io_16.c +++ b/src/panfrost/midgard/nir_fuse_io_16.c @@ -89,7 +89,7 @@ nir_fuse_io_16(nir_shader *shader) } nir_metadata_preserve(impl, - nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_control_flow); } return progress; diff --git a/src/panfrost/util/pan_lower_framebuffer.c b/src/panfrost/util/pan_lower_framebuffer.c index 96e24683b25..d8e335f3fbb 100644 --- a/src/panfrost/util/pan_lower_framebuffer.c +++ b/src/panfrost/util/pan_lower_framebuffer.c @@ -625,7 +625,7 @@ pan_lower_framebuffer(nir_shader *shader, const enum pipe_format *rt_fmts, assert(shader->info.stage == MESA_SHADER_FRAGMENT); return nir_shader_instructions_pass( - shader, lower, nir_metadata_block_index | nir_metadata_dominance, + shader, lower, nir_metadata_control_flow, &(struct inputs){ .rt_fmts = rt_fmts, .raw_fmt_mask = raw_fmt_mask, diff --git a/src/panfrost/util/pan_lower_helper_invocation.c b/src/panfrost/util/pan_lower_helper_invocation.c index d4d1614f0f4..d9f47ecab8e 100644 --- a/src/panfrost/util/pan_lower_helper_invocation.c +++ b/src/panfrost/util/pan_lower_helper_invocation.c @@ -50,5 +50,5 @@ pan_lower_helper_invocation(nir_shader *shader) { return nir_shader_intrinsics_pass( shader, pan_lower_helper_invocation_instr, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } diff --git a/src/panfrost/util/pan_lower_image_index.c b/src/panfrost/util/pan_lower_image_index.c index 4f3655af6e4..cb98044e11d 100644 --- a/src/panfrost/util/pan_lower_image_index.c +++ b/src/panfrost/util/pan_lower_image_index.c @@ -51,5 +51,5 @@ pan_lower_image_index(nir_shader *shader, unsigned vs_img_attrib_offset) return nir_shader_intrinsics_pass( shader, lower_image_intr, - nir_metadata_block_index | nir_metadata_dominance, &vs_img_attrib_offset); + nir_metadata_control_flow, &vs_img_attrib_offset); } diff --git a/src/panfrost/util/pan_lower_image_ms.c b/src/panfrost/util/pan_lower_image_ms.c index 0296cf839cd..e1ad3d593cd 100644 --- a/src/panfrost/util/pan_lower_image_ms.c +++ b/src/panfrost/util/pan_lower_image_ms.c @@ -68,5 +68,5 @@ pan_nir_lower_image_ms(nir_shader *shader) { return nir_shader_intrinsics_pass( shader, nir_lower_image_ms, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } diff --git a/src/panfrost/util/pan_lower_sample_position.c b/src/panfrost/util/pan_lower_sample_position.c index e24019cc728..c459f822334 100644 --- a/src/panfrost/util/pan_lower_sample_position.c +++ b/src/panfrost/util/pan_lower_sample_position.c @@ -67,5 +67,5 @@ pan_lower_sample_pos(nir_shader *shader) return nir_shader_intrinsics_pass( shader, pan_lower_sample_pos_impl, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } diff --git a/src/panfrost/util/pan_lower_store_component.c b/src/panfrost/util/pan_lower_store_component.c index d591aa9234d..717250138a3 100644 --- a/src/panfrost/util/pan_lower_store_component.c +++ b/src/panfrost/util/pan_lower_store_component.c @@ -92,7 +92,7 @@ pan_nir_lower_store_component(nir_shader *s) struct hash_table_u64 *stores = _mesa_hash_table_u64_create(NULL); bool progress = nir_shader_intrinsics_pass( s, lower_store_component, - nir_metadata_block_index | nir_metadata_dominance, stores); + nir_metadata_control_flow, stores); _mesa_hash_table_u64_destroy(stores); return progress; } diff --git a/src/panfrost/util/pan_lower_writeout.c b/src/panfrost/util/pan_lower_writeout.c index eb528ce3bf3..60d7e23dc59 100644 --- a/src/panfrost/util/pan_lower_writeout.c +++ b/src/panfrost/util/pan_lower_writeout.c @@ -182,7 +182,7 @@ pan_nir_lower_zs_store(nir_shader *nir) } nir_metadata_preserve(impl, - nir_metadata_block_index | nir_metadata_dominance); + nir_metadata_control_flow); progress = true; } diff --git a/src/panfrost/util/pan_lower_xfb.c b/src/panfrost/util/pan_lower_xfb.c index 3fc96b2e380..545f6751741 100644 --- a/src/panfrost/util/pan_lower_xfb.c +++ b/src/panfrost/util/pan_lower_xfb.c @@ -101,5 +101,5 @@ bool pan_lower_xfb(nir_shader *nir) { return nir_shader_intrinsics_pass( - nir, lower_xfb, nir_metadata_block_index | nir_metadata_dominance, NULL); + nir, lower_xfb, nir_metadata_control_flow, NULL); } diff --git a/src/panfrost/vulkan/bifrost/panvk_vX_nir_lower_descriptors.c b/src/panfrost/vulkan/bifrost/panvk_vX_nir_lower_descriptors.c index f4a5c1c0667..f4e27062afe 100644 --- a/src/panfrost/vulkan/bifrost/panvk_vX_nir_lower_descriptors.c +++ b/src/panfrost/vulkan/bifrost/panvk_vX_nir_lower_descriptors.c @@ -1058,9 +1058,8 @@ panvk_per_arch(nir_lower_descriptors)( create_copy_table(&ctx); upload_shader_desc_info(dev, shader, &ctx.desc_info); - progress = nir_shader_instructions_pass( - nir, lower_descriptors_instr, - nir_metadata_block_index | nir_metadata_dominance, &ctx); + progress = nir_shader_instructions_pass(nir, lower_descriptors_instr, + nir_metadata_control_flow, &ctx); out: _mesa_hash_table_destroy(ctx.ht, NULL); diff --git a/src/panfrost/vulkan/panvk_vX_blend.c b/src/panfrost/vulkan/panvk_vX_blend.c index 2681983825f..c58365edc44 100644 --- a/src/panfrost/vulkan/panvk_vX_blend.c +++ b/src/panfrost/vulkan/panvk_vX_blend.c @@ -124,7 +124,7 @@ get_blend_shader_locked(struct panvk_device *dev, GENX(pan_blend_create_shader)(state, src0_type, src1_type, rt); NIR_PASS_V(nir, nir_shader_instructions_pass, lower_load_blend_const, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); /* Compile the NIR shader */ struct panfrost_compile_inputs inputs = { diff --git a/src/panfrost/vulkan/panvk_vX_shader.c b/src/panfrost/vulkan/panvk_vX_shader.c index a27b318b14f..85786305490 100644 --- a/src/panfrost/vulkan/panvk_vX_shader.c +++ b/src/panfrost/vulkan/panvk_vX_shader.c @@ -338,7 +338,7 @@ panvk_lower_nir(struct panvk_device *dev, nir_shader *nir, NIR_PASS_V(nir, pan_lower_image_index, MAX_VS_ATTRIBS); NIR_PASS_V(nir, nir_shader_instructions_pass, panvk_lower_sysvals, - nir_metadata_block_index | nir_metadata_dominance, NULL); + nir_metadata_control_flow, NULL); } static VkResult diff --git a/src/vulkan/runtime/vk_nir_convert_ycbcr.c b/src/vulkan/runtime/vk_nir_convert_ycbcr.c index 8a660954284..41ea22c013e 100644 --- a/src/vulkan/runtime/vk_nir_convert_ycbcr.c +++ b/src/vulkan/runtime/vk_nir_convert_ycbcr.c @@ -453,7 +453,6 @@ bool nir_vk_lower_ycbcr_tex(nir_shader *nir, }; return nir_shader_instructions_pass(nir, lower_ycbcr_tex_instr, - nir_metadata_block_index | - nir_metadata_dominance, + nir_metadata_control_flow, &state); }