| Message ID | 20210217202036.1724901-71-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | TCI fixes and cleanups | expand |
On 17/02/2021 21.20, Richard Henderson wrote: > The longest test at the moment seems to be a (slower) > aarch64 host, for which test-mmap takes 64 seconds. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > configure | 3 +++ > tests/tcg/Makefile.target | 6 ++++-- > 2 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/configure b/configure > index a79b3746d4..b8924276bc 100755 > --- a/configure > +++ b/configure > @@ -5797,6 +5797,9 @@ fi > if test "$optreset" = "yes" ; then > echo "HAVE_OPTRESET=y" >> $config_host_mak > fi > +if test "$tcg" = "enabled" -a "$tcg_interpreter" = "true" ; then > + echo "CONFIG_TCG_INTERPRETER=y" >> $config_host_mak > +fi > if test "$fdatasync" = "yes" ; then > echo "CONFIG_FDATASYNC=y" >> $config_host_mak > fi > diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target > index 24d75a5801..fa5813192a 100644 > --- a/tests/tcg/Makefile.target > +++ b/tests/tcg/Makefile.target > @@ -77,8 +77,10 @@ LDFLAGS= > QEMU_OPTS= > > > -# If TCG debugging is enabled things are a lot slower > -ifeq ($(CONFIG_DEBUG_TCG),y) > +# If TCG debugging, or TCI is enabled things are a lot slower > +ifneq ($(CONFIG_TCG_INTERPRETER),) > +TIMEOUT=90 > +else ifneq ($(CONFIG_DEBUG_TCG),) > TIMEOUT=60 > else > TIMEOUT=15 Reviewed-by: Thomas Huth <thuth@redhat.com> Does it even get slower if you enable both at the same time, TCG debugging and TCI?
On 2/17/21 10:09 PM, Thomas Huth wrote: >> -ifeq ($(CONFIG_DEBUG_TCG),y) >> +# If TCG debugging, or TCI is enabled things are a lot slower >> +ifneq ($(CONFIG_TCG_INTERPRETER),) >> +TIMEOUT=90 >> +else ifneq ($(CONFIG_DEBUG_TCG),) >> TIMEOUT=60 >> else >> TIMEOUT=15 > > Reviewed-by: Thomas Huth <thuth@redhat.com> > > Does it even get slower if you enable both at the same time, TCG debugging and > TCI? As it happens, my testing was with --enable-debug-tcg. So, unless you're doing --enable-debug (-O0) testing, we should be fine. r~
diff --git a/configure b/configure index a79b3746d4..b8924276bc 100755 --- a/configure +++ b/configure @@ -5797,6 +5797,9 @@ fi if test "$optreset" = "yes" ; then echo "HAVE_OPTRESET=y" >> $config_host_mak fi +if test "$tcg" = "enabled" -a "$tcg_interpreter" = "true" ; then + echo "CONFIG_TCG_INTERPRETER=y" >> $config_host_mak +fi if test "$fdatasync" = "yes" ; then echo "CONFIG_FDATASYNC=y" >> $config_host_mak fi diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index 24d75a5801..fa5813192a 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -77,8 +77,10 @@ LDFLAGS= QEMU_OPTS= -# If TCG debugging is enabled things are a lot slower -ifeq ($(CONFIG_DEBUG_TCG),y) +# If TCG debugging, or TCI is enabled things are a lot slower +ifneq ($(CONFIG_TCG_INTERPRETER),) +TIMEOUT=90 +else ifneq ($(CONFIG_DEBUG_TCG),) TIMEOUT=60 else TIMEOUT=15
The longest test at the moment seems to be a (slower) aarch64 host, for which test-mmap takes 64 seconds. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- configure | 3 +++ tests/tcg/Makefile.target | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-)