meson: Add support for the vc5 driver.

v2: Default vc5 to off, since it requires the simulator currently.  Add
    missing dep on the XML generation from libbroadcom_vc5.

Reviewed-by: Dylan Baker <dylan@pnwbakers.com> (v1)

diff --git a/meson.build b/meson.build
index 9967df0..5c42102 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -96,6 +96,7 @@ with_gallium_radeonsi = false
 with_gallium_nouveau = false
 with_gallium_softpipe = false
 with_gallium_vc4 = false
+with_gallium_vc5 = false
 _drivers = get_option('gallium-drivers')
 if _drivers != ''
   _split = _drivers.split(',')
@@ -104,6 +105,7 @@ if _drivers != ''
   with_gallium_nouveau = _split.contains('nouveau')
   with_gallium_softpipe = _split.contains('swrast')
   with_gallium_vc4 = _split.contains('vc4')
+  with_gallium_vc5 = _split.contains('vc5')
   with_gallium = true
   with_dri = true
 endif

diff --git a/src/broadcom/compiler/meson.build b/src/broadcom/compiler/meson.build
new file mode 100644 (file)
index 0000000..bedf0ad
--- /dev/null
+++ b/src/broadcom/compiler/meson.build
@@ -0,0 +1,44 @@
+# Copyright © 2017 Broadcom
+#
+# 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.
+
+libbroadcom_compiler_files = files(
+  'nir_to_vir.c',
+  'vir.c',
+  'vir_dump.c',
+  'vir_live_variables.c',
+  'vir_lower_uniforms.c',
+  'vir_opt_copy_propagate.c',
+  'vir_opt_dead_code.c',
+  'vir_register_allocate.c',
+  'vir_to_qpu.c',
+  'qpu_schedule.c',
+  'qpu_validate.c',
+  'v3d_compiler.h',
+  'v3d_nir_lower_io.c',
+)
+
+libbroadcom_compiler = static_library(
+  ['broadcom_compiler', v3d_xml_h, nir_opcodes_h, nir_builder_opcodes_h],
+  libbroadcom_compiler_files,
+  include_directories : [inc_common, inc_broadcom],
+  c_args : [c_vis_args, no_override_init_args],
+  dependencies : [dep_libdrm, dep_valgrind],
+  build_by_default : false,
+)

diff --git a/src/broadcom/meson.build b/src/broadcom/meson.build
index 909ca10..dbeee09 100644 (file)
--- a/src/broadcom/meson.build
+++ b/src/broadcom/meson.build
@@ -21,3 +21,24 @@
 inc_broadcom = include_directories('.', 'cle')
 
 subdir('cle')
+
+if with_gallium_vc5
+  subdir('compiler')
+  subdir('qpu')
+
+  libbroadcom_vc5 = static_library(
+    'libbroadcom_vc5',
+    [
+      files(
+        'common/v3d_debug.c',
+       'clif/clif_dump.c',
+      ),
+      v3d_xml_pack,
+    ],
+    include_directories : [inc_common, inc_broadcom, inc_src],
+    c_args : [c_vis_args, no_override_init_args],
+    link_whole : [libbroadcom_compiler, libbroadcom_qpu],
+    build_by_default : false,
+    dependencies: dep_valgrind,
+  )
+endif

diff --git a/src/broadcom/qpu/meson.build b/src/broadcom/qpu/meson.build
new file mode 100644 (file)
index 0000000..ca90aa2
--- /dev/null
+++ b/src/broadcom/qpu/meson.build
@@ -0,0 +1,39 @@
+# Copyright © 2017 Broadcom
+#
+# 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.
+
+libbroadcom_qpu_files = files(
+  'qpu_disasm.c',
+  'qpu_instr.c',
+  'qpu_pack.c',
+)
+
+libbroadcom_qpu = static_library(
+  ['broadcom_qpu', v3d_xml_h],
+  libbroadcom_qpu_files,
+  include_directories : [inc_common, inc_broadcom],
+  c_args : [c_vis_args, no_override_init_args],
+  dependencies : [dep_libdrm, dep_valgrind],
+  build_by_default : false,
+)
+
+test('qpu_disasm',
+  executable('qpu_disasm', 'tests/qpu_disasm.c',
+  link_with: [libbroadcom_qpu, libmesa_util],
+  include_directories: inc_common))

