mesa: update submitted patch with backported version
PATCH 1/1 mesa: update submitted patch with backported version
* 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(-)
meta/recipes-graphics/mesa/files/0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch +25 -56
@@ -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] - -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 ") +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> +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) - 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);
meta/recipes-graphics/mesa/mesa.inc +1 -4
@@ -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"
Signature · 1 line
2.39.0
Hello Martin,
Quoted 11 lines · On Mon, 16 Jan 2023 16:30:35 +0100 "Martin Jansa" <[email protected]>…
* 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/54cfb552abc50e8167cdc46d87455a9a414d7c65and as a bonus it doesn't break the build with
DEBUG_BUILDfor 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/170930Signed-off-by Martin Jansa <[email protected]>
There was a conflict while applying this patch on my testing branch due to a previous patch touching mesa.inc. It was simple enough so I have fixed it, but you might want to double check the resulting commit:
Signature · 3 lines
Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Quoted 17 lines · Luca Ceresoli
Hello Martin,
Quoted 2 lines · On Mon, 16 Jan 2023 16:30:35 +0100 "Martin Jansa" <[email protected]>…
* this version was merged to main in:
https://gitlab.freedesktop.org/mesa/mesa/-/commit/267dd1f4d571ee606141aa66f1665aa152b4e911
Quoted 2 lines
and cherry-picked to staging/23.0 as well in:
https://gitlab.freedesktop.org/mesa/mesa/-/commit/54cfb552abc50e8167cdc46d87455a9a414d7c65
Quoted 6 lines
and as a bonus it doesn't break the build with
DEBUG_BUILDfor 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
Quoted 8 lines
Quoted 1 line
Signed-off-by Martin Jansa <[email protected]>There was a conflict while applying this patch on my testing branch due to a previous patch touching mesa.inc. It was simple enough so I have fixed it, but you might want to double check the resulting commit:
git log --oneline contrib/lucaceresoli/master-next -- meta/recipes-graphics/mesa/ | head -n 38b328a698cc mesa: update submitted patch with backported version ab86331bf4a mesa: allow mesa (gbm) to compile without backend 256173b0245 mesa: update 22.2.3 -> 22.3.3
^^^ LGTM