OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compiler: use NDEBUG to guard asserts

Browse Source 
nir_validate.c's #endif already had the correct NDEBUG comment

Fixes: dcb1acdea0 "nir/validate: Only build in debug mode"
Fixes: 9ff71b649b "i965/nir: Validate that NIR passes call nir_metadata_preserve()"
Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Eric Engestrom
2017-11-23 13:16:43 +00:00
parent bb46111c01
commit 7b85b9b877
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/compiler/nir/nir.h
View File

@@ -41,9 +41,9 @@
#include "compiler/shader_info.h" #include "compiler/shader_info.h"
#include <stdio.h> #include <stdio.h>
#ifdef DEBUG #ifndef NDEBUG
#include "util/debug.h" #include "util/debug.h"
#endif /* DEBUG */ #endif /* NDEBUG */
#include "nir_opcodes.h" #include "nir_opcodes.h"
@@ -2336,7 +2336,7 @@ nir_deref_var *nir_deref_var_clone(const nir_deref_var *deref, void *mem_ctx);
nir_shader *nir_shader_serialize_deserialize(void *mem_ctx, nir_shader *s); nir_shader *nir_shader_serialize_deserialize(void *mem_ctx, nir_shader *s);
#ifdef DEBUG #ifndef NDEBUG
void nir_validate_shader(nir_shader *shader); void nir_validate_shader(nir_shader *shader);
void nir_metadata_set_validation_flag(nir_shader *shader); void nir_metadata_set_validation_flag(nir_shader *shader);
void nir_metadata_check_validation_flag(nir_shader *shader); void nir_metadata_check_validation_flag(nir_shader *shader);
@@ -2377,7 +2377,7 @@ static inline void nir_metadata_check_validation_flag(nir_shader *shader) { (voi
static inline bool should_clone_nir(void) { return false; } static inline bool should_clone_nir(void) { return false; }
static inline bool should_serialize_deserialize_nir(void) { return false; } static inline bool should_serialize_deserialize_nir(void) { return false; }
static inline bool should_print_nir(void) { return false; } static inline bool should_print_nir(void) { return false; }
#endif /* DEBUG */ #endif /* NDEBUG */
#define _PASS(nir, do_pass) do { \ #define _PASS(nir, do_pass) do { \
do_pass \ do_pass \

2
src/compiler/nir/nir_metadata.c
View File

@@ -59,7 +59,7 @@ nir_metadata_preserve(nir_function_impl *impl, nir_metadata preserved)
impl->valid_metadata &= preserved; impl->valid_metadata &= preserved;
} }
#ifdef DEBUG #ifndef NDEBUG
/** /**
* Make sure passes properly invalidate metadata (part 1). * Make sure passes properly invalidate metadata (part 1).
* *

2
src/compiler/nir/nir_validate.c
View File

@@ -35,7 +35,7 @@
/* Since this file is just a pile of asserts, don't bother compiling it if /* Since this file is just a pile of asserts, don't bother compiling it if
* we're not building a debug build. * we're not building a debug build.
*/ */
#ifdef DEBUG #ifndef NDEBUG
/* /*
* Per-register validation state. * Per-register validation state.