diff mbox series

[v2] mesa: only apply patch to fix ALWAYS_INLINE for native

Message ID 20220921080357.8493-1-kai.kang@windriver.com
State New
Headers show
Series [v2] mesa: only apply patch to fix ALWAYS_INLINE for native | expand

Commit Message

Kai Sept. 21, 2022, 8:03 a.m. UTC
From: Kai Kang <kai.kang@windriver.com>

0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch is not
required by target mesa any more. But it still fails to compile
mesa-native with DEBUG_BUILD enabled on Ubuntu 18.04 with gcc 7.5.0
without this patch:

| ../mesa-22.1.6/src/compiler/nir/nir_inline_helpers.h: In function ‘nir_opt_move_block’:
| ../mesa-22.1.6/src/compiler/nir/nir_opt_move.c:55:1: error: inlining failed in call to
    always_inline ‘src_is_ssa’: indirect function call with a yet undetermined callee
|  src_is_ssa(nir_src *src, void *state)
|  ^~~~~~~~~~

So only apply it for mesa-native.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
v2:
* add comment

 meta/recipes-graphics/mesa/mesa.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Richard Purdie Sept. 21, 2022, 9:08 a.m. UTC | #1
On Wed, 2022-09-21 at 16:03 +0800, kai wrote:
> From: Kai Kang <kai.kang@windriver.com>
> 
> 0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch is not
> required by target mesa any more. But it still fails to compile
> mesa-native with DEBUG_BUILD enabled on Ubuntu 18.04 with gcc 7.5.0
> without this patch:
> 
> > ../mesa-22.1.6/src/compiler/nir/nir_inline_helpers.h: In function ‘nir_opt_move_block’:
> > ../mesa-22.1.6/src/compiler/nir/nir_opt_move.c:55:1: error: inlining failed in call to
>     always_inline ‘src_is_ssa’: indirect function call with a yet undetermined callee
> >  src_is_ssa(nir_src *src, void *state)
> >  ^~~~~~~~~~
> 
> So only apply it for mesa-native.
> 
> Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ---
> v2:
> * add comment
> 
>  meta/recipes-graphics/mesa/mesa.inc | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
> index ea7ed4fd27..913aec987d 100644
> --- a/meta/recipes-graphics/mesa/mesa.inc
> +++ b/meta/recipes-graphics/mesa/mesa.inc
> @@ -22,9 +22,11 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
>             file://0001-util-format-Check-for-NEON-before-using-it.patch \
>             file://0001-Revert-egl-wayland-deprecate-drm_handle_format-and-d.patch \
>             file://0001-swrast_kms-use-swkmsDRI2Extension-instead-of-driDRI2.patch \
> -           file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch \
>             "
>  
> +# required by mesa-native on Ubuntu 18.04 with gcc 7.5 when DEBUG_BUILD enabled
> +SRC_URI:append:class-native = " file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch"
> +
>  SRC_URI[sha256sum] = "22ced061eb9adab8ea35368246c1995c09723f3f71653cd5050c5cec376e671a"
>  
>  UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"

This still generates warnings for musl builds, e.g.:

https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/5882/steps/11/logs/warnings

Cheers,

Richard
Kai Sept. 29, 2022, 9:20 a.m. UTC | #2
On 9/21/22 17:08, Richard Purdie wrote:
> On Wed, 2022-09-21 at 16:03 +0800, kai wrote:
>> From: Kai Kang <kai.kang@windriver.com>
>>
>> 0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch is not
>> required by target mesa any more. But it still fails to compile
>> mesa-native with DEBUG_BUILD enabled on Ubuntu 18.04 with gcc 7.5.0
>> without this patch:
>>
>>> ../mesa-22.1.6/src/compiler/nir/nir_inline_helpers.h: In function ‘nir_opt_move_block’:
>>> ../mesa-22.1.6/src/compiler/nir/nir_opt_move.c:55:1: error: inlining failed in call to
>>      always_inline ‘src_is_ssa’: indirect function call with a yet undetermined callee
>>>   src_is_ssa(nir_src *src, void *state)
>>>   ^~~~~~~~~~
>> So only apply it for mesa-native.
>>
>> Signed-off-by: Kai Kang <kai.kang@windriver.com>
>> ---
>> v2:
>> * add comment
>>
>>   meta/recipes-graphics/mesa/mesa.inc | 4 +++-
>>   1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
>> index ea7ed4fd27..913aec987d 100644
>> --- a/meta/recipes-graphics/mesa/mesa.inc
>> +++ b/meta/recipes-graphics/mesa/mesa.inc
>> @@ -22,9 +22,11 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
>>              file://0001-util-format-Check-for-NEON-before-using-it.patch \
>>              file://0001-Revert-egl-wayland-deprecate-drm_handle_format-and-d.patch \
>>              file://0001-swrast_kms-use-swkmsDRI2Extension-instead-of-driDRI2.patch \
>> -           file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch \
>>              "
>>   
>> +# required by mesa-native on Ubuntu 18.04 with gcc 7.5 when DEBUG_BUILD enabled
>> +SRC_URI:append:class-native = " file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch"
>> +
>>   SRC_URI[sha256sum] = "22ced061eb9adab8ea35368246c1995c09723f3f71653cd5050c5cec376e671a"
>>   
>>   UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
> This still generates warnings for musl builds, e.g.:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/5882/steps/11/logs/warnings

