Mesa (main): pan/va: Integrate the tests into meson test

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue Jul 27 20:33:39 UTC 2021


Module: Mesa
Branch: main
Commit: 8d104a387adb9fc69f8fbcec37dbf63ce71b7124
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8d104a387adb9fc69f8fbcec37dbf63ce71b7124

Author: Alyssa Rosenzweig <alyssa at collabora.com>
Date:   Fri Jul 16 11:48:46 2021 -0400

pan/va: Integrate the tests into meson test

This way we will get testing in CI. Invoke as

   meson test --suite=panfrost

Signed-off-by: Alyssa Rosenzweig <alyssa at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12025>

---

 src/panfrost/bifrost/meson.build         |  2 ++
 src/panfrost/bifrost/valhall/meson.build | 61 ++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/src/panfrost/bifrost/meson.build b/src/panfrost/bifrost/meson.build
index 8cc0d6a187e..a829eefce99 100644
--- a/src/panfrost/bifrost/meson.build
+++ b/src/panfrost/bifrost/meson.build
@@ -19,6 +19,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+subdir('valhall')
+
 libpanfrost_bifrost_files = files(
   'bi_helper_invocations.c',
   'bi_layout.c',
diff --git a/src/panfrost/bifrost/valhall/meson.build b/src/panfrost/bifrost/valhall/meson.build
new file mode 100644
index 00000000000..ef8ea8cfec5
--- /dev/null
+++ b/src/panfrost/bifrost/valhall/meson.build
@@ -0,0 +1,61 @@
+# Copyright (C) 2020-2021 Collabora
+# Copyright (C) 2018 Rob Clark
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+valhall_disasm_c = custom_target(
+  'valhall_disasm_c',
+  input : ['disasm.py', 'ISA.xml'],
+  output : 'valhall_disasm.c',
+  command : [prog_python, '@INPUT@'],
+  capture : true,
+  depend_files : files('valhall.py'),
+)
+
+libpanfrost_valhall_disasm = static_library(
+  'panfrost_valhall_disasm',
+  valhall_disasm_c,
+  include_directories : [inc_include, inc_src, inc_mesa],
+  c_args : [no_override_init_args],
+  gnu_symbol_visibility : 'hidden',
+  build_by_default : false,
+)
+
+if with_tests
+  test(
+    'valhall_disasm',
+    executable(
+      'valhall_disasm_test',
+      files('test/test-disassembler.c'),
+      c_args : [c_msvc_compat_args, no_override_init_args],
+      gnu_symbol_visibility : 'hidden',
+      include_directories : [inc_include, inc_src, inc_mesa],
+      link_with : [libpanfrost_valhall_disasm],
+    ),
+    suite : ['panfrost'],
+    args : files('test/assembler-cases.txt'),
+  )
+
+  test(
+    'valhall_asm',
+    prog_python,
+    args : files('test-assembly.py', 'test/assembler-cases.txt', 'test/negative-cases.txt'),
+    suite : ['panfrost'],
+  )
+endif



More information about the mesa-commit mailing list