Mesa (staging/21.2): intel: fix INTEL_DEBUG environment variable on 32-bit systems
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Oct 28 00:02:03 UTC 2021
Module: Mesa
Branch: staging/21.2
Commit: f1926fed4a4a3d112787d08eac7a82dc8cfd97ed
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f1926fed4a4a3d112787d08eac7a82dc8cfd97ed
Author: Marcin Ślusarz <marcin.slusarz at intel.com>
Date: Wed Oct 13 11:21:41 2021 +0200
intel: fix INTEL_DEBUG environment variable on 32-bit systems
INTEL_DEBUG is defined (since 4015e1876a77162e3444eeaa29a0dfbc47efe90e) as:
#define INTEL_DEBUG __builtin_expect(intel_debug, 0)
which unfortunately chops off upper 32 bits from intel_debug
on platforms where sizeof(long) != sizeof(uint64_t) because
__builtin_expect is defined only for the long type.
Fix this by changing the definition of INTEL_DEBUG to be function-like
macro with "flags" argument. New definition returns 0 or 1 when
any of the flags match.
Most of the changes in this commit were generated using:
for c in `git grep INTEL_DEBUG | grep "&" | grep -v i915 | awk -F: '{print $1}' | sort | uniq`; do
perl -pi -e "s/INTEL_DEBUG & ([A-Z0-9a-z_]+)/INTEL_DBG(\1)/" $c
perl -pi -e "s/INTEL_DEBUG & (\([A-Z0-9_ |]+\))/INTEL_DBG\1/" $c
done
but it didn't handle all cases and required minor cleanups (like removal
of round brackets which were not needed anymore).
Signed-off-by: Marcin Ślusarz <marcin.slusarz at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13406>
---
src/gallium/drivers/crocus/crocus_batch.c | 17 +++++----
src/gallium/drivers/crocus/crocus_clear.c | 4 +--
src/gallium/drivers/crocus/crocus_context.h | 2 +-
src/gallium/drivers/crocus/crocus_disk_cache.c | 2 +-
src/gallium/drivers/crocus/crocus_draw.c | 4 +--
src/gallium/drivers/crocus/crocus_program.c | 2 +-
src/gallium/drivers/crocus/crocus_resource.c | 4 +--
src/gallium/drivers/crocus/crocus_screen.c | 2 +-
src/gallium/drivers/crocus/crocus_state.c | 8 ++---
src/gallium/drivers/iris/iris_batch.c | 16 ++++-----
src/gallium/drivers/iris/iris_clear.c | 4 +--
src/gallium/drivers/iris/iris_context.c | 2 +-
src/gallium/drivers/iris/iris_context.h | 2 +-
src/gallium/drivers/iris/iris_disk_cache.c | 2 +-
src/gallium/drivers/iris/iris_draw.c | 4 +--
src/gallium/drivers/iris/iris_fence.c | 6 ++--
src/gallium/drivers/iris/iris_program.c | 2 +-
src/gallium/drivers/iris/iris_resource.c | 6 ++--
src/gallium/drivers/iris/iris_screen.c | 2 +-
src/gallium/drivers/iris/iris_state.c | 2 +-
src/intel/compiler/brw_compile_clip.c | 2 +-
src/intel/compiler/brw_compile_ff_gs.c | 2 +-
src/intel/compiler/brw_compile_sf.c | 2 +-
src/intel/compiler/brw_compiler.c | 7 ++--
src/intel/compiler/brw_disasm_info.c | 2 +-
src/intel/compiler/brw_eu.cpp | 2 +-
src/intel/compiler/brw_eu_compact.c | 4 +--
src/intel/compiler/brw_fs.cpp | 44 +++++++++++------------
src/intel/compiler/brw_shader.cpp | 6 ++--
src/intel/compiler/brw_vec4.cpp | 8 ++---
src/intel/compiler/brw_vec4_gs_visitor.cpp | 6 ++--
src/intel/compiler/brw_vec4_tcs.cpp | 6 ++--
src/intel/compiler/brw_vec4_tes.cpp | 2 +-
src/intel/compiler/brw_vec4_vs_visitor.cpp | 2 +-
src/intel/dev/intel_debug.h | 11 +++---
src/intel/isl/isl_drm.c | 2 +-
src/intel/perf/intel_perf.c | 6 ++--
src/intel/vulkan/anv_batch_chain.c | 6 ++--
src/intel/vulkan/anv_device.c | 10 +++---
src/intel/vulkan/anv_image.c | 8 ++---
src/intel/vulkan/anv_perf.c | 12 +++----
src/intel/vulkan/anv_pipeline.c | 2 +-
src/intel/vulkan/anv_private.h | 4 +--
src/intel/vulkan/genX_cmd_buffer.c | 4 +--
src/mesa/drivers/dri/i965/brw_batch.c | 16 ++++-----
src/mesa/drivers/dri/i965/brw_binding_tables.c | 2 +-
src/mesa/drivers/dri/i965/brw_blorp.c | 2 +-
src/mesa/drivers/dri/i965/brw_clear.c | 4 +--
src/mesa/drivers/dri/i965/brw_context.c | 14 ++++----
src/mesa/drivers/dri/i965/brw_context.h | 2 +-
src/mesa/drivers/dri/i965/brw_cs.c | 2 +-
src/mesa/drivers/dri/i965/brw_disk_cache.c | 4 +--
src/mesa/drivers/dri/i965/brw_draw_upload.c | 2 +-
src/mesa/drivers/dri/i965/brw_gs.c | 2 +-
src/mesa/drivers/dri/i965/brw_link.cpp | 2 +-
src/mesa/drivers/dri/i965/brw_mipmap_tree.c | 2 +-
src/mesa/drivers/dri/i965/brw_performance_query.c | 4 +--
src/mesa/drivers/dri/i965/brw_pixel_bitmap.c | 2 +-
src/mesa/drivers/dri/i965/brw_program.c | 2 +-
src/mesa/drivers/dri/i965/brw_screen.c | 8 ++---
src/mesa/drivers/dri/i965/brw_state_upload.c | 6 ++--
src/mesa/drivers/dri/i965/brw_tcs.c | 2 +-
src/mesa/drivers/dri/i965/brw_tes.c | 2 +-
src/mesa/drivers/dri/i965/brw_urb.c | 4 +--
src/mesa/drivers/dri/i965/brw_vs.c | 4 +--
src/mesa/drivers/dri/i965/brw_wm.c | 6 ++--
src/mesa/drivers/dri/i965/genX_state_upload.c | 2 +-
src/mesa/drivers/dri/i965/gfx7_l3_state.c | 2 +-
68 files changed, 176 insertions(+), 175 deletions(-)
Diff: http://cgit.freedesktop.org/mesa/mesa/diff/?id=f1926fed4a4a3d112787d08eac7a82dc8cfd97ed
More information about the mesa-commit
mailing list