2 files changed, 6 insertions, 4 deletions
diff --git a/src/gallium/drivers/freedreno/ir3/ir3.c b/src/gallium/drivers/freedreno/ir3/ir3.c
index 04c02340940..dd5fb2fbbe5 100644
--- a/src/gallium/drivers/freedreno/ir3/ir3.c
+++ b/src/gallium/drivers/freedreno/ir3/ir3.c
@@ -745,8 +745,7 @@ static void insert_instr(struct ir3_block *block,
 {
 	struct ir3 *shader = block->shader;
 #ifdef DEBUG
-	static uint32_t serialno = 0;
-	instr->serialno = ++serialno;
+	instr->serialno = ++shader->instr_count;
 #endif
 	list_addtail(&instr->node, &block->instr_list);
 
@@ -758,8 +757,7 @@ struct ir3_block * ir3_block_create(struct ir3 *shader)
 {
 	struct ir3_block *block = ir3_alloc(shader, sizeof(*block));
 #ifdef DEBUG
-	static uint32_t serialno = 0;
-	block->serialno = ++serialno;
+	block->serialno = ++shader->block_count;
 #endif
 	block->shader = shader;
 	list_inithead(&block->node);
diff --git a/src/gallium/drivers/freedreno/ir3/ir3.h b/src/gallium/drivers/freedreno/ir3/ir3.h
index 84235cc1cd2..781a660bff8 100644
--- a/src/gallium/drivers/freedreno/ir3/ir3.h
+++ b/src/gallium/drivers/freedreno/ir3/ir3.h
@@ -444,6 +444,10 @@ struct ir3 {
 
 	/* List of ir3_array's: */
 	struct list_head array_list;
+
+#ifdef DEBUG
+	unsigned block_count, instr_count;
+#endif
 };
 
 typedef struct nir_register nir_register;