Skip to contentSkip to conversation

mesa: update submitted patch with backported version

PATCH Martin Jansa 2 participants 2 messages Jan 16, 2023 – Jan 18, 2023 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Kai: can you please test it on ubuntu-18.04?

I've tested it with DEBUG_BUILD in native and target build on a host with new toolchain (gentoo with gcc-12.2.1) and according to
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17439 it works with old toolchain as well.

Quoted 169 lines · Martin Jansa via lists.openembedded.org

* this version was merged to main in:

https://gitlab.freedesktop.org/mesa/mesa/-/commit/267dd1f4d571ee606141aa66f1665aa152b4e911
and cherry-picked to staging/23.0 as well in:

https://gitlab.freedesktop.org/mesa/mesa/-/commit/54cfb552abc50e8167cdc46d87455a9a414d7c65

and as a bonus it doesn't break the build with DEBUG_BUILD for newer toolchain, so we can apply it for target build as well, see:
https://lists.openembedded.org/g/openembedded-core/message/169002
https://lists.openembedded.org/g/openembedded-core/message/170930

---
 ...ove-fix-ALWAYS_INLINE-compiler-error.patch | 81 ++++++-------------
 meta/recipes-graphics/mesa/mesa.inc           |  5 +-
 2 files changed, 26 insertions(+), 60 deletions(-)

diff --git a/meta/recipes-graphics/mesa/files/0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch b/meta/recipes-graphics/mesa/files/0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch index 7989843eb4..1cf23492fe 100644
---
a/meta/recipes-graphics/mesa/files/0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch
+++
b/meta/recipes-graphics/mesa/files/0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch

(quoted diff) +3 -10
@@ -1,67 +1,36 @@
-From da6e47f1717f34c73de388c56ffaf4861a07fdc5 Mon Sep 17 00:00:00 2001
-From: t bettler <[email protected]>
-Date: Sat, 9 Jul 2022 09:28:51 +0000
+From 267dd1f4d571ee606141aa66f1665aa152b4e911 Mon Sep 17 00:00:00 2001
+From: t0b3 <[email protected]>
+Date: Sat, 10 Dec 2022 14:32:53 +0100
 Subject: [PATCH] nir/nir_opt_move: fix ALWAYS_INLINE compiler error
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
 
-Backport merge request to fix mesa compile error when debug build
-enabled.
-
-Upstream-Status: Submitted [

https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17439]

(quoted diff) +0 -11
-
-Signed-off-by: Kai Kang <[email protected]>
-
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-fix call to ‘always_inline’ ‘src_is_ssa’
-
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6825
-Fixes: f1d20ec67c3f186886b97de94f74484650f8fda1 ("nir/nir_opt_move:

handle non-SSA defs ")

(quoted diff) +5 -0
+Reviewed-by: Iago Toral Quiroga <[email protected]>
+Reviewed-by: Adam Jackson <[email protected]>
+Closes: #6825
+Fixes: f1d20ec6 ("nir/nir_opt_move: handle non-SSA defs ")
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17439
Quoted 1 line

+Upstream-Status: Backport [
https://gitlab.freedesktop.org/mesa/mesa/-/commit/267dd1f4d571ee606141aa66f1665aa152b4e911
]
---
- src/compiler/nir/nir_inline_helpers.h | 10 ++++++++--
- src/compiler/nir/nir_opt_move.c | 2 +-
- 2 files changed, 9 insertions(+), 3 deletions(-)
+ src/compiler/nir/nir_opt_move.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)

-diff --git a/src/compiler/nir/nir_inline_helpers.h b/src/compiler/nir/nir_inline_helpers.h
-index 125dd8a..ec33f05 100644
---- a/src/compiler/nir/nir_inline_helpers.h
-+++ b/src/compiler/nir/nir_inline_helpers.h
-@@ -73,8 +73,8 @@ nir_foreach_dest(nir_instr *instr, nir_foreach_dest_cb cb, void *state)

