From bc2e806b0f16c3a4a079803d01f1617adefd4dbf Mon Sep 17 00:00:00 2001 From: Christian Gmeiner Date: Fri, 28 May 2021 22:52:45 +0200 Subject: [PATCH] freedreno/isa: move isaspec to a new home This commit moves isaspec out of freedreno into a more generic new home - src/compiler/isaspec. Signed-off-by: Christian Gmeiner Reviewed-by: Rob Clark Part-of: --- src/{freedreno/isa => compiler/isaspec}/README.rst | 0 src/{freedreno/isa => compiler/isaspec}/decode.c | 0 src/{freedreno/isa => compiler/isaspec}/decode.h | 0 src/{freedreno/isa => compiler/isaspec}/decode.py | 0 src/{freedreno/isa => compiler/isaspec}/encode.py | 0 src/{freedreno/isa => compiler/isaspec}/isa.py | 0 src/compiler/isaspec/meson.build | 24 ++++++++++++++++++++++ src/compiler/meson.build | 1 + src/freedreno/isa/meson.build | 19 ++++++++--------- 9 files changed, 33 insertions(+), 11 deletions(-) rename src/{freedreno/isa => compiler/isaspec}/README.rst (100%) rename src/{freedreno/isa => compiler/isaspec}/decode.c (100%) rename src/{freedreno/isa => compiler/isaspec}/decode.h (100%) rename src/{freedreno/isa => compiler/isaspec}/decode.py (100%) rename src/{freedreno/isa => compiler/isaspec}/encode.py (100%) rename src/{freedreno/isa => compiler/isaspec}/isa.py (100%) create mode 100644 src/compiler/isaspec/meson.build diff --git a/src/freedreno/isa/README.rst b/src/compiler/isaspec/README.rst similarity index 100% rename from src/freedreno/isa/README.rst rename to src/compiler/isaspec/README.rst diff --git a/src/freedreno/isa/decode.c b/src/compiler/isaspec/decode.c similarity index 100% rename from src/freedreno/isa/decode.c rename to src/compiler/isaspec/decode.c diff --git a/src/freedreno/isa/decode.h b/src/compiler/isaspec/decode.h similarity index 100% rename from src/freedreno/isa/decode.h rename to src/compiler/isaspec/decode.h diff --git a/src/freedreno/isa/decode.py b/src/compiler/isaspec/decode.py similarity index 100% rename from src/freedreno/isa/decode.py rename to src/compiler/isaspec/decode.py diff --git a/src/freedreno/isa/encode.py b/src/compiler/isaspec/encode.py similarity index 100% rename from src/freedreno/isa/encode.py rename to src/compiler/isaspec/encode.py diff --git a/src/freedreno/isa/isa.py b/src/compiler/isaspec/isa.py similarity index 100% rename from src/freedreno/isa/isa.py rename to src/compiler/isaspec/isa.py diff --git a/src/compiler/isaspec/meson.build b/src/compiler/isaspec/meson.build new file mode 100644 index 0000000..9c8dd0d --- /dev/null +++ b/src/compiler/isaspec/meson.build @@ -0,0 +1,24 @@ +# Copyright © 2020 Google, Inc + +# 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. + +prog_isaspec_decode = find_program('decode.py') +idep_isaspec_decode = declare_dependency(sources : files('decode.c'), include_directories : include_directories('.')) + +prog_isaspec_encode = find_program('encode.py') diff --git a/src/compiler/meson.build b/src/compiler/meson.build index a74a630..9cb55b3 100644 --- a/src/compiler/meson.build +++ b/src/compiler/meson.build @@ -98,3 +98,4 @@ if with_tests endif subdir('glsl') +subdir('isaspec') diff --git a/src/freedreno/isa/meson.build b/src/freedreno/isa/meson.build index 57a06c6..4110ad0 100644 --- a/src/freedreno/isa/meson.build +++ b/src/freedreno/isa/meson.build @@ -28,30 +28,27 @@ isa_depend_files = [ 'ir3-cat5.xml', 'ir3-cat6.xml', 'ir3-cat7.xml', - 'isa.py', ] -ir3_isa_c = custom_target( - 'ir3-isa.c', - input: ['decode.py', 'ir3.xml'], +ir3_isa = custom_target( + 'ir3-isa', + input: ['ir3.xml'], output: ['isaspec-isa.h', 'ir3-isa.c', 'ir3-isa.h'], command: [ - prog_python, '@INPUT@', '@OUTPUT@' + prog_isaspec_decode, '@INPUT@', '@OUTPUT@' ], depend_files: isa_depend_files, ) decode_files = [ - ir3_isa_c, + ir3_isa, 'isa.h', - 'decode.h', - 'decode.c', ] libir3decode = static_library( 'ir3decode', decode_files, - dependencies: idep_mesautil, + dependencies: [idep_mesautil, idep_isaspec_decode], include_directories: [ inc_include, inc_src, @@ -75,10 +72,10 @@ ir3disasm = executable( encode_h = custom_target( 'encode.h', - input: ['encode.py', 'ir3.xml'], + input: ['ir3.xml'], output: 'encode.h', command: [ - prog_python, '@INPUT@', '@OUTPUT@' + prog_isaspec_encode, '@INPUT@', '@OUTPUT@' ], depend_files: isa_depend_files, ) -- 2.7.4