KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iris: drop likely/unlikely around INTEL_DEBUG 

It's included in declaration of INTEL_DEBUG.

Signed-off-by: Marcin Ślusarz <marcin.slusarz@intel.com>
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6732>
This commit is contained in:
Marcin Ślusarz 2020-09-14 18:49:43 +02:00 committed by Marge Bot
parent 4015e1876a
commit e6d26fbf3d
6 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gallium/drivers/iris/iris_batch.c
View File

@ -211,7 +211,7 @@ iris_init_batch(struct iris_context *ice,
batch->other_batches[j++] = &ice->batches[i];
}
if (unlikely(INTEL_DEBUG)) {
if (INTEL_DEBUG) {
const unsigned decode_flags =
GEN_BATCH_DECODE_FULL |
((INTEL_DEBUG & DEBUG_COLOR) ? GEN_BATCH_DECODE_IN_COLOR : 0) |
@ -443,7 +443,7 @@ iris_batch_free(struct iris_batch *batch)
_mesa_hash_table_destroy(batch->cache.render, NULL);
if (unlikely(INTEL_DEBUG))
if (INTEL_DEBUG)
gen_batch_decode_ctx_finish(&batch->decoder);
}
@ -684,8 +684,7 @@ _iris_batch_flush(struct iris_batch *batch, const char *file, int line)
iris_finish_batch(batch);
if (unlikely(INTEL_DEBUG &
(DEBUG_BATCH | DEBUG_SUBMIT | DEBUG_PIPE_CONTROL))) {
if (INTEL_DEBUG & (DEBUG_BATCH | DEBUG_SUBMIT | DEBUG_PIPE_CONTROL)) {
const char *basefile = strstr(file, "iris/");
if (basefile)
file = basefile + 5;
@ -719,7 +718,7 @@ _iris_batch_flush(struct iris_batch *batch, const char *file, int line)
util_dynarray_clear(&batch->exec_fences);
if (unlikely(INTEL_DEBUG & DEBUG_SYNC)) {
if (INTEL_DEBUG & DEBUG_SYNC) {
dbg_printf("waiting for idle\n");
iris_bo_wait_rendering(batch->bo); /* if execbuf failed; this is a nop */
}

2
src/gallium/drivers/iris/iris_context.c
View File

@ -302,7 +302,7 @@ iris_create_context(struct pipe_screen *pscreen, void *priv, unsigned flags)
if (flags & PIPE_CONTEXT_LOW_PRIORITY)
priority = GEN_CONTEXT_LOW_PRIORITY;
if (unlikely(INTEL_DEBUG & DEBUG_BATCH))
if (INTEL_DEBUG & DEBUG_BATCH)
ice->state.sizes = _mesa_hash_table_u64_create(ice);
for (int i = 0; i < IRIS_BATCH_COUNT; i++) {

4
src/gallium/drivers/iris/iris_draw.c
View File

@ -241,7 +241,7 @@ iris_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
/* We can't safely re-emit 3DSTATE_SO_BUFFERS because it may zero the
* write offsets, changing the behavior.
*/
if (unlikely(INTEL_DEBUG & DEBUG_REEMIT)) {
if (INTEL_DEBUG & DEBUG_REEMIT) {
ice->state.dirty |= IRIS_ALL_DIRTY_FOR_RENDER & ~IRIS_DIRTY_SO_BUFFERS;
ice->state.stage_dirty |= IRIS_ALL_STAGE_DIRTY_FOR_RENDER;
}
@ -346,7 +346,7 @@ iris_launch_grid(struct pipe_context *ctx, const struct pipe_grid_info *grid)
if (ice->state.predicate == IRIS_PREDICATE_STATE_DONT_RENDER)
return;
if (unlikely(INTEL_DEBUG & DEBUG_REEMIT)) {
if (INTEL_DEBUG & DEBUG_REEMIT) {
ice->state.dirty |= IRIS_ALL_DIRTY_FOR_COMPUTE;
ice->state.stage_dirty |= IRIS_ALL_STAGE_DIRTY_FOR_COMPUTE;
}

2
src/gallium/drivers/iris/iris_program.c
View File

@ -922,7 +922,7 @@ iris_setup_binding_table(const struct gen_device_info *devinfo,
}
bt->size_bytes = next * 4;
if (unlikely(INTEL_DEBUG & DEBUG_BT)) {
if (INTEL_DEBUG & DEBUG_BT) {
iris_print_binding_table(stderr, gl_shader_stage_name(info->stage), bt);
}

2
src/gallium/drivers/iris/iris_resource.c
View File

@ -113,7 +113,7 @@ modifier_is_supported(const struct gen_device_info *devinfo,
break;
case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS:
case I915_FORMAT_MOD_Y_TILED_CCS: {
if (unlikely(INTEL_DEBUG & DEBUG_NO_RBC))
if (INTEL_DEBUG & DEBUG_NO_RBC)
return false;
enum isl_format rt_format =

2
src/gallium/drivers/iris/iris_screen.c
View File

@ -618,7 +618,7 @@ iris_shader_perf_log(void *data, const char *fmt, ...)
va_list args;
va_start(args, fmt);
if (unlikely(INTEL_DEBUG & DEBUG_PERF)) {
if (INTEL_DEBUG & DEBUG_PERF) {
va_list args_copy;
va_copy(args_copy, args);
vfprintf(stderr, fmt, args_copy);