From 73cbb35442035f89e2eaeabe336c5d5579b1ba31 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Mon, 6 Oct 2025 14:25:26 -0700 Subject: [PATCH] brw: Move into a new src/intel/compiler/brw subdirectory This keeps the directory structure a bit more organized: - brw specific code - elk specific code - common NIR passes that could be used in both places It also means that you can now 'git grep' in the brw directory without finding a bunch of elk code, or having to "grep thing b*". Reviewed-by: Dylan Baker Reviewed-by: Alyssa Rosenzweig Part-of: --- src/gallium/drivers/iris/iris_batch.c | 2 +- src/gallium/drivers/iris/iris_blorp.c | 2 +- src/gallium/drivers/iris/iris_disk_cache.c | 2 +- src/gallium/drivers/iris/iris_indirect_gen.c | 2 +- src/gallium/drivers/iris/iris_program.c | 4 +- src/gallium/drivers/iris/iris_program_cache.c | 6 +- src/gallium/drivers/iris/iris_state.c | 2 +- src/intel/blorp/blorp_brw.c | 4 +- src/intel/blorp/blorp_genX_exec_brw.h | 2 +- src/intel/blorp/meson.build | 2 +- src/intel/compiler/{ => brw}/brw_analysis.cpp | 0 src/intel/compiler/{ => brw}/brw_analysis.h | 0 .../compiler/{ => brw}/brw_analysis_def.cpp | 0 .../{ => brw}/brw_analysis_liveness.cpp | 0 .../{ => brw}/brw_analysis_performance.cpp | 0 src/intel/compiler/{ => brw}/brw_asm.c | 0 src/intel/compiler/{ => brw}/brw_asm.h | 0 .../compiler/{ => brw}/brw_asm_internal.h | 0 src/intel/compiler/{ => brw}/brw_asm_tool.c | 0 src/intel/compiler/{ => brw}/brw_builder.cpp | 0 src/intel/compiler/{ => brw}/brw_builder.h | 0 src/intel/compiler/{ => brw}/brw_cfg.cpp | 0 src/intel/compiler/{ => brw}/brw_cfg.h | 0 .../compiler/{ => brw}/brw_compile_bs.cpp | 0 .../compiler/{ => brw}/brw_compile_cs.cpp | 0 .../compiler/{ => brw}/brw_compile_fs.cpp | 0 .../compiler/{ => brw}/brw_compile_gs.cpp | 0 .../compiler/{ => brw}/brw_compile_mesh.cpp | 0 .../compiler/{ => brw}/brw_compile_tcs.cpp | 0 .../compiler/{ => brw}/brw_compile_tes.cpp | 0 .../compiler/{ => brw}/brw_compile_vs.cpp | 0 src/intel/compiler/{ => brw}/brw_compiler.c | 0 src/intel/compiler/{ => brw}/brw_compiler.h | 2 +- .../compiler/{ => brw}/brw_debug_recompile.c | 0 src/intel/compiler/{ => brw}/brw_disasm.c | 0 src/intel/compiler/{ => brw}/brw_disasm.h | 0 .../compiler/{ => brw}/brw_disasm_info.cpp | 0 .../compiler/{ => brw}/brw_disasm_info.h | 2 +- .../compiler/{ => brw}/brw_disasm_tool.c | 0 src/intel/compiler/{ => brw}/brw_eu.c | 0 src/intel/compiler/{ => brw}/brw_eu.h | 0 src/intel/compiler/{ => brw}/brw_eu_compact.c | 0 src/intel/compiler/{ => brw}/brw_eu_defines.h | 0 src/intel/compiler/{ => brw}/brw_eu_emit.c | 0 src/intel/compiler/{ => brw}/brw_eu_inst.h | 0 .../compiler/{ => brw}/brw_eu_validate.c | 0 src/intel/compiler/{ => brw}/brw_from_nir.cpp | 0 .../compiler/{ => brw}/brw_generator.cpp | 0 src/intel/compiler/{ => brw}/brw_generator.h | 0 src/intel/compiler/{ => brw}/brw_gram.y | 0 src/intel/compiler/{ => brw}/brw_inst.cpp | 0 src/intel/compiler/{ => brw}/brw_inst.h | 2 +- src/intel/compiler/{ => brw}/brw_isa_info.h | 0 src/intel/compiler/{ => brw}/brw_lex.l | 0 src/intel/compiler/{ => brw}/brw_load_reg.cpp | 0 src/intel/compiler/{ => brw}/brw_lower.cpp | 0 .../compiler/{ => brw}/brw_lower_dpas.cpp | 0 .../brw_lower_integer_multiplication.cpp | 0 .../{ => brw}/brw_lower_logical_sends.cpp | 0 .../compiler/{ => brw}/brw_lower_pack.cpp | 0 .../{ => brw}/brw_lower_regioning.cpp | 0 .../{ => brw}/brw_lower_scoreboard.cpp | 0 .../{ => brw}/brw_lower_simd_width.cpp | 0 .../{ => brw}/brw_lower_subgroup_ops.cpp | 0 src/intel/compiler/{ => brw}/brw_nir.c | 0 src/intel/compiler/{ => brw}/brw_nir.h | 0 .../{ => brw}/brw_nir_analyze_ubo_ranges.c | 0 .../brw_nir_lower_alpha_to_coverage.c | 0 .../brw_nir_lower_cooperative_matrix.c | 0 .../{ => brw}/brw_nir_lower_cs_intrinsics.c | 0 .../{ => brw}/brw_nir_lower_fs_barycentrics.c | 0 .../{ => brw}/brw_nir_lower_fs_load_output.c | 0 .../compiler/{ => brw}/brw_nir_lower_fsign.py | 0 .../brw_nir_lower_immediate_offsets.c | 0 .../brw_nir_lower_intersection_shader.c | 0 .../{ => brw}/brw_nir_lower_ray_queries.c | 0 .../{ => brw}/brw_nir_lower_rt_intrinsics.c | 0 .../brw_nir_lower_rt_intrinsics_pre_trace.c | 0 .../brw_nir_lower_sample_index_in_coord.c | 0 .../{ => brw}/brw_nir_lower_shader_calls.c | 0 .../{ => brw}/brw_nir_lower_storage_image.c | 0 .../{ => brw}/brw_nir_lower_texel_address.c | 0 .../{ => brw}/brw_nir_lower_texture.c | 0 .../compiler/{ => brw}/brw_nir_opt_fsat.c | 0 src/intel/compiler/{ => brw}/brw_nir_rt.c | 0 src/intel/compiler/{ => brw}/brw_nir_rt.h | 0 .../compiler/{ => brw}/brw_nir_rt_builder.h | 0 .../{ => brw}/brw_nir_wa_18019110168.c | 0 .../compiler/{ => brw}/brw_nir_workarounds.py | 0 src/intel/compiler/{ => brw}/brw_opt.cpp | 0 .../{ => brw}/brw_opt_address_reg_load.cpp | 0 .../compiler/{ => brw}/brw_opt_algebraic.cpp | 0 .../{ => brw}/brw_opt_bank_conflicts.cpp | 0 .../{ => brw}/brw_opt_cmod_propagation.cpp | 0 .../{ => brw}/brw_opt_combine_constants.cpp | 0 .../{ => brw}/brw_opt_copy_propagation.cpp | 0 src/intel/compiler/{ => brw}/brw_opt_cse.cpp | 0 .../{ => brw}/brw_opt_dead_code_eliminate.cpp | 0 .../{ => brw}/brw_opt_register_coalesce.cpp | 0 .../brw_opt_saturate_propagation.cpp | 0 .../{ => brw}/brw_opt_txf_combiner.cpp | 0 .../{ => brw}/brw_opt_virtual_grfs.cpp | 0 .../compiler/{ => brw}/brw_packed_float.c | 0 src/intel/compiler/{ => brw}/brw_print.cpp | 0 src/intel/compiler/{ => brw}/brw_private.h | 0 src/intel/compiler/{ => brw}/brw_reg.cpp | 0 src/intel/compiler/{ => brw}/brw_reg.h | 0 .../compiler/{ => brw}/brw_reg_allocate.cpp | 0 src/intel/compiler/{ => brw}/brw_reg_type.c | 0 src/intel/compiler/{ => brw}/brw_reg_type.h | 0 src/intel/compiler/{ => brw}/brw_rt.h | 0 .../{ => brw}/brw_schedule_instructions.cpp | 0 src/intel/compiler/{ => brw}/brw_shader.cpp | 0 src/intel/compiler/{ => brw}/brw_shader.h | 0 .../compiler/{ => brw}/brw_simd_selection.cpp | 0 src/intel/compiler/{ => brw}/brw_spirv.c | 0 .../compiler/{ => brw}/brw_thread_payload.cpp | 0 .../compiler/{ => brw}/brw_thread_payload.h | 0 src/intel/compiler/{ => brw}/brw_validate.cpp | 0 src/intel/compiler/{ => brw}/brw_vue_map.c | 0 .../compiler/{ => brw}/brw_workaround.cpp | 0 src/intel/compiler/brw/meson.build | 282 ++++++++++++++++++ .../compiler/{ => brw}/test_eu_compact.cpp | 0 .../compiler/{ => brw}/test_eu_validate.cpp | 0 src/intel/compiler/{ => brw}/test_helpers.cpp | 0 src/intel/compiler/{ => brw}/test_helpers.h | 0 .../{ => brw}/test_insert_load_reg.cpp | 0 .../{ => brw}/test_lower_scoreboard.cpp | 0 .../compiler/{ => brw}/test_opt_algebraic.cpp | 0 .../{ => brw}/test_opt_cmod_propagation.cpp | 0 .../{ => brw}/test_opt_combine_constants.cpp | 0 .../{ => brw}/test_opt_copy_propagation.cpp | 0 src/intel/compiler/{ => brw}/test_opt_cse.cpp | 0 .../{ => brw}/test_opt_register_coalesce.cpp | 0 .../test_opt_saturate_propagation.cpp | 0 .../{ => brw}/test_simd_selection.cpp | 0 .../{ => brw}/test_vf_float_conversions.cpp | 0 .../compiler/{ => brw}/tests/gen11/cr0.asm | 0 .../{ => brw}/tests/gen11/cr0.expected | 0 .../compiler/{ => brw}/tests/gen11/rol.asm | 0 .../{ => brw}/tests/gen11/rol.expected | 0 .../compiler/{ => brw}/tests/gen11/ror.asm | 0 .../{ => brw}/tests/gen11/ror.expected | 0 .../compiler/{ => brw}/tests/gen12.5/add3.asm | 0 .../{ => brw}/tests/gen12.5/add3.expected | 0 .../compiler/{ => brw}/tests/gen12.5/send.asm | 0 .../{ => brw}/tests/gen12.5/send.expected | 0 .../compiler/{ => brw}/tests/gen12.5/swsb.asm | 0 .../{ => brw}/tests/gen12.5/swsb.expected | 0 .../compiler/{ => brw}/tests/gen12/dp4a.asm | 0 .../{ => brw}/tests/gen12/dp4a.expected | 0 .../compiler/{ => brw}/tests/gen12/send.asm | 0 .../{ => brw}/tests/gen12/send.expected | 0 .../compiler/{ => brw}/tests/gen12/swsb.asm | 0 .../{ => brw}/tests/gen12/swsb.expected | 0 .../compiler/{ => brw}/tests/gen12/sync.asm | 0 .../{ => brw}/tests/gen12/sync.expected | 0 .../compiler/{ => brw}/tests/gen9/add.asm | 0 .../{ => brw}/tests/gen9/add.expected | 0 .../compiler/{ => brw}/tests/gen9/and.asm | 0 .../{ => brw}/tests/gen9/and.expected | 0 .../compiler/{ => brw}/tests/gen9/asr.asm | 0 .../{ => brw}/tests/gen9/asr.expected | 0 .../compiler/{ => brw}/tests/gen9/bfe.asm | 0 .../{ => brw}/tests/gen9/bfe.expected | 0 .../compiler/{ => brw}/tests/gen9/bfi1.asm | 0 .../{ => brw}/tests/gen9/bfi1.expected | 0 .../compiler/{ => brw}/tests/gen9/bfi2.asm | 0 .../{ => brw}/tests/gen9/bfi2.expected | 0 .../compiler/{ => brw}/tests/gen9/bfrev.asm | 0 .../{ => brw}/tests/gen9/bfrev.expected | 0 .../compiler/{ => brw}/tests/gen9/break.asm | 0 .../{ => brw}/tests/gen9/break.expected | 0 .../compiler/{ => brw}/tests/gen9/cbit.asm | 0 .../{ => brw}/tests/gen9/cbit.expected | 0 .../compiler/{ => brw}/tests/gen9/cmp.asm | 0 .../{ => brw}/tests/gen9/cmp.expected | 0 .../compiler/{ => brw}/tests/gen9/cont.asm | 0 .../{ => brw}/tests/gen9/cont.expected | 0 .../compiler/{ => brw}/tests/gen9/cr0.asm | 0 .../{ => brw}/tests/gen9/cr0.expected | 0 .../compiler/{ => brw}/tests/gen9/csel.asm | 0 .../{ => brw}/tests/gen9/csel.expected | 0 .../compiler/{ => brw}/tests/gen9/else.asm | 0 .../{ => brw}/tests/gen9/else.expected | 0 .../compiler/{ => brw}/tests/gen9/endif.asm | 0 .../{ => brw}/tests/gen9/endif.expected | 0 .../compiler/{ => brw}/tests/gen9/fbh.asm | 0 .../{ => brw}/tests/gen9/fbh.expected | 0 .../compiler/{ => brw}/tests/gen9/fbl.asm | 0 .../{ => brw}/tests/gen9/fbl.expected | 0 .../compiler/{ => brw}/tests/gen9/frc.asm | 0 .../{ => brw}/tests/gen9/frc.expected | 0 .../compiler/{ => brw}/tests/gen9/halt.asm | 0 .../{ => brw}/tests/gen9/halt.expected | 0 .../compiler/{ => brw}/tests/gen9/if.asm | 0 .../compiler/{ => brw}/tests/gen9/if.expected | 0 .../compiler/{ => brw}/tests/gen9/lrp.asm | 0 .../{ => brw}/tests/gen9/lrp.expected | 0 .../compiler/{ => brw}/tests/gen9/lzd.asm | 0 .../{ => brw}/tests/gen9/lzd.expected | 0 .../compiler/{ => brw}/tests/gen9/mach.asm | 0 .../{ => brw}/tests/gen9/mach.expected | 0 .../compiler/{ => brw}/tests/gen9/mad.asm | 0 .../{ => brw}/tests/gen9/mad.expected | 0 .../compiler/{ => brw}/tests/gen9/math.asm | 0 .../{ => brw}/tests/gen9/math.expected | 0 .../compiler/{ => brw}/tests/gen9/mov.asm | 0 .../{ => brw}/tests/gen9/mov.expected | 0 .../compiler/{ => brw}/tests/gen9/mul.asm | 0 .../{ => brw}/tests/gen9/mul.expected | 0 .../compiler/{ => brw}/tests/gen9/nop.asm | 0 .../{ => brw}/tests/gen9/nop.expected | 0 .../compiler/{ => brw}/tests/gen9/not.asm | 0 .../{ => brw}/tests/gen9/not.expected | 0 .../compiler/{ => brw}/tests/gen9/or.asm | 0 .../compiler/{ => brw}/tests/gen9/or.expected | 0 .../compiler/{ => brw}/tests/gen9/pln.asm | 0 .../{ => brw}/tests/gen9/pln.expected | 0 .../compiler/{ => brw}/tests/gen9/rndd.asm | 0 .../{ => brw}/tests/gen9/rndd.expected | 0 .../compiler/{ => brw}/tests/gen9/rnde.asm | 0 .../{ => brw}/tests/gen9/rnde.expected | 0 .../compiler/{ => brw}/tests/gen9/rndz.asm | 0 .../{ => brw}/tests/gen9/rndz.expected | 0 .../compiler/{ => brw}/tests/gen9/sel.asm | 0 .../{ => brw}/tests/gen9/sel.expected | 0 .../compiler/{ => brw}/tests/gen9/send.asm | 0 .../{ => brw}/tests/gen9/send.expected | 0 .../compiler/{ => brw}/tests/gen9/sendc.asm | 0 .../{ => brw}/tests/gen9/sendc.expected | 0 .../compiler/{ => brw}/tests/gen9/sends.asm | 0 .../{ => brw}/tests/gen9/sends.expected | 0 .../compiler/{ => brw}/tests/gen9/shl.asm | 0 .../{ => brw}/tests/gen9/shl.expected | 0 .../compiler/{ => brw}/tests/gen9/shr.asm | 0 .../{ => brw}/tests/gen9/shr.expected | 0 .../compiler/{ => brw}/tests/gen9/wait.asm | 0 .../{ => brw}/tests/gen9/wait.expected | 0 .../compiler/{ => brw}/tests/gen9/while.asm | 0 .../{ => brw}/tests/gen9/while.expected | 0 .../compiler/{ => brw}/tests/gen9/xor.asm | 0 .../{ => brw}/tests/gen9/xor.expected | 0 .../compiler/{ => brw}/tests/run-test.py | 0 src/intel/compiler/elk/elk_disasm_info.h | 2 +- src/intel/compiler/elk/elk_ir.h | 2 +- src/intel/compiler/elk/meson.build | 1 + src/intel/compiler/meson.build | 281 +---------------- src/intel/decoder/intel_batch_decoder_brw.c | 2 +- src/intel/executor/executor_macros.c | 2 +- src/intel/executor/executor_main.c | 4 +- src/intel/meson.build | 1 + src/intel/tools/aubinator_error_decode_xe.c | 2 +- src/intel/tools/aubinator_viewer.h | 2 +- src/intel/tools/intel_dev_info.c | 2 +- src/intel/tools/intel_tools.c | 4 +- src/intel/tools/intel_tools.h | 2 +- src/intel/vulkan/anv_blorp.c | 2 +- src/intel/vulkan/anv_internal_kernels.c | 4 +- .../vulkan/anv_nir_apply_pipeline_layout.c | 2 +- .../vulkan/anv_nir_compute_push_layout.c | 2 +- .../vulkan/anv_nir_lower_unaligned_dispatch.c | 2 +- .../vulkan/anv_nir_push_descriptor_analysis.c | 2 +- src/intel/vulkan/anv_private.h | 4 +- src/intel/vulkan/anv_shader.c | 2 +- src/intel/vulkan/anv_shader_compile.c | 4 +- src/intel/vulkan/anv_util.c | 2 +- 267 files changed, 327 insertions(+), 322 deletions(-) rename src/intel/compiler/{ => brw}/brw_analysis.cpp (100%) rename src/intel/compiler/{ => brw}/brw_analysis.h (100%) rename src/intel/compiler/{ => brw}/brw_analysis_def.cpp (100%) rename src/intel/compiler/{ => brw}/brw_analysis_liveness.cpp (100%) rename src/intel/compiler/{ => brw}/brw_analysis_performance.cpp (100%) rename src/intel/compiler/{ => brw}/brw_asm.c (100%) rename src/intel/compiler/{ => brw}/brw_asm.h (100%) rename src/intel/compiler/{ => brw}/brw_asm_internal.h (100%) rename src/intel/compiler/{ => brw}/brw_asm_tool.c (100%) rename src/intel/compiler/{ => brw}/brw_builder.cpp (100%) rename src/intel/compiler/{ => brw}/brw_builder.h (100%) rename src/intel/compiler/{ => brw}/brw_cfg.cpp (100%) rename src/intel/compiler/{ => brw}/brw_cfg.h (100%) rename src/intel/compiler/{ => brw}/brw_compile_bs.cpp (100%) rename src/intel/compiler/{ => brw}/brw_compile_cs.cpp (100%) rename src/intel/compiler/{ => brw}/brw_compile_fs.cpp (100%) rename src/intel/compiler/{ => brw}/brw_compile_gs.cpp (100%) rename src/intel/compiler/{ => brw}/brw_compile_mesh.cpp (100%) rename src/intel/compiler/{ => brw}/brw_compile_tcs.cpp (100%) rename src/intel/compiler/{ => brw}/brw_compile_tes.cpp (100%) rename src/intel/compiler/{ => brw}/brw_compile_vs.cpp (100%) rename src/intel/compiler/{ => brw}/brw_compiler.c (100%) rename src/intel/compiler/{ => brw}/brw_compiler.h (99%) rename src/intel/compiler/{ => brw}/brw_debug_recompile.c (100%) rename src/intel/compiler/{ => brw}/brw_disasm.c (100%) rename src/intel/compiler/{ => brw}/brw_disasm.h (100%) rename src/intel/compiler/{ => brw}/brw_disasm_info.cpp (100%) rename src/intel/compiler/{ => brw}/brw_disasm_info.h (98%) rename src/intel/compiler/{ => brw}/brw_disasm_tool.c (100%) rename src/intel/compiler/{ => brw}/brw_eu.c (100%) rename src/intel/compiler/{ => brw}/brw_eu.h (100%) rename src/intel/compiler/{ => brw}/brw_eu_compact.c (100%) rename src/intel/compiler/{ => brw}/brw_eu_defines.h (100%) rename src/intel/compiler/{ => brw}/brw_eu_emit.c (100%) rename src/intel/compiler/{ => brw}/brw_eu_inst.h (100%) rename src/intel/compiler/{ => brw}/brw_eu_validate.c (100%) rename src/intel/compiler/{ => brw}/brw_from_nir.cpp (100%) rename src/intel/compiler/{ => brw}/brw_generator.cpp (100%) rename src/intel/compiler/{ => brw}/brw_generator.h (100%) rename src/intel/compiler/{ => brw}/brw_gram.y (100%) rename src/intel/compiler/{ => brw}/brw_inst.cpp (100%) rename src/intel/compiler/{ => brw}/brw_inst.h (99%) rename src/intel/compiler/{ => brw}/brw_isa_info.h (100%) rename src/intel/compiler/{ => brw}/brw_lex.l (100%) rename src/intel/compiler/{ => brw}/brw_load_reg.cpp (100%) rename src/intel/compiler/{ => brw}/brw_lower.cpp (100%) rename src/intel/compiler/{ => brw}/brw_lower_dpas.cpp (100%) rename src/intel/compiler/{ => brw}/brw_lower_integer_multiplication.cpp (100%) rename src/intel/compiler/{ => brw}/brw_lower_logical_sends.cpp (100%) rename src/intel/compiler/{ => brw}/brw_lower_pack.cpp (100%) rename src/intel/compiler/{ => brw}/brw_lower_regioning.cpp (100%) rename src/intel/compiler/{ => brw}/brw_lower_scoreboard.cpp (100%) rename src/intel/compiler/{ => brw}/brw_lower_simd_width.cpp (100%) rename src/intel/compiler/{ => brw}/brw_lower_subgroup_ops.cpp (100%) rename src/intel/compiler/{ => brw}/brw_nir.c (100%) rename src/intel/compiler/{ => brw}/brw_nir.h (100%) rename src/intel/compiler/{ => brw}/brw_nir_analyze_ubo_ranges.c (100%) rename src/intel/compiler/{ => brw}/brw_nir_lower_alpha_to_coverage.c (100%) rename src/intel/compiler/{ => brw}/brw_nir_lower_cooperative_matrix.c (100%) rename src/intel/compiler/{ => brw}/brw_nir_lower_cs_intrinsics.c (100%) rename src/intel/compiler/{ => brw}/brw_nir_lower_fs_barycentrics.c (100%) rename src/intel/compiler/{ => brw}/brw_nir_lower_fs_load_output.c (100%) rename src/intel/compiler/{ => brw}/brw_nir_lower_fsign.py (100%) rename src/intel/compiler/{ => brw}/brw_nir_lower_immediate_offsets.c (100%) rename src/intel/compiler/{ => brw}/brw_nir_lower_intersection_shader.c (100%) rename src/intel/compiler/{ => brw}/brw_nir_lower_ray_queries.c (100%) rename src/intel/compiler/{ => brw}/brw_nir_lower_rt_intrinsics.c (100%) rename src/intel/compiler/{ => brw}/brw_nir_lower_rt_intrinsics_pre_trace.c (100%) rename src/intel/compiler/{ => brw}/brw_nir_lower_sample_index_in_coord.c (100%) rename src/intel/compiler/{ => brw}/brw_nir_lower_shader_calls.c (100%) rename src/intel/compiler/{ => brw}/brw_nir_lower_storage_image.c (100%) rename src/intel/compiler/{ => brw}/brw_nir_lower_texel_address.c (100%) rename src/intel/compiler/{ => brw}/brw_nir_lower_texture.c (100%) rename src/intel/compiler/{ => brw}/brw_nir_opt_fsat.c (100%) rename src/intel/compiler/{ => brw}/brw_nir_rt.c (100%) rename src/intel/compiler/{ => brw}/brw_nir_rt.h (100%) rename src/intel/compiler/{ => brw}/brw_nir_rt_builder.h (100%) rename src/intel/compiler/{ => brw}/brw_nir_wa_18019110168.c (100%) rename src/intel/compiler/{ => brw}/brw_nir_workarounds.py (100%) rename src/intel/compiler/{ => brw}/brw_opt.cpp (100%) rename src/intel/compiler/{ => brw}/brw_opt_address_reg_load.cpp (100%) rename src/intel/compiler/{ => brw}/brw_opt_algebraic.cpp (100%) rename src/intel/compiler/{ => brw}/brw_opt_bank_conflicts.cpp (100%) rename src/intel/compiler/{ => brw}/brw_opt_cmod_propagation.cpp (100%) rename src/intel/compiler/{ => brw}/brw_opt_combine_constants.cpp (100%) rename src/intel/compiler/{ => brw}/brw_opt_copy_propagation.cpp (100%) rename src/intel/compiler/{ => brw}/brw_opt_cse.cpp (100%) rename src/intel/compiler/{ => brw}/brw_opt_dead_code_eliminate.cpp (100%) rename src/intel/compiler/{ => brw}/brw_opt_register_coalesce.cpp (100%) rename src/intel/compiler/{ => brw}/brw_opt_saturate_propagation.cpp (100%) rename src/intel/compiler/{ => brw}/brw_opt_txf_combiner.cpp (100%) rename src/intel/compiler/{ => brw}/brw_opt_virtual_grfs.cpp (100%) rename src/intel/compiler/{ => brw}/brw_packed_float.c (100%) rename src/intel/compiler/{ => brw}/brw_print.cpp (100%) rename src/intel/compiler/{ => brw}/brw_private.h (100%) rename src/intel/compiler/{ => brw}/brw_reg.cpp (100%) rename src/intel/compiler/{ => brw}/brw_reg.h (100%) rename src/intel/compiler/{ => brw}/brw_reg_allocate.cpp (100%) rename src/intel/compiler/{ => brw}/brw_reg_type.c (100%) rename src/intel/compiler/{ => brw}/brw_reg_type.h (100%) rename src/intel/compiler/{ => brw}/brw_rt.h (100%) rename src/intel/compiler/{ => brw}/brw_schedule_instructions.cpp (100%) rename src/intel/compiler/{ => brw}/brw_shader.cpp (100%) rename src/intel/compiler/{ => brw}/brw_shader.h (100%) rename src/intel/compiler/{ => brw}/brw_simd_selection.cpp (100%) rename src/intel/compiler/{ => brw}/brw_spirv.c (100%) rename src/intel/compiler/{ => brw}/brw_thread_payload.cpp (100%) rename src/intel/compiler/{ => brw}/brw_thread_payload.h (100%) rename src/intel/compiler/{ => brw}/brw_validate.cpp (100%) rename src/intel/compiler/{ => brw}/brw_vue_map.c (100%) rename src/intel/compiler/{ => brw}/brw_workaround.cpp (100%) create mode 100644 src/intel/compiler/brw/meson.build rename src/intel/compiler/{ => brw}/test_eu_compact.cpp (100%) rename src/intel/compiler/{ => brw}/test_eu_validate.cpp (100%) rename src/intel/compiler/{ => brw}/test_helpers.cpp (100%) rename src/intel/compiler/{ => brw}/test_helpers.h (100%) rename src/intel/compiler/{ => brw}/test_insert_load_reg.cpp (100%) rename src/intel/compiler/{ => brw}/test_lower_scoreboard.cpp (100%) rename src/intel/compiler/{ => brw}/test_opt_algebraic.cpp (100%) rename src/intel/compiler/{ => brw}/test_opt_cmod_propagation.cpp (100%) rename src/intel/compiler/{ => brw}/test_opt_combine_constants.cpp (100%) rename src/intel/compiler/{ => brw}/test_opt_copy_propagation.cpp (100%) rename src/intel/compiler/{ => brw}/test_opt_cse.cpp (100%) rename src/intel/compiler/{ => brw}/test_opt_register_coalesce.cpp (100%) rename src/intel/compiler/{ => brw}/test_opt_saturate_propagation.cpp (100%) rename src/intel/compiler/{ => brw}/test_simd_selection.cpp (100%) rename src/intel/compiler/{ => brw}/test_vf_float_conversions.cpp (100%) rename src/intel/compiler/{ => brw}/tests/gen11/cr0.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen11/cr0.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen11/rol.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen11/rol.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen11/ror.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen11/ror.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen12.5/add3.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen12.5/add3.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen12.5/send.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen12.5/send.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen12.5/swsb.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen12.5/swsb.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen12/dp4a.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen12/dp4a.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen12/send.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen12/send.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen12/swsb.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen12/swsb.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen12/sync.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen12/sync.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/add.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/add.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/and.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/and.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/asr.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/asr.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/bfe.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/bfe.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/bfi1.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/bfi1.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/bfi2.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/bfi2.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/bfrev.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/bfrev.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/break.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/break.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/cbit.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/cbit.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/cmp.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/cmp.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/cont.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/cont.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/cr0.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/cr0.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/csel.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/csel.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/else.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/else.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/endif.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/endif.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/fbh.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/fbh.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/fbl.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/fbl.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/frc.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/frc.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/halt.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/halt.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/if.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/if.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/lrp.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/lrp.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/lzd.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/lzd.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/mach.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/mach.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/mad.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/mad.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/math.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/math.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/mov.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/mov.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/mul.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/mul.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/nop.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/nop.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/not.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/not.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/or.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/or.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/pln.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/pln.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/rndd.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/rndd.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/rnde.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/rnde.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/rndz.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/rndz.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/sel.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/sel.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/send.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/send.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/sendc.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/sendc.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/sends.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/sends.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/shl.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/shl.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/shr.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/shr.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/wait.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/wait.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/while.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/while.expected (100%) rename src/intel/compiler/{ => brw}/tests/gen9/xor.asm (100%) rename src/intel/compiler/{ => brw}/tests/gen9/xor.expected (100%) rename src/intel/compiler/{ => brw}/tests/run-test.py (100%) diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c index 76e73bd2db1..02ac54073b8 100644 --- a/src/gallium/drivers/iris/iris_batch.c +++ b/src/gallium/drivers/iris/iris_batch.c @@ -48,7 +48,7 @@ #include "common/intel_aux_map.h" #include "intel/common/intel_gem.h" -#include "intel/compiler/brw_compiler.h" +#include "intel/compiler/brw/brw_compiler.h" #ifdef INTEL_USE_ELK #include "intel/compiler/elk/elk_compiler.h" #endif diff --git a/src/gallium/drivers/iris/iris_blorp.c b/src/gallium/drivers/iris/iris_blorp.c index 73764281994..443076b234b 100644 --- a/src/gallium/drivers/iris/iris_blorp.c +++ b/src/gallium/drivers/iris/iris_blorp.c @@ -42,7 +42,7 @@ #include "util/u_upload_mgr.h" #include "intel/common/intel_l3_config.h" -#include "intel/compiler/brw_compiler.h" +#include "intel/compiler/brw/brw_compiler.h" #include "genxml/gen_macros.h" diff --git a/src/gallium/drivers/iris/iris_disk_cache.c b/src/gallium/drivers/iris/iris_disk_cache.c index 07b8ede56c3..fd7f75ff64d 100644 --- a/src/gallium/drivers/iris/iris_disk_cache.c +++ b/src/gallium/drivers/iris/iris_disk_cache.c @@ -36,7 +36,7 @@ #include "util/build_id.h" #include "util/disk_cache.h" #include "util/mesa-sha1.h" -#include "intel/compiler/brw_compiler.h" +#include "intel/compiler/brw/brw_compiler.h" #ifdef INTEL_USE_ELK #include "intel/compiler/elk/elk_compiler.h" #endif diff --git a/src/gallium/drivers/iris/iris_indirect_gen.c b/src/gallium/drivers/iris/iris_indirect_gen.c index 9fe2d1c775b..bcf1c1be615 100644 --- a/src/gallium/drivers/iris/iris_indirect_gen.c +++ b/src/gallium/drivers/iris/iris_indirect_gen.c @@ -34,7 +34,7 @@ #include "iris_genx_macros.h" #if GFX_VER >= 9 -#include "intel/compiler/brw_compiler.h" +#include "intel/compiler/brw/brw_compiler.h" #include "intel/common/intel_genX_state_brw.h" #else #include "intel/compiler/elk/elk_compiler.h" diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c index 19590a3fb39..135fadf7b09 100644 --- a/src/gallium/drivers/iris/iris_program.c +++ b/src/gallium/drivers/iris/iris_program.c @@ -42,8 +42,8 @@ #include "compiler/nir/nir.h" #include "compiler/nir/nir_builder.h" #include "compiler/nir/nir_serialize.h" -#include "intel/compiler/brw_compiler.h" -#include "intel/compiler/brw_nir.h" +#include "intel/compiler/brw/brw_compiler.h" +#include "intel/compiler/brw/brw_nir.h" #include "intel/compiler/intel_nir.h" #include "intel/compiler/intel_prim.h" #ifdef INTEL_USE_ELK diff --git a/src/gallium/drivers/iris/iris_program_cache.c b/src/gallium/drivers/iris/iris_program_cache.c index 55c93fc4685..bbb63ecaa97 100644 --- a/src/gallium/drivers/iris/iris_program_cache.c +++ b/src/gallium/drivers/iris/iris_program_cache.c @@ -36,11 +36,11 @@ #include "pipe/p_screen.h" #include "util/u_atomic.h" #include "util/u_upload_mgr.h" -#include "compiler/brw_disasm.h" #include "compiler/nir/nir.h" #include "compiler/nir/nir_builder.h" -#include "intel/compiler/brw_compiler.h" -#include "intel/compiler/brw_nir.h" +#include "intel/compiler/brw/brw_compiler.h" +#include "intel/compiler/brw/brw_disasm.h" +#include "intel/compiler/brw/brw_nir.h" #ifdef INTEL_USE_ELK #include "intel/compiler/elk/elk_compiler.h" #include "intel/compiler/elk/elk_nir.h" diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index ad2a373b749..5ff05c34f24 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -110,7 +110,7 @@ #include "iris_genx_macros.h" #if GFX_VER >= 9 -#include "intel/compiler/brw_compiler.h" +#include "intel/compiler/brw/brw_compiler.h" #include "intel/common/intel_genX_state_brw.h" #else #include "intel/compiler/elk/elk_compiler.h" diff --git a/src/intel/blorp/blorp_brw.c b/src/intel/blorp/blorp_brw.c index fe541ad5bff..427ccf3365b 100644 --- a/src/intel/blorp/blorp_brw.c +++ b/src/intel/blorp/blorp_brw.c @@ -5,8 +5,8 @@ #include "blorp_priv.h" #include "blorp_nir_builder.h" -#include "compiler/brw_compiler.h" -#include "compiler/brw_nir.h" +#include "brw/brw_compiler.h" +#include "brw/brw_nir.h" #include "dev/intel_debug.h" static const nir_shader_compiler_options * diff --git a/src/intel/blorp/blorp_genX_exec_brw.h b/src/intel/blorp/blorp_genX_exec_brw.h index f874a3152f4..9ea5ddc8f1e 100644 --- a/src/intel/blorp/blorp_genX_exec_brw.h +++ b/src/intel/blorp/blorp_genX_exec_brw.h @@ -31,7 +31,7 @@ #include "common/intel_sample_positions.h" #include "common/intel_l3_config.h" #include "genxml/gen_macros.h" -#include "intel/compiler/brw_compiler.h" +#include "compiler/brw/brw_compiler.h" /** * This file provides the blorp pipeline setup and execution functionality. diff --git a/src/intel/blorp/meson.build b/src/intel/blorp/meson.build index 92254d341e4..bf4e2c4b093 100644 --- a/src/intel/blorp/meson.build +++ b/src/intel/blorp/meson.build @@ -23,7 +23,7 @@ files_blorp_elk = files( libblorp = static_library( 'blorp', [files_libblorp, files_blorp_brw], - include_directories : [inc_include, inc_src, inc_intel], + include_directories : [inc_include, inc_src, inc_intel, inc_intel_compiler], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', dependencies : [idep_nir_headers, idep_genxml, idep_mesautil, idep_intel_dev], diff --git a/src/intel/compiler/brw_analysis.cpp b/src/intel/compiler/brw/brw_analysis.cpp similarity index 100% rename from src/intel/compiler/brw_analysis.cpp rename to src/intel/compiler/brw/brw_analysis.cpp diff --git a/src/intel/compiler/brw_analysis.h b/src/intel/compiler/brw/brw_analysis.h similarity index 100% rename from src/intel/compiler/brw_analysis.h rename to src/intel/compiler/brw/brw_analysis.h diff --git a/src/intel/compiler/brw_analysis_def.cpp b/src/intel/compiler/brw/brw_analysis_def.cpp similarity index 100% rename from src/intel/compiler/brw_analysis_def.cpp rename to src/intel/compiler/brw/brw_analysis_def.cpp diff --git a/src/intel/compiler/brw_analysis_liveness.cpp b/src/intel/compiler/brw/brw_analysis_liveness.cpp similarity index 100% rename from src/intel/compiler/brw_analysis_liveness.cpp rename to src/intel/compiler/brw/brw_analysis_liveness.cpp diff --git a/src/intel/compiler/brw_analysis_performance.cpp b/src/intel/compiler/brw/brw_analysis_performance.cpp similarity index 100% rename from src/intel/compiler/brw_analysis_performance.cpp rename to src/intel/compiler/brw/brw_analysis_performance.cpp diff --git a/src/intel/compiler/brw_asm.c b/src/intel/compiler/brw/brw_asm.c similarity index 100% rename from src/intel/compiler/brw_asm.c rename to src/intel/compiler/brw/brw_asm.c diff --git a/src/intel/compiler/brw_asm.h b/src/intel/compiler/brw/brw_asm.h similarity index 100% rename from src/intel/compiler/brw_asm.h rename to src/intel/compiler/brw/brw_asm.h diff --git a/src/intel/compiler/brw_asm_internal.h b/src/intel/compiler/brw/brw_asm_internal.h similarity index 100% rename from src/intel/compiler/brw_asm_internal.h rename to src/intel/compiler/brw/brw_asm_internal.h diff --git a/src/intel/compiler/brw_asm_tool.c b/src/intel/compiler/brw/brw_asm_tool.c similarity index 100% rename from src/intel/compiler/brw_asm_tool.c rename to src/intel/compiler/brw/brw_asm_tool.c diff --git a/src/intel/compiler/brw_builder.cpp b/src/intel/compiler/brw/brw_builder.cpp similarity index 100% rename from src/intel/compiler/brw_builder.cpp rename to src/intel/compiler/brw/brw_builder.cpp diff --git a/src/intel/compiler/brw_builder.h b/src/intel/compiler/brw/brw_builder.h similarity index 100% rename from src/intel/compiler/brw_builder.h rename to src/intel/compiler/brw/brw_builder.h diff --git a/src/intel/compiler/brw_cfg.cpp b/src/intel/compiler/brw/brw_cfg.cpp similarity index 100% rename from src/intel/compiler/brw_cfg.cpp rename to src/intel/compiler/brw/brw_cfg.cpp diff --git a/src/intel/compiler/brw_cfg.h b/src/intel/compiler/brw/brw_cfg.h similarity index 100% rename from src/intel/compiler/brw_cfg.h rename to src/intel/compiler/brw/brw_cfg.h diff --git a/src/intel/compiler/brw_compile_bs.cpp b/src/intel/compiler/brw/brw_compile_bs.cpp similarity index 100% rename from src/intel/compiler/brw_compile_bs.cpp rename to src/intel/compiler/brw/brw_compile_bs.cpp diff --git a/src/intel/compiler/brw_compile_cs.cpp b/src/intel/compiler/brw/brw_compile_cs.cpp similarity index 100% rename from src/intel/compiler/brw_compile_cs.cpp rename to src/intel/compiler/brw/brw_compile_cs.cpp diff --git a/src/intel/compiler/brw_compile_fs.cpp b/src/intel/compiler/brw/brw_compile_fs.cpp similarity index 100% rename from src/intel/compiler/brw_compile_fs.cpp rename to src/intel/compiler/brw/brw_compile_fs.cpp diff --git a/src/intel/compiler/brw_compile_gs.cpp b/src/intel/compiler/brw/brw_compile_gs.cpp similarity index 100% rename from src/intel/compiler/brw_compile_gs.cpp rename to src/intel/compiler/brw/brw_compile_gs.cpp diff --git a/src/intel/compiler/brw_compile_mesh.cpp b/src/intel/compiler/brw/brw_compile_mesh.cpp similarity index 100% rename from src/intel/compiler/brw_compile_mesh.cpp rename to src/intel/compiler/brw/brw_compile_mesh.cpp diff --git a/src/intel/compiler/brw_compile_tcs.cpp b/src/intel/compiler/brw/brw_compile_tcs.cpp similarity index 100% rename from src/intel/compiler/brw_compile_tcs.cpp rename to src/intel/compiler/brw/brw_compile_tcs.cpp diff --git a/src/intel/compiler/brw_compile_tes.cpp b/src/intel/compiler/brw/brw_compile_tes.cpp similarity index 100% rename from src/intel/compiler/brw_compile_tes.cpp rename to src/intel/compiler/brw/brw_compile_tes.cpp diff --git a/src/intel/compiler/brw_compile_vs.cpp b/src/intel/compiler/brw/brw_compile_vs.cpp similarity index 100% rename from src/intel/compiler/brw_compile_vs.cpp rename to src/intel/compiler/brw/brw_compile_vs.cpp diff --git a/src/intel/compiler/brw_compiler.c b/src/intel/compiler/brw/brw_compiler.c similarity index 100% rename from src/intel/compiler/brw_compiler.c rename to src/intel/compiler/brw/brw_compiler.c diff --git a/src/intel/compiler/brw_compiler.h b/src/intel/compiler/brw/brw_compiler.h similarity index 99% rename from src/intel/compiler/brw_compiler.h rename to src/intel/compiler/brw/brw_compiler.h index 8b0e65a3bb3..1fa8f2ef099 100644 --- a/src/intel/compiler/brw_compiler.h +++ b/src/intel/compiler/brw/brw_compiler.h @@ -36,7 +36,7 @@ #include "util/shader_stats.h" #include "util/u_math.h" #include "brw_isa_info.h" -#include "intel_shader_enums.h" +#include "compiler/intel_shader_enums.h" #include "nir_shader_compiler_options.h" #ifdef __cplusplus diff --git a/src/intel/compiler/brw_debug_recompile.c b/src/intel/compiler/brw/brw_debug_recompile.c similarity index 100% rename from src/intel/compiler/brw_debug_recompile.c rename to src/intel/compiler/brw/brw_debug_recompile.c diff --git a/src/intel/compiler/brw_disasm.c b/src/intel/compiler/brw/brw_disasm.c similarity index 100% rename from src/intel/compiler/brw_disasm.c rename to src/intel/compiler/brw/brw_disasm.c diff --git a/src/intel/compiler/brw_disasm.h b/src/intel/compiler/brw/brw_disasm.h similarity index 100% rename from src/intel/compiler/brw_disasm.h rename to src/intel/compiler/brw/brw_disasm.h diff --git a/src/intel/compiler/brw_disasm_info.cpp b/src/intel/compiler/brw/brw_disasm_info.cpp similarity index 100% rename from src/intel/compiler/brw_disasm_info.cpp rename to src/intel/compiler/brw/brw_disasm_info.cpp diff --git a/src/intel/compiler/brw_disasm_info.h b/src/intel/compiler/brw/brw_disasm_info.h similarity index 98% rename from src/intel/compiler/brw_disasm_info.h rename to src/intel/compiler/brw/brw_disasm_info.h index c8cd08d0e7d..645aa0aae44 100644 --- a/src/intel/compiler/brw_disasm_info.h +++ b/src/intel/compiler/brw/brw_disasm_info.h @@ -23,7 +23,7 @@ #pragma once -#include "brw_list.h" +#include "compiler/brw_list.h" #ifdef __cplusplus extern "C" { diff --git a/src/intel/compiler/brw_disasm_tool.c b/src/intel/compiler/brw/brw_disasm_tool.c similarity index 100% rename from src/intel/compiler/brw_disasm_tool.c rename to src/intel/compiler/brw/brw_disasm_tool.c diff --git a/src/intel/compiler/brw_eu.c b/src/intel/compiler/brw/brw_eu.c similarity index 100% rename from src/intel/compiler/brw_eu.c rename to src/intel/compiler/brw/brw_eu.c diff --git a/src/intel/compiler/brw_eu.h b/src/intel/compiler/brw/brw_eu.h similarity index 100% rename from src/intel/compiler/brw_eu.h rename to src/intel/compiler/brw/brw_eu.h diff --git a/src/intel/compiler/brw_eu_compact.c b/src/intel/compiler/brw/brw_eu_compact.c similarity index 100% rename from src/intel/compiler/brw_eu_compact.c rename to src/intel/compiler/brw/brw_eu_compact.c diff --git a/src/intel/compiler/brw_eu_defines.h b/src/intel/compiler/brw/brw_eu_defines.h similarity index 100% rename from src/intel/compiler/brw_eu_defines.h rename to src/intel/compiler/brw/brw_eu_defines.h diff --git a/src/intel/compiler/brw_eu_emit.c b/src/intel/compiler/brw/brw_eu_emit.c similarity index 100% rename from src/intel/compiler/brw_eu_emit.c rename to src/intel/compiler/brw/brw_eu_emit.c diff --git a/src/intel/compiler/brw_eu_inst.h b/src/intel/compiler/brw/brw_eu_inst.h similarity index 100% rename from src/intel/compiler/brw_eu_inst.h rename to src/intel/compiler/brw/brw_eu_inst.h diff --git a/src/intel/compiler/brw_eu_validate.c b/src/intel/compiler/brw/brw_eu_validate.c similarity index 100% rename from src/intel/compiler/brw_eu_validate.c rename to src/intel/compiler/brw/brw_eu_validate.c diff --git a/src/intel/compiler/brw_from_nir.cpp b/src/intel/compiler/brw/brw_from_nir.cpp similarity index 100% rename from src/intel/compiler/brw_from_nir.cpp rename to src/intel/compiler/brw/brw_from_nir.cpp diff --git a/src/intel/compiler/brw_generator.cpp b/src/intel/compiler/brw/brw_generator.cpp similarity index 100% rename from src/intel/compiler/brw_generator.cpp rename to src/intel/compiler/brw/brw_generator.cpp diff --git a/src/intel/compiler/brw_generator.h b/src/intel/compiler/brw/brw_generator.h similarity index 100% rename from src/intel/compiler/brw_generator.h rename to src/intel/compiler/brw/brw_generator.h diff --git a/src/intel/compiler/brw_gram.y b/src/intel/compiler/brw/brw_gram.y similarity index 100% rename from src/intel/compiler/brw_gram.y rename to src/intel/compiler/brw/brw_gram.y diff --git a/src/intel/compiler/brw_inst.cpp b/src/intel/compiler/brw/brw_inst.cpp similarity index 100% rename from src/intel/compiler/brw_inst.cpp rename to src/intel/compiler/brw/brw_inst.cpp diff --git a/src/intel/compiler/brw_inst.h b/src/intel/compiler/brw/brw_inst.h similarity index 99% rename from src/intel/compiler/brw_inst.h rename to src/intel/compiler/brw/brw_inst.h index 1958ee4abb5..8474a6da3fb 100644 --- a/src/intel/compiler/brw_inst.h +++ b/src/intel/compiler/brw/brw_inst.h @@ -26,7 +26,7 @@ #include #include "brw_reg.h" -#include "brw_list.h" +#include "compiler/brw_list.h" #define MAX_SAMPLER_MESSAGE_SIZE 11 diff --git a/src/intel/compiler/brw_isa_info.h b/src/intel/compiler/brw/brw_isa_info.h similarity index 100% rename from src/intel/compiler/brw_isa_info.h rename to src/intel/compiler/brw/brw_isa_info.h diff --git a/src/intel/compiler/brw_lex.l b/src/intel/compiler/brw/brw_lex.l similarity index 100% rename from src/intel/compiler/brw_lex.l rename to src/intel/compiler/brw/brw_lex.l diff --git a/src/intel/compiler/brw_load_reg.cpp b/src/intel/compiler/brw/brw_load_reg.cpp similarity index 100% rename from src/intel/compiler/brw_load_reg.cpp rename to src/intel/compiler/brw/brw_load_reg.cpp diff --git a/src/intel/compiler/brw_lower.cpp b/src/intel/compiler/brw/brw_lower.cpp similarity index 100% rename from src/intel/compiler/brw_lower.cpp rename to src/intel/compiler/brw/brw_lower.cpp diff --git a/src/intel/compiler/brw_lower_dpas.cpp b/src/intel/compiler/brw/brw_lower_dpas.cpp similarity index 100% rename from src/intel/compiler/brw_lower_dpas.cpp rename to src/intel/compiler/brw/brw_lower_dpas.cpp diff --git a/src/intel/compiler/brw_lower_integer_multiplication.cpp b/src/intel/compiler/brw/brw_lower_integer_multiplication.cpp similarity index 100% rename from src/intel/compiler/brw_lower_integer_multiplication.cpp rename to src/intel/compiler/brw/brw_lower_integer_multiplication.cpp diff --git a/src/intel/compiler/brw_lower_logical_sends.cpp b/src/intel/compiler/brw/brw_lower_logical_sends.cpp similarity index 100% rename from src/intel/compiler/brw_lower_logical_sends.cpp rename to src/intel/compiler/brw/brw_lower_logical_sends.cpp diff --git a/src/intel/compiler/brw_lower_pack.cpp b/src/intel/compiler/brw/brw_lower_pack.cpp similarity index 100% rename from src/intel/compiler/brw_lower_pack.cpp rename to src/intel/compiler/brw/brw_lower_pack.cpp diff --git a/src/intel/compiler/brw_lower_regioning.cpp b/src/intel/compiler/brw/brw_lower_regioning.cpp similarity index 100% rename from src/intel/compiler/brw_lower_regioning.cpp rename to src/intel/compiler/brw/brw_lower_regioning.cpp diff --git a/src/intel/compiler/brw_lower_scoreboard.cpp b/src/intel/compiler/brw/brw_lower_scoreboard.cpp similarity index 100% rename from src/intel/compiler/brw_lower_scoreboard.cpp rename to src/intel/compiler/brw/brw_lower_scoreboard.cpp diff --git a/src/intel/compiler/brw_lower_simd_width.cpp b/src/intel/compiler/brw/brw_lower_simd_width.cpp similarity index 100% rename from src/intel/compiler/brw_lower_simd_width.cpp rename to src/intel/compiler/brw/brw_lower_simd_width.cpp diff --git a/src/intel/compiler/brw_lower_subgroup_ops.cpp b/src/intel/compiler/brw/brw_lower_subgroup_ops.cpp similarity index 100% rename from src/intel/compiler/brw_lower_subgroup_ops.cpp rename to src/intel/compiler/brw/brw_lower_subgroup_ops.cpp diff --git a/src/intel/compiler/brw_nir.c b/src/intel/compiler/brw/brw_nir.c similarity index 100% rename from src/intel/compiler/brw_nir.c rename to src/intel/compiler/brw/brw_nir.c diff --git a/src/intel/compiler/brw_nir.h b/src/intel/compiler/brw/brw_nir.h similarity index 100% rename from src/intel/compiler/brw_nir.h rename to src/intel/compiler/brw/brw_nir.h diff --git a/src/intel/compiler/brw_nir_analyze_ubo_ranges.c b/src/intel/compiler/brw/brw_nir_analyze_ubo_ranges.c similarity index 100% rename from src/intel/compiler/brw_nir_analyze_ubo_ranges.c rename to src/intel/compiler/brw/brw_nir_analyze_ubo_ranges.c diff --git a/src/intel/compiler/brw_nir_lower_alpha_to_coverage.c b/src/intel/compiler/brw/brw_nir_lower_alpha_to_coverage.c similarity index 100% rename from src/intel/compiler/brw_nir_lower_alpha_to_coverage.c rename to src/intel/compiler/brw/brw_nir_lower_alpha_to_coverage.c diff --git a/src/intel/compiler/brw_nir_lower_cooperative_matrix.c b/src/intel/compiler/brw/brw_nir_lower_cooperative_matrix.c similarity index 100% rename from src/intel/compiler/brw_nir_lower_cooperative_matrix.c rename to src/intel/compiler/brw/brw_nir_lower_cooperative_matrix.c diff --git a/src/intel/compiler/brw_nir_lower_cs_intrinsics.c b/src/intel/compiler/brw/brw_nir_lower_cs_intrinsics.c similarity index 100% rename from src/intel/compiler/brw_nir_lower_cs_intrinsics.c rename to src/intel/compiler/brw/brw_nir_lower_cs_intrinsics.c diff --git a/src/intel/compiler/brw_nir_lower_fs_barycentrics.c b/src/intel/compiler/brw/brw_nir_lower_fs_barycentrics.c similarity index 100% rename from src/intel/compiler/brw_nir_lower_fs_barycentrics.c rename to src/intel/compiler/brw/brw_nir_lower_fs_barycentrics.c diff --git a/src/intel/compiler/brw_nir_lower_fs_load_output.c b/src/intel/compiler/brw/brw_nir_lower_fs_load_output.c similarity index 100% rename from src/intel/compiler/brw_nir_lower_fs_load_output.c rename to src/intel/compiler/brw/brw_nir_lower_fs_load_output.c diff --git a/src/intel/compiler/brw_nir_lower_fsign.py b/src/intel/compiler/brw/brw_nir_lower_fsign.py similarity index 100% rename from src/intel/compiler/brw_nir_lower_fsign.py rename to src/intel/compiler/brw/brw_nir_lower_fsign.py diff --git a/src/intel/compiler/brw_nir_lower_immediate_offsets.c b/src/intel/compiler/brw/brw_nir_lower_immediate_offsets.c similarity index 100% rename from src/intel/compiler/brw_nir_lower_immediate_offsets.c rename to src/intel/compiler/brw/brw_nir_lower_immediate_offsets.c diff --git a/src/intel/compiler/brw_nir_lower_intersection_shader.c b/src/intel/compiler/brw/brw_nir_lower_intersection_shader.c similarity index 100% rename from src/intel/compiler/brw_nir_lower_intersection_shader.c rename to src/intel/compiler/brw/brw_nir_lower_intersection_shader.c diff --git a/src/intel/compiler/brw_nir_lower_ray_queries.c b/src/intel/compiler/brw/brw_nir_lower_ray_queries.c similarity index 100% rename from src/intel/compiler/brw_nir_lower_ray_queries.c rename to src/intel/compiler/brw/brw_nir_lower_ray_queries.c diff --git a/src/intel/compiler/brw_nir_lower_rt_intrinsics.c b/src/intel/compiler/brw/brw_nir_lower_rt_intrinsics.c similarity index 100% rename from src/intel/compiler/brw_nir_lower_rt_intrinsics.c rename to src/intel/compiler/brw/brw_nir_lower_rt_intrinsics.c diff --git a/src/intel/compiler/brw_nir_lower_rt_intrinsics_pre_trace.c b/src/intel/compiler/brw/brw_nir_lower_rt_intrinsics_pre_trace.c similarity index 100% rename from src/intel/compiler/brw_nir_lower_rt_intrinsics_pre_trace.c rename to src/intel/compiler/brw/brw_nir_lower_rt_intrinsics_pre_trace.c diff --git a/src/intel/compiler/brw_nir_lower_sample_index_in_coord.c b/src/intel/compiler/brw/brw_nir_lower_sample_index_in_coord.c similarity index 100% rename from src/intel/compiler/brw_nir_lower_sample_index_in_coord.c rename to src/intel/compiler/brw/brw_nir_lower_sample_index_in_coord.c diff --git a/src/intel/compiler/brw_nir_lower_shader_calls.c b/src/intel/compiler/brw/brw_nir_lower_shader_calls.c similarity index 100% rename from src/intel/compiler/brw_nir_lower_shader_calls.c rename to src/intel/compiler/brw/brw_nir_lower_shader_calls.c diff --git a/src/intel/compiler/brw_nir_lower_storage_image.c b/src/intel/compiler/brw/brw_nir_lower_storage_image.c similarity index 100% rename from src/intel/compiler/brw_nir_lower_storage_image.c rename to src/intel/compiler/brw/brw_nir_lower_storage_image.c diff --git a/src/intel/compiler/brw_nir_lower_texel_address.c b/src/intel/compiler/brw/brw_nir_lower_texel_address.c similarity index 100% rename from src/intel/compiler/brw_nir_lower_texel_address.c rename to src/intel/compiler/brw/brw_nir_lower_texel_address.c diff --git a/src/intel/compiler/brw_nir_lower_texture.c b/src/intel/compiler/brw/brw_nir_lower_texture.c similarity index 100% rename from src/intel/compiler/brw_nir_lower_texture.c rename to src/intel/compiler/brw/brw_nir_lower_texture.c diff --git a/src/intel/compiler/brw_nir_opt_fsat.c b/src/intel/compiler/brw/brw_nir_opt_fsat.c similarity index 100% rename from src/intel/compiler/brw_nir_opt_fsat.c rename to src/intel/compiler/brw/brw_nir_opt_fsat.c diff --git a/src/intel/compiler/brw_nir_rt.c b/src/intel/compiler/brw/brw_nir_rt.c similarity index 100% rename from src/intel/compiler/brw_nir_rt.c rename to src/intel/compiler/brw/brw_nir_rt.c diff --git a/src/intel/compiler/brw_nir_rt.h b/src/intel/compiler/brw/brw_nir_rt.h similarity index 100% rename from src/intel/compiler/brw_nir_rt.h rename to src/intel/compiler/brw/brw_nir_rt.h diff --git a/src/intel/compiler/brw_nir_rt_builder.h b/src/intel/compiler/brw/brw_nir_rt_builder.h similarity index 100% rename from src/intel/compiler/brw_nir_rt_builder.h rename to src/intel/compiler/brw/brw_nir_rt_builder.h diff --git a/src/intel/compiler/brw_nir_wa_18019110168.c b/src/intel/compiler/brw/brw_nir_wa_18019110168.c similarity index 100% rename from src/intel/compiler/brw_nir_wa_18019110168.c rename to src/intel/compiler/brw/brw_nir_wa_18019110168.c diff --git a/src/intel/compiler/brw_nir_workarounds.py b/src/intel/compiler/brw/brw_nir_workarounds.py similarity index 100% rename from src/intel/compiler/brw_nir_workarounds.py rename to src/intel/compiler/brw/brw_nir_workarounds.py diff --git a/src/intel/compiler/brw_opt.cpp b/src/intel/compiler/brw/brw_opt.cpp similarity index 100% rename from src/intel/compiler/brw_opt.cpp rename to src/intel/compiler/brw/brw_opt.cpp diff --git a/src/intel/compiler/brw_opt_address_reg_load.cpp b/src/intel/compiler/brw/brw_opt_address_reg_load.cpp similarity index 100% rename from src/intel/compiler/brw_opt_address_reg_load.cpp rename to src/intel/compiler/brw/brw_opt_address_reg_load.cpp diff --git a/src/intel/compiler/brw_opt_algebraic.cpp b/src/intel/compiler/brw/brw_opt_algebraic.cpp similarity index 100% rename from src/intel/compiler/brw_opt_algebraic.cpp rename to src/intel/compiler/brw/brw_opt_algebraic.cpp diff --git a/src/intel/compiler/brw_opt_bank_conflicts.cpp b/src/intel/compiler/brw/brw_opt_bank_conflicts.cpp similarity index 100% rename from src/intel/compiler/brw_opt_bank_conflicts.cpp rename to src/intel/compiler/brw/brw_opt_bank_conflicts.cpp diff --git a/src/intel/compiler/brw_opt_cmod_propagation.cpp b/src/intel/compiler/brw/brw_opt_cmod_propagation.cpp similarity index 100% rename from src/intel/compiler/brw_opt_cmod_propagation.cpp rename to src/intel/compiler/brw/brw_opt_cmod_propagation.cpp diff --git a/src/intel/compiler/brw_opt_combine_constants.cpp b/src/intel/compiler/brw/brw_opt_combine_constants.cpp similarity index 100% rename from src/intel/compiler/brw_opt_combine_constants.cpp rename to src/intel/compiler/brw/brw_opt_combine_constants.cpp diff --git a/src/intel/compiler/brw_opt_copy_propagation.cpp b/src/intel/compiler/brw/brw_opt_copy_propagation.cpp similarity index 100% rename from src/intel/compiler/brw_opt_copy_propagation.cpp rename to src/intel/compiler/brw/brw_opt_copy_propagation.cpp diff --git a/src/intel/compiler/brw_opt_cse.cpp b/src/intel/compiler/brw/brw_opt_cse.cpp similarity index 100% rename from src/intel/compiler/brw_opt_cse.cpp rename to src/intel/compiler/brw/brw_opt_cse.cpp diff --git a/src/intel/compiler/brw_opt_dead_code_eliminate.cpp b/src/intel/compiler/brw/brw_opt_dead_code_eliminate.cpp similarity index 100% rename from src/intel/compiler/brw_opt_dead_code_eliminate.cpp rename to src/intel/compiler/brw/brw_opt_dead_code_eliminate.cpp diff --git a/src/intel/compiler/brw_opt_register_coalesce.cpp b/src/intel/compiler/brw/brw_opt_register_coalesce.cpp similarity index 100% rename from src/intel/compiler/brw_opt_register_coalesce.cpp rename to src/intel/compiler/brw/brw_opt_register_coalesce.cpp diff --git a/src/intel/compiler/brw_opt_saturate_propagation.cpp b/src/intel/compiler/brw/brw_opt_saturate_propagation.cpp similarity index 100% rename from src/intel/compiler/brw_opt_saturate_propagation.cpp rename to src/intel/compiler/brw/brw_opt_saturate_propagation.cpp diff --git a/src/intel/compiler/brw_opt_txf_combiner.cpp b/src/intel/compiler/brw/brw_opt_txf_combiner.cpp similarity index 100% rename from src/intel/compiler/brw_opt_txf_combiner.cpp rename to src/intel/compiler/brw/brw_opt_txf_combiner.cpp diff --git a/src/intel/compiler/brw_opt_virtual_grfs.cpp b/src/intel/compiler/brw/brw_opt_virtual_grfs.cpp similarity index 100% rename from src/intel/compiler/brw_opt_virtual_grfs.cpp rename to src/intel/compiler/brw/brw_opt_virtual_grfs.cpp diff --git a/src/intel/compiler/brw_packed_float.c b/src/intel/compiler/brw/brw_packed_float.c similarity index 100% rename from src/intel/compiler/brw_packed_float.c rename to src/intel/compiler/brw/brw_packed_float.c diff --git a/src/intel/compiler/brw_print.cpp b/src/intel/compiler/brw/brw_print.cpp similarity index 100% rename from src/intel/compiler/brw_print.cpp rename to src/intel/compiler/brw/brw_print.cpp diff --git a/src/intel/compiler/brw_private.h b/src/intel/compiler/brw/brw_private.h similarity index 100% rename from src/intel/compiler/brw_private.h rename to src/intel/compiler/brw/brw_private.h diff --git a/src/intel/compiler/brw_reg.cpp b/src/intel/compiler/brw/brw_reg.cpp similarity index 100% rename from src/intel/compiler/brw_reg.cpp rename to src/intel/compiler/brw/brw_reg.cpp diff --git a/src/intel/compiler/brw_reg.h b/src/intel/compiler/brw/brw_reg.h similarity index 100% rename from src/intel/compiler/brw_reg.h rename to src/intel/compiler/brw/brw_reg.h diff --git a/src/intel/compiler/brw_reg_allocate.cpp b/src/intel/compiler/brw/brw_reg_allocate.cpp similarity index 100% rename from src/intel/compiler/brw_reg_allocate.cpp rename to src/intel/compiler/brw/brw_reg_allocate.cpp diff --git a/src/intel/compiler/brw_reg_type.c b/src/intel/compiler/brw/brw_reg_type.c similarity index 100% rename from src/intel/compiler/brw_reg_type.c rename to src/intel/compiler/brw/brw_reg_type.c diff --git a/src/intel/compiler/brw_reg_type.h b/src/intel/compiler/brw/brw_reg_type.h similarity index 100% rename from src/intel/compiler/brw_reg_type.h rename to src/intel/compiler/brw/brw_reg_type.h diff --git a/src/intel/compiler/brw_rt.h b/src/intel/compiler/brw/brw_rt.h similarity index 100% rename from src/intel/compiler/brw_rt.h rename to src/intel/compiler/brw/brw_rt.h diff --git a/src/intel/compiler/brw_schedule_instructions.cpp b/src/intel/compiler/brw/brw_schedule_instructions.cpp similarity index 100% rename from src/intel/compiler/brw_schedule_instructions.cpp rename to src/intel/compiler/brw/brw_schedule_instructions.cpp diff --git a/src/intel/compiler/brw_shader.cpp b/src/intel/compiler/brw/brw_shader.cpp similarity index 100% rename from src/intel/compiler/brw_shader.cpp rename to src/intel/compiler/brw/brw_shader.cpp diff --git a/src/intel/compiler/brw_shader.h b/src/intel/compiler/brw/brw_shader.h similarity index 100% rename from src/intel/compiler/brw_shader.h rename to src/intel/compiler/brw/brw_shader.h diff --git a/src/intel/compiler/brw_simd_selection.cpp b/src/intel/compiler/brw/brw_simd_selection.cpp similarity index 100% rename from src/intel/compiler/brw_simd_selection.cpp rename to src/intel/compiler/brw/brw_simd_selection.cpp diff --git a/src/intel/compiler/brw_spirv.c b/src/intel/compiler/brw/brw_spirv.c similarity index 100% rename from src/intel/compiler/brw_spirv.c rename to src/intel/compiler/brw/brw_spirv.c diff --git a/src/intel/compiler/brw_thread_payload.cpp b/src/intel/compiler/brw/brw_thread_payload.cpp similarity index 100% rename from src/intel/compiler/brw_thread_payload.cpp rename to src/intel/compiler/brw/brw_thread_payload.cpp diff --git a/src/intel/compiler/brw_thread_payload.h b/src/intel/compiler/brw/brw_thread_payload.h similarity index 100% rename from src/intel/compiler/brw_thread_payload.h rename to src/intel/compiler/brw/brw_thread_payload.h diff --git a/src/intel/compiler/brw_validate.cpp b/src/intel/compiler/brw/brw_validate.cpp similarity index 100% rename from src/intel/compiler/brw_validate.cpp rename to src/intel/compiler/brw/brw_validate.cpp diff --git a/src/intel/compiler/brw_vue_map.c b/src/intel/compiler/brw/brw_vue_map.c similarity index 100% rename from src/intel/compiler/brw_vue_map.c rename to src/intel/compiler/brw/brw_vue_map.c diff --git a/src/intel/compiler/brw_workaround.cpp b/src/intel/compiler/brw/brw_workaround.cpp similarity index 100% rename from src/intel/compiler/brw_workaround.cpp rename to src/intel/compiler/brw/brw_workaround.cpp diff --git a/src/intel/compiler/brw/meson.build b/src/intel/compiler/brw/meson.build new file mode 100644 index 00000000000..0af7e216c22 --- /dev/null +++ b/src/intel/compiler/brw/meson.build @@ -0,0 +1,282 @@ +# Copyright © 2017 Intel Corporation +# SPDX-License-Identifier: MIT + +libintel_compiler_brw_files = files( + '../brw_list.h', + '../intel_prim.h', + 'brw_analysis.h', + 'brw_analysis.cpp', + 'brw_analysis_def.cpp', + 'brw_analysis_liveness.cpp', + 'brw_analysis_performance.cpp', + 'brw_builder.cpp', + 'brw_builder.h', + 'brw_cfg.cpp', + 'brw_cfg.h', + 'brw_compile_bs.cpp', + 'brw_compile_cs.cpp', + 'brw_compile_fs.cpp', + 'brw_compile_gs.cpp', + 'brw_compile_mesh.cpp', + 'brw_compile_tcs.cpp', + 'brw_compile_tes.cpp', + 'brw_compile_vs.cpp', + 'brw_compiler.c', + 'brw_compiler.h', + 'brw_debug_recompile.c', + 'brw_disasm.c', + 'brw_disasm_info.cpp', + 'brw_disasm_info.h', + 'brw_eu.c', + 'brw_eu_compact.c', + 'brw_eu_defines.h', + 'brw_eu_emit.c', + 'brw_eu_inst.h', + 'brw_eu.h', + 'brw_eu_validate.c', + 'brw_from_nir.cpp', + 'brw_generator.cpp', + 'brw_generator.h', + 'brw_inst.cpp', + 'brw_inst.h', + 'brw_isa_info.h', + 'brw_load_reg.cpp', + 'brw_lower.cpp', + 'brw_lower_dpas.cpp', + 'brw_lower_integer_multiplication.cpp', + 'brw_lower_logical_sends.cpp', + 'brw_lower_pack.cpp', + 'brw_lower_regioning.cpp', + 'brw_lower_scoreboard.cpp', + 'brw_lower_simd_width.cpp', + 'brw_lower_subgroup_ops.cpp', + 'brw_nir.h', + 'brw_nir.c', + 'brw_nir_analyze_ubo_ranges.c', + 'brw_nir_lower_cooperative_matrix.c', + 'brw_nir_lower_cs_intrinsics.c', + 'brw_nir_lower_alpha_to_coverage.c', + 'brw_nir_lower_fs_barycentrics.c', + 'brw_nir_lower_fs_load_output.c', + 'brw_nir_lower_immediate_offsets.c', + 'brw_nir_lower_intersection_shader.c', + 'brw_nir_lower_ray_queries.c', + 'brw_nir_lower_rt_intrinsics.c', + 'brw_nir_lower_rt_intrinsics_pre_trace.c', + 'brw_nir_lower_sample_index_in_coord.c', + 'brw_nir_lower_shader_calls.c', + 'brw_nir_lower_storage_image.c', + 'brw_nir_lower_texel_address.c', + 'brw_nir_lower_texture.c', + 'brw_nir_wa_18019110168.c', + 'brw_nir_opt_fsat.c', + 'brw_nir_rt.h', + 'brw_nir_rt.c', + 'brw_nir_rt_builder.h', + 'brw_opt.cpp', + 'brw_opt_address_reg_load.cpp', + 'brw_opt_algebraic.cpp', + 'brw_opt_bank_conflicts.cpp', + 'brw_opt_cmod_propagation.cpp', + 'brw_opt_combine_constants.cpp', + 'brw_opt_copy_propagation.cpp', + 'brw_opt_cse.cpp', + 'brw_opt_dead_code_eliminate.cpp', + 'brw_opt_register_coalesce.cpp', + 'brw_opt_saturate_propagation.cpp', + 'brw_opt_txf_combiner.cpp', + 'brw_opt_virtual_grfs.cpp', + 'brw_packed_float.c', + 'brw_print.cpp', + 'brw_private.h', + 'brw_reg.cpp', + 'brw_reg.h', + 'brw_reg_allocate.cpp', + 'brw_reg_type.c', + 'brw_reg_type.h', + 'brw_rt.h', + 'brw_schedule_instructions.cpp', + 'brw_shader.cpp', + 'brw_shader.h', + 'brw_simd_selection.cpp', + 'brw_spirv.c', + 'brw_thread_payload.cpp', + 'brw_thread_payload.h', + 'brw_validate.cpp', + 'brw_vue_map.c', + 'brw_workaround.cpp', +) + +brw_nir_lower_fsign = custom_target( + 'brw_nir_lower_fsign.c', + input : 'brw_nir_lower_fsign.py', + output : 'brw_nir_lower_fsign.c', + command : [ + prog_python, '@INPUT@', '-p', dir_compiler_nir, + ], + depend_files : nir_algebraic_depends, + capture : true, +) + +brw_nir_workarounds = custom_target( + 'brw_nir_workarounds.c', + input : 'brw_nir_workarounds.py', + output : 'brw_nir_workarounds.c', + command : [ + prog_python, '@INPUT@', '-p', dir_compiler_nir, + ], + depend_files : nir_algebraic_depends, + capture : true, +) + +libintel_compiler_brw = static_library( + 'intel_compiler', + [libintel_compiler_brw_files, brw_nir_lower_fsign, brw_nir_workarounds, [brw_device_sha1_gen_src]], + include_directories : [inc_include, inc_src, inc_intel, inc_intel_compiler], + c_args : [no_override_init_args], + cpp_args : ['-Werror=vla'], + gnu_symbol_visibility : 'hidden', + link_with : libintel_compiler_nir, + dependencies : [idep_nir_headers, idep_mesautil, idep_intel_dev, idep_vtn, idep_mda], + build_by_default : false, +) + +idep_intel_compiler_brw = declare_dependency( + link_with : [libintel_compiler_brw, libisl], + dependencies : [ + idep_nir, + idep_mesautil, + idep_vtn, + ], +) + +if with_tests + test( + 'intel_compiler_brw_tests', + executable( + 'intel_compiler_brw_tests', + files( + 'test_eu_compact.cpp', + 'test_eu_validate.cpp', + 'test_helpers.cpp', + 'test_helpers.h', + 'test_insert_load_reg.cpp', + 'test_lower_scoreboard.cpp', + 'test_opt_algebraic.cpp', + 'test_opt_cmod_propagation.cpp', + 'test_opt_combine_constants.cpp', + 'test_opt_copy_propagation.cpp', + 'test_opt_cse.cpp', + 'test_opt_register_coalesce.cpp', + 'test_opt_saturate_propagation.cpp', + 'test_simd_selection.cpp', + 'test_vf_float_conversions.cpp', + ), + include_directories : [inc_include, inc_src, inc_intel], + cpp_args : ['-Werror=vla'], + link_with : libisl, + dependencies : [idep_gtest, idep_nir, idep_mesautil, idep_intel_dev, + idep_intel_compiler_brw], + ), + suite : ['intel'], + protocol : 'gtest', + ) +endif + +if with_intel_tools + +bison_command = [] +if yacc_is_bison + bison_command = [ + prog_bison, '@INPUT@', '--defines=@OUTPUT1@', + '--output=@OUTPUT0@' + ] +else + bison_command = [ + prog_bison, '-H', '@OUTPUT1@', + '-o', '@OUTPUT0@', '@INPUT@' + ] +endif + +brw_gram_tab = custom_target( + 'brw_gram.tab.[ch]', + input : 'brw_gram.y', + output : ['brw_gram.tab.c', 'brw_gram.tab.h'], + command : bison_command +) + +brw_lex_yy_c = custom_target( + 'brw_lex.yy.c', + input : 'brw_lex.l', + output : 'brw_lex.yy.c', + command : [prog_flex, '-o', '@OUTPUT@', '@INPUT@'] +) + +brw_asm_deps = [ + dep_thread, + idep_intel_compiler_brw, + idep_intel_dev, + idep_mesautil, +] + +brw_asm = static_library( + 'brw_asm', + ['brw_asm.c', brw_gram_tab[0], brw_gram_tab[1], brw_lex_yy_c], + dependencies : brw_asm_deps, + include_directories : [inc_include, inc_src, inc_intel], + c_args : [no_override_init_args], + gnu_symbol_visibility : 'hidden', + build_by_default : false, +) + +idep_brw_asm = declare_dependency( + link_with : brw_asm, + dependencies : brw_asm_deps, +) + +brw_asm_tool = executable( + 'brw_asm', + ['brw_asm_tool.c'], + dependencies : idep_brw_asm, + include_directories : [inc_include, inc_src, inc_intel], + c_args : [no_override_init_args], + gnu_symbol_visibility : 'hidden', + install : true +) + +asm_testcases = [ + ['skl', 'gfx9'], + ['icl', 'gfx11'], + ['tgl', 'gfx12'], + ['dg2', 'gfx12.5'], +] + +test_runner = find_program('tests/run-test.py') +foreach testcase : asm_testcases + _gen_name = testcase[0] + _gen_num = testcase[1] + _gen_folder = join_paths(meson.current_source_dir(), 'tests', + _gen_num.replace('gfx', 'gen')) + test( + 'brw_asm_' + _gen_num, test_runner, + args : [ + '--brw_asm', brw_asm_tool, + '--gen_name', _gen_name, + '--gen_folder', _gen_folder, + ], + suite : 'intel', + ) +endforeach + +brw_disasm_tool = executable( + 'brw_disasm', + files('brw_disasm_tool.c'), + dependencies : [idep_mesautil, dep_thread, idep_intel_dev, + idep_intel_compiler_brw], + include_directories : [inc_include, inc_src, inc_intel], + c_args : [no_override_init_args], + gnu_symbol_visibility : 'hidden', + install : true +) + +endif diff --git a/src/intel/compiler/test_eu_compact.cpp b/src/intel/compiler/brw/test_eu_compact.cpp similarity index 100% rename from src/intel/compiler/test_eu_compact.cpp rename to src/intel/compiler/brw/test_eu_compact.cpp diff --git a/src/intel/compiler/test_eu_validate.cpp b/src/intel/compiler/brw/test_eu_validate.cpp similarity index 100% rename from src/intel/compiler/test_eu_validate.cpp rename to src/intel/compiler/brw/test_eu_validate.cpp diff --git a/src/intel/compiler/test_helpers.cpp b/src/intel/compiler/brw/test_helpers.cpp similarity index 100% rename from src/intel/compiler/test_helpers.cpp rename to src/intel/compiler/brw/test_helpers.cpp diff --git a/src/intel/compiler/test_helpers.h b/src/intel/compiler/brw/test_helpers.h similarity index 100% rename from src/intel/compiler/test_helpers.h rename to src/intel/compiler/brw/test_helpers.h diff --git a/src/intel/compiler/test_insert_load_reg.cpp b/src/intel/compiler/brw/test_insert_load_reg.cpp similarity index 100% rename from src/intel/compiler/test_insert_load_reg.cpp rename to src/intel/compiler/brw/test_insert_load_reg.cpp diff --git a/src/intel/compiler/test_lower_scoreboard.cpp b/src/intel/compiler/brw/test_lower_scoreboard.cpp similarity index 100% rename from src/intel/compiler/test_lower_scoreboard.cpp rename to src/intel/compiler/brw/test_lower_scoreboard.cpp diff --git a/src/intel/compiler/test_opt_algebraic.cpp b/src/intel/compiler/brw/test_opt_algebraic.cpp similarity index 100% rename from src/intel/compiler/test_opt_algebraic.cpp rename to src/intel/compiler/brw/test_opt_algebraic.cpp diff --git a/src/intel/compiler/test_opt_cmod_propagation.cpp b/src/intel/compiler/brw/test_opt_cmod_propagation.cpp similarity index 100% rename from src/intel/compiler/test_opt_cmod_propagation.cpp rename to src/intel/compiler/brw/test_opt_cmod_propagation.cpp diff --git a/src/intel/compiler/test_opt_combine_constants.cpp b/src/intel/compiler/brw/test_opt_combine_constants.cpp similarity index 100% rename from src/intel/compiler/test_opt_combine_constants.cpp rename to src/intel/compiler/brw/test_opt_combine_constants.cpp diff --git a/src/intel/compiler/test_opt_copy_propagation.cpp b/src/intel/compiler/brw/test_opt_copy_propagation.cpp similarity index 100% rename from src/intel/compiler/test_opt_copy_propagation.cpp rename to src/intel/compiler/brw/test_opt_copy_propagation.cpp diff --git a/src/intel/compiler/test_opt_cse.cpp b/src/intel/compiler/brw/test_opt_cse.cpp similarity index 100% rename from src/intel/compiler/test_opt_cse.cpp rename to src/intel/compiler/brw/test_opt_cse.cpp diff --git a/src/intel/compiler/test_opt_register_coalesce.cpp b/src/intel/compiler/brw/test_opt_register_coalesce.cpp similarity index 100% rename from src/intel/compiler/test_opt_register_coalesce.cpp rename to src/intel/compiler/brw/test_opt_register_coalesce.cpp diff --git a/src/intel/compiler/test_opt_saturate_propagation.cpp b/src/intel/compiler/brw/test_opt_saturate_propagation.cpp similarity index 100% rename from src/intel/compiler/test_opt_saturate_propagation.cpp rename to src/intel/compiler/brw/test_opt_saturate_propagation.cpp diff --git a/src/intel/compiler/test_simd_selection.cpp b/src/intel/compiler/brw/test_simd_selection.cpp similarity index 100% rename from src/intel/compiler/test_simd_selection.cpp rename to src/intel/compiler/brw/test_simd_selection.cpp diff --git a/src/intel/compiler/test_vf_float_conversions.cpp b/src/intel/compiler/brw/test_vf_float_conversions.cpp similarity index 100% rename from src/intel/compiler/test_vf_float_conversions.cpp rename to src/intel/compiler/brw/test_vf_float_conversions.cpp diff --git a/src/intel/compiler/tests/gen11/cr0.asm b/src/intel/compiler/brw/tests/gen11/cr0.asm similarity index 100% rename from src/intel/compiler/tests/gen11/cr0.asm rename to src/intel/compiler/brw/tests/gen11/cr0.asm diff --git a/src/intel/compiler/tests/gen11/cr0.expected b/src/intel/compiler/brw/tests/gen11/cr0.expected similarity index 100% rename from src/intel/compiler/tests/gen11/cr0.expected rename to src/intel/compiler/brw/tests/gen11/cr0.expected diff --git a/src/intel/compiler/tests/gen11/rol.asm b/src/intel/compiler/brw/tests/gen11/rol.asm similarity index 100% rename from src/intel/compiler/tests/gen11/rol.asm rename to src/intel/compiler/brw/tests/gen11/rol.asm diff --git a/src/intel/compiler/tests/gen11/rol.expected b/src/intel/compiler/brw/tests/gen11/rol.expected similarity index 100% rename from src/intel/compiler/tests/gen11/rol.expected rename to src/intel/compiler/brw/tests/gen11/rol.expected diff --git a/src/intel/compiler/tests/gen11/ror.asm b/src/intel/compiler/brw/tests/gen11/ror.asm similarity index 100% rename from src/intel/compiler/tests/gen11/ror.asm rename to src/intel/compiler/brw/tests/gen11/ror.asm diff --git a/src/intel/compiler/tests/gen11/ror.expected b/src/intel/compiler/brw/tests/gen11/ror.expected similarity index 100% rename from src/intel/compiler/tests/gen11/ror.expected rename to src/intel/compiler/brw/tests/gen11/ror.expected diff --git a/src/intel/compiler/tests/gen12.5/add3.asm b/src/intel/compiler/brw/tests/gen12.5/add3.asm similarity index 100% rename from src/intel/compiler/tests/gen12.5/add3.asm rename to src/intel/compiler/brw/tests/gen12.5/add3.asm diff --git a/src/intel/compiler/tests/gen12.5/add3.expected b/src/intel/compiler/brw/tests/gen12.5/add3.expected similarity index 100% rename from src/intel/compiler/tests/gen12.5/add3.expected rename to src/intel/compiler/brw/tests/gen12.5/add3.expected diff --git a/src/intel/compiler/tests/gen12.5/send.asm b/src/intel/compiler/brw/tests/gen12.5/send.asm similarity index 100% rename from src/intel/compiler/tests/gen12.5/send.asm rename to src/intel/compiler/brw/tests/gen12.5/send.asm diff --git a/src/intel/compiler/tests/gen12.5/send.expected b/src/intel/compiler/brw/tests/gen12.5/send.expected similarity index 100% rename from src/intel/compiler/tests/gen12.5/send.expected rename to src/intel/compiler/brw/tests/gen12.5/send.expected diff --git a/src/intel/compiler/tests/gen12.5/swsb.asm b/src/intel/compiler/brw/tests/gen12.5/swsb.asm similarity index 100% rename from src/intel/compiler/tests/gen12.5/swsb.asm rename to src/intel/compiler/brw/tests/gen12.5/swsb.asm diff --git a/src/intel/compiler/tests/gen12.5/swsb.expected b/src/intel/compiler/brw/tests/gen12.5/swsb.expected similarity index 100% rename from src/intel/compiler/tests/gen12.5/swsb.expected rename to src/intel/compiler/brw/tests/gen12.5/swsb.expected diff --git a/src/intel/compiler/tests/gen12/dp4a.asm b/src/intel/compiler/brw/tests/gen12/dp4a.asm similarity index 100% rename from src/intel/compiler/tests/gen12/dp4a.asm rename to src/intel/compiler/brw/tests/gen12/dp4a.asm diff --git a/src/intel/compiler/tests/gen12/dp4a.expected b/src/intel/compiler/brw/tests/gen12/dp4a.expected similarity index 100% rename from src/intel/compiler/tests/gen12/dp4a.expected rename to src/intel/compiler/brw/tests/gen12/dp4a.expected diff --git a/src/intel/compiler/tests/gen12/send.asm b/src/intel/compiler/brw/tests/gen12/send.asm similarity index 100% rename from src/intel/compiler/tests/gen12/send.asm rename to src/intel/compiler/brw/tests/gen12/send.asm diff --git a/src/intel/compiler/tests/gen12/send.expected b/src/intel/compiler/brw/tests/gen12/send.expected similarity index 100% rename from src/intel/compiler/tests/gen12/send.expected rename to src/intel/compiler/brw/tests/gen12/send.expected diff --git a/src/intel/compiler/tests/gen12/swsb.asm b/src/intel/compiler/brw/tests/gen12/swsb.asm similarity index 100% rename from src/intel/compiler/tests/gen12/swsb.asm rename to src/intel/compiler/brw/tests/gen12/swsb.asm diff --git a/src/intel/compiler/tests/gen12/swsb.expected b/src/intel/compiler/brw/tests/gen12/swsb.expected similarity index 100% rename from src/intel/compiler/tests/gen12/swsb.expected rename to src/intel/compiler/brw/tests/gen12/swsb.expected diff --git a/src/intel/compiler/tests/gen12/sync.asm b/src/intel/compiler/brw/tests/gen12/sync.asm similarity index 100% rename from src/intel/compiler/tests/gen12/sync.asm rename to src/intel/compiler/brw/tests/gen12/sync.asm diff --git a/src/intel/compiler/tests/gen12/sync.expected b/src/intel/compiler/brw/tests/gen12/sync.expected similarity index 100% rename from src/intel/compiler/tests/gen12/sync.expected rename to src/intel/compiler/brw/tests/gen12/sync.expected diff --git a/src/intel/compiler/tests/gen9/add.asm b/src/intel/compiler/brw/tests/gen9/add.asm similarity index 100% rename from src/intel/compiler/tests/gen9/add.asm rename to src/intel/compiler/brw/tests/gen9/add.asm diff --git a/src/intel/compiler/tests/gen9/add.expected b/src/intel/compiler/brw/tests/gen9/add.expected similarity index 100% rename from src/intel/compiler/tests/gen9/add.expected rename to src/intel/compiler/brw/tests/gen9/add.expected diff --git a/src/intel/compiler/tests/gen9/and.asm b/src/intel/compiler/brw/tests/gen9/and.asm similarity index 100% rename from src/intel/compiler/tests/gen9/and.asm rename to src/intel/compiler/brw/tests/gen9/and.asm diff --git a/src/intel/compiler/tests/gen9/and.expected b/src/intel/compiler/brw/tests/gen9/and.expected similarity index 100% rename from src/intel/compiler/tests/gen9/and.expected rename to src/intel/compiler/brw/tests/gen9/and.expected diff --git a/src/intel/compiler/tests/gen9/asr.asm b/src/intel/compiler/brw/tests/gen9/asr.asm similarity index 100% rename from src/intel/compiler/tests/gen9/asr.asm rename to src/intel/compiler/brw/tests/gen9/asr.asm diff --git a/src/intel/compiler/tests/gen9/asr.expected b/src/intel/compiler/brw/tests/gen9/asr.expected similarity index 100% rename from src/intel/compiler/tests/gen9/asr.expected rename to src/intel/compiler/brw/tests/gen9/asr.expected diff --git a/src/intel/compiler/tests/gen9/bfe.asm b/src/intel/compiler/brw/tests/gen9/bfe.asm similarity index 100% rename from src/intel/compiler/tests/gen9/bfe.asm rename to src/intel/compiler/brw/tests/gen9/bfe.asm diff --git a/src/intel/compiler/tests/gen9/bfe.expected b/src/intel/compiler/brw/tests/gen9/bfe.expected similarity index 100% rename from src/intel/compiler/tests/gen9/bfe.expected rename to src/intel/compiler/brw/tests/gen9/bfe.expected diff --git a/src/intel/compiler/tests/gen9/bfi1.asm b/src/intel/compiler/brw/tests/gen9/bfi1.asm similarity index 100% rename from src/intel/compiler/tests/gen9/bfi1.asm rename to src/intel/compiler/brw/tests/gen9/bfi1.asm diff --git a/src/intel/compiler/tests/gen9/bfi1.expected b/src/intel/compiler/brw/tests/gen9/bfi1.expected similarity index 100% rename from src/intel/compiler/tests/gen9/bfi1.expected rename to src/intel/compiler/brw/tests/gen9/bfi1.expected diff --git a/src/intel/compiler/tests/gen9/bfi2.asm b/src/intel/compiler/brw/tests/gen9/bfi2.asm similarity index 100% rename from src/intel/compiler/tests/gen9/bfi2.asm rename to src/intel/compiler/brw/tests/gen9/bfi2.asm diff --git a/src/intel/compiler/tests/gen9/bfi2.expected b/src/intel/compiler/brw/tests/gen9/bfi2.expected similarity index 100% rename from src/intel/compiler/tests/gen9/bfi2.expected rename to src/intel/compiler/brw/tests/gen9/bfi2.expected diff --git a/src/intel/compiler/tests/gen9/bfrev.asm b/src/intel/compiler/brw/tests/gen9/bfrev.asm similarity index 100% rename from src/intel/compiler/tests/gen9/bfrev.asm rename to src/intel/compiler/brw/tests/gen9/bfrev.asm diff --git a/src/intel/compiler/tests/gen9/bfrev.expected b/src/intel/compiler/brw/tests/gen9/bfrev.expected similarity index 100% rename from src/intel/compiler/tests/gen9/bfrev.expected rename to src/intel/compiler/brw/tests/gen9/bfrev.expected diff --git a/src/intel/compiler/tests/gen9/break.asm b/src/intel/compiler/brw/tests/gen9/break.asm similarity index 100% rename from src/intel/compiler/tests/gen9/break.asm rename to src/intel/compiler/brw/tests/gen9/break.asm diff --git a/src/intel/compiler/tests/gen9/break.expected b/src/intel/compiler/brw/tests/gen9/break.expected similarity index 100% rename from src/intel/compiler/tests/gen9/break.expected rename to src/intel/compiler/brw/tests/gen9/break.expected diff --git a/src/intel/compiler/tests/gen9/cbit.asm b/src/intel/compiler/brw/tests/gen9/cbit.asm similarity index 100% rename from src/intel/compiler/tests/gen9/cbit.asm rename to src/intel/compiler/brw/tests/gen9/cbit.asm diff --git a/src/intel/compiler/tests/gen9/cbit.expected b/src/intel/compiler/brw/tests/gen9/cbit.expected similarity index 100% rename from src/intel/compiler/tests/gen9/cbit.expected rename to src/intel/compiler/brw/tests/gen9/cbit.expected diff --git a/src/intel/compiler/tests/gen9/cmp.asm b/src/intel/compiler/brw/tests/gen9/cmp.asm similarity index 100% rename from src/intel/compiler/tests/gen9/cmp.asm rename to src/intel/compiler/brw/tests/gen9/cmp.asm diff --git a/src/intel/compiler/tests/gen9/cmp.expected b/src/intel/compiler/brw/tests/gen9/cmp.expected similarity index 100% rename from src/intel/compiler/tests/gen9/cmp.expected rename to src/intel/compiler/brw/tests/gen9/cmp.expected diff --git a/src/intel/compiler/tests/gen9/cont.asm b/src/intel/compiler/brw/tests/gen9/cont.asm similarity index 100% rename from src/intel/compiler/tests/gen9/cont.asm rename to src/intel/compiler/brw/tests/gen9/cont.asm diff --git a/src/intel/compiler/tests/gen9/cont.expected b/src/intel/compiler/brw/tests/gen9/cont.expected similarity index 100% rename from src/intel/compiler/tests/gen9/cont.expected rename to src/intel/compiler/brw/tests/gen9/cont.expected diff --git a/src/intel/compiler/tests/gen9/cr0.asm b/src/intel/compiler/brw/tests/gen9/cr0.asm similarity index 100% rename from src/intel/compiler/tests/gen9/cr0.asm rename to src/intel/compiler/brw/tests/gen9/cr0.asm diff --git a/src/intel/compiler/tests/gen9/cr0.expected b/src/intel/compiler/brw/tests/gen9/cr0.expected similarity index 100% rename from src/intel/compiler/tests/gen9/cr0.expected rename to src/intel/compiler/brw/tests/gen9/cr0.expected diff --git a/src/intel/compiler/tests/gen9/csel.asm b/src/intel/compiler/brw/tests/gen9/csel.asm similarity index 100% rename from src/intel/compiler/tests/gen9/csel.asm rename to src/intel/compiler/brw/tests/gen9/csel.asm diff --git a/src/intel/compiler/tests/gen9/csel.expected b/src/intel/compiler/brw/tests/gen9/csel.expected similarity index 100% rename from src/intel/compiler/tests/gen9/csel.expected rename to src/intel/compiler/brw/tests/gen9/csel.expected diff --git a/src/intel/compiler/tests/gen9/else.asm b/src/intel/compiler/brw/tests/gen9/else.asm similarity index 100% rename from src/intel/compiler/tests/gen9/else.asm rename to src/intel/compiler/brw/tests/gen9/else.asm diff --git a/src/intel/compiler/tests/gen9/else.expected b/src/intel/compiler/brw/tests/gen9/else.expected similarity index 100% rename from src/intel/compiler/tests/gen9/else.expected rename to src/intel/compiler/brw/tests/gen9/else.expected diff --git a/src/intel/compiler/tests/gen9/endif.asm b/src/intel/compiler/brw/tests/gen9/endif.asm similarity index 100% rename from src/intel/compiler/tests/gen9/endif.asm rename to src/intel/compiler/brw/tests/gen9/endif.asm diff --git a/src/intel/compiler/tests/gen9/endif.expected b/src/intel/compiler/brw/tests/gen9/endif.expected similarity index 100% rename from src/intel/compiler/tests/gen9/endif.expected rename to src/intel/compiler/brw/tests/gen9/endif.expected diff --git a/src/intel/compiler/tests/gen9/fbh.asm b/src/intel/compiler/brw/tests/gen9/fbh.asm similarity index 100% rename from src/intel/compiler/tests/gen9/fbh.asm rename to src/intel/compiler/brw/tests/gen9/fbh.asm diff --git a/src/intel/compiler/tests/gen9/fbh.expected b/src/intel/compiler/brw/tests/gen9/fbh.expected similarity index 100% rename from src/intel/compiler/tests/gen9/fbh.expected rename to src/intel/compiler/brw/tests/gen9/fbh.expected diff --git a/src/intel/compiler/tests/gen9/fbl.asm b/src/intel/compiler/brw/tests/gen9/fbl.asm similarity index 100% rename from src/intel/compiler/tests/gen9/fbl.asm rename to src/intel/compiler/brw/tests/gen9/fbl.asm diff --git a/src/intel/compiler/tests/gen9/fbl.expected b/src/intel/compiler/brw/tests/gen9/fbl.expected similarity index 100% rename from src/intel/compiler/tests/gen9/fbl.expected rename to src/intel/compiler/brw/tests/gen9/fbl.expected diff --git a/src/intel/compiler/tests/gen9/frc.asm b/src/intel/compiler/brw/tests/gen9/frc.asm similarity index 100% rename from src/intel/compiler/tests/gen9/frc.asm rename to src/intel/compiler/brw/tests/gen9/frc.asm diff --git a/src/intel/compiler/tests/gen9/frc.expected b/src/intel/compiler/brw/tests/gen9/frc.expected similarity index 100% rename from src/intel/compiler/tests/gen9/frc.expected rename to src/intel/compiler/brw/tests/gen9/frc.expected diff --git a/src/intel/compiler/tests/gen9/halt.asm b/src/intel/compiler/brw/tests/gen9/halt.asm similarity index 100% rename from src/intel/compiler/tests/gen9/halt.asm rename to src/intel/compiler/brw/tests/gen9/halt.asm diff --git a/src/intel/compiler/tests/gen9/halt.expected b/src/intel/compiler/brw/tests/gen9/halt.expected similarity index 100% rename from src/intel/compiler/tests/gen9/halt.expected rename to src/intel/compiler/brw/tests/gen9/halt.expected diff --git a/src/intel/compiler/tests/gen9/if.asm b/src/intel/compiler/brw/tests/gen9/if.asm similarity index 100% rename from src/intel/compiler/tests/gen9/if.asm rename to src/intel/compiler/brw/tests/gen9/if.asm diff --git a/src/intel/compiler/tests/gen9/if.expected b/src/intel/compiler/brw/tests/gen9/if.expected similarity index 100% rename from src/intel/compiler/tests/gen9/if.expected rename to src/intel/compiler/brw/tests/gen9/if.expected diff --git a/src/intel/compiler/tests/gen9/lrp.asm b/src/intel/compiler/brw/tests/gen9/lrp.asm similarity index 100% rename from src/intel/compiler/tests/gen9/lrp.asm rename to src/intel/compiler/brw/tests/gen9/lrp.asm diff --git a/src/intel/compiler/tests/gen9/lrp.expected b/src/intel/compiler/brw/tests/gen9/lrp.expected similarity index 100% rename from src/intel/compiler/tests/gen9/lrp.expected rename to src/intel/compiler/brw/tests/gen9/lrp.expected diff --git a/src/intel/compiler/tests/gen9/lzd.asm b/src/intel/compiler/brw/tests/gen9/lzd.asm similarity index 100% rename from src/intel/compiler/tests/gen9/lzd.asm rename to src/intel/compiler/brw/tests/gen9/lzd.asm diff --git a/src/intel/compiler/tests/gen9/lzd.expected b/src/intel/compiler/brw/tests/gen9/lzd.expected similarity index 100% rename from src/intel/compiler/tests/gen9/lzd.expected rename to src/intel/compiler/brw/tests/gen9/lzd.expected diff --git a/src/intel/compiler/tests/gen9/mach.asm b/src/intel/compiler/brw/tests/gen9/mach.asm similarity index 100% rename from src/intel/compiler/tests/gen9/mach.asm rename to src/intel/compiler/brw/tests/gen9/mach.asm diff --git a/src/intel/compiler/tests/gen9/mach.expected b/src/intel/compiler/brw/tests/gen9/mach.expected similarity index 100% rename from src/intel/compiler/tests/gen9/mach.expected rename to src/intel/compiler/brw/tests/gen9/mach.expected diff --git a/src/intel/compiler/tests/gen9/mad.asm b/src/intel/compiler/brw/tests/gen9/mad.asm similarity index 100% rename from src/intel/compiler/tests/gen9/mad.asm rename to src/intel/compiler/brw/tests/gen9/mad.asm diff --git a/src/intel/compiler/tests/gen9/mad.expected b/src/intel/compiler/brw/tests/gen9/mad.expected similarity index 100% rename from src/intel/compiler/tests/gen9/mad.expected rename to src/intel/compiler/brw/tests/gen9/mad.expected diff --git a/src/intel/compiler/tests/gen9/math.asm b/src/intel/compiler/brw/tests/gen9/math.asm similarity index 100% rename from src/intel/compiler/tests/gen9/math.asm rename to src/intel/compiler/brw/tests/gen9/math.asm diff --git a/src/intel/compiler/tests/gen9/math.expected b/src/intel/compiler/brw/tests/gen9/math.expected similarity index 100% rename from src/intel/compiler/tests/gen9/math.expected rename to src/intel/compiler/brw/tests/gen9/math.expected diff --git a/src/intel/compiler/tests/gen9/mov.asm b/src/intel/compiler/brw/tests/gen9/mov.asm similarity index 100% rename from src/intel/compiler/tests/gen9/mov.asm rename to src/intel/compiler/brw/tests/gen9/mov.asm diff --git a/src/intel/compiler/tests/gen9/mov.expected b/src/intel/compiler/brw/tests/gen9/mov.expected similarity index 100% rename from src/intel/compiler/tests/gen9/mov.expected rename to src/intel/compiler/brw/tests/gen9/mov.expected diff --git a/src/intel/compiler/tests/gen9/mul.asm b/src/intel/compiler/brw/tests/gen9/mul.asm similarity index 100% rename from src/intel/compiler/tests/gen9/mul.asm rename to src/intel/compiler/brw/tests/gen9/mul.asm diff --git a/src/intel/compiler/tests/gen9/mul.expected b/src/intel/compiler/brw/tests/gen9/mul.expected similarity index 100% rename from src/intel/compiler/tests/gen9/mul.expected rename to src/intel/compiler/brw/tests/gen9/mul.expected diff --git a/src/intel/compiler/tests/gen9/nop.asm b/src/intel/compiler/brw/tests/gen9/nop.asm similarity index 100% rename from src/intel/compiler/tests/gen9/nop.asm rename to src/intel/compiler/brw/tests/gen9/nop.asm diff --git a/src/intel/compiler/tests/gen9/nop.expected b/src/intel/compiler/brw/tests/gen9/nop.expected similarity index 100% rename from src/intel/compiler/tests/gen9/nop.expected rename to src/intel/compiler/brw/tests/gen9/nop.expected diff --git a/src/intel/compiler/tests/gen9/not.asm b/src/intel/compiler/brw/tests/gen9/not.asm similarity index 100% rename from src/intel/compiler/tests/gen9/not.asm rename to src/intel/compiler/brw/tests/gen9/not.asm diff --git a/src/intel/compiler/tests/gen9/not.expected b/src/intel/compiler/brw/tests/gen9/not.expected similarity index 100% rename from src/intel/compiler/tests/gen9/not.expected rename to src/intel/compiler/brw/tests/gen9/not.expected diff --git a/src/intel/compiler/tests/gen9/or.asm b/src/intel/compiler/brw/tests/gen9/or.asm similarity index 100% rename from src/intel/compiler/tests/gen9/or.asm rename to src/intel/compiler/brw/tests/gen9/or.asm diff --git a/src/intel/compiler/tests/gen9/or.expected b/src/intel/compiler/brw/tests/gen9/or.expected similarity index 100% rename from src/intel/compiler/tests/gen9/or.expected rename to src/intel/compiler/brw/tests/gen9/or.expected diff --git a/src/intel/compiler/tests/gen9/pln.asm b/src/intel/compiler/brw/tests/gen9/pln.asm similarity index 100% rename from src/intel/compiler/tests/gen9/pln.asm rename to src/intel/compiler/brw/tests/gen9/pln.asm diff --git a/src/intel/compiler/tests/gen9/pln.expected b/src/intel/compiler/brw/tests/gen9/pln.expected similarity index 100% rename from src/intel/compiler/tests/gen9/pln.expected rename to src/intel/compiler/brw/tests/gen9/pln.expected diff --git a/src/intel/compiler/tests/gen9/rndd.asm b/src/intel/compiler/brw/tests/gen9/rndd.asm similarity index 100% rename from src/intel/compiler/tests/gen9/rndd.asm rename to src/intel/compiler/brw/tests/gen9/rndd.asm diff --git a/src/intel/compiler/tests/gen9/rndd.expected b/src/intel/compiler/brw/tests/gen9/rndd.expected similarity index 100% rename from src/intel/compiler/tests/gen9/rndd.expected rename to src/intel/compiler/brw/tests/gen9/rndd.expected diff --git a/src/intel/compiler/tests/gen9/rnde.asm b/src/intel/compiler/brw/tests/gen9/rnde.asm similarity index 100% rename from src/intel/compiler/tests/gen9/rnde.asm rename to src/intel/compiler/brw/tests/gen9/rnde.asm diff --git a/src/intel/compiler/tests/gen9/rnde.expected b/src/intel/compiler/brw/tests/gen9/rnde.expected similarity index 100% rename from src/intel/compiler/tests/gen9/rnde.expected rename to src/intel/compiler/brw/tests/gen9/rnde.expected diff --git a/src/intel/compiler/tests/gen9/rndz.asm b/src/intel/compiler/brw/tests/gen9/rndz.asm similarity index 100% rename from src/intel/compiler/tests/gen9/rndz.asm rename to src/intel/compiler/brw/tests/gen9/rndz.asm diff --git a/src/intel/compiler/tests/gen9/rndz.expected b/src/intel/compiler/brw/tests/gen9/rndz.expected similarity index 100% rename from src/intel/compiler/tests/gen9/rndz.expected rename to src/intel/compiler/brw/tests/gen9/rndz.expected diff --git a/src/intel/compiler/tests/gen9/sel.asm b/src/intel/compiler/brw/tests/gen9/sel.asm similarity index 100% rename from src/intel/compiler/tests/gen9/sel.asm rename to src/intel/compiler/brw/tests/gen9/sel.asm diff --git a/src/intel/compiler/tests/gen9/sel.expected b/src/intel/compiler/brw/tests/gen9/sel.expected similarity index 100% rename from src/intel/compiler/tests/gen9/sel.expected rename to src/intel/compiler/brw/tests/gen9/sel.expected diff --git a/src/intel/compiler/tests/gen9/send.asm b/src/intel/compiler/brw/tests/gen9/send.asm similarity index 100% rename from src/intel/compiler/tests/gen9/send.asm rename to src/intel/compiler/brw/tests/gen9/send.asm diff --git a/src/intel/compiler/tests/gen9/send.expected b/src/intel/compiler/brw/tests/gen9/send.expected similarity index 100% rename from src/intel/compiler/tests/gen9/send.expected rename to src/intel/compiler/brw/tests/gen9/send.expected diff --git a/src/intel/compiler/tests/gen9/sendc.asm b/src/intel/compiler/brw/tests/gen9/sendc.asm similarity index 100% rename from src/intel/compiler/tests/gen9/sendc.asm rename to src/intel/compiler/brw/tests/gen9/sendc.asm diff --git a/src/intel/compiler/tests/gen9/sendc.expected b/src/intel/compiler/brw/tests/gen9/sendc.expected similarity index 100% rename from src/intel/compiler/tests/gen9/sendc.expected rename to src/intel/compiler/brw/tests/gen9/sendc.expected diff --git a/src/intel/compiler/tests/gen9/sends.asm b/src/intel/compiler/brw/tests/gen9/sends.asm similarity index 100% rename from src/intel/compiler/tests/gen9/sends.asm rename to src/intel/compiler/brw/tests/gen9/sends.asm diff --git a/src/intel/compiler/tests/gen9/sends.expected b/src/intel/compiler/brw/tests/gen9/sends.expected similarity index 100% rename from src/intel/compiler/tests/gen9/sends.expected rename to src/intel/compiler/brw/tests/gen9/sends.expected diff --git a/src/intel/compiler/tests/gen9/shl.asm b/src/intel/compiler/brw/tests/gen9/shl.asm similarity index 100% rename from src/intel/compiler/tests/gen9/shl.asm rename to src/intel/compiler/brw/tests/gen9/shl.asm diff --git a/src/intel/compiler/tests/gen9/shl.expected b/src/intel/compiler/brw/tests/gen9/shl.expected similarity index 100% rename from src/intel/compiler/tests/gen9/shl.expected rename to src/intel/compiler/brw/tests/gen9/shl.expected diff --git a/src/intel/compiler/tests/gen9/shr.asm b/src/intel/compiler/brw/tests/gen9/shr.asm similarity index 100% rename from src/intel/compiler/tests/gen9/shr.asm rename to src/intel/compiler/brw/tests/gen9/shr.asm diff --git a/src/intel/compiler/tests/gen9/shr.expected b/src/intel/compiler/brw/tests/gen9/shr.expected similarity index 100% rename from src/intel/compiler/tests/gen9/shr.expected rename to src/intel/compiler/brw/tests/gen9/shr.expected diff --git a/src/intel/compiler/tests/gen9/wait.asm b/src/intel/compiler/brw/tests/gen9/wait.asm similarity index 100% rename from src/intel/compiler/tests/gen9/wait.asm rename to src/intel/compiler/brw/tests/gen9/wait.asm diff --git a/src/intel/compiler/tests/gen9/wait.expected b/src/intel/compiler/brw/tests/gen9/wait.expected similarity index 100% rename from src/intel/compiler/tests/gen9/wait.expected rename to src/intel/compiler/brw/tests/gen9/wait.expected diff --git a/src/intel/compiler/tests/gen9/while.asm b/src/intel/compiler/brw/tests/gen9/while.asm similarity index 100% rename from src/intel/compiler/tests/gen9/while.asm rename to src/intel/compiler/brw/tests/gen9/while.asm diff --git a/src/intel/compiler/tests/gen9/while.expected b/src/intel/compiler/brw/tests/gen9/while.expected similarity index 100% rename from src/intel/compiler/tests/gen9/while.expected rename to src/intel/compiler/brw/tests/gen9/while.expected diff --git a/src/intel/compiler/tests/gen9/xor.asm b/src/intel/compiler/brw/tests/gen9/xor.asm similarity index 100% rename from src/intel/compiler/tests/gen9/xor.asm rename to src/intel/compiler/brw/tests/gen9/xor.asm diff --git a/src/intel/compiler/tests/gen9/xor.expected b/src/intel/compiler/brw/tests/gen9/xor.expected similarity index 100% rename from src/intel/compiler/tests/gen9/xor.expected rename to src/intel/compiler/brw/tests/gen9/xor.expected diff --git a/src/intel/compiler/tests/run-test.py b/src/intel/compiler/brw/tests/run-test.py similarity index 100% rename from src/intel/compiler/tests/run-test.py rename to src/intel/compiler/brw/tests/run-test.py diff --git a/src/intel/compiler/elk/elk_disasm_info.h b/src/intel/compiler/elk/elk_disasm_info.h index e26393307fd..b6d913c4bdf 100644 --- a/src/intel/compiler/elk/elk_disasm_info.h +++ b/src/intel/compiler/elk/elk_disasm_info.h @@ -23,7 +23,7 @@ #pragma once -#include "../brw_list.h" +#include "compiler/brw_list.h" #ifdef __cplusplus extern "C" { diff --git a/src/intel/compiler/elk/elk_ir.h b/src/intel/compiler/elk/elk_ir.h index 410c9a6b273..3485d502aa8 100644 --- a/src/intel/compiler/elk/elk_ir.h +++ b/src/intel/compiler/elk/elk_ir.h @@ -26,7 +26,7 @@ #include #include "elk_reg.h" -#include "../brw_list.h" +#include "compiler/brw_list.h" #define MAX_SAMPLER_MESSAGE_SIZE 11 diff --git a/src/intel/compiler/elk/meson.build b/src/intel/compiler/elk/meson.build index f5a1bb6adcb..6be127352e6 100644 --- a/src/intel/compiler/elk/meson.build +++ b/src/intel/compiler/elk/meson.build @@ -2,6 +2,7 @@ # SPDX-License-Identifier: MIT libintel_compiler_elk_files = files( + '../brw_list.h', '../intel_prim.h', 'elk_cfg.cpp', 'elk_cfg.h', diff --git a/src/intel/compiler/meson.build b/src/intel/compiler/meson.build index d55ed7efe86..cdfdd00d5f8 100644 --- a/src/intel/compiler/meson.build +++ b/src/intel/compiler/meson.build @@ -29,291 +29,12 @@ libintel_compiler_nir = static_library( build_by_default : false, ) -libintel_compiler_brw_files = files( - 'intel_prim.h', - 'brw_analysis.h', - 'brw_analysis.cpp', - 'brw_analysis_def.cpp', - 'brw_analysis_liveness.cpp', - 'brw_analysis_performance.cpp', - 'brw_builder.cpp', - 'brw_builder.h', - 'brw_cfg.cpp', - 'brw_cfg.h', - 'brw_compile_bs.cpp', - 'brw_compile_cs.cpp', - 'brw_compile_fs.cpp', - 'brw_compile_gs.cpp', - 'brw_compile_mesh.cpp', - 'brw_compile_tcs.cpp', - 'brw_compile_tes.cpp', - 'brw_compile_vs.cpp', - 'brw_compiler.c', - 'brw_compiler.h', - 'brw_debug_recompile.c', - 'brw_disasm.c', - 'brw_disasm_info.cpp', - 'brw_disasm_info.h', - 'brw_eu.c', - 'brw_eu_compact.c', - 'brw_eu_defines.h', - 'brw_eu_emit.c', - 'brw_eu_inst.h', - 'brw_eu.h', - 'brw_eu_validate.c', - 'brw_from_nir.cpp', - 'brw_generator.cpp', - 'brw_generator.h', - 'brw_inst.cpp', - 'brw_inst.h', - 'brw_isa_info.h', - 'brw_list.h', - 'brw_load_reg.cpp', - 'brw_lower.cpp', - 'brw_lower_dpas.cpp', - 'brw_lower_integer_multiplication.cpp', - 'brw_lower_logical_sends.cpp', - 'brw_lower_pack.cpp', - 'brw_lower_regioning.cpp', - 'brw_lower_scoreboard.cpp', - 'brw_lower_simd_width.cpp', - 'brw_lower_subgroup_ops.cpp', - 'brw_nir.h', - 'brw_nir.c', - 'brw_nir_analyze_ubo_ranges.c', - 'brw_nir_lower_cooperative_matrix.c', - 'brw_nir_lower_cs_intrinsics.c', - 'brw_nir_lower_alpha_to_coverage.c', - 'brw_nir_lower_fs_barycentrics.c', - 'brw_nir_lower_fs_load_output.c', - 'brw_nir_lower_immediate_offsets.c', - 'brw_nir_lower_intersection_shader.c', - 'brw_nir_lower_ray_queries.c', - 'brw_nir_lower_rt_intrinsics.c', - 'brw_nir_lower_rt_intrinsics_pre_trace.c', - 'brw_nir_lower_sample_index_in_coord.c', - 'brw_nir_lower_shader_calls.c', - 'brw_nir_lower_storage_image.c', - 'brw_nir_lower_texel_address.c', - 'brw_nir_lower_texture.c', - 'brw_nir_wa_18019110168.c', - 'brw_nir_opt_fsat.c', - 'brw_nir_rt.h', - 'brw_nir_rt.c', - 'brw_nir_rt_builder.h', - 'brw_opt.cpp', - 'brw_opt_address_reg_load.cpp', - 'brw_opt_algebraic.cpp', - 'brw_opt_bank_conflicts.cpp', - 'brw_opt_cmod_propagation.cpp', - 'brw_opt_combine_constants.cpp', - 'brw_opt_copy_propagation.cpp', - 'brw_opt_cse.cpp', - 'brw_opt_dead_code_eliminate.cpp', - 'brw_opt_register_coalesce.cpp', - 'brw_opt_saturate_propagation.cpp', - 'brw_opt_txf_combiner.cpp', - 'brw_opt_virtual_grfs.cpp', - 'brw_packed_float.c', - 'brw_print.cpp', - 'brw_private.h', - 'brw_reg.cpp', - 'brw_reg.h', - 'brw_reg_allocate.cpp', - 'brw_reg_type.c', - 'brw_reg_type.h', - 'brw_rt.h', - 'brw_schedule_instructions.cpp', - 'brw_shader.cpp', - 'brw_shader.h', - 'brw_simd_selection.cpp', - 'brw_spirv.c', - 'brw_thread_payload.cpp', - 'brw_thread_payload.h', - 'brw_validate.cpp', - 'brw_vue_map.c', - 'brw_workaround.cpp', -) - brw_device_sha1_gen_src = custom_target('brw_device_sha1_gen.c', input : ['brw_device_sha1_gen_c.py', '../dev/intel_device_info.py'], output : ['brw_device_sha1_gen.c'], command : [prog_python, '@INPUT0@', '--out', '@OUTPUT@']) - -brw_nir_lower_fsign = custom_target( - 'brw_nir_lower_fsign.c', - input : 'brw_nir_lower_fsign.py', - output : 'brw_nir_lower_fsign.c', - command : [ - prog_python, '@INPUT@', '-p', dir_compiler_nir, - ], - depend_files : nir_algebraic_depends, - capture : true, -) - -brw_nir_workarounds = custom_target( - 'brw_nir_workarounds.c', - input : 'brw_nir_workarounds.py', - output : 'brw_nir_workarounds.c', - command : [ - prog_python, '@INPUT@', '-p', dir_compiler_nir, - ], - depend_files : nir_algebraic_depends, - capture : true, -) - -libintel_compiler_brw = static_library( - 'intel_compiler', - [libintel_compiler_brw_files, brw_nir_lower_fsign, brw_nir_workarounds, [brw_device_sha1_gen_src]], - include_directories : [inc_include, inc_src, inc_intel], - c_args : [no_override_init_args], - cpp_args : ['-Werror=vla'], - gnu_symbol_visibility : 'hidden', - link_with : libintel_compiler_nir, - dependencies : [idep_nir_headers, idep_mesautil, idep_intel_dev, idep_vtn, idep_mda], - build_by_default : false, -) - -idep_intel_compiler_brw = declare_dependency( - link_with : [libintel_compiler_brw, libisl], - dependencies : [ - idep_nir, - idep_mesautil, - idep_vtn, - ], -) - -if with_tests - test( - 'intel_compiler_brw_tests', - executable( - 'intel_compiler_brw_tests', - files( - 'test_eu_compact.cpp', - 'test_eu_validate.cpp', - 'test_helpers.cpp', - 'test_helpers.h', - 'test_insert_load_reg.cpp', - 'test_lower_scoreboard.cpp', - 'test_opt_algebraic.cpp', - 'test_opt_cmod_propagation.cpp', - 'test_opt_combine_constants.cpp', - 'test_opt_copy_propagation.cpp', - 'test_opt_cse.cpp', - 'test_opt_register_coalesce.cpp', - 'test_opt_saturate_propagation.cpp', - 'test_simd_selection.cpp', - 'test_vf_float_conversions.cpp', - ), - include_directories : [inc_include, inc_src, inc_intel], - cpp_args : ['-Werror=vla'], - link_with : libisl, - dependencies : [idep_gtest, idep_nir, idep_mesautil, idep_intel_dev, - idep_intel_compiler_brw], - ), - suite : ['intel'], - protocol : 'gtest', - ) -endif - -if with_intel_tools - -bison_command = [] -if yacc_is_bison - bison_command = [ - prog_bison, '@INPUT@', '--defines=@OUTPUT1@', - '--output=@OUTPUT0@' - ] -else - bison_command = [ - prog_bison, '-H', '@OUTPUT1@', - '-o', '@OUTPUT0@', '@INPUT@' - ] -endif - -brw_gram_tab = custom_target( - 'brw_gram.tab.[ch]', - input : 'brw_gram.y', - output : ['brw_gram.tab.c', 'brw_gram.tab.h'], - command : bison_command -) - -brw_lex_yy_c = custom_target( - 'brw_lex.yy.c', - input : 'brw_lex.l', - output : 'brw_lex.yy.c', - command : [prog_flex, '-o', '@OUTPUT@', '@INPUT@'] -) - -brw_asm_deps = [ - dep_thread, - idep_intel_compiler_brw, - idep_intel_dev, - idep_mesautil, -] - -brw_asm = static_library( - 'brw_asm', - ['brw_asm.c', brw_gram_tab[0], brw_gram_tab[1], brw_lex_yy_c], - dependencies : brw_asm_deps, - include_directories : [inc_include, inc_src, inc_intel], - c_args : [no_override_init_args], - gnu_symbol_visibility : 'hidden', - build_by_default : false, -) - -idep_brw_asm = declare_dependency( - link_with : brw_asm, - dependencies : brw_asm_deps, -) - -brw_asm_tool = executable( - 'brw_asm', - ['brw_asm_tool.c'], - dependencies : idep_brw_asm, - include_directories : [inc_include, inc_src, inc_intel], - c_args : [no_override_init_args], - gnu_symbol_visibility : 'hidden', - install : true -) - -asm_testcases = [ - ['skl', 'gfx9'], - ['icl', 'gfx11'], - ['tgl', 'gfx12'], - ['dg2', 'gfx12.5'], -] - -test_runner = find_program('tests/run-test.py') -foreach testcase : asm_testcases - _gen_name = testcase[0] - _gen_num = testcase[1] - _gen_folder = join_paths(meson.current_source_dir(), 'tests', - _gen_num.replace('gfx', 'gen')) - test( - 'brw_asm_' + _gen_num, test_runner, - args : [ - '--brw_asm', brw_asm_tool, - '--gen_name', _gen_name, - '--gen_folder', _gen_folder, - ], - suite : 'intel', - ) -endforeach - -brw_disasm_tool = executable( - 'brw_disasm', - files('brw_disasm_tool.c'), - dependencies : [idep_mesautil, dep_thread, idep_intel_dev, - idep_intel_compiler_brw], - include_directories : [inc_include, inc_src, inc_intel], - c_args : [no_override_init_args], - gnu_symbol_visibility : 'hidden', - install : true -) - -endif +subdir('brw') if with_intel_elk subdir('elk') diff --git a/src/intel/decoder/intel_batch_decoder_brw.c b/src/intel/decoder/intel_batch_decoder_brw.c index 074c0297ec7..94c8cd1059c 100644 --- a/src/intel/decoder/intel_batch_decoder_brw.c +++ b/src/intel/decoder/intel_batch_decoder_brw.c @@ -6,7 +6,7 @@ #include "intel_decoder.h" #include "intel_decoder_private.h" -#include "compiler/brw_disasm.h" +#include "compiler/brw/brw_disasm.h" static void ctx_disassemble_program_brw(struct intel_batch_decode_ctx *ctx, diff --git a/src/intel/executor/executor_macros.c b/src/intel/executor/executor_macros.c index 9e2b5ad9362..36d858cb50a 100644 --- a/src/intel/executor/executor_macros.c +++ b/src/intel/executor/executor_macros.c @@ -6,7 +6,7 @@ #include #include "util/ralloc.h" -#include "intel/compiler/brw_asm.h" +#include "intel/compiler/brw/brw_asm.h" #include "executor.h" diff --git a/src/intel/executor/executor_main.c b/src/intel/executor/executor_main.c index 5f17eadfb4c..a2ac28f0860 100644 --- a/src/intel/executor/executor_main.c +++ b/src/intel/executor/executor_main.c @@ -20,8 +20,8 @@ #include "drm-uapi/i915_drm.h" #include "drm-uapi/xe_drm.h" -#include "intel/compiler/brw_asm.h" -#include "intel/compiler/brw_isa_info.h" +#include "intel/compiler/brw/brw_asm.h" +#include "intel/compiler/brw/brw_isa_info.h" #include "intel/common/intel_gem.h" #include "intel/common/xe/intel_engine.h" #include "intel/decoder/intel_decoder.h" diff --git a/src/intel/meson.build b/src/intel/meson.build index e5ef168c8a1..bf890f21130 100644 --- a/src/intel/meson.build +++ b/src/intel/meson.build @@ -2,6 +2,7 @@ # SPDX-License-Identifier: MIT inc_intel = include_directories('.') +inc_intel_compiler = include_directories('compiler') with_intel_elk = get_option('intel-elk') diff --git a/src/intel/tools/aubinator_error_decode_xe.c b/src/intel/tools/aubinator_error_decode_xe.c index 33c3c956e34..a83ed3de752 100644 --- a/src/intel/tools/aubinator_error_decode_xe.c +++ b/src/intel/tools/aubinator_error_decode_xe.c @@ -12,7 +12,7 @@ #include "aubinator_error_decode_lib.h" #include "error_decode_lib.h" #include "error_decode_xe_lib.h" -#include "intel/compiler/brw_isa_info.h" +#include "intel/compiler/brw/brw_isa_info.h" #include "intel/common/intel_gem.h" #include "intel/dev/intel_device_info.h" diff --git a/src/intel/tools/aubinator_viewer.h b/src/intel/tools/aubinator_viewer.h index a8bb988e9d5..5ec941b4922 100644 --- a/src/intel/tools/aubinator_viewer.h +++ b/src/intel/tools/aubinator_viewer.h @@ -3,7 +3,7 @@ #include "imgui/imgui.h" -#include "compiler/brw_disasm.h" +#include "compiler/brw/brw_disasm.h" #include "decoder/intel_decoder.h" struct aub_viewer_cfg { diff --git a/src/intel/tools/intel_dev_info.c b/src/intel/tools/intel_dev_info.c index d0c3c6009fa..e04e939ed39 100644 --- a/src/intel/tools/intel_dev_info.c +++ b/src/intel/tools/intel_dev_info.c @@ -38,7 +38,7 @@ #include "dev/intel_device_info.h" #include "dev/intel_device_info_serialize.h" #include "dev/intel_hwconfig.h" -#include "compiler/brw_compiler.h" +#include "compiler/brw/brw_compiler.h" static int error(char *fmt, ...) diff --git a/src/intel/tools/intel_tools.c b/src/intel/tools/intel_tools.c index b63aec48ab5..92b680d89b2 100644 --- a/src/intel/tools/intel_tools.c +++ b/src/intel/tools/intel_tools.c @@ -5,8 +5,8 @@ #include "intel_tools.h" -#include "compiler/brw_disasm.h" -#include "compiler/brw_isa_info.h" +#include "compiler/brw/brw_disasm.h" +#include "compiler/brw/brw_isa_info.h" #ifdef INTEL_USE_ELK #include "compiler/elk/elk_disasm.h" #include "compiler/elk/elk_isa_info.h" diff --git a/src/intel/tools/intel_tools.h b/src/intel/tools/intel_tools.h index 13d14e4e3e9..5867d55462a 100644 --- a/src/intel/tools/intel_tools.h +++ b/src/intel/tools/intel_tools.h @@ -9,7 +9,7 @@ #include "intel/decoder/intel_decoder.h" -#include "compiler/brw_isa_info.h" +#include "compiler/brw/brw_isa_info.h" #ifdef INTEL_USE_ELK #include "compiler/elk/elk_isa_info.h" #endif diff --git a/src/intel/vulkan/anv_blorp.c b/src/intel/vulkan/anv_blorp.c index 7cf450df305..85a2869e139 100644 --- a/src/intel/vulkan/anv_blorp.c +++ b/src/intel/vulkan/anv_blorp.c @@ -22,7 +22,7 @@ */ #include "anv_private.h" -#include "compiler/brw_disasm.h" +#include "compiler/brw/brw_disasm.h" #include "genxml/gen80_pack.h" static bool diff --git a/src/intel/vulkan/anv_internal_kernels.c b/src/intel/vulkan/anv_internal_kernels.c index dcfb75fa185..e54f431044b 100644 --- a/src/intel/vulkan/anv_internal_kernels.c +++ b/src/intel/vulkan/anv_internal_kernels.c @@ -24,8 +24,8 @@ #include "anv_private.h" #include "compiler/intel_nir.h" -#include "compiler/brw_compiler.h" -#include "compiler/brw_nir.h" +#include "compiler/brw/brw_compiler.h" +#include "compiler/brw/brw_nir.h" #include "compiler/nir/nir.h" #include "compiler/nir/nir_builder.h" #include "dev/intel_debug.h" diff --git a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c index 8ac71f788b7..d749b8acc00 100644 --- a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c +++ b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c @@ -23,7 +23,7 @@ #include "anv_nir.h" #include "nir/nir_builder.h" -#include "compiler/brw_nir.h" +#include "compiler/brw/brw_nir.h" #include "util/mesa-sha1.h" #include "util/set.h" diff --git a/src/intel/vulkan/anv_nir_compute_push_layout.c b/src/intel/vulkan/anv_nir_compute_push_layout.c index 932c4461e89..eb8eeae53b1 100644 --- a/src/intel/vulkan/anv_nir_compute_push_layout.c +++ b/src/intel/vulkan/anv_nir_compute_push_layout.c @@ -23,7 +23,7 @@ #include "anv_nir.h" #include "nir_builder.h" -#include "compiler/brw_nir.h" +#include "compiler/brw/brw_nir.h" #include "util/mesa-sha1.h" bool diff --git a/src/intel/vulkan/anv_nir_lower_unaligned_dispatch.c b/src/intel/vulkan/anv_nir_lower_unaligned_dispatch.c index 296cbd17c3f..ecef461e077 100644 --- a/src/intel/vulkan/anv_nir_lower_unaligned_dispatch.c +++ b/src/intel/vulkan/anv_nir_lower_unaligned_dispatch.c @@ -5,7 +5,7 @@ #include "anv_nir.h" #include "nir_builder.h" -#include "compiler/brw_nir.h" +#include "compiler/brw/brw_nir.h" bool anv_nir_lower_unaligned_dispatch(nir_shader *shader) diff --git a/src/intel/vulkan/anv_nir_push_descriptor_analysis.c b/src/intel/vulkan/anv_nir_push_descriptor_analysis.c index 4e3ff2243c4..1b0252fd56a 100644 --- a/src/intel/vulkan/anv_nir_push_descriptor_analysis.c +++ b/src/intel/vulkan/anv_nir_push_descriptor_analysis.c @@ -23,7 +23,7 @@ #include "anv_nir.h" -#include "compiler/brw_nir.h" +#include "compiler/brw/brw_nir.h" static const struct anv_descriptor_set_layout * anv_pipeline_layout_get_push_set(struct anv_descriptor_set_layout * const *set_layouts, diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index 61858eb706e..68d0cf0963b 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -51,8 +51,8 @@ #include "decoder/intel_decoder.h" #include "dev/intel_device_info.h" #include "blorp/blorp.h" -#include "compiler/brw_compiler.h" -#include "compiler/brw_rt.h" +#include "compiler/brw/brw_compiler.h" +#include "compiler/brw/brw_rt.h" #include "ds/intel_driver_ds.h" #include "util/bitset.h" #include "util/bitscan.h" diff --git a/src/intel/vulkan/anv_shader.c b/src/intel/vulkan/anv_shader.c index bde52ac4922..4a13a4cb2e2 100644 --- a/src/intel/vulkan/anv_shader.c +++ b/src/intel/vulkan/anv_shader.c @@ -7,7 +7,7 @@ #include "nir/nir_serialize.h" -#include "compiler/brw_disasm.h" +#include "compiler/brw/brw_disasm.h" #include "util/shader_stats.h" static void diff --git a/src/intel/vulkan/anv_shader_compile.c b/src/intel/vulkan/anv_shader_compile.c index 78fa4b1d467..4e96551a5da 100644 --- a/src/intel/vulkan/anv_shader_compile.c +++ b/src/intel/vulkan/anv_shader_compile.c @@ -12,8 +12,8 @@ #include "common/intel_compute_slm.h" #include "common/intel_l3_config.h" -#include "compiler/brw_nir.h" -#include "compiler/brw_nir_rt.h" +#include "compiler/brw/brw_nir.h" +#include "compiler/brw/brw_nir_rt.h" #include "compiler/intel_nir.h" #include "git_sha1.h" diff --git a/src/intel/vulkan/anv_util.c b/src/intel/vulkan/anv_util.c index b55942193e3..f32ecbcef4e 100644 --- a/src/intel/vulkan/anv_util.c +++ b/src/intel/vulkan/anv_util.c @@ -33,7 +33,7 @@ #include "anv_private.h" #include "vk_enum_to_str.h" -#include "compiler/brw_nir_rt.h" +#include "compiler/brw/brw_nir_rt.h" #ifdef NO_REGEX typedef int regex_t;