From a7f2e683ded4387febd8529bb0a3fa8c691fcce4 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Thu, 29 Jul 2021 15:43:26 +1000 Subject: [PATCH] nir: move nir_block_ends_in_break() to nir.h Will be used in a following commit. Reviewed-by: Ian Romanick Part-of: --- src/compiler/nir/nir.h | 11 +++++++++++ src/compiler/nir/nir_loop_analyze.h | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h index 76ca1f9..47e4658 100644 --- a/src/compiler/nir/nir.h +++ b/src/compiler/nir/nir.h @@ -2938,6 +2938,17 @@ nir_block_ends_in_jump(nir_block *block) nir_block_last_instr(block)->type == nir_instr_type_jump; } +static inline bool +nir_block_ends_in_break(nir_block *block) +{ + if (exec_list_is_empty(&block->instr_list)) + return false; + + nir_instr *instr = nir_block_last_instr(block); + return instr->type == nir_instr_type_jump && + nir_instr_as_jump(instr)->type == nir_jump_break; +} + #define nir_foreach_instr(instr, block) \ foreach_list_typed(nir_instr, instr, node, &(block)->instr_list) #define nir_foreach_instr_reverse(instr, block) \ diff --git a/src/compiler/nir/nir_loop_analyze.h b/src/compiler/nir/nir_loop_analyze.h index 7b4ed66..18c2305 100644 --- a/src/compiler/nir/nir_loop_analyze.h +++ b/src/compiler/nir/nir_loop_analyze.h @@ -92,15 +92,4 @@ nir_is_trivial_loop_if(nir_if *nif, nir_block *break_block) return true; } -static inline bool -nir_block_ends_in_break(nir_block *block) -{ - if (exec_list_is_empty(&block->instr_list)) - return false; - - nir_instr *instr = nir_block_last_instr(block); - return instr->type == nir_instr_type_jump && - nir_instr_as_jump(instr)->type == nir_jump_break; -} - #endif /* NIR_LOOP_ANALYZE_H */ -- 2.7.4