[Mesa-dev] [PATCH 0/8] intel: Add a common folder for code-sharing

Jason Ekstrand jason at jlekstrand.net
Wed Aug 31 20:56:50 UTC 2016


Right now, we have 3 places where code is shared between the Vulkan and GL
drivers: blorp, isl, and libi965_compiler.  There are a few places where we
want to share misc. code that doesn't fall into any of these categories.
This little series adds a new src/intel/common folder and puts the device
info and shared urb setup code there.

Cc: Jordan Justen <jordan.l.justen at intel.com>

Jason Ekstrand (8):
  intel: Add a new "common" library for more code sharing
  intel: s/brw_device_info/gen_device_info/
  intel: Rename brw_get_device_name/info to gen_get_device_name/info
  intel: Pull the guts of gen7_l3_state.c into a shared helper
  anv: Leverage the shared L3$ config code
  anv: Refactor pipeline l3 config setup
  anv/cmd_buffer: Move emit_lri and emit_lrm higher up
  anv: Move cmd_buffer_config_l3 into anv_cmd_buffer.c

 src/intel/Android.common.mk                        |  37 ++
 src/intel/Android.mk                               |   1 +
 src/intel/Makefile.am                              |   1 +
 src/intel/Makefile.common.am                       |  24 +
 src/intel/Makefile.isl.am                          |   1 +
 src/intel/Makefile.sources                         |   6 +
 src/intel/blorp/blorp_blit.c                       |   4 +-
 src/intel/blorp/blorp_genX_exec.h                  |   2 +-
 .../common/gen_device_info.c}                      |  64 +--
 .../common/gen_device_info.h}                      |   6 +-
 src/intel/common/gen_l3_config.c                   | 297 +++++++++++
 src/intel/common/gen_l3_config.h                   | 108 ++++
 src/intel/isl/isl.c                                |   2 +-
 src/intel/isl/isl.h                                |  22 +-
 src/intel/isl/isl_format.c                         |  16 +-
 src/intel/isl/isl_priv.h                           |   2 +-
 src/intel/isl/isl_storage_image.c                  |   4 +-
 .../isl/tests/isl_surf_get_image_offset_test.c     |   8 +-
 src/intel/tools/Makefile.am                        |   1 +
 src/intel/tools/disasm.c                           |   8 +-
 src/intel/vulkan/Makefile.am                       |   1 +
 src/intel/vulkan/Makefile.sources                  |   4 -
 src/intel/vulkan/anv_allocator.c                   |   2 +-
 src/intel/vulkan/anv_device.c                      |   6 +-
 src/intel/vulkan/anv_entrypoints_gen.py            |   6 +-
 src/intel/vulkan/anv_formats.c                     |   6 +-
 src/intel/vulkan/anv_genX.h                        |   4 +-
 src/intel/vulkan/anv_pipeline.c                    |  58 ++-
 src/intel/vulkan/anv_private.h                     |  18 +-
 src/intel/vulkan/gen7_cmd_buffer.c                 |   2 +-
 src/intel/vulkan/gen8_cmd_buffer.c                 |   2 +-
 src/intel/vulkan/genX_cmd_buffer.c                 | 198 +++++++-
 src/intel/vulkan/genX_l3.c                         | 545 ---------------------
 src/intel/vulkan/genX_pipeline.c                   |   4 +-
 src/mesa/drivers/dri/i965/Android.mk               |   1 +
 src/mesa/drivers/dri/i965/Makefile.am              |   1 +
 src/mesa/drivers/dri/i965/Makefile.sources         |   2 -
 src/mesa/drivers/dri/i965/brw_clip_line.c          |   2 +-
 src/mesa/drivers/dri/i965/brw_clip_tri.c           |   2 +-
 src/mesa/drivers/dri/i965/brw_compiler.c           |   2 +-
 src/mesa/drivers/dri/i965/brw_compiler.h           |   8 +-
 src/mesa/drivers/dri/i965/brw_context.c            |   4 +-
 src/mesa/drivers/dri/i965/brw_context.h            |  10 +-
 src/mesa/drivers/dri/i965/brw_cs.c                 |   2 +-
 src/mesa/drivers/dri/i965/brw_disasm.c             |  38 +-
 src/mesa/drivers/dri/i965/brw_eu.c                 |  12 +-
 src/mesa/drivers/dri/i965/brw_eu.h                 |  26 +-
 src/mesa/drivers/dri/i965/brw_eu_compact.c         |  50 +-
 src/mesa/drivers/dri/i965/brw_eu_emit.c            | 144 +++---
 src/mesa/drivers/dri/i965/brw_eu_validate.c        |  12 +-
 src/mesa/drivers/dri/i965/brw_fs.cpp               |  30 +-
 src/mesa/drivers/dri/i965/brw_fs.h                 |   2 +-
 .../drivers/dri/i965/brw_fs_cmod_propagation.cpp   |   2 +-
 .../drivers/dri/i965/brw_fs_combine_constants.cpp  |   4 +-
 .../drivers/dri/i965/brw_fs_copy_propagation.cpp   |   2 +-
 src/mesa/drivers/dri/i965/brw_fs_nir.cpp           |   4 +-
 src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp  |   4 +-
 .../drivers/dri/i965/brw_fs_surface_builder.cpp    |  18 +-
 src/mesa/drivers/dri/i965/brw_gs.c                 |   2 +-
 src/mesa/drivers/dri/i965/brw_inst.h               |  48 +-
 src/mesa/drivers/dri/i965/brw_ir_fs.h              |   4 +-
 src/mesa/drivers/dri/i965/brw_ir_vec4.h            |   6 +-
 src/mesa/drivers/dri/i965/brw_nir.c                |   6 +-
 src/mesa/drivers/dri/i965/brw_nir.h                |   6 +-
 src/mesa/drivers/dri/i965/brw_pipe_control.c       |   2 +-
 src/mesa/drivers/dri/i965/brw_reg.h                |   4 +-
 .../drivers/dri/i965/brw_schedule_instructions.cpp |   4 +-
 src/mesa/drivers/dri/i965/brw_shader.cpp           |  10 +-
 src/mesa/drivers/dri/i965/brw_shader.h             |  10 +-
 src/mesa/drivers/dri/i965/brw_surface_formats.c    |   2 +-
 src/mesa/drivers/dri/i965/brw_tcs.c                |   2 +-
 src/mesa/drivers/dri/i965/brw_tes.c                |   2 +-
 src/mesa/drivers/dri/i965/brw_vec4.cpp             |   6 +-
 .../drivers/dri/i965/brw_vec4_copy_propagation.cpp |   4 +-
 src/mesa/drivers/dri/i965/brw_vec4_generator.cpp   |  20 +-
 src/mesa/drivers/dri/i965/brw_vec4_tcs.cpp         |   2 +-
 src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp     |   2 +-
 src/mesa/drivers/dri/i965/brw_vue_map.c            |   2 +-
 src/mesa/drivers/dri/i965/brw_wm.c                 |   2 +-
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c   |   2 +-
 src/mesa/drivers/dri/i965/gen7_cs_state.c          |   2 +-
 src/mesa/drivers/dri/i965/gen7_l3_state.c          | 372 ++------------
 src/mesa/drivers/dri/i965/gen7_urb.c               |   2 +-
 src/mesa/drivers/dri/i965/intel_asm_annotation.c   |   4 +-
 src/mesa/drivers/dri/i965/intel_asm_annotation.h   |   4 +-
 src/mesa/drivers/dri/i965/intel_mipmap_tree.c      |   2 +-
 src/mesa/drivers/dri/i965/intel_mipmap_tree.h      |   2 +-
 src/mesa/drivers/dri/i965/intel_screen.c           |   4 +-
 src/mesa/drivers/dri/i965/intel_screen.h           |   4 +-
 src/mesa/drivers/dri/i965/test_eu_compact.c        |   8 +-
 .../drivers/dri/i965/test_fs_cmod_propagation.cpp  |   4 +-
 .../dri/i965/test_fs_saturate_propagation.cpp      |   4 +-
 .../dri/i965/test_vec4_cmod_propagation.cpp        |   4 +-
 .../dri/i965/test_vec4_copy_propagation.cpp        |   4 +-
 .../dri/i965/test_vec4_register_coalesce.cpp       |   4 +-
 95 files changed, 1106 insertions(+), 1318 deletions(-)
 create mode 100644 src/intel/Android.common.mk
 create mode 100644 src/intel/Makefile.common.am
 rename src/{mesa/drivers/dri/i965/brw_device_info.c => intel/common/gen_device_info.c} (87%)
 rename src/{mesa/drivers/dri/i965/brw_device_info.h => intel/common/gen_device_info.h} (97%)
 create mode 100644 src/intel/common/gen_l3_config.c
 create mode 100644 src/intel/common/gen_l3_config.h
 delete mode 100644 src/intel/vulkan/genX_l3.c

-- 
2.5.0.400.gff86faf



More information about the mesa-dev mailing list