Skip to contentSkip to conversation

mesa: only apply patch to fix ALWAYS_INLINE for native

PATCH Kai 3 participants 5 messages Oct 12, 2022 – Oct 18, 2022 1 message not in the archive

lore
Share & tools
lore

Kai

author
#1 lore raw
In reply to a message not in the archive
Quoted 13 lines · kai

From: Kai Kang <[email protected]>

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)
|  ^~~~~~~~~~
Quoted 6 lines

So only apply it for mesa-native.

---
v3:
* rebase

Ping.

Kai

Quoted 30 lines
  meta/recipes-graphics/mesa/mesa.inc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-graphics/mesa/mesa.inc +3 -2
index 8a74e0a80a..c94e439363 100644
@@ -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: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Signature · 2 lines
Kai Kang
Wind River Linux
#3 lore raw
Quoted 6 lines · Ross Burton
Quoted 1 line

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

Quoted 13 lines

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: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#4 lore raw
Quoted 3 lines · Khem Raj via lists.openembedded.org

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

#5 lore raw
In reply to Kai
Quoted 15 lines · kai
Quoted 13 lines · kai

From: Kai Kang <[email protected]>

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)
|  ^~~~~~~~~~
Quoted 8 lines
Quoted 6 lines

So only apply it for mesa-native.

---
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

Quoted 41 lines

Kai

Quoted 14 lines
  meta/recipes-graphics/mesa/mesa.inc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-graphics/mesa/mesa.inc +0 -0
index 8a74e0a80a..c94e439363 100644
@@ -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 \

meta/recipes-graphics/mesa/mesa.inc SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ · line 29

Quoted 10 lines
meta/recipes-graphics/mesa/mesa.inc +3 -1
             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: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-