Skip to contentSkip to conversation

mesa: only apply patch to fix ALWAYS_INLINE for native

PATCH Superseded [email protected] 3 participants 5 messages Sep 21, 2022 – Sep 30, 2022

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 mesa: only apply patch to fix ALWAYS_INLINE for native

From: Kai Kang <[email protected]>

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.

---
v2:
* add comment

 meta/recipes-graphics/mesa/mesa.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-graphics/mesa/mesa.inc +3 -1
index ea7ed4fd27..913aec987d 100644
@@ -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+)+)"
Signature · 1 line
2.17.1
#1 lore raw
Quoted 30 lines · kai

From: Kai Kang <[email protected]>

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:

Quoted 2 lines

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

Quoted 2 lines

src_is_ssa(nir_src *src, void *state)
^~~~~~~~~~

So only apply it for mesa-native.

---
v2:
* add comment

 meta/recipes-graphics/mesa/mesa.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-graphics/mesa/mesa.inc +0 -0
index ea7ed4fd27..913aec987d 100644
@@ -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 \

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

Quoted 10 lines
meta/recipes-graphics/mesa/mesa.inc +3 -1
            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

author
#2 lore raw
Quoted 39 lines · Richard Purdie
Quoted 38 lines · kai

From: Kai Kang <[email protected]>

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:

Quoted 2 lines

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

Quoted 2 lines

src_is_ssa(nir_src *src, void *state)
^~~~~~~~~~

So only apply it for mesa-native.

---
v2:
* add comment

  meta/recipes-graphics/mesa/mesa.inc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-graphics/mesa/mesa.inc +3 -1
index ea7ed4fd27..913aec987d 100644
@@ -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"
 
Quoted 4 lines

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

Quoted 1 line
meta/recipes-graphics/mesa/mesa.inc +0 -0
  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

Quoted 5 lines

Cheers,

Richard

Signature · 2 lines
Kai Kang
Wind River Linux
#3 lore raw

Hello,

Quoted 41 lines · kai
Quoted 40 lines · Richard Purdie
Quoted 27 lines · kai

From: Kai Kang <[email protected]>

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:

Quoted 2 lines

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

Quoted 2 lines

src_is_ssa(nir_src *src, void *state)
^~~~~~~~~~

So only apply it for mesa-native.

---
v2:
* add comment

  meta/recipes-graphics/mesa/mesa.inc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-graphics/mesa/mesa.inc +0 -0
index ea7ed4fd27..913aec987d 100644

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

Quoted 10 lines
meta/recipes-graphics/mesa/mesa.inc +3 -1
@@ -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.:

Quoted 7 lines
Quoted 1 line

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?

Quoted 17 lines

Thanks,
Kai

Quoted 5 lines

Cheers,

Richard

Signature · 2 lines
Kai Kang
Wind River Linux
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
author
#4 lore raw
Quoted 44 lines · Alexandre Belloni

Hello,

Quoted 41 lines · kai
Quoted 40 lines · Richard Purdie
Quoted 27 lines · kai

From: Kai Kang <[email protected]>

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:

Quoted 2 lines

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

Quoted 2 lines

src_is_ssa(nir_src *src, void *state)
^~~~~~~~~~

So only apply it for mesa-native.

---
v2:
* add comment

   meta/recipes-graphics/mesa/mesa.inc | 4 +++-
   1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-graphics/mesa/mesa.inc +0 -0
index ea7ed4fd27..913aec987d 100644

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

Quoted 10 lines
meta/recipes-graphics/mesa/mesa.inc +3 -1
@@ -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.:

Quoted 7 lines
Quoted 6 lines
Quoted 1 line

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

Quoted 21 lines
Quoted 20 lines

Thanks,
Kai

Quoted 4 lines

Cheers,

Richard

Signature · 10 lines
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: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 2 lines
Kai Kang
Wind River Linux