diff --git a/src/gallium/drivers/panfrost/meson.build b/src/gallium/drivers/panfrost/meson.build index 017024e7c7e..c03d6f73ed2 100644 --- a/src/gallium/drivers/panfrost/meson.build +++ b/src/gallium/drivers/panfrost/meson.build @@ -83,5 +83,5 @@ libpanfrost = static_library( driver_panfrost = declare_dependency( compile_args : compile_args_panfrost, - link_with : [libpanfrost, libpanfrostwinsys, libpanfrost_shared, libpanfrost_midgard, libpanfrost_bifrost, libpanfrost_decode, libpanfrost_lib], + link_with : [libpanfrost, libpanfrostwinsys, libpanfrost_shared, libpanfrost_compiler, libpanfrost_decode, libpanfrost_lib], ) diff --git a/src/panfrost/clc/meson.build b/src/panfrost/clc/meson.build index feb0c8a090f..5a394c243b1 100644 --- a/src/panfrost/clc/meson.build +++ b/src/panfrost/clc/meson.build @@ -9,7 +9,7 @@ else prog_panfrost_compile = executable( 'panfrost_compile', ['pan_compile.c'], - link_with : [libpanfrost_bifrost], + link_with : [libpanfrost_compiler], include_directories : [inc_include, inc_src], c_args : [c_msvc_compat_args, no_override_init_args], link_args : [ld_args_build_id], diff --git a/src/panfrost/compiler/bifrost/meson.build b/src/panfrost/compiler/bifrost/meson.build index d9699f513eb..06d7a0b7f6e 100644 --- a/src/panfrost/compiler/bifrost/meson.build +++ b/src/panfrost/compiler/bifrost/meson.build @@ -135,7 +135,6 @@ libpanfrost_bifrost_disasm = static_library( ['bifrost/disassemble.c', 'bi_print_common.c', bifrost_gen_disasm_c], include_directories : [inc_include, inc_src], dependencies: [idep_nir], - link_with: [libpanfrost_util], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', build_by_default : false, @@ -151,8 +150,3 @@ libpanfrost_bifrost = static_library( gnu_symbol_visibility : 'hidden', build_by_default : false, ) - -if with_tests - subdir('test') - subdir('valhall/test') -endif diff --git a/src/panfrost/compiler/bifrost/test/meson.build b/src/panfrost/compiler/bifrost/test/meson.build index 725bbf6581a..b29936a9c7d 100644 --- a/src/panfrost/compiler/bifrost/test/meson.build +++ b/src/panfrost/compiler/bifrost/test/meson.build @@ -19,7 +19,7 @@ test( gnu_symbol_visibility : 'hidden', include_directories : [inc_include, inc_src, inc_valhall], dependencies: [idep_gtest, idep_nir, idep_bi_opcodes_h, idep_bi_builder_h, idep_valhall_enums_h], - link_with : [libpanfrost_bifrost], + link_with : [libpanfrost_compiler], ), suite : ['panfrost'], protocol : 'gtest', diff --git a/src/panfrost/compiler/bifrost/valhall/test/meson.build b/src/panfrost/compiler/bifrost/valhall/test/meson.build index e0aadb3ed68..ef6fc22f560 100644 --- a/src/panfrost/compiler/bifrost/valhall/test/meson.build +++ b/src/panfrost/compiler/bifrost/valhall/test/meson.build @@ -19,7 +19,7 @@ test( gnu_symbol_visibility : 'hidden', include_directories : [inc_include, inc_src, inc_valhall], dependencies: [idep_gtest, idep_nir, idep_bi_opcodes_h, idep_bi_builder_h, idep_valhall_enums_h], - link_with : [libpanfrost_bifrost], + link_with : [libpanfrost_compiler], ), suite : ['panfrost'], protocol : 'gtest', diff --git a/src/panfrost/compiler/meson.build b/src/panfrost/compiler/meson.build index ee27bda3926..c781801a71c 100644 --- a/src/panfrost/compiler/meson.build +++ b/src/panfrost/compiler/meson.build @@ -1,7 +1,7 @@ # Copyright © 2025 Collabora, Ltd. # SPDX-License-Identifier: MIT -libpanfrost_util_files = files( +libpanfrost_compiler_files = files( 'pan_ir.c', 'pan_ir.h', 'pan_nir_collect_varyings.c', @@ -18,15 +18,21 @@ libpanfrost_util_files = files( 'pan_nir_lower_xfb.c', ) -libpanfrost_util = static_library( - 'panfrost_util', - [libpanfrost_util_files], +subdir('bifrost') +subdir('midgard') + +libpanfrost_compiler = static_library( + 'panfrost_compiler', + [libpanfrost_compiler_files], include_directories : [inc_include, inc_src], dependencies: [idep_nir, idep_mesautil], + link_with: [libpanfrost_midgard, libpanfrost_bifrost], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', build_by_default : false, ) -subdir('bifrost') -subdir('midgard') +if with_tests + subdir('bifrost/test') + subdir('bifrost/valhall/test') +endif diff --git a/src/panfrost/compiler/midgard/meson.build b/src/panfrost/compiler/midgard/meson.build index 031b4abe0b5..6196f74ddcf 100644 --- a/src/panfrost/compiler/midgard/meson.build +++ b/src/panfrost/compiler/midgard/meson.build @@ -55,7 +55,7 @@ libpanfrost_midgard = static_library( idep_nir, idep_mesautil, ], - link_with: [libpanfrost_util, libpanfrost_midgard_disasm], + link_with: [libpanfrost_midgard_disasm], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', build_by_default : false, diff --git a/src/panfrost/lib/meson.build b/src/panfrost/lib/meson.build index f4eb3352574..21e12a18f4f 100644 --- a/src/panfrost/lib/meson.build +++ b/src/panfrost/lib/meson.build @@ -66,7 +66,7 @@ libpanfrost_lib = static_library( ) libpanfrost_dep = declare_dependency( - link_with: [libpanfrost_lib, libpanfrost_decode, libpanfrost_midgard, libpanfrost_bifrost, libpanfrost_pixel_format, libpanfrost_per_arch], + link_with: [libpanfrost_lib, libpanfrost_decode, libpanfrost_compiler, libpanfrost_pixel_format, libpanfrost_per_arch], include_directories: [inc_include, inc_src, inc_panfrost], dependencies: [deps_for_libpanfrost, libpankmod_dep, idep_nir], ) diff --git a/src/panfrost/meson.build b/src/panfrost/meson.build index ec92e7718a8..2bd60db4341 100644 --- a/src/panfrost/meson.build +++ b/src/panfrost/meson.build @@ -44,7 +44,7 @@ bifrost_compiler = executable( dep_libdrm, ], link_with : [ - libpanfrost_bifrost, + libpanfrost_compiler, ], build_by_default : with_tools.contains('panfrost') ) diff --git a/src/panfrost/vulkan/meson.build b/src/panfrost/vulkan/meson.build index 9c7b06d2d35..11681bae638 100644 --- a/src/panfrost/vulkan/meson.build +++ b/src/panfrost/vulkan/meson.build @@ -196,11 +196,9 @@ libvulkan_panfrost = shared_library( link_whole : [panvk_per_arch_libs], link_with : [ libpanfrost_shared, - libpanfrost_midgard, - libpanfrost_bifrost, libpanfrost_decode, libpanfrost_lib, - libpanfrost_util, + libpanfrost_compiler, ], dependencies : [ dep_dl,