From f4276ef7ef4b92bdcb2f43b34ff95a3189fc0ce1 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Thu, 16 Nov 2017 13:35:01 -0800 Subject: [PATCH] i965: Move common code out of #ifdef MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit I'm going to change the call in a later patch and with the difference in indentation level it wasn't immediately obvious that the calls were identical. Reviewed-by: Samuel Iglesias Gonsálvez Reviewed-by: Kenneth Graunke --- src/intel/compiler/brw_fs_generator.cpp | 7 ++----- src/intel/compiler/brw_vec4_generator.cpp | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/intel/compiler/brw_fs_generator.cpp b/src/intel/compiler/brw_fs_generator.cpp index 46f9a338ea2..96691ac3ffc 100644 --- a/src/intel/compiler/brw_fs_generator.cpp +++ b/src/intel/compiler/brw_fs_generator.cpp @@ -2192,17 +2192,14 @@ fs_generator::generate_code(const cfg_t *cfg, int dispatch_width) annotation_finalize(&annotation, p->next_insn_offset); #ifndef NDEBUG - bool validated = brw_validate_instructions(devinfo, p->store, - start_offset, - p->next_insn_offset, - &annotation); + bool validated = #else if (unlikely(debug_flag)) +#endif brw_validate_instructions(devinfo, p->store, start_offset, p->next_insn_offset, &annotation); -#endif int before_size = p->next_insn_offset - start_offset; brw_compact_instructions(p, start_offset, annotation.ann_count, diff --git a/src/intel/compiler/brw_vec4_generator.cpp b/src/intel/compiler/brw_vec4_generator.cpp index bde4110e549..63831e4ad63 100644 --- a/src/intel/compiler/brw_vec4_generator.cpp +++ b/src/intel/compiler/brw_vec4_generator.cpp @@ -2178,15 +2178,13 @@ generate_code(struct brw_codegen *p, annotation_finalize(&annotation, p->next_insn_offset); #ifndef NDEBUG - bool validated = brw_validate_instructions(devinfo, p->store, - 0, p->next_insn_offset, - &annotation); + bool validated = #else if (unlikely(debug_flag)) +#endif brw_validate_instructions(devinfo, p->store, 0, p->next_insn_offset, &annotation); -#endif int before_size = p->next_insn_offset; brw_compact_instructions(p, 0, annotation.ann_count, annotation.ann); -- 2.30.2