nir: Add hooks for testing serialization

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Jason Ekstrand
2017-09-14 16:49:53 -07:00
committed by Jordan Justen
parent 120da00975
commit 54f691311c
2 changed files with 36 additions and 0 deletions

View File

@@ -2312,6 +2312,8 @@ nir_variable *nir_variable_clone(const nir_variable *c, nir_shader *shader);
nir_deref *nir_deref_clone(const nir_deref *deref, void *mem_ctx);
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);
#ifdef DEBUG
void nir_validate_shader(nir_shader *shader);
void nir_metadata_set_validation_flag(nir_shader *shader);
@@ -2327,6 +2329,16 @@ should_clone_nir(void)
return should_clone;
}
static inline bool
should_serialize_deserialize_nir(void)
{
static int test_serialize = -1;
if (test_serialize < 0)
test_serialize = env_var_as_boolean("NIR_TEST_SERIALIZE", false);
return test_serialize;
}
static inline bool
should_print_nir(void)
{
@@ -2341,6 +2353,7 @@ static inline void nir_validate_shader(nir_shader *shader) { (void) shader; }
static inline void nir_metadata_set_validation_flag(nir_shader *shader) { (void) shader; }
static inline void nir_metadata_check_validation_flag(nir_shader *shader) { (void) shader; }
static inline bool should_clone_nir(void) { return false; }
static inline bool should_serialize_deserialize_nir(void) { return false; }
static inline bool should_print_nir(void) { return false; }
#endif /* DEBUG */
@@ -2352,6 +2365,10 @@ static inline bool should_print_nir(void) { return false; }
ralloc_free(nir); \
nir = clone; \
} \
if (should_serialize_deserialize_nir()) { \
void *mem_ctx = ralloc_parent(nir); \
nir = nir_shader_serialize_deserialize(mem_ctx, nir); \
} \
} while (0)
#define NIR_PASS(progress, nir, pass, ...) _PASS(nir, \

View File

@@ -1199,3 +1199,22 @@ nir_deserialize(void *mem_ctx,
return ctx.nir;
}
nir_shader *
nir_shader_serialize_deserialize(void *mem_ctx, nir_shader *s)
{
const struct nir_shader_compiler_options *options = s->options;
struct blob writer;
blob_init(&writer);
nir_serialize(&writer, s);
ralloc_free(s);
struct blob_reader reader;
blob_reader_init(&reader, writer.data, writer.size);
nir_shader *ns = nir_deserialize(mem_ctx, options, &reader);
blob_finish(&writer);
return ns;
}