Hi Richard,

The warnings are related with binutils but not mesa. Would you like to 
review it again, please?

Thanks,
Kai

>
> Cheers,
>
> Richard
>
Kai Sept. 30, 2022, 1:32 a.m. UTC | #3
On 9/30/22 06:15, Alexandre Belloni wrote:
> Hello,
>
> On 29/09/2022 17:20:52+0800, kai wrote:
>> On 9/21/22 17:08, Richard Purdie wrote:
>>> On Wed, 2022-09-21 at 16:03 +0800, kai wrote:
>>>> From: Kai Kang <kai.kang@windriver.com>
>>>>
>>>> 0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch is not
>>>> required by target mesa any more. But it still fails to compile
>>>> mesa-native with DEBUG_BUILD enabled on Ubuntu 18.04 with gcc 7.5.0
>>>> without this patch:
>>>>
>>>>> ../mesa-22.1.6/src/compiler/nir/nir_inline_helpers.h: In function ‘nir_opt_move_block’:
>>>>> ../mesa-22.1.6/src/compiler/nir/nir_opt_move.c:55:1: error: inlining failed in call to
>>>>       always_inline ‘src_is_ssa’: indirect function call with a yet undetermined callee
>>>>>    src_is_ssa(nir_src *src, void *state)
>>>>>    ^~~~~~~~~~
>>>> So only apply it for mesa-native.
>>>>
>>>> Signed-off-by: Kai Kang <kai.kang@windriver.com>
>>>> ---
>>>> v2:
>>>> * add comment
>>>>
>>>>    meta/recipes-graphics/mesa/mesa.inc | 4 +++-
>>>>    1 file changed, 3 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
>>>> index ea7ed4fd27..913aec987d 100644
>>>> --- a/meta/recipes-graphics/mesa/mesa.inc
>>>> +++ b/meta/recipes-graphics/mesa/mesa.inc
>>>> @@ -22,9 +22,11 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
>>>>               file://0001-util-format-Check-for-NEON-before-using-it.patch \
>>>>               file://0001-Revert-egl-wayland-deprecate-drm_handle_format-and-d.patch \
>>>>               file://0001-swrast_kms-use-swkmsDRI2Extension-instead-of-driDRI2.patch \
>>>> -           file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch \
>>>>               "
>>>> +# required by mesa-native on Ubuntu 18.04 with gcc 7.5 when DEBUG_BUILD enabled
>>>> +SRC_URI:append:class-native = " file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch"
>>>> +
>>>>    SRC_URI[sha256sum] = "22ced061eb9adab8ea35368246c1995c09723f3f71653cd5050c5cec376e671a"
>>>>    UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
>>> This still generates warnings for musl builds, e.g.:
>>>
>>> https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/5882/steps/11/logs/warnings
>> Hi Richard,
>>
>> The warnings are related with binutils but not mesa. Would you like to
>> review it again, please?
>>
> Sure, but it doesn't apply on master anymore, could you rebase please?

OK.

Kai

>
>> Thanks,
>> Kai
>>
>>> Cheers,
>>>
>>> Richard
>>>
>> -- 
>> Kai Kang
>> Wind River Linux
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#171178): https://lists.openembedded.org/g/openembedded-core/message/171178
>> Mute This Topic: https://lists.openembedded.org/mt/93821960/3617179
>> Group Owner: openembedded-core+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
>
diff mbox series

Patch

diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index ea7ed4fd27..913aec987d 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -22,9 +22,11 @@  SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
            file://0001-util-format-Check-for-NEON-before-using-it.patch \
            file://0001-Revert-egl-wayland-deprecate-drm_handle_format-and-d.patch \
            file://0001-swrast_kms-use-swkmsDRI2Extension-instead-of-driDRI2.patch \
-           file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch \
            "
 
+# required by mesa-native on Ubuntu 18.04 with gcc 7.5 when DEBUG_BUILD enabled
+SRC_URI:append:class-native = " file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch"
+
 SRC_URI[sha256sum] = "22ced061eb9adab8ea35368246c1995c09723f3f71653cd5050c5cec376e671a"
 
 UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"