Re: [OE-core] [PATCH v3] mesa: only apply patch to fix ALWAYS_INLINE for native

Re: [OE-core] [PATCH v3] mesa: only apply patch to fix ALWAYS_INLINE for native

[Kai]

On 9/30/22 16:34, kai wrote:
> From: Kai Kang <kai.kang@windriver.com>
>
> 0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch is not
> needed by target mesa any more. But it still fails to compile
> mesa-native without this patch when DEBUG_BUILD is enabled on Ubuntu
> 18.04 with gcc 7.5.0:
>
> | ../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>
> ---
> v3:
> * rebase

Ping.

Kai

>
>   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 8a74e0a80a..c94e439363 100644
> --- a/meta/recipes-graphics/mesa/mesa.inc
> +++ b/meta/recipes-graphics/mesa/mesa.inc
> @@ -19,9 +19,11 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
>              file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
>              file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \
>              file://0001-util-format-Check-for-NEON-before-using-it.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] = "b1f9c8fd08f2cae3adf83355bef4d2398e8025f44947332880f2d0066bdafa8c"
>   
>   UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#171214): https://lists.openembedded.org/g/openembedded-core/message/171214
> Mute This Topic: https://lists.openembedded.org/mt/94012441/3616933
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [kai.kang@windriver.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

-- 
Kai Kang
Wind River Linux

Re: [OE-core] [PATCH v3] mesa: only apply patch to fix ALWAYS_INLINE for native

[Ross Burton]

> Ping.

As per https://wiki.yoctoproject.org/wiki/Weekly_Status, master is frozen for release and RP is on vacation, so patches are being review/accumulated but are not merging just yet.

Ross

Re: [OE-core] [PATCH v3] mesa: only apply patch to fix ALWAYS_INLINE for native

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 800 bytes --]

On Wed, Oct 12, 2022 at 9:38 AM Ross Burton <ross.burton@arm.com> wrote:

> > Ping.
>
> As per https://wiki.yoctoproject.org/wiki/Weekly_Status, master is frozen
> for release and RP is on vacation, so patches are being review/accumulated
> but are not merging just yet.
>

Can we publish the staging branch somewhere on poky-contrib or
oe-core-contrib

>
> Ross
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#171670):
> https://lists.openembedded.org/g/openembedded-core/message/171670
> Mute This Topic: https://lists.openembedded.org/mt/94012441/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

[-- Attachment #2: Type: text/html, Size: 1814 bytes --]

Re: [OE-core] [PATCH v3] mesa: only apply patch to fix ALWAYS_INLINE for native

[Ross Burton]

On 12 Oct 2022, at 21:51, Khem Raj via lists.openembedded.org <raj.khem=gmail.com@lists.openembedded.org> wrote:
> As per https://wiki.yoctoproject.org/wiki/Weekly_Status, master is frozen for release and RP is on vacation, so patches are being review/accumulated but are not merging just yet.
> 
> Can we publish the staging branch somewhere on poky-contrib or oe-core-contrib 

There are a few.

My usual staging branch is ross/mut on poky-contrib.  It’s a bit of a mess usually...

Alex and Luca are very efficient at sweeping the lists and doing builds. Their staging branches are on openembedded-core-contrib:  abelloni/master-next and  lucaceresoli/master-next respectively.

Ross

Re: [OE-core] [PATCH v3] mesa: only apply patch to fix ALWAYS_INLINE for native

[Khem Raj]

On Wed, Oct 12, 2022 at 12:10 AM kai <kai.kang@windriver.com> wrote:
>
> On 9/30/22 16:34, kai wrote:
> > From: Kai Kang <kai.kang@windriver.com>
> >
> > 0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch is not
> > needed by target mesa any more. But it still fails to compile
> > mesa-native without this patch when DEBUG_BUILD is enabled on Ubuntu
> > 18.04 with gcc 7.5.0:
> >
> > | ../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>
> > ---
> > v3:
> > * rebase
>
> Ping.

This patch will break mesa recipes from other layers which override
mesa from core. They
won't be able to find this patch since now it will be inserted
previously where overriding SRC_URI
was enough, not anymore

>
> Kai
>
> >
> >   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 8a74e0a80a..c94e439363 100644
> > --- a/meta/recipes-graphics/mesa/mesa.inc
> > +++ b/meta/recipes-graphics/mesa/mesa.inc
> > @@ -19,9 +19,11 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
> >              file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
> >              file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \
> >              file://0001-util-format-Check-for-NEON-before-using-it.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] = "b1f9c8fd08f2cae3adf83355bef4d2398e8025f44947332880f2d0066bdafa8c"
> >
> >   UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
> >
> >
> >
>
> --
> Kai Kang
> Wind River Linux
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#171646): https://lists.openembedded.org/g/openembedded-core/message/171646
> Mute This Topic: https://lists.openembedded.org/mt/94012441/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>