aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/compiler/nir/nir_validate.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/compiler/nir/nir_validate.c b/src/compiler/nir/nir_validate.c
index 80f397098a2..5f812974720 100644
--- a/src/compiler/nir/nir_validate.c
+++ b/src/compiler/nir/nir_validate.c
@@ -26,6 +26,7 @@
*/
#include "nir.h"
+#include "c11/threads.h"
#include <assert.h>
/*
@@ -1180,11 +1181,18 @@ destroy_validate_state(validate_state *state)
_mesa_hash_table_destroy(state->errors, NULL);
}
+mtx_t fail_dump_mutex = _MTX_INITIALIZER_NP;
+
static void
dump_errors(validate_state *state, const char *when)
{
struct hash_table *errors = state->errors;
+ /* Lock around dumping so that we get clean dumps in a multi-threaded
+ * scenario
+ */
+ mtx_lock(&fail_dump_mutex);
+
if (when) {
fprintf(stderr, "NIR validation failed %s\n", when);
fprintf(stderr, "%d errors:\n", _mesa_hash_table_num_entries(errors));
@@ -1203,6 +1211,8 @@ dump_errors(validate_state *state, const char *when)
}
}
+ mtx_unlock(&fail_dump_mutex);
+
abort();
}