1. Patchew
  2. QEMU
  3. View series

[PATCH] travis.yml: enable linux-gcc-debug-tcg cache

Alex Bennée posted 1 patch 4 years, 6 months ago
Failed in applying to current master (apply log)
.travis.yml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
[PATCH] travis.yml: enable linux-gcc-debug-tcg cache
Posted by Alex Bennée 4 years, 6 months ago 
Create a new cache for the --enable-debug-tcg builds which is separate
from the normal debug builds which generate different code. We also
enable debug-tcg for the new plugins based builds as we want to ensure
any breakage to TCG is picked up by the sanity checks.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 .travis.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e3f10a93683..34bc8134f5b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -135,7 +135,7 @@ matrix:
     # TCG debug can be run just on its own and is mostly agnostic to user/softmmu distinctions
     - env:
         - CONFIG="--enable-debug-tcg --disable-system"
-        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug"
+        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
 
 
     - env:
@@ -336,29 +336,29 @@ matrix:
     - env:
         - CONFIG="--disable-system --enable-debug-tcg"
         - TEST_CMD="make -j3 check-tcg V=1"
-        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
+        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
 
 
     # Run check-tcg against linux-user (with plugins)
     # we skip sparc64-linux-user until it has been fixed somewhat
     - env:
-        - CONFIG="--disable-system --enable-plugins --target-list-exclude=sparc64-linux-user"
+        - CONFIG="--disable-system --enable-plugins --enable-debug-tcg --target-list-exclude=sparc64-linux-user"
         - TEST_CMD="make -j3 check-tcg V=1"
-        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
+        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
 
 
     # Run check-tcg against softmmu targets
     - env:
         - CONFIG="--enable-debug-tcg --target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu"
         - TEST_CMD="make -j3 check-tcg V=1"
-        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
+        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
 
 
     # Run check-tcg against softmmu targets (with plugins)
     - env:
-        - CONFIG="--enable-plugins --target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu"
+        - CONFIG="--enable-plugins --enable-debug-tcg --target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu"
         - TEST_CMD="make -j3 check-tcg V=1"
-        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
+        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
 
 
     # Release builds
-- 
2.20.1
Re: [PATCH] travis.yml: enable linux-gcc-debug-tcg cache
Posted by Philippe Mathieu-Daudé 4 years, 6 months ago 
On 10/24/19 6:06 PM, Alex Bennée wrote:
> Create a new cache for the --enable-debug-tcg builds which is separate
> from the normal debug builds which generate different code. We also
> enable debug-tcg for the new plugins based builds as we want to ensure
> any breakage to TCG is picked up by the sanity checks.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   .travis.yml | 14 +++++++-------
>   1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/.travis.yml b/.travis.yml
> index e3f10a93683..34bc8134f5b 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -135,7 +135,7 @@ matrix:
>       # TCG debug can be run just on its own and is mostly agnostic to user/softmmu distinctions
>       - env:	
>           - CONFIG="--enable-debug-tcg --disable-system"
> -        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug"
> +        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"

This one runs default TEST_CMD="make check -j3 V=1"

>   
>   
>       - env:
> @@ -336,29 +336,29 @@ matrix:
>       - env:
>           - CONFIG="--disable-system --enable-debug-tcg"
>           - TEST_CMD="make -j3 check-tcg V=1"

And this one "check-tcg", OK.
(Maybe we can reorder the $CONFIG arguments so both jobs are more similar).

Too bad Travis 'stages' are an enterprise feature:

https://docs.travis-ci.com/user/conditional-builds-stages-jobs/#conditional-stages

Because here we are building 2x the same, and cache isn't used.

Not this patch problem.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> -        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
> +        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
>   
>   
>       # Run check-tcg against linux-user (with plugins)
>       # we skip sparc64-linux-user until it has been fixed somewhat
>       - env:
> -        - CONFIG="--disable-system --enable-plugins --target-list-exclude=sparc64-linux-user"
> +        - CONFIG="--disable-system --enable-plugins --enable-debug-tcg --target-list-exclude=sparc64-linux-user"
>           - TEST_CMD="make -j3 check-tcg V=1"
> -        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
> +        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
>   
>   
>       # Run check-tcg against softmmu targets
>       - env:
>           - CONFIG="--enable-debug-tcg --target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu"
>           - TEST_CMD="make -j3 check-tcg V=1"
> -        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
> +        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
>   
>   
>       # Run check-tcg against softmmu targets (with plugins)
>       - env:
> -        - CONFIG="--enable-plugins --target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu"
> +        - CONFIG="--enable-plugins --enable-debug-tcg --target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu"
>           - TEST_CMD="make -j3 check-tcg V=1"
> -        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
> +        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
>   
>   
>       # Release builds
>
Re: [PATCH] travis.yml: enable linux-gcc-debug-tcg cache
Posted by Alex Bennée 4 years, 6 months ago 
Philippe Mathieu-Daudé <philmd@redhat.com> writes:

> On 10/24/19 6:06 PM, Alex Bennée wrote:
>> Create a new cache for the --enable-debug-tcg builds which is separate
>> from the normal debug builds which generate different code. We also
>> enable debug-tcg for the new plugins based builds as we want to ensure
>> any breakage to TCG is picked up by the sanity checks.
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> ---
>>   .travis.yml | 14 +++++++-------
>>   1 file changed, 7 insertions(+), 7 deletions(-)
>> diff --git a/.travis.yml b/.travis.yml
>> index e3f10a93683..34bc8134f5b 100644
>> --- a/.travis.yml
>> +++ b/.travis.yml
>> @@ -135,7 +135,7 @@ matrix:
>>       # TCG debug can be run just on its own and is mostly agnostic to user/softmmu distinctions
>>       - env:
>>           - CONFIG="--enable-debug-tcg --disable-system"
>> -        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug"
>> +        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
>
> This one runs default TEST_CMD="make check -j3 V=1"

