Mesa (main): intel: move away from booleans to identify platforms

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 361b3fee3c5ee38821d96660d68ebec2e31e5f47
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=361b3fee3c5ee38821d96660d68ebec2e31e5f47

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Wed Sep 22 15:06:58 2021 +0300

intel: move away from booleans to identify platforms

v2: Drop changes around GFX_VERx10 == 75 (Luis)

v3: Replace
   (GFX_VERx10 < 75 && devinfo->platform != INTEL_PLATFORM_BYT)
   by
   (devinfo->platform == INTEL_PLATFORM_IVB)
   Replace
   (devinfo->ver >= 5 || devinfo->platform == INTEL_PLATFORM_G4X)
   by
   (devinfo->verx10 >= 45)
   Replace
   (devinfo->platform != INTEL_PLATFORM_G4X)
   by
   (devinfo->verx10 != 45)

v4: Fix crocus typo

v5: Rebase

v6: Add GFX3, ILK & I965 platforms (Jordan)
    Move ifdef to code expressions (Jordan)

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12981>

---

 src/gallium/drivers/crocus/crocus_batch.c        |   2 +-
 src/gallium/drivers/crocus/crocus_pipe_control.c |   2 +-
 src/gallium/drivers/crocus/crocus_screen.c       |   2 +-
 src/gallium/drivers/crocus/crocus_state.c        |  18 ++--
 src/gallium/drivers/iris/iris_screen.c           |   2 +-
 src/gallium/drivers/iris/iris_state.c            |   4 +-
 src/intel/common/intel_l3_config.c               |  11 ++-
 src/intel/common/tests/mi_builder_test.cpp       |   3 +-
 src/intel/compiler/brw_clip_util.c               |   2 +-
 src/intel/compiler/brw_disasm.c                  |   4 +-
 src/intel/compiler/brw_eu.h                      |  14 +--
 src/intel/compiler/brw_eu_compact.c              |  21 +++--
 src/intel/compiler/brw_eu_emit.c                 |   2 +-
 src/intel/compiler/brw_eu_validate.c             |  16 ++--
 src/intel/compiler/brw_fs.cpp                    |  12 +--
 src/intel/compiler/brw_fs_generator.cpp          |  15 +--
 src/intel/compiler/brw_fs_lower_regioning.cpp    |   3 +-
 src/intel/compiler/brw_fs_nir.cpp                |   4 +-
 src/intel/compiler/brw_inst.h                    |   9 +-
 src/intel/compiler/brw_ir_fs.h                   |   3 +-
 src/intel/compiler/brw_ir_performance.cpp        |  48 +++++-----
 src/intel/compiler/brw_nir.c                     |   2 +-
 src/intel/compiler/brw_nir_lower_storage_image.c |   2 +-
 src/intel/compiler/brw_schedule_instructions.cpp |   2 +-
 src/intel/compiler/brw_vec4_generator.cpp        |  14 +--
 src/intel/compiler/brw_vec4_nir.cpp              |   2 +-
 src/intel/compiler/brw_vec4_surface_builder.cpp  |   4 +-
 src/intel/compiler/brw_vec4_visitor.cpp          |   2 +-
 src/intel/compiler/test_eu_compact.cpp           |   4 +-
 src/intel/compiler/test_eu_validate.cpp          |  25 +++--
 src/intel/dev/intel_device_info.c                | 111 ++++++++++++-----------
 src/intel/dev/intel_device_info.h                |  49 ++++++----
 src/intel/dev/intel_device_info_test.c           |   2 +
 src/intel/isl/isl.c                              |  14 +--
 src/intel/isl/isl.h                              |   8 +-
 src/intel/isl/isl_format.c                       |   8 +-
 src/intel/isl/isl_gfx7.c                         |   2 +-
 src/intel/isl/isl_surface_state.c                |   2 +-
 src/intel/perf/intel_perf.c                      |  51 ++++++-----
 src/intel/perf/intel_perf_mdapi.c                |   4 +-
 src/intel/tools/intel_dump_gpu.c                 |   6 +-
 src/intel/tools/intel_noop_drm_shim.c            |   4 +-
 src/intel/vulkan/anv_device.c                    |  15 +--
 src/intel/vulkan/genX_cmd_buffer.c               |   2 +-
 src/intel/vulkan/genX_pipeline.c                 |   2 +-
 src/intel/vulkan/genX_query.c                    |   4 +-
 src/intel/vulkan/genX_state.c                    |   6 +-
 src/intel/vulkan/gfx8_cmd_buffer.c               |   2 +-
 src/mesa/drivers/dri/i965/brw_batch.c            |   2 +-
 src/mesa/drivers/dri/i965/brw_blorp.c            |   4 +-
 src/mesa/drivers/dri/i965/brw_context.c          |   2 +-
 src/mesa/drivers/dri/i965/brw_curbe.c            |   2 +-
 src/mesa/drivers/dri/i965/brw_draw_upload.c      |   2 +-
 src/mesa/drivers/dri/i965/brw_extensions.c       |   9 +-
 src/mesa/drivers/dri/i965/brw_mipmap_tree.c      |   2 +-
 src/mesa/drivers/dri/i965/brw_mipmap_tree.h      |   2 +-
 src/mesa/drivers/dri/i965/brw_misc_state.c       |  10 +-
 src/mesa/drivers/dri/i965/brw_pipe_control.c     |  10 +-
 src/mesa/drivers/dri/i965/brw_screen.c           |  12 +--
 src/mesa/drivers/dri/i965/brw_state_upload.c     |   4 +-
 src/mesa/drivers/dri/i965/brw_urb.c              |   2 +-
 src/mesa/drivers/dri/i965/brw_wm.c               |   5 +-
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c |   2 +-
 src/mesa/drivers/dri/i965/genX_state_upload.c    |  10 +-
 src/mesa/drivers/dri/i965/gfx6_queryobj.c        |   2 +-
 src/mesa/drivers/dri/i965/gfx7_l3_state.c        |   8 +-
 src/mesa/drivers/dri/i965/gfx7_urb.c             |  10 +-
 src/mesa/drivers/dri/i965/hsw_queryobj.c         |   2 +-
 src/mesa/drivers/dri/i965/hsw_sol.c              |   4 +-
 69 files changed, 346 insertions(+), 306 deletions(-)

Diff:   http://cgit.freedesktop.org/mesa/mesa/diff/?id=361b3fee3c5ee38821d96660d68ebec2e31e5f47