[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/8] build-system: clean up TCG/TCI configury
From: |
Paolo Bonzini |
Subject: |
[PATCH 1/8] build-system: clean up TCG/TCI configury |
Date: |
Thu, 7 Jan 2021 15:00:32 +0100 |
Make CONFIG_TCG_INTERPRETER a Meson option, and enable TCI (though with
a warning) if the host CPU is unsupported, making it more similar to
other --enable-* options.
Remove TCG-specific include paths from !CONFIG_TCG builds.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 11 +++--------
disas/meson.build | 2 --
meson.build | 50 ++++++++++++++++++++++++-----------------------
meson_options.txt | 2 ++
4 files changed, 31 insertions(+), 34 deletions(-)
diff --git a/configure b/configure
index 8e0de14aa6..81801a6fe0 100755
--- a/configure
+++ b/configure
@@ -355,7 +355,7 @@ sanitizers="no"
tsan="no"
fortify_source="$default_feature"
strip_opt="yes"
-tcg_interpreter="no"
+tcg_interpreter="auto"
bigendian="no"
mingw32="no"
gcov="no"
@@ -1117,9 +1117,9 @@ for opt do
;;
--enable-whpx) whpx="enabled"
;;
- --disable-tcg-interpreter) tcg_interpreter="no"
+ --disable-tcg-interpreter) tcg_interpreter="disabled"
;;
- --enable-tcg-interpreter) tcg_interpreter="yes"
+ --enable-tcg-interpreter) tcg_interpreter="enabled"
;;
--disable-cap-ng) cap_ng="disabled"
;;
@@ -5911,11 +5911,6 @@ fi
if test "$optreset" = "yes" ; then
echo "HAVE_OPTRESET=y" >> $config_host_mak
fi
-if test "$tcg" = "enabled"; then
- if test "$tcg_interpreter" = "yes" ; then
- echo "CONFIG_TCG_INTERPRETER=y" >> $config_host_mak
- fi
-fi
if test "$fdatasync" = "yes" ; then
echo "CONFIG_FDATASYNC=y" >> $config_host_mak
fi
diff --git a/disas/meson.build b/disas/meson.build
index 09a852742e..da341a511e 100644
--- a/disas/meson.build
+++ b/disas/meson.build
@@ -22,5 +22,3 @@ common_ss.add(when: 'CONFIG_SH4_DIS', if_true: files('sh4.c'))
common_ss.add(when: 'CONFIG_SPARC_DIS', if_true: files('sparc.c'))
common_ss.add(when: 'CONFIG_XTENSA_DIS', if_true: files('xtensa.c'))
common_ss.add(when: capstone, if_true: files('capstone.c'))
-
-specific_ss.add(when: 'CONFIG_TCG_INTERPRETER', if_true: files('tci.c'))
diff --git a/meson.build b/meson.build
index 2742b37e14..36f1d02190 100644
--- a/meson.build
+++ b/meson.build
@@ -109,25 +109,8 @@ if targetos == 'linux'
language: ['c', 'cpp'])
endif
-if 'CONFIG_TCG_INTERPRETER' in config_host
- tcg_arch = 'tci'
-elif config_host['ARCH'] == 'sparc64'
- tcg_arch = 'sparc'
-elif config_host['ARCH'] == 's390x'
- tcg_arch = 's390'
-elif config_host['ARCH'] in ['x86_64', 'x32']
- tcg_arch = 'i386'
-elif config_host['ARCH'] == 'ppc64'
- tcg_arch = 'ppc'
-elif config_host['ARCH'] in ['riscv32', 'riscv64']
- tcg_arch = 'riscv'
-else
- tcg_arch = config_host['ARCH']
-endif
-add_project_arguments('-iquote', meson.current_source_dir() / 'tcg' / tcg_arch,
- '-iquote', '.',
+add_project_arguments('-iquote', '.',
'-iquote', meson.current_source_dir(),
- '-iquote', meson.current_source_dir() / 'accel/tcg',
'-iquote', meson.current_source_dir() / 'include',
'-iquote', meson.current_source_dir() / 'disas/libvixl',
language: ['c', 'cpp', 'objc'])
@@ -224,14 +207,31 @@ if not get_option('hax').disabled()
accelerators += 'CONFIG_HAX'
endif
endif
+
+tcg_arch = config_host['ARCH']
if not get_option('tcg').disabled()
- if cpu not in supported_cpus
- if 'CONFIG_TCG_INTERPRETER' in config_host
+ if get_option('tcg_interpreter').enabled() or cpu not in supported_cpus
+ if get_option('tcg_interpreter').disabled()
+ error('TCG interpreter disabled but host CPU @0@ supported'.format(cpu))
+ elif get_option('tcg_interpreter').auto()
warning('Unsupported CPU @0@, will use TCG with TCI
(experimental)'.format(cpu))
- else
- error('Unsupported CPU @0@, try --enable-tcg-interpreter'.format(cpu))
endif
+ tcg_arch = 'tci'
+ elif config_host['ARCH'] == 'sparc64'
+ tcg_arch = 'sparc'
+ elif config_host['ARCH'] == 's390x'
+ tcg_arch = 's390'
+ elif config_host['ARCH'] in ['x86_64', 'x32']
+ tcg_arch = 'i386'
+ elif config_host['ARCH'] == 'ppc64'
+ tcg_arch = 'ppc'
+ elif config_host['ARCH'] in ['riscv32', 'riscv64']
+ tcg_arch = 'riscv'
endif
+ add_project_arguments('-iquote', meson.current_source_dir() / 'tcg' /
tcg_arch,
+ '-iquote', meson.current_source_dir() / 'accel/tcg',
+ language: ['c', 'cpp', 'objc'])
+
accelerators += 'CONFIG_TCG'
config_host += { 'CONFIG_TCG': 'y' }
endif
@@ -1833,7 +1833,9 @@ specific_ss.add(when: 'CONFIG_TCG', if_true: files(
'tcg/tcg-op.c',
'tcg/tcg.c',
))
-specific_ss.add(when: 'CONFIG_TCG_INTERPRETER', if_true: files('disas/tci.c',
'tcg/tci.c'))
+if tcg_arch == 'tci'
+ specific_ss.add(files('disas/tci.c', 'tcg/tci.c'))
+endif
subdir('backends')
subdir('disas')
@@ -2392,7 +2394,7 @@ summary_info += {'WHPX support':
config_all.has_key('CONFIG_WHPX')}
summary_info += {'TCG support': config_all.has_key('CONFIG_TCG')}
if config_all.has_key('CONFIG_TCG')
summary_info += {'TCG debug enabled':
config_host.has_key('CONFIG_DEBUG_TCG')}
- summary_info += {'TCG interpreter':
config_host.has_key('CONFIG_TCG_INTERPRETER')}
+ summary_info += {'TCG interpreter': tcg_arch == 'tci'}
endif
summary_info += {'malloc trim support': has_malloc_trim}
summary_info += {'RDMA support': config_host.has_key('CONFIG_RDMA')}
diff --git a/meson_options.txt b/meson_options.txt
index 7948a8255c..41f9c2cf6c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -37,6 +37,8 @@ option('xen_pci_passthrough', type: 'feature', value: 'auto',
description: 'Xen PCI passthrough support')
option('tcg', type: 'feature', value: 'auto',
description: 'TCG support')
+option('tcg_interpreter', type: 'feature', value: 'auto',
+ description: 'TCG bytecode interpreter (TCI)')
option('cfi', type: 'boolean', value: 'false',
description: 'Control-Flow Integrity (CFI)')
option('cfi_debug', type: 'boolean', value: 'false',
--
2.29.2
- [RFC PATCH v2 0/8] Automatically convert configure options to meson build options, Paolo Bonzini, 2021/01/07
- [PATCH 1/8] build-system: clean up TCG/TCI configury,
Paolo Bonzini <=
- Re: [PATCH 1/8] build-system: clean up TCG/TCI configury, Peter Maydell, 2021/01/07
- Re: [PATCH 1/8] build-system: clean up TCG/TCI configury, Paolo Bonzini, 2021/01/07
- Re: [PATCH 1/8] build-system: clean up TCG/TCI configury, Daniel P . Berrangé, 2021/01/07
- Re: [PATCH 1/8] build-system: clean up TCG/TCI configury, Philippe Mathieu-Daudé, 2021/01/13
- Re: [PATCH 1/8] build-system: clean up TCG/TCI configury, Helge Deller, 2021/01/13
- Re: [PATCH 1/8] build-system: clean up TCG/TCI configury, Daniel P . Berrangé, 2021/01/13
- Re: [PATCH 1/8] build-system: clean up TCG/TCI configury, Peter Maydell, 2021/01/13
- Re: [PATCH 1/8] build-system: clean up TCG/TCI configury, Helge Deller, 2021/01/13
- Re: [PATCH 1/8] build-system: clean up TCG/TCI configury, Helge Deller, 2021/01/13
- Re: [PATCH 1/8] build-system: clean up TCG/TCI configury, Paolo Bonzini, 2021/01/13