(quoted diff) +0 -11
-    return _nir_foreach_dest(instr, cb, state);
- }
-
--static inline bool
--nir_foreach_src(nir_instr *instr, nir_foreach_src_cb cb, void *state)
-+static ALWAYS_INLINE bool
-+_nir_foreach_src(nir_instr *instr, nir_foreach_src_cb cb, void *state)
- {
-    switch (instr->type) {
-    case nir_instr_type_alu: {
-@@ -162,3 +162,9 @@ nir_foreach_src(nir_instr *instr, nir_foreach_src_cb

cb, void *state)

(quoted diff) +0 -2
-    dest_state.cb = cb;
-    return _nir_foreach_dest(instr, _nir_visit_dest_indirect,

&dest_state);
- }
-+
-+static inline bool
-+nir_foreach_src(nir_instr *instr, nir_foreach_src_cb cb, void *state) -+{
-+ return _nir_foreach_src(instr, cb, state);
-+}
diff --git a/src/compiler/nir/nir_opt_move.c
b/src/compiler/nir/nir_opt_move.c

(quoted diff) +14 -7
-index 81bcde5..051c3cc 100644
+index 81bcde5c436..9aeb9f4cf86 100644
 --- a/src/compiler/nir/nir_opt_move.c
 +++ b/src/compiler/nir/nir_opt_move.c
-@@ -60,7 +60,7 @@ src_is_ssa(nir_src *src, void *state)
- static ALWAYS_INLINE bool
- instr_reads_register(nir_instr *instr)
+@@ -51,13 +51,13 @@
+  * lower register pressure.
+  */
+
+-static ALWAYS_INLINE bool
++static inline bool
+ src_is_ssa(nir_src *src, void *state)
  {
--   return !nir_foreach_src(instr, src_is_ssa, NULL);
-+   return !_nir_foreach_src(instr, src_is_ssa, NULL);
+    return src->is_ssa;
  }
 
- static bool
+-static ALWAYS_INLINE bool
++static inline bool
+ instr_reads_register(nir_instr *instr)
+ {
+    return !nir_foreach_src(instr, src_is_ssa, NULL);
meta/recipes-graphics/mesa/mesa.inc +1 -3
index 5fdb67ca2a..866b7fc462 100644
@@ -18,11 +18,8 @@ SRC_URI = "
 https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
 
 file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
            file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch
 \
            file://0001-util-format-Check-for-NEON-before-using-it.patch \
-           ${NATIVE_PATCHES} \
+
 file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch \
            "
-NATIVE_PATCHES ?= ""
-# required by mesa-native on Ubuntu 18.04 with gcc 7.5 when DEBUG_BUILD

enabled
-NATIVE_PATCHES:class-native = "file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch"

SRC_URI[sha256sum] =
"bed799788bf2bd9ef079d97cd8e09348bf53cb086818578e40773b2b17812922"

--
2.39.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#175996):
https://lists.openembedded.org/g/openembedded-core/message/175996
Mute This Topic: https://lists.openembedded.org/mt/96308437/3617156
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#2 lore raw
Quoted 1 line · Martin Jansa

Kai: can you please test it on ubuntu-18.04?

Hi Martin,

It works for me with & without DEBUG_BUILD on ubuntu-18.04.6(gcc 7.5.0).

Regards,
Kai

Quoted 192 lines

I've tested it with DEBUG_BUILD in native and target build on a host with new toolchain (gentoo with gcc-12.2.1) and according to https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17439 <https://urldefense.com/v3/__https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17439__;!!AjveYdw8EvQ!d1I0Oop5Q1K7nA2qwulHGN9mgP7ofnN-EUUea_ivsroO0Ks1bU1j3VJqZuTQ0X2H5ycY9aAW5Cz_ChByclpNB_Q$> it works with old toolchain as well.

On Mon, Jan 16, 2023 at 4:30 PM Martin Jansa via lists.openembedded.org <https://urldefense.com/v3/__http://lists.openembedded.org__;!!AjveYdw8EvQ!d1I0Oop5Q1K7nA2qwulHGN9mgP7ofnN-EUUea_ivsroO0Ks1bU1j3VJqZuTQ0X2H5ycY9aAW5Cz_ChByW1_uzh4$> <[email protected]> wrote:

    * this version was merged to main in:
    https://gitlab.freedesktop.org/mesa/mesa/-/commit/267dd1f4d571ee606141aa66f1665aa152b4e911
    <https://urldefense.com/v3/__https://gitlab.freedesktop.org/mesa/mesa/-/commit/267dd1f4d571ee606141aa66f1665aa152b4e911__;!!AjveYdw8EvQ!d1I0Oop5Q1K7nA2qwulHGN9mgP7ofnN-EUUea_ivsroO0Ks1bU1j3VJqZuTQ0X2H5ycY9aAW5Cz_ChBy7EjBk3I$>
      and cherry-picked to staging/23.0 as well in:
    https://gitlab.freedesktop.org/mesa/mesa/-/commit/54cfb552abc50e8167cdc46d87455a9a414d7c65
    <https://urldefense.com/v3/__https://gitlab.freedesktop.org/mesa/mesa/-/commit/54cfb552abc50e8167cdc46d87455a9a414d7c65__;!!AjveYdw8EvQ!d1I0Oop5Q1K7nA2qwulHGN9mgP7ofnN-EUUea_ivsroO0Ks1bU1j3VJqZuTQ0X2H5ycY9aAW5Cz_ChBysISDH1Y$>

      and as a bonus it doesn't break the build with DEBUG_BUILD
      for newer toolchain, so we can apply it for target build as
    well, see:
    https://lists.openembedded.org/g/openembedded-core/message/169002
    <https://urldefense.com/v3/__https://lists.openembedded.org/g/openembedded-core/message/169002__;!!AjveYdw8EvQ!d1I0Oop5Q1K7nA2qwulHGN9mgP7ofnN-EUUea_ivsroO0Ks1bU1j3VJqZuTQ0X2H5ycY9aAW5Cz_ChByT2LkadU$>
    https://lists.openembedded.org/g/openembedded-core/message/170930
    <https://urldefense.com/v3/__https://lists.openembedded.org/g/openembedded-core/message/170930__;!!AjveYdw8EvQ!d1I0Oop5Q1K7nA2qwulHGN9mgP7ofnN-EUUea_ivsroO0Ks1bU1j3VJqZuTQ0X2H5ycY9aAW5Cz_ChBy4OYfHIk$>

    Signed-off-by: Martin Jansa <[email protected]>
    ---
     ...ove-fix-ALWAYS_INLINE-compiler-error.patch | 81
    ++++++-------------
     meta/recipes-graphics/mesa/mesa.inc           |  5 +-
     2 files changed, 26 insertions(+), 60 deletions(-)

    diff --git
    a/meta/recipes-graphics/mesa/files/0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch
    b/meta/recipes-graphics/mesa/files/0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch
    index 7989843eb4..1cf23492fe 100644
    ---
    a/meta/recipes-graphics/mesa/files/0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch
    +++
    b/meta/recipes-graphics/mesa/files/0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch
    @@ -1,67 +1,36 @@
    -From da6e47f1717f34c73de388c56ffaf4861a07fdc5 Mon Sep 17 00:00:00
    2001
    -From: t bettler <[email protected]>
    -Date: Sat, 9 Jul 2022 09:28:51 +0000
    +From 267dd1f4d571ee606141aa66f1665aa152b4e911 Mon Sep 17 00:00:00
    2001
    +From: t0b3 <[email protected]>
    +Date: Sat, 10 Dec 2022 14:32:53 +0100
     Subject: [PATCH] nir/nir_opt_move: fix ALWAYS_INLINE compiler error
    -MIME-Version: 1.0
    -Content-Type: text/plain; charset=UTF-8
    -Content-Transfer-Encoding: 8bit

    -Backport merge request to fix mesa compile error when debug build
    -enabled.
    -
    -Upstream-Status: Submitted
    [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17439
    <https://urldefense.com/v3/__https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17439__;!!AjveYdw8EvQ!d1I0Oop5Q1K7nA2qwulHGN9mgP7ofnN-EUUea_ivsroO0Ks1bU1j3VJqZuTQ0X2H5ycY9aAW5Cz_ChByclpNB_Q$>]
    -
    -Signed-off-by: Kai Kang <[email protected]>
    -
    -MIME-Version: 1.0
    -Content-Type: text/plain; charset=UTF-8
    -Content-Transfer-Encoding: 8bit
    -
    -fix call to ‘always_inline’ ‘src_is_ssa’
    -
    -Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6825
    <https://urldefense.com/v3/__https://gitlab.freedesktop.org/mesa/mesa/-/issues/6825__;!!AjveYdw8EvQ!d1I0Oop5Q1K7nA2qwulHGN9mgP7ofnN-EUUea_ivsroO0Ks1bU1j3VJqZuTQ0X2H5ycY9aAW5Cz_ChByYbcOI8M$>
    -Fixes: f1d20ec67c3f186886b97de94f74484650f8fda1
    ("nir/nir_opt_move: handle non-SSA defs ")
    +Reviewed-by: Iago Toral Quiroga <[email protected]>
    +Reviewed-by: Adam Jackson <[email protected]>
    +Closes: #6825
    +Fixes: f1d20ec6 ("nir/nir_opt_move: handle non-SSA defs ")
    +Part-of:
    <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17439
    <https://urldefense.com/v3/__https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17439__;!!AjveYdw8EvQ!d1I0Oop5Q1K7nA2qwulHGN9mgP7ofnN-EUUea_ivsroO0Ks1bU1j3VJqZuTQ0X2H5ycY9aAW5Cz_ChByclpNB_Q$>>

    +Upstream-Status: Backport
    [https://gitlab.freedesktop.org/mesa/mesa/-/commit/267dd1f4d571ee606141aa66f1665aa152b4e911
    <https://urldefense.com/v3/__https://gitlab.freedesktop.org/mesa/mesa/-/commit/267dd1f4d571ee606141aa66f1665aa152b4e911__;!!AjveYdw8EvQ!d1I0Oop5Q1K7nA2qwulHGN9mgP7ofnN-EUUea_ivsroO0Ks1bU1j3VJqZuTQ0X2H5ycY9aAW5Cz_ChBy7EjBk3I$>]
     ---
    - src/compiler/nir/nir_inline_helpers.h | 10 ++++++++--
    - src/compiler/nir/nir_opt_move.c       |  2 +-
    - 2 files changed, 9 insertions(+), 3 deletions(-)
    + src/compiler/nir/nir_opt_move.c | 4 ++--
    + 1 file changed, 2 insertions(+), 2 deletions(-)

    -diff --git a/src/compiler/nir/nir_inline_helpers.h
    b/src/compiler/nir/nir_inline_helpers.h
    -index 125dd8a..ec33f05 100644
    ---- a/src/compiler/nir/nir_inline_helpers.h
    -+++ b/src/compiler/nir/nir_inline_helpers.h
    -@@ -73,8 +73,8 @@ nir_foreach_dest(nir_instr *instr,
    nir_foreach_dest_cb cb, void *state)
    -    return _nir_foreach_dest(instr, cb, state);
    - }
    -
    --static inline bool
    --nir_foreach_src(nir_instr *instr, nir_foreach_src_cb cb, void
    *state)
    -+static ALWAYS_INLINE bool
    -+_nir_foreach_src(nir_instr *instr, nir_foreach_src_cb cb, void
    *state)
    - {
    -    switch (instr->type) {
    -    case nir_instr_type_alu: {
    -@@ -162,3 +162,9 @@ nir_foreach_src(nir_instr *instr,
    nir_foreach_src_cb cb, void *state)
    -    dest_state.cb = cb;
    -    return _nir_foreach_dest(instr, _nir_visit_dest_indirect,
    &dest_state);
    - }
    -+
    -+static inline bool
    -+nir_foreach_src(nir_instr *instr, nir_foreach_src_cb cb, void
    *state)
    -+{
    -+   return _nir_foreach_src(instr, cb, state);
    -+}
     diff --git a/src/compiler/nir/nir_opt_move.c
    b/src/compiler/nir/nir_opt_move.c
    -index 81bcde5..051c3cc 100644
    +index 81bcde5c436..9aeb9f4cf86 100644
     --- a/src/compiler/nir/nir_opt_move.c
     +++ b/src/compiler/nir/nir_opt_move.c
    -@@ -60,7 +60,7 @@ src_is_ssa(nir_src *src, void *state)
    - static ALWAYS_INLINE bool
    - instr_reads_register(nir_instr *instr)
    +@@ -51,13 +51,13 @@
    +  * lower register pressure.
    +  */
    +
    +-static ALWAYS_INLINE bool
    ++static inline bool
    + src_is_ssa(nir_src *src, void *state)
      {
    --   return !nir_foreach_src(instr, src_is_ssa, NULL);
    -+   return !_nir_foreach_src(instr, src_is_ssa, NULL);
    +    return src->is_ssa;
      }

    - static bool
    +-static ALWAYS_INLINE bool
    ++static inline bool
    + instr_reads_register(nir_instr *instr)
    + {
    +    return !nir_foreach_src(instr, src_is_ssa, NULL);
    diff --git a/meta/recipes-graphics/mesa/mesa.inc
    b/meta/recipes-graphics/mesa/mesa.inc
    index 5fdb67ca2a..866b7fc462 100644
    --- a/meta/recipes-graphics/mesa/mesa.inc
    +++ b/meta/recipes-graphics/mesa/mesa.inc
    @@ -18,11 +18,8 @@ SRC_URI =
    "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz
    <https://urldefense.com/v3/__https://mesa.freedesktop.org/archive/mesa-$*7BPV*7D.tar.xz__;JSU!!AjveYdw8EvQ!d1I0Oop5Q1K7nA2qwulHGN9mgP7ofnN-EUUea_ivsroO0Ks1bU1j3VJqZuTQ0X2H5ycY9aAW5Cz_ChByN8-ENrs$>
    \
    file://0001-meson.build-check-for-all-linux-host_os-combinations.patch
    \
    file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
    file://0001-util-format-Check-for-NEON-before-using-it.patch \
    -           ${NATIVE_PATCHES} \
    +
    file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch \
                "
    -NATIVE_PATCHES ?= ""
    -# required by mesa-native on Ubuntu 18.04 with gcc 7.5 when
    DEBUG_BUILD enabled
    -NATIVE_PATCHES:class-native =
    "file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch"

     SRC_URI[sha256sum] =
    "bed799788bf2bd9ef079d97cd8e09348bf53cb086818578e40773b2b17812922"

    -- 
    2.39.0


    -=-=-=-=-=-=-=-=-=-=-=-
    Links: You receive all messages sent to this group.
    View/Reply Online (#175996):
    https://lists.openembedded.org/g/openembedded-core/message/175996
    <https://urldefense.com/v3/__https://lists.openembedded.org/g/openembedded-core/message/175996__;!!AjveYdw8EvQ!d1I0Oop5Q1K7nA2qwulHGN9mgP7ofnN-EUUea_ivsroO0Ks1bU1j3VJqZuTQ0X2H5ycY9aAW5Cz_ChByuuFtNn4$>
    Mute This Topic:
    https://lists.openembedded.org/mt/96308437/3617156
    <https://urldefense.com/v3/__https://lists.openembedded.org/mt/96308437/3617156__;!!AjveYdw8EvQ!d1I0Oop5Q1K7nA2qwulHGN9mgP7ofnN-EUUea_ivsroO0Ks1bU1j3VJqZuTQ0X2H5ycY9aAW5Cz_ChBynxgHZrw$>
    Group Owner: [email protected]
    <mailto:openembedded-core%[email protected]>
    Unsubscribe:
    https://lists.openembedded.org/g/openembedded-core/unsub
    <https://urldefense.com/v3/__https://lists.openembedded.org/g/openembedded-core/unsub__;!!AjveYdw8EvQ!d1I0Oop5Q1K7nA2qwulHGN9mgP7ofnN-EUUea_ivsroO0Ks1bU1j3VJqZuTQ0X2H5ycY9aAW5Cz_ChByHCJTpEs$>
    [[email protected]]
    -=-=-=-=-=-=-=-=-=-=-=-
Signature · 2 lines
Kai Kang
Wind River Linux