intel: Make a libintel_compiler_nir internal static library

We were compiling these twice, one for brw, one for elk.  There's no
reason to do that, just compile the common code once and link against it
in both backends.

Reviewed-by: Dylan Baker <dylan.c.baker@intel.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37755>
This commit is contained in:
Kenneth Graunke 2025-10-06 14:50:15 -07:00 committed by Marge Bot
parent 86aa241c66
commit d4c8ca43ef
2 changed files with 16 additions and 3 deletions

View file

@ -128,11 +128,12 @@ elk_nir_trig = custom_target(
libintel_compiler_elk = static_library(
'intel_compiler_elk',
[libintel_compiler_elk_files, intel_nir_files, elk_nir_trig, ir_expression_operation_h],
[libintel_compiler_elk_files, elk_nir_trig, ir_expression_operation_h],
include_directories : [inc_include, inc_src, inc_intel],
c_args : [no_override_init_args],
cpp_args : ['-Werror=vla'],
gnu_symbol_visibility : 'hidden',
link_with : libintel_compiler_nir,
dependencies : [idep_nir_headers, idep_mesautil, idep_intel_dev, idep_vtn],
build_by_default : false,
)

View file

@ -1,7 +1,7 @@
# Copyright © 2017 Intel Corporation
# SPDX-License-Identifier: MIT
intel_nir_files = files(
libintel_compiler_nir_files = files(
'intel_nir.h',
'intel_nir.c',
@ -18,6 +18,17 @@ intel_nir_files = files(
'intel_nir_tcs_workarounds.c',
)
libintel_compiler_nir = static_library(
'intel_compiler_nir',
[libintel_compiler_nir_files],
include_directories : [inc_include, inc_src, inc_intel],
c_args : [no_override_init_args],
cpp_args : ['-Werror=vla'],
gnu_symbol_visibility : 'hidden',
dependencies : [idep_nir_headers, idep_mesautil, idep_intel_dev, idep_vtn, idep_mda],
build_by_default : false,
)
libintel_compiler_brw_files = files(
'brw_analysis.h',
'brw_analysis.cpp',
@ -154,11 +165,12 @@ brw_nir_workarounds = custom_target(
libintel_compiler_brw = static_library(
'intel_compiler',
[libintel_compiler_brw_files, intel_nir_files, brw_nir_lower_fsign, brw_nir_workarounds, [brw_device_sha1_gen_src]],
[libintel_compiler_brw_files, brw_nir_lower_fsign, brw_nir_workarounds, [brw_device_sha1_gen_src]],
include_directories : [inc_include, inc_src, inc_intel],
c_args : [no_override_init_args],
cpp_args : ['-Werror=vla'],
gnu_symbol_visibility : 'hidden',
link_with : libintel_compiler_nir,
dependencies : [idep_nir_headers, idep_mesautil, idep_intel_dev, idep_vtn, idep_mda],
build_by_default : false,
)