radeonsi/sqtt: clear record_counts variable
authorPierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Mon, 25 Sep 2023 09:21:38 +0000 (11:21 +0200)
committerEric Engestrom <eric@engestrom.ch>
Wed, 20 Dec 2023 21:26:40 +0000 (21:26 +0000)
This avoids hitting the asserts in ac_sqtt_finish.

Fixes: 94ce6540d8c ("ac/sqtt: add helpers for initializing ac_thread_trace_data")
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26774>
(cherry picked from commit e4d537fb84369906d7eda9229f847f5d4cdfb124)

.pick_status.json
src/gallium/drivers/radeonsi/si_sqtt.c

index 7f15a88..8392b8e 100644 (file)
         "description": "radeonsi/sqtt: clear record_counts variable",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "94ce6540d8c8c46c285d3877af4a56f5b59e5d80",
         "notes": null
index 63618e6..eeaa83f 100644 (file)
@@ -677,12 +677,14 @@ void si_destroy_sqtt(struct si_context *sctx) {
   list_for_each_entry_safe(struct rgp_pso_correlation_record, record,
                            &pso_correlation->record, list) {
     list_del(&record->list);
+    pso_correlation->record_count--;
     free(record);
   }
 
   list_for_each_entry_safe(struct rgp_loader_events_record, record,
                            &loader_events->record, list) {
     list_del(&record->list);
+    loader_events->record_count--;
     free(record);
   }
 
@@ -698,6 +700,7 @@ void si_destroy_sqtt(struct si_context *sctx) {
     }
     list_del(&record->list);
     free(record);
+    code_object->record_count--;
   }
 
   ac_sqtt_finish(sctx->sqtt);