From 19670129c58bc779630e7f5d0b031d9ed78bc0c7 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Date: Wed, 4 Aug 2021 08:31:51 +0200
Subject: [PATCH] ci: Update canvas_text trace

The previous one had all rendering and setup in a single frame, so
repeatedly replaying it for performance tracking was reaching OOM due to
the repeated creation of resources that weren't being released.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12195>
---
 src/freedreno/ci/traces-freedreno.yml               |  4 ++--
 src/gallium/drivers/iris/ci/traces-iris.yml         | 10 +++++-----
 src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml |  4 ++--
 src/gallium/drivers/panfrost/ci/traces-panfrost.yml |  6 +++---
 src/gallium/drivers/radeonsi/ci/traces-radeonsi.yml |  4 ++--
 src/gallium/drivers/virgl/ci/traces-virgl.yml       |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/freedreno/ci/traces-freedreno.yml b/src/freedreno/ci/traces-freedreno.yml
index 199cf43ec9a..9fcf33ab0df 100644
--- a/src/freedreno/ci/traces-freedreno.yml
+++ b/src/freedreno/ci/traces-freedreno.yml
@@ -533,11 +533,11 @@ traces:
       # a306/a630 would need higher GL version to run
       - device: freedreno-a630
         checksum: 0e32ca8fc815a7250f38a07faeafb21b
-  - path: pathfinder/canvas_text.trace
+  - path: pathfinder/canvas_text_v2.trace
     expectations:
       # a306/a630 would need higher GL version to run
       - device: freedreno-a630
-        checksum: 74129b650bd3ca806ff2dd46813ba6e6
+        checksum: c163253b33a93577600e2f1c0571737c
   - path: pathfinder/demo.trace
     expectations:
       # a306/a630 would need higher GL version to run
diff --git a/src/gallium/drivers/iris/ci/traces-iris.yml b/src/gallium/drivers/iris/ci/traces-iris.yml
index 67b7f73a4e1..6c26ff020b7 100644
--- a/src/gallium/drivers/iris/ci/traces-iris.yml
+++ b/src/gallium/drivers/iris/ci/traces-iris.yml
@@ -84,16 +84,16 @@ traces:
         checksum: 21bccd42f2deb6416cf6591cd6a99258
       - device: gl-intel-kbl
         checksum: 21bccd42f2deb6416cf6591cd6a99258
-  - path: pathfinder/canvas_text.trace
+  - path: pathfinder/canvas_text_v2.trace
     expectations:
       - device: gl-intel-apl
-        checksum: 7873656a6fd5cce14d37cb7873bfc813
+        checksum: 448886e3b24f6408e013ea13f7c96d28
       - device: gl-intel-glk
-        checksum: 7873656a6fd5cce14d37cb7873bfc813
+        checksum: 448886e3b24f6408e013ea13f7c96d28
       - device: gl-intel-amly
-        checksum: 7873656a6fd5cce14d37cb7873bfc813
+        checksum: 448886e3b24f6408e013ea13f7c96d28
       - device: gl-intel-kbl
-        checksum: 7873656a6fd5cce14d37cb7873bfc813
+        checksum: 448886e3b24f6408e013ea13f7c96d28
   - path: gputest/furmark.trace
     expectations:
       - device: gl-intel-apl
diff --git a/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml b/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml
index 02d0db80621..54869e795dd 100644
--- a/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml
+++ b/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml
@@ -26,10 +26,10 @@ traces:
     expectations:
       - device: gl-vmware-llvmpipe
         checksum: c4ee0eef519f1a32ba24b7b392b31b28
-  - path: pathfinder/canvas_text.trace
+  - path: pathfinder/canvas_text_v2.trace
     expectations:
       - device: gl-vmware-llvmpipe
-        checksum: f8c6d9a5c9248821ed9aaa376bef05c3
+        checksum: 7ec3d817091a273223158ab0f4f726b5
   - path: gputest/furmark.trace
     expectations:
       - device: gl-vmware-llvmpipe
diff --git a/src/gallium/drivers/panfrost/ci/traces-panfrost.yml b/src/gallium/drivers/panfrost/ci/traces-panfrost.yml
index a75dea3d6ee..1f0a82a8ab7 100644
--- a/src/gallium/drivers/panfrost/ci/traces-panfrost.yml
+++ b/src/gallium/drivers/panfrost/ci/traces-panfrost.yml
@@ -36,12 +36,12 @@ traces:
         checksum: 2fb2c8e83719526cb6c02b6c2e069d61
       - device: gl-panfrost-t760
         checksum: 2fb2c8e83719526cb6c02b6c2e069d61
-  - path: pathfinder/canvas_text.trace
+  - path: pathfinder/canvas_text_v2.trace
     expectations:
       - device: gl-panfrost-t860
-        checksum: 939038749a5204ec2b1448d3b9208fb3
+        checksum: 35fbb0c520595e948d3a0f3aaa499d77
       - device: gl-panfrost-t760
-        checksum: 939038749a5204ec2b1448d3b9208fb3
+        checksum: 35fbb0c520595e948d3a0f3aaa499d77
   - path: gputest/furmark.trace
     expectations:
       - device: gl-panfrost-t860
diff --git a/src/gallium/drivers/radeonsi/ci/traces-radeonsi.yml b/src/gallium/drivers/radeonsi/ci/traces-radeonsi.yml
index 739bf42c332..79ef6b3d52b 100644
--- a/src/gallium/drivers/radeonsi/ci/traces-radeonsi.yml
+++ b/src/gallium/drivers/radeonsi/ci/traces-radeonsi.yml
@@ -26,10 +26,10 @@ traces:
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 78dd2357ad6e5ffc049a75bfb11c5497
-  - path: pathfinder/canvas_text.trace
+  - path: pathfinder/canvas_text_v2.trace
     expectations:
       - device: gl-radeonsi-stoney
-        checksum: 56d1398206ceea45562f80f8ea9d3814
+        checksum: 6cb8190a2ee4c335291914fbc70a8bb8
   - path: gputest/furmark.trace
     expectations:
       - device: gl-radeonsi-stoney
diff --git a/src/gallium/drivers/virgl/ci/traces-virgl.yml b/src/gallium/drivers/virgl/ci/traces-virgl.yml
index 195b9b05a06..1d2729a9c31 100644
--- a/src/gallium/drivers/virgl/ci/traces-virgl.yml
+++ b/src/gallium/drivers/virgl/ci/traces-virgl.yml
@@ -225,7 +225,7 @@ traces:
 #      - device: gl-virgl
 #        checksum: 0e32ca8fc815a7250f38a07faeafb21b
 # Crash
-#  - path: pathfinder/canvas_text.trace
+#  - path: pathfinder/canvas_text_v2.trace
 #    expectations:
 #      - device: gl-virgl
 #        checksum: 74129b650bd3ca806ff2dd46813ba6e6