diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2023-01-16 16:30:35 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-18 16:42:28 +0000 |
commit | 1949009c5381c0937e834e6ccbcf263513d56033 (patch) | |
tree | 041c2c88115f9fa26089d2a514c2c5980661fc3e /meta/recipes-graphics/mesa/files/0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch | |
parent | a5292fd2db0c3c0955e113ebba4c50e7c5ea3cc3 (diff) | |
download | poky-1949009c5381c0937e834e6ccbcf263513d56033.tar.gz |
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
(From OE-Core rev: fa8826a325cf18f22ea7a282a29c83f7c5819adb)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/files/0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch')
-rw-r--r-- | meta/recipes-graphics/mesa/files/0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch | 81 |
1 files changed, 25 insertions, 56 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 @@ | |||
1 | From da6e47f1717f34c73de388c56ffaf4861a07fdc5 Mon Sep 17 00:00:00 2001 | 1 | From 267dd1f4d571ee606141aa66f1665aa152b4e911 Mon Sep 17 00:00:00 2001 |
2 | From: t bettler <thomas.bettler@gmail.com> | 2 | From: t0b3 <thomas.bettler@gmail.com> |
3 | Date: Sat, 9 Jul 2022 09:28:51 +0000 | 3 | Date: Sat, 10 Dec 2022 14:32:53 +0100 |
4 | Subject: [PATCH] nir/nir_opt_move: fix ALWAYS_INLINE compiler error | 4 | Subject: [PATCH] nir/nir_opt_move: fix ALWAYS_INLINE compiler error |
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | 5 | ||
9 | Backport merge request to fix mesa compile error when debug build | 6 | Reviewed-by: Iago Toral Quiroga <itoral@igalia.com> |
10 | enabled. | 7 | Reviewed-by: Adam Jackson <ajax@redhat.com> |
11 | 8 | Closes: #6825 | |
12 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17439] | 9 | Fixes: f1d20ec6 ("nir/nir_opt_move: handle non-SSA defs ") |
13 | 10 | Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17439> | |
14 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
15 | |||
16 | MIME-Version: 1.0 | ||
17 | Content-Type: text/plain; charset=UTF-8 | ||
18 | Content-Transfer-Encoding: 8bit | ||
19 | |||
20 | fix call to ‘always_inline’ ‘src_is_ssa’ | ||
21 | |||
22 | Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6825 | ||
23 | Fixes: f1d20ec67c3f186886b97de94f74484650f8fda1 ("nir/nir_opt_move: handle non-SSA defs ") | ||
24 | 11 | ||
12 | Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/267dd1f4d571ee606141aa66f1665aa152b4e911] | ||
25 | --- | 13 | --- |
26 | src/compiler/nir/nir_inline_helpers.h | 10 ++++++++-- | 14 | src/compiler/nir/nir_opt_move.c | 4 ++-- |
27 | src/compiler/nir/nir_opt_move.c | 2 +- | 15 | 1 file changed, 2 insertions(+), 2 deletions(-) |
28 | 2 files changed, 9 insertions(+), 3 deletions(-) | ||
29 | 16 | ||
30 | diff --git a/src/compiler/nir/nir_inline_helpers.h b/src/compiler/nir/nir_inline_helpers.h | ||
31 | index 125dd8a..ec33f05 100644 | ||
32 | --- a/src/compiler/nir/nir_inline_helpers.h | ||
33 | +++ b/src/compiler/nir/nir_inline_helpers.h | ||
34 | @@ -73,8 +73,8 @@ nir_foreach_dest(nir_instr *instr, nir_foreach_dest_cb cb, void *state) | ||
35 | return _nir_foreach_dest(instr, cb, state); | ||
36 | } | ||
37 | |||
38 | -static inline bool | ||
39 | -nir_foreach_src(nir_instr *instr, nir_foreach_src_cb cb, void *state) | ||
40 | +static ALWAYS_INLINE bool | ||
41 | +_nir_foreach_src(nir_instr *instr, nir_foreach_src_cb cb, void *state) | ||
42 | { | ||
43 | switch (instr->type) { | ||
44 | case nir_instr_type_alu: { | ||
45 | @@ -162,3 +162,9 @@ nir_foreach_src(nir_instr *instr, nir_foreach_src_cb cb, void *state) | ||
46 | dest_state.cb = cb; | ||
47 | return _nir_foreach_dest(instr, _nir_visit_dest_indirect, &dest_state); | ||
48 | } | ||
49 | + | ||
50 | +static inline bool | ||
51 | +nir_foreach_src(nir_instr *instr, nir_foreach_src_cb cb, void *state) | ||
52 | +{ | ||
53 | + return _nir_foreach_src(instr, cb, state); | ||
54 | +} | ||
55 | diff --git a/src/compiler/nir/nir_opt_move.c b/src/compiler/nir/nir_opt_move.c | 17 | diff --git a/src/compiler/nir/nir_opt_move.c b/src/compiler/nir/nir_opt_move.c |
56 | index 81bcde5..051c3cc 100644 | 18 | index 81bcde5c436..9aeb9f4cf86 100644 |
57 | --- a/src/compiler/nir/nir_opt_move.c | 19 | --- a/src/compiler/nir/nir_opt_move.c |
58 | +++ b/src/compiler/nir/nir_opt_move.c | 20 | +++ b/src/compiler/nir/nir_opt_move.c |
59 | @@ -60,7 +60,7 @@ src_is_ssa(nir_src *src, void *state) | 21 | @@ -51,13 +51,13 @@ |
60 | static ALWAYS_INLINE bool | 22 | * lower register pressure. |
61 | instr_reads_register(nir_instr *instr) | 23 | */ |
24 | |||
25 | -static ALWAYS_INLINE bool | ||
26 | +static inline bool | ||
27 | src_is_ssa(nir_src *src, void *state) | ||
62 | { | 28 | { |
63 | - return !nir_foreach_src(instr, src_is_ssa, NULL); | 29 | return src->is_ssa; |
64 | + return !_nir_foreach_src(instr, src_is_ssa, NULL); | ||
65 | } | 30 | } |
66 | 31 | ||
67 | static bool | 32 | -static ALWAYS_INLINE bool |
33 | +static inline bool | ||
34 | instr_reads_register(nir_instr *instr) | ||
35 | { | ||
36 | return !nir_foreach_src(instr, src_is_ssa, NULL); | ||