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>
diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c
index 6d1f6b8..5f885f5 100644
--- a/src/gallium/drivers/iris/iris_batch.c
+++ b/src/gallium/drivers/iris/iris_batch.c
@@ -211,7 +211,7 @@
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 @@
_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_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 @@
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 */
}
diff --git a/src/gallium/drivers/iris/iris_context.c b/src/gallium/drivers/iris/iris_context.c
index 5c0022f..216e770 100644
--- a/src/gallium/drivers/iris/iris_context.c
+++ b/src/gallium/drivers/iris/iris_context.c
@@ -302,7 +302,7 @@
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++) {
diff --git a/src/gallium/drivers/iris/iris_draw.c b/src/gallium/drivers/iris/iris_draw.c
index c9f4da9..8fbe422 100644
--- a/src/gallium/drivers/iris/iris_draw.c
+++ b/src/gallium/drivers/iris/iris_draw.c
@@ -241,7 +241,7 @@
/* 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 @@
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;
}
diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c
index d3f15aa..379999a 100644
--- a/src/gallium/drivers/iris/iris_program.c
+++ b/src/gallium/drivers/iris/iris_program.c
@@ -922,7 +922,7 @@
}
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);
}
diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c
index 6da5a1b..e9bca00 100644
--- a/src/gallium/drivers/iris/iris_resource.c
+++ b/src/gallium/drivers/iris/iris_resource.c
@@ -113,7 +113,7 @@
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 =
diff --git a/src/gallium/drivers/iris/iris_screen.c b/src/gallium/drivers/iris/iris_screen.c
index 3b391f1..8c060d3 100644
--- a/src/gallium/drivers/iris/iris_screen.c
+++ b/src/gallium/drivers/iris/iris_screen.c
@@ -618,7 +618,7 @@
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);
