panfrost: Move non-Gallium files outside of Gallium
In preparation for a Panfrost-based non-Gallium driver (maybe Vulkan...?), hoist everything except for the Gallium driver into a shared src/panfrost. Practically, that means the compilers, the headers, and pandecode. Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
This commit is contained in:
parent
a2d0ea92ba
commit
ec2a59cd7a
|
@ -26,27 +26,10 @@ files_panfrost = files(
|
|||
'pan_resource.c',
|
||||
'pan_resource.h',
|
||||
|
||||
'midgard/midgard_compile.c',
|
||||
'midgard/mir.c',
|
||||
'midgard/midgard_print.c',
|
||||
'midgard/midgard_schedule.c',
|
||||
'midgard/midgard_emit.c',
|
||||
'midgard/midgard_ra.c',
|
||||
'midgard/midgard_ra_pipeline.c',
|
||||
'midgard/midgard_liveness.c',
|
||||
'midgard/midgard_ops.c',
|
||||
'midgard/cppwrap.cpp',
|
||||
'midgard/disassemble.c',
|
||||
|
||||
'nir/nir_undef_to_zero.c',
|
||||
'nir/nir_lower_blend.c',
|
||||
'nir/nir_lower_framebuffer.c',
|
||||
|
||||
'bifrost/disassemble.c',
|
||||
|
||||
'pandecode/common.c',
|
||||
'pandecode/decode.c',
|
||||
|
||||
'pan_context.c',
|
||||
'pan_afbc.c',
|
||||
'pan_blit.c',
|
||||
|
@ -58,7 +41,6 @@ files_panfrost = files(
|
|||
'pan_blending.c',
|
||||
'pan_blend_shaders.c',
|
||||
'pan_blend_cso.c',
|
||||
'pan_pretty_print.c',
|
||||
'pan_fragment.c',
|
||||
'pan_invocation.c',
|
||||
'pan_instancing.c',
|
||||
|
@ -75,9 +57,6 @@ panfrost_includes = [
|
|||
inc_include,
|
||||
inc_src,
|
||||
inc_panfrost,
|
||||
include_directories('include'),
|
||||
include_directories('midgard'),
|
||||
include_directories('bifrost'),
|
||||
]
|
||||
|
||||
compile_args_panfrost = [
|
||||
|
@ -85,21 +64,9 @@ compile_args_panfrost = [
|
|||
'-Wno-pointer-arith'
|
||||
]
|
||||
|
||||
midgard_nir_algebraic_c = custom_target(
|
||||
'midgard_nir_algebraic.c',
|
||||
input : 'midgard/midgard_nir_algebraic.py',
|
||||
output : 'midgard_nir_algebraic.c',
|
||||
command : [
|
||||
prog_python, '@INPUT@',
|
||||
'-p', join_paths(meson.source_root(), 'src/compiler/nir/'),
|
||||
],
|
||||
capture : true,
|
||||
depend_files : nir_algebraic_py,
|
||||
)
|
||||
|
||||
libpanfrost = static_library(
|
||||
'panfrost',
|
||||
[files_panfrost, midgard_nir_algebraic_c],
|
||||
files_panfrost,
|
||||
dependencies: [
|
||||
dep_thread,
|
||||
dep_libdrm,
|
||||
|
@ -111,58 +78,5 @@ libpanfrost = static_library(
|
|||
|
||||
driver_panfrost = declare_dependency(
|
||||
compile_args : compile_args_panfrost,
|
||||
link_with : [libpanfrost, libpanfrostwinsys, libpanfrost_shared],
|
||||
)
|
||||
|
||||
files_bifrost = files(
|
||||
'bifrost/disassemble.c',
|
||||
'bifrost/cmdline.c',
|
||||
)
|
||||
|
||||
bifrost_compiler = executable(
|
||||
'bifrost_compiler',
|
||||
[files_bifrost],
|
||||
include_directories : [
|
||||
inc_common,
|
||||
inc_src,
|
||||
inc_include,
|
||||
inc_gallium,
|
||||
inc_gallium_aux,
|
||||
include_directories('bifrost')
|
||||
],
|
||||
dependencies : [
|
||||
dep_thread,
|
||||
idep_nir
|
||||
],
|
||||
link_with : [
|
||||
libgallium,
|
||||
libglsl_standalone,
|
||||
libmesa_util
|
||||
],
|
||||
build_by_default : true
|
||||
)
|
||||
|
||||
files_pandecode = files(
|
||||
'pandecode/cmdline.c',
|
||||
'pandecode/common.c',
|
||||
'pandecode/decode.c',
|
||||
|
||||
'pan_pretty_print.c',
|
||||
|
||||
'midgard/disassemble.c',
|
||||
'midgard/midgard_ops.c',
|
||||
'bifrost/disassemble.c',
|
||||
)
|
||||
|
||||
pandecode = executable(
|
||||
'pandecode',
|
||||
files_pandecode,
|
||||
include_directories : panfrost_includes,
|
||||
dependencies : [
|
||||
dep_thread,
|
||||
],
|
||||
link_with : [
|
||||
libmesa_util
|
||||
],
|
||||
build_by_default : true
|
||||
link_with : [libpanfrost, libpanfrostwinsys, libpanfrost_shared, libpanfrost_midgard, libpanfrost_bifrost, libpanfrost_decode],
|
||||
)
|
||||
|
|
|
@ -0,0 +1,33 @@
|
|||
# Copyright © 2018 Rob Clark
|
||||
# Copyright © 2019 Collabora
|
||||
|
||||
# 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.
|
||||
|
||||
libpanfrost_bifrost_files = files(
|
||||
'disassemble.c',
|
||||
)
|
||||
|
||||
libpanfrost_bifrost = static_library(
|
||||
'panfrost_bifrost',
|
||||
[libpanfrost_bifrost_files],
|
||||
include_directories : [inc_common],
|
||||
c_args : [c_vis_args, no_override_init_args],
|
||||
cpp_args : [cpp_vis_args],
|
||||
build_by_default : false,
|
||||
)
|
|
@ -19,6 +19,64 @@
|
|||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
# SOFTWARE.
|
||||
|
||||
inc_panfrost = include_directories(['.', 'shared'])
|
||||
inc_panfrost_hw = include_directories([
|
||||
'include'
|
||||
])
|
||||
|
||||
inc_panfrost = include_directories([
|
||||
'.', 'include', 'shared', 'midgard', 'bifrost'
|
||||
])
|
||||
|
||||
subdir('shared')
|
||||
subdir('midgard')
|
||||
subdir('bifrost')
|
||||
subdir('pandecode')
|
||||
|
||||
files_pandecode = files(
|
||||
'pandecode/cmdline.c',
|
||||
'pandecode/common.c',
|
||||
'pandecode/decode.c',
|
||||
'pandecode/pan_pretty_print.c',
|
||||
|
||||
'midgard/disassemble.c',
|
||||
'midgard/midgard_ops.c',
|
||||
'bifrost/disassemble.c',
|
||||
)
|
||||
|
||||
pandecode = executable(
|
||||
'pandecoder',
|
||||
files_pandecode,
|
||||
include_directories : [inc_common, inc_include, inc_src, inc_panfrost],
|
||||
dependencies : [
|
||||
dep_thread,
|
||||
],
|
||||
link_with : [
|
||||
libmesa_util
|
||||
],
|
||||
build_by_default : true
|
||||
)
|
||||
|
||||
files_bifrost = files(
|
||||
'bifrost/cmdline.c',
|
||||
)
|
||||
|
||||
bifrost_compiler = executable(
|
||||
'bifrost_compiler',
|
||||
[files_bifrost],
|
||||
include_directories : [
|
||||
inc_common,
|
||||
inc_include,
|
||||
inc_src,
|
||||
inc_panfrost,
|
||||
],
|
||||
dependencies : [
|
||||
dep_thread,
|
||||
idep_nir
|
||||
],
|
||||
link_with : [
|
||||
libglsl_standalone,
|
||||
libmesa_util,
|
||||
libpanfrost_bifrost
|
||||
],
|
||||
build_by_default : true
|
||||
)
|
||||
|
|
|
@ -0,0 +1,63 @@
|
|||
# Copyright © 2018 Rob Clark
|
||||
# Copyright © 2019 Collabora
|
||||
|
||||
# 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.
|
||||
|
||||
libpanfrost_midgard_files = files(
|
||||
'midgard_compile.c',
|
||||
'mir.c',
|
||||
'midgard_print.c',
|
||||
'midgard_schedule.c',
|
||||
'midgard_emit.c',
|
||||
'midgard_ra.c',
|
||||
'midgard_ra_pipeline.c',
|
||||
'midgard_liveness.c',
|
||||
'midgard_ops.c',
|
||||
'cppwrap.cpp',
|
||||
'disassemble.c',
|
||||
)
|
||||
|
||||
midgard_nir_algebraic_c = custom_target(
|
||||
'midgard_nir_algebraic.c',
|
||||
input : 'midgard_nir_algebraic.py',
|
||||
output : 'midgard_nir_algebraic.c',
|
||||
command : [
|
||||
prog_python, '@INPUT@',
|
||||
'-p', join_paths(meson.source_root(), 'src/compiler/nir/'),
|
||||
],
|
||||
capture : true,
|
||||
depend_files : nir_algebraic_py,
|
||||
)
|
||||
|
||||
libpanfrost_midgard = static_library(
|
||||
'panfrost_midgard',
|
||||
[libpanfrost_midgard_files, midgard_nir_algebraic_c],
|
||||
include_directories : [
|
||||
inc_common,
|
||||
inc_include,
|
||||
inc_src,
|
||||
inc_panfrost_hw,
|
||||
],
|
||||
dependencies: [
|
||||
idep_nir
|
||||
],
|
||||
c_args : [c_vis_args, no_override_init_args],
|
||||
cpp_args : [cpp_vis_args],
|
||||
build_by_default : false,
|
||||
)
|
|
@ -32,9 +32,10 @@
|
|||
#include "decode.h"
|
||||
#include "util/u_math.h"
|
||||
|
||||
#include "../pan_pretty_print.h"
|
||||
#include "../midgard/disassemble.h"
|
||||
#include "../bifrost/disassemble.h"
|
||||
#include "pan_pretty_print.h"
|
||||
#include "midgard/disassemble.h"
|
||||
#include "bifrost/disassemble.h"
|
||||
|
||||
int pandecode_replay_jc(mali_ptr jc_gpu_va, bool bifrost);
|
||||
|
||||
#define MEMORY_PROP(obj, p) {\
|
|
@ -0,0 +1,35 @@
|
|||
# Copyright © 2018 Rob Clark
|
||||
# Copyright © 2019 Collabora
|
||||
|
||||
# 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.
|
||||
|
||||
libpanfrost_decode_files = files(
|
||||
'pan_pretty_print.c',
|
||||
'common.c',
|
||||
'decode.c',
|
||||
)
|
||||
|
||||
libpanfrost_decode = static_library(
|
||||
'panfrost_decode',
|
||||
[libpanfrost_decode_files],
|
||||
include_directories : [inc_common, inc_panfrost],
|
||||
c_args : [c_vis_args, no_override_init_args],
|
||||
cpp_args : [cpp_vis_args],
|
||||
build_by_default : false,
|
||||
)
|
Loading…
Reference in New Issue