That does exercise the TCG a little because the various qemu-system-FOO
builds have some bootcode. However given we exercise the TCG more
further down we could just drop this matrix entry.

>
>>
>>       - env:
>> @@ -336,29 +336,29 @@ matrix:
>>       - env:
>>           - CONFIG="--disable-system --enable-debug-tcg"
>>           - TEST_CMD="make -j3 check-tcg V=1"
>
> And this one "check-tcg", OK.
> (Maybe we can reorder the $CONFIG arguments so both jobs are more similar).
>
> Too bad Travis 'stages' are an enterprise feature:
>
> https://docs.travis-ci.com/user/conditional-builds-stages-jobs/#conditional-stages
>
> Because here we are building 2x the same, and cache isn't used.

Why isn't the cache used?

>
> Not this patch problem.
>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
>> -        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
>> +        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
>>
>>       # Run check-tcg against linux-user (with plugins)
>>       # we skip sparc64-linux-user until it has been fixed somewhat
>>       - env:
>> -        - CONFIG="--disable-system --enable-plugins --target-list-exclude=sparc64-linux-user"
>> +        - CONFIG="--disable-system --enable-plugins --enable-debug-tcg --target-list-exclude=sparc64-linux-user"
>>           - TEST_CMD="make -j3 check-tcg V=1"
>> -        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
>> +        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
>>
>>       # Run check-tcg against softmmu targets
>>       - env:
>>           - CONFIG="--enable-debug-tcg --target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu"
>>           - TEST_CMD="make -j3 check-tcg V=1"
>> -        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
>> +        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
>>
>>       # Run check-tcg against softmmu targets (with plugins)
>>       - env:
>> -        - CONFIG="--enable-plugins --target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu"
>> +        - CONFIG="--enable-plugins --enable-debug-tcg --target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu"
>>           - TEST_CMD="make -j3 check-tcg V=1"
>> -        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
>> +        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
>>
>>       # Release builds
>>


--
Alex Bennée
Re: [PATCH] travis.yml: enable linux-gcc-debug-tcg cache
Posted by Philippe Mathieu-Daudé 4 years, 6 months ago 
On 10/24/19 7:06 PM, Alex Bennée wrote:
> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
> 
>> On 10/24/19 6:06 PM, Alex Bennée wrote:
>>> Create a new cache for the --enable-debug-tcg builds which is separate
>>> from the normal debug builds which generate different code. We also
>>> enable debug-tcg for the new plugins based builds as we want to ensure
>>> any breakage to TCG is picked up by the sanity checks.
>>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>>> ---
>>>    .travis.yml | 14 +++++++-------
>>>    1 file changed, 7 insertions(+), 7 deletions(-)
>>> diff --git a/.travis.yml b/.travis.yml
>>> index e3f10a93683..34bc8134f5b 100644
>>> --- a/.travis.yml
>>> +++ b/.travis.yml
>>> @@ -135,7 +135,7 @@ matrix:
>>>        # TCG debug can be run just on its own and is mostly agnostic to user/softmmu distinctions
>>>        - env:
>>>            - CONFIG="--enable-debug-tcg --disable-system"
>>> -        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug"
>>> +        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
>>
>> This one runs default TEST_CMD="make check -j3 V=1"
> 
> That does exercise the TCG a little because the various qemu-system-FOO
> builds have some bootcode. However given we exercise the TCG more
> further down we could just drop this matrix entry.

I haven't checked how long takes "make check check-tcg", hopefully we 
could merge both.

>>>
>>>        - env:
>>> @@ -336,29 +336,29 @@ matrix:
>>>        - env:
>>>            - CONFIG="--disable-system --enable-debug-tcg"
>>>            - TEST_CMD="make -j3 check-tcg V=1"
>>
>> And this one "check-tcg", OK.
>> (Maybe we can reorder the $CONFIG arguments so both jobs are more similar).
>>
>> Too bad Travis 'stages' are an enterprise feature:
>>
>> https://docs.travis-ci.com/user/conditional-builds-stages-jobs/#conditional-stages
>>
>> Because here we are building 2x the same, and cache isn't used.
> 
> Why isn't the cache used?

IIUC cache aren't shared within the same jobs of a build, but by jobs at 
build+1.

>>
>> Not this patch problem.
>>
>> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>
>>> -        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
>>> +        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
>>>
>>>        # Run check-tcg against linux-user (with plugins)
>>>        # we skip sparc64-linux-user until it has been fixed somewhat
>>>        - env:
>>> -        - CONFIG="--disable-system --enable-plugins --target-list-exclude=sparc64-linux-user"
>>> +        - CONFIG="--disable-system --enable-plugins --enable-debug-tcg --target-list-exclude=sparc64-linux-user"
>>>            - TEST_CMD="make -j3 check-tcg V=1"
>>> -        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
>>> +        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
>>>
>>>        # Run check-tcg against softmmu targets
>>>        - env:
>>>            - CONFIG="--enable-debug-tcg --target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu"
>>>            - TEST_CMD="make -j3 check-tcg V=1"
>>> -        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
>>> +        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
>>>
>>>        # Run check-tcg against softmmu targets (with plugins)
>>>        - env:
>>> -        - CONFIG="--enable-plugins --target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu"
>>> +        - CONFIG="--enable-plugins --enable-debug-tcg --target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu"
>>>            - TEST_CMD="make -j3 check-tcg V=1"
>>> -        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
>>> +        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
>>>
>>>        # Release builds
>>>
> 
> 
> --
> Alex Bennée
>

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.