diff --git a/src/gallium/drivers/vc5/meson.build b/src/gallium/drivers/vc5/meson.build
new file mode 100644 (file)
index 0000000..d066366
--- /dev/null
+++ b/src/gallium/drivers/vc5/meson.build
@@ -0,0 +1,65 @@
+# Copyright © 2017 Broadcom
+#
+# 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.
+
+files_libvc5 = files(
+  'vc5_blit.c',
+  'vc5_bufmgr.c',
+  'vc5_bufmgr.h',
+  'vc5_cl.c',
+  'vc5_cl.h',
+  'vc5_context.c',
+  'vc5_context.h',
+  'vc5_draw.c',
+  'vc5_emit.c',
+  'vc5_fence.c',
+  'vc5_formats.c',
+  'vc5_job.c',
+  'vc5_program.c',
+  'vc5_query.c',
+  'vc5_rcl.c',
+  'vc5_resource.c',
+  'vc5_resource.h',
+  'vc5_screen.c',
+  'vc5_screen.h',
+  'vc5_simulator.c',
+  'vc5_state.c',
+  'vc5_tiling.c',
+  'vc5_tiling.h',
+  'vc5_uniforms.c',
+)
+
+v3dv3_c_args = []
+dep_v3dv3 = dependency('v3dv3')
+if dep_v3dv3.found()
+  v3dv3_c_args = '-DUSE_VC5_SIMULATOR'
+endif
+
+libvc5 = static_library(
+  'vc5',
+  [files_libvc5, v3d_xml_pack, nir_opcodes_h, nir_builder_opcodes_h],
+  include_directories : [
+    inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_broadcom,
+    inc_gallium_drivers, inc_drm_uapi,
+  ],
+  c_args : [c_vis_args, v3dv3_c_args],
+  cpp_args : [cpp_vis_args],
+  dependencies : [dep_v3dv3, dep_libdrm, dep_valgrind],
+  build_by_default : false,
+)

diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index b563a5f..a65b32c 100644 (file)
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -35,6 +35,9 @@ subdir('drivers/softpipe')
 if with_gallium_vc4
   subdir('drivers/vc4')
 endif
+if with_gallium_vc5
+  subdir('drivers/vc5')
+endif
 subdir('drivers/llvmpipe')
 subdir('winsys/sw/null')
 subdir('winsys/sw/dri')
@@ -49,6 +52,9 @@ subdir('winsys/nouveau/drm')
 if with_gallium_vc4
   subdir('winsys/vc4/drm')
 endif
+if with_gallium_vc5
+  subdir('winsys/vc5/drm')
+endif
 subdir('state_trackers/dri')
 # TODO: freedreno
 # TODO: i915

diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
index fd758e1..541234f 100644 (file)
--- a/src/gallium/targets/dri/meson.build
+++ b/src/gallium/targets/dri/meson.build
@@ -83,11 +83,20 @@ if with_gallium_softpipe
 endif
 if with_gallium_vc4
   gallium_dri_c_args += '-DGALLIUM_VC4'
-  gallium_dri_link_with += [libvc4, libvc4winsys, libbroadcom_cle]
+  gallium_dri_link_with += [libvc4, libvc4winsys]
   gallium_dri_drivers += 'vc4_dri.so'
 endif
+if with_gallium_vc5
+  gallium_dri_c_args += '-DGALLIUM_VC5'
+  gallium_dri_link_with += [libvc5, libvc5winsys, libbroadcom_vc5]
+  gallium_dri_drivers += 'vc5_dri.so'
+endif
+
+if with_gallium_vc4 or with_gallium_vc5
+  gallium_dri_link_with += libbroadcom_cle
+endif
 
-if with_gallium_vc4 or with_gallium_radeonsi
+if with_gallium_vc4 or with_gallium_vc5 or with_gallium_radeonsi
   gallium_dri_link_with += libnir
 endif
 

diff --git a/src/gallium/winsys/vc5/drm/meson.build b/src/gallium/winsys/vc5/drm/meson.build
new file mode 100644 (file)
index 0000000..d859301
--- /dev/null
+++ b/src/gallium/winsys/vc5/drm/meson.build
@@ -0,0 +1,29 @@
+# Copyright © 2017 Broadcom
+#
+# 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.
+
+libvc5winsys = static_library(
+  'vc5winsys',
+  files('vc5_drm_winsys.c'),
+  include_directories : [
+    inc_src, inc_include,
+    inc_gallium, inc_gallium_aux, inc_gallium_drivers,
+  ],
+  c_args : [c_vis_args],
+)