Mesa (staging/21.2): freedreno/ir3: Add build id to the disassembler test

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Jul 29 16:08:30 UTC 2021


Module: Mesa
Branch: staging/21.2
Commit: 947fd891bfedc276e6e25676898672f30d4d019d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=947fd891bfedc276e6e25676898672f30d4d019d

Author: Dylan Baker <dylan.c.baker at intel.com>
Date:   Tue Jul 27 12:01:36 2021 -0700

freedreno/ir3: Add build id to the disassembler test

This is required (at least for me on x86) to get the tool to pass it's
own test, otherwise it fails the build_id assertion.

Fixes: 1462b00391711ff86350e802c1a3e5075a3a1632
       ("freedreno/ir3: Add a unit test for our disassembler.")

Acked-by: Rob Clark <robclark at freedesktop.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12084>
(cherry picked from commit 097cf3952bff22e7132ab4eb804f4ea14d61a8d4)

---

 .pick_status.json             | 2 +-
 src/freedreno/ir3/meson.build | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 331c45b4344..f51b0858278 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -274,7 +274,7 @@
         "description": "freedreno/ir3: Add build id to the disassembler test",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "1462b00391711ff86350e802c1a3e5075a3a1632"
     },
diff --git a/src/freedreno/ir3/meson.build b/src/freedreno/ir3/meson.build
index 7bff85fe437..1bf9847ad95 100644
--- a/src/freedreno/ir3/meson.build
+++ b/src/freedreno/ir3/meson.build
@@ -128,6 +128,7 @@ test('ir3_disasm',
   executable(
     'ir3_disasm',
     'tests/disasm.c',
+    link_args : [ld_args_build_id],
     link_with: [libfreedreno_ir3, libir3decode],
     dependencies: [idep_mesautil, idep_nir],
     include_directories: [inc_freedreno, inc_include, inc_src, inc_gallium],



More information about the mesa-commit mailing list