For those of you who like branches:
https://cgit.freedesktop.org/~jekstrand/mesa/log/?h=wip/move-compiler
On Tue, Feb 28, 2017 at 9:03 PM, Jason Ekstrand <ja...@jlekstrand.net>
wrote:
> This little series moves the i965 back-end compiler to src/intel/compiler.
> It's not incredibly pretty; I didn't do as much header clean-up as perhaps
> could have been done. Anything that I didn't know what to do with I moved
> to brw_shader or brw_program. The second-to-last patch which shuffles the
> header includes around is also one big patch. It could be split up but
> there didn't seem to be much of a point.
>
> Jason Ekstrand (24):
> i965: Move a couple of #defines from brw_context to brw_compiler
> i965: Move some helpers from brw_context.h to brw_shader.h
> i965: Move brw_disassemble_inst to brw_eu.h
> i965: Move some gen4 WM defines to brw_compiler.h
> i965: Move assign_common_binding_table_offsets to brw_program
> i965/vue_map: Stop using GLbitfield types
> i965: Get rid of BRW_PRIM_OFFSET
> i965: Don't use MAX_SURFACES in mark_surface_used
> i965/gs: Add the gl_prim_to_hw_prim table to vec4_gs_visitor.cpp
> i964/gs: Move MAX_GS_INPUT_VERTICES to brw_vec4_gs_visitor.h
> i965: Move SOL binding #defines to brw_compiler.h
> i965: Move SHADER_TIME_STRIDE to brw_compiler.h
> i965: Move brw_register_blocks to brw_fs.cpp
> i965/inst: Stop using fi_type
> i965: Move BRW_MAX_DRAW_BUFFERS to brw_compiler.h
> i965: Move BRW_ATTRIB_WA_* defines to brw_compiler.h
> i965: Make mark_surface_used a static inline in brw_compiler.h
> i965: Move channel_expressions and vector_splitting to brw_program.h
> i965: Move image uniform setup to brw_nir_uniforms.cpp
> i965: Move a bunch of pre-compile and link stuff to brw_program.h
> i965: Add a header for brw_vec4_vs_visitor
> i965: Delete brw_do_cubemap_normalize
> i965: Reduce cross-pollination between the DRI driver and compiler
> i965: Move the back-end compiler to src/intel/compiler
>
> src/intel/Makefile.am | 2 +
> src/intel/Makefile.compiler.am | 116 ++++++++++++++++
> src/intel/Makefile.sources | 89 ++++++++++++
> src/intel/blorp/blorp_priv.h | 2 +-
> src/intel/compiler/.gitignore | 1 +
> .../dri/i965 => intel/compiler}/brw_cfg.cpp | 0
> .../drivers/dri/i965 => intel/compiler}/brw_cfg.h | 0
> .../dri/i965 => intel/compiler}/brw_compiler.c | 3 +-
> .../dri/i965 => intel/compiler}/brw_compiler.h | 116 +++++++++++++++-
> .../compiler}/brw_dead_control_flow.cpp | 0
> .../compiler}/brw_dead_control_flow.h | 0
> .../dri/i965 => intel/compiler}/brw_disasm.c | 3 +-
> .../drivers/dri/i965 => intel/compiler}/brw_eu.c | 3 +-
> .../drivers/dri/i965 => intel/compiler}/brw_eu.h | 2 +
> .../dri/i965 => intel/compiler}/brw_eu_compact.c | 3 +-
> .../dri/i965 => intel/compiler}/brw_eu_emit.c | 1 -
> .../dri/i965 => intel/compiler}/brw_eu_util.c | 1 -
> .../dri/i965 => intel/compiler}/brw_eu_validate.c | 0
> .../drivers/dri/i965 => intel/compiler}/brw_fs.cpp | 15 +-
> .../drivers/dri/i965 => intel/compiler}/brw_fs.h | 3 -
> .../dri/i965 => intel/compiler}/brw_fs_builder.h | 1 -
> .../compiler}/brw_fs_cmod_propagation.cpp | 0
> .../compiler}/brw_fs_combine_constants.cpp | 0
> .../compiler}/brw_fs_copy_propagation.cpp | 0
> .../dri/i965 => intel/compiler}/brw_fs_cse.cpp | 0
> .../compiler}/brw_fs_dead_code_eliminate.cpp | 0
> .../i965 => intel/compiler}/brw_fs_generator.cpp | 0
> .../compiler}/brw_fs_live_variables.cpp | 0
> .../compiler}/brw_fs_live_variables.h | 0
> .../i965 => intel/compiler}/brw_fs_lower_d2x.cpp | 0
> .../i965 => intel/compiler}/brw_fs_lower_pack.cpp | 0
> .../dri/i965 => intel/compiler}/brw_fs_nir.cpp | 0
> .../compiler}/brw_fs_reg_allocate.cpp | 0
> .../compiler}/brw_fs_register_coalesce.cpp | 0
> .../compiler}/brw_fs_saturate_propagation.cpp | 0
> .../compiler}/brw_fs_sel_peephole.cpp | 0
> .../compiler}/brw_fs_surface_builder.cpp | 0
> .../compiler}/brw_fs_surface_builder.h | 1 -
> .../i965 => intel/compiler}/brw_fs_validate.cpp | 0
> .../dri/i965 => intel/compiler}/brw_fs_visitor.cpp | 0
> .../drivers/dri/i965 => intel/compiler}/brw_inst.h | 13 +-
> .../compiler}/brw_interpolation_map.c | 1 -
> .../dri/i965 => intel/compiler}/brw_ir_allocator.h | 0
> .../dri/i965 => intel/compiler}/brw_ir_fs.h | 0
> .../dri/i965 => intel/compiler}/brw_ir_vec4.h | 1 -
> .../drivers/dri/i965 => intel/compiler}/brw_nir.c | 1 +
> .../drivers/dri/i965 => intel/compiler}/brw_nir.h | 0
> .../compiler}/brw_nir_analyze_boolean_resolves.c | 0
> .../compiler}/brw_nir_attribute_workarounds.c | 1 -
> .../i965 => intel/compiler}/brw_nir_intrinsics.c | 0
> .../compiler}/brw_nir_opt_peephole_ffma.c | 0
> .../compiler}/brw_nir_tcs_workarounds.c | 0
> .../compiler}/brw_nir_trig_workarounds.py | 0
> .../dri/i965 => intel/compiler}/brw_packed_float.c | 0
> .../compiler}/brw_predicated_break.cpp | 0
> .../drivers/dri/i965 => intel/compiler}/brw_reg.h | 0
> .../compiler}/brw_schedule_instructions.cpp | 0
> .../dri/i965 => intel/compiler}/brw_shader.cpp | 151
> +--------------------
> .../dri/i965 => intel/compiler}/brw_shader.h | 41 +++---
> .../dri/i965 => intel/compiler}/brw_vec4.cpp | 5 +-
> .../drivers/dri/i965 => intel/compiler}/brw_vec4.h | 0
> .../dri/i965 => intel/compiler}/brw_vec4_builder.h | 1 -
> .../compiler}/brw_vec4_cmod_propagation.cpp | 0
> .../compiler}/brw_vec4_copy_propagation.cpp | 0
> .../dri/i965 => intel/compiler}/brw_vec4_cse.cpp | 0
> .../compiler}/brw_vec4_dead_code_eliminate.cpp | 0
> .../i965 => intel/compiler}/brw_vec4_generator.cpp | 3 +-
> .../i965 => intel/compiler}/brw_vec4_gs_nir.cpp | 0
> .../compiler}/brw_vec4_gs_visitor.cpp | 21 ++-
> .../i965 => intel/compiler}/brw_vec4_gs_visitor.h | 2 +
> .../compiler}/brw_vec4_live_variables.cpp | 0
> .../compiler}/brw_vec4_live_variables.h | 0
> .../dri/i965 => intel/compiler}/brw_vec4_nir.cpp | 0
> .../compiler}/brw_vec4_reg_allocate.cpp | 0
> .../compiler}/brw_vec4_surface_builder.cpp | 0
> .../compiler}/brw_vec4_surface_builder.h | 0
> .../dri/i965 => intel/compiler}/brw_vec4_tcs.cpp | 1 +
> .../dri/i965 => intel/compiler}/brw_vec4_tcs.h | 0
> .../dri/i965 => intel/compiler}/brw_vec4_tes.cpp | 1 +
> .../dri/i965 => intel/compiler}/brw_vec4_tes.h | 0
> .../i965 => intel/compiler}/brw_vec4_visitor.cpp | 0
> .../compiler}/brw_vec4_vs_visitor.cpp | 4 +-
> .../dri/i965 => intel/compiler}/brw_vue_map.c | 13 +-
> .../dri/i965 => intel/compiler}/brw_wm_iz.cpp | 15 +-
> .../i965 => intel/compiler}/gen6_gs_visitor.cpp | 0
> .../dri/i965 => intel/compiler}/gen6_gs_visitor.h | 0
> .../i965 => intel/compiler}/intel_asm_annotation.c | 0
> .../dri/i965 => intel/compiler}/test_eu_compact.c | 0
> .../i965 => intel/compiler}/test_eu_validate.cpp | 0
> .../compiler}/test_fs_cmod_propagation.cpp | 0
> .../compiler}/test_fs_copy_propagation.cpp | 0
> .../compiler}/test_fs_saturate_propagation.cpp | 0
> .../compiler}/test_vec4_cmod_propagation.cpp | 0
> .../compiler}/test_vec4_copy_propagation.cpp | 0
> .../compiler}/test_vec4_register_coalesce.cpp | 0
> .../compiler}/test_vf_float_conversions.cpp | 0
> src/intel/tools/disasm.c | 4 +-
> src/intel/vulkan/anv_pipeline.c | 2 +-
> src/intel/vulkan/anv_private.h | 2 +-
> src/mesa/drivers/dri/i965/Makefile.am | 86 ------------
> src/mesa/drivers/dri/i965/Makefile.sources | 93 -------------
> src/mesa/drivers/dri/i965/brw_clip.c | 1 -
> src/mesa/drivers/dri/i965/brw_clip.h | 2 +-
> src/mesa/drivers/dri/i965/brw_clip_line.c | 1 -
> src/mesa/drivers/dri/i965/brw_clip_point.c | 1 -
> src/mesa/drivers/dri/i965/brw_clip_tri.c | 1 -
> src/mesa/drivers/dri/i965/brw_clip_unfilled.c | 1 -
> src/mesa/drivers/dri/i965/brw_clip_util.c | 1 -
> src/mesa/drivers/dri/i965/brw_context.c | 1 -
> src/mesa/drivers/dri/i965/brw_context.h | 93 +------------
> src/mesa/drivers/dri/i965/brw_cs.c | 4 +-
> .../drivers/dri/i965/brw_cubemap_normalize.cpp | 121
> -----------------
> src/mesa/drivers/dri/i965/brw_defines.h | 10 +-
> src/mesa/drivers/dri/i965/brw_draw.c | 1 -
> src/mesa/drivers/dri/i965/brw_ff_gs.c | 2 +-
> src/mesa/drivers/dri/i965/brw_ff_gs.h | 2 +-
> src/mesa/drivers/dri/i965/brw_ff_gs_emit.c | 3 +-
> src/mesa/drivers/dri/i965/brw_gs.c | 3 +-
> src/mesa/drivers/dri/i965/brw_link.cpp | 4 +-
> src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp | 55 +++++++-
> src/mesa/drivers/dri/i965/brw_program.c | 100 +++++++++++++-
> src/mesa/drivers/dri/i965/brw_program.h | 26 +++-
> src/mesa/drivers/dri/i965/brw_program_cache.c | 2 +-
> src/mesa/drivers/dri/i965/brw_sf.c | 1 -
> src/mesa/drivers/dri/i965/brw_sf.h | 2 +-
> src/mesa/drivers/dri/i965/brw_sf_emit.c | 1 -
> src/mesa/drivers/dri/i965/brw_state_dump.c | 1 -
> src/mesa/drivers/dri/i965/brw_state_upload.c | 1 +
> src/mesa/drivers/dri/i965/brw_tcs.c | 3 +-
> src/mesa/drivers/dri/i965/brw_tes.c | 3 +-
> src/mesa/drivers/dri/i965/brw_util.c | 8 +-
> src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.h | 68 ++++++++++
> src/mesa/drivers/dri/i965/brw_vs.c | 2 +-
> src/mesa/drivers/dri/i965/brw_vs.h | 56 +-------
> src/mesa/drivers/dri/i965/brw_wm.c | 35 +++--
> src/mesa/drivers/dri/i965/brw_wm.h | 18 ---
> src/mesa/drivers/dri/i965/gen6_sol.c | 2 +-
> src/mesa/drivers/dri/i965/gen7_cs_state.c | 3 +-
> src/mesa/drivers/dri/i965/intel_debug.h | 3 +
> src/mesa/drivers/dri/i965/intel_screen.c | 2 +-
> 140 files changed, 705 insertions(+), 763 deletions(-)
> create mode 100644 src/intel/Makefile.compiler.am
> create mode 100644 src/intel/compiler/.gitignore
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_cfg.cpp (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_cfg.h (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_compiler.c (99%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_compiler.h (87%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/brw_dead_control_flow.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_dead_control_flow.h
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_disasm.c (99%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_eu.c (99%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_eu.h (99%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_eu_compact.c
> (99%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_eu_emit.c (99%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_eu_util.c (99%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_eu_validate.c
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs.cpp (99%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs.h (99%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_builder.h
> (99%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/brw_fs_cmod_propagation.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/brw_fs_combine_constants.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/brw_fs_copy_propagation.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_cse.cpp (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/brw_fs_dead_code_eliminate.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_generator.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/brw_fs_live_variables.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_live_variables.h
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_lower_d2x.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_lower_pack.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_nir.cpp (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_reg_allocate.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/brw_fs_register_coalesce.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/brw_fs_saturate_propagation.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_sel_peephole.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/brw_fs_surface_builder.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_surface_builder.h
> (99%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_validate.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_visitor.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_inst.h (99%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_interpolation_map.c
> (99%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_ir_allocator.h
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_ir_fs.h (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_ir_vec4.h (99%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_nir.c (99%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_nir.h (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/brw_nir_analyze_boolean_resolves.c
> (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/brw_nir_attribute_workarounds.c
> (99%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_nir_intrinsics.c
> (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/brw_nir_opt_peephole_ffma.c
> (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/brw_nir_tcs_workarounds.c
> (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/brw_nir_trig_workarounds.py
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_packed_float.c
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_predicated_break.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_reg.h (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/brw_schedule_instructions.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_shader.cpp (86%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_shader.h (88%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4.cpp (99%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4.h (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_builder.h
> (99%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/brw_vec4_cmod_propagation.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/brw_vec4_copy_propagation.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_cse.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/brw_vec4_dead_code_eliminate.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_generator.cpp
> (99%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_gs_nir.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_gs_visitor.cpp
> (97%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_gs_visitor.h
> (98%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/brw_vec4_live_variables.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/brw_vec4_live_variables.h
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_nir.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/brw_vec4_reg_allocate.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/brw_vec4_surface_builder.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/brw_vec4_surface_builder.h
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_tcs.cpp
> (99%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_tcs.h (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_tes.cpp
> (99%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_tes.h (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_visitor.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_vs_visitor.cpp
> (99%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vue_map.c (97%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_wm_iz.cpp (91%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/gen6_gs_visitor.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/gen6_gs_visitor.h
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/intel_asm_annotation.c
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/test_eu_compact.c
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/test_eu_validate.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/test_fs_cmod_propagation.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/test_fs_copy_propagation.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/test_fs_saturate_propagation.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/test_vec4_cmod_propagation.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/test_vec4_copy_propagation.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/test_vec4_register_coalesce.cpp
> (100%)
> rename src/{mesa/drivers/dri/i965 =>
> intel/compiler}/test_vf_float_conversions.cpp
> (100%)
> delete mode 100644 src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp
> create mode 100644 src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.h
>
> --
> 2.5.0.400.gff86faf
>
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
