From patchwork Tue Jul 16 09:46:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Changqing Li X-Patchwork-Id: 46511 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B49AC3DA49 for ; Tue, 16 Jul 2024 09:46:39 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web11.6946.1721123195684168262 for ; Tue, 16 Jul 2024 02:46:35 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=79271bf3b2=changqing.li@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46G6OG7b005596 for ; Tue, 16 Jul 2024 02:46:35 -0700 Received: from ala-exchng02.corp.ad.wrs.com (ala-exchng02.wrs.com [147.11.82.254]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 40bmv0ap9j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 16 Jul 2024 02:46:35 -0700 (PDT) Received: from ala-exchng01.corp.ad.wrs.com (147.11.82.252) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 16 Jul 2024 02:46:34 -0700 Received: from pek-lpg-core2.wrs.com (128.224.153.41) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Tue, 16 Jul 2024 02:46:33 -0700 From: To: Subject: [scarthgap][master][PATCH] pixman: update patch for fixing inline failure with -Og Date: Tue, 16 Jul 2024 17:46:33 +0800 Message-ID: <20240716094633.3534017-1-changqing.li@windriver.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: Bo71MZdA_KAd9-G8mQWAafeitb39lPfR X-Proofpoint-GUID: Bo71MZdA_KAd9-G8mQWAafeitb39lPfR X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-15_19,2024-07-16_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 malwarescore=0 mlxscore=0 impostorscore=0 lowpriorityscore=0 adultscore=0 priorityscore=1501 spamscore=0 phishscore=0 bulkscore=0 mlxlogscore=999 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.21.0-2406140001 definitions=main-2407160070 X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-0064b401.pphosted.com id 46G6OG7b005596 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 16 Jul 2024 09:46:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202095 From: Changqing Li Previous patch works on fedora40 with gcc-14, but not works on ubuntu2004 with gcc-9. Update the patch to fix the do_compile failure: In function ‘combine_inner’, inlined from ‘combine_soft_light_ca_float’ at ../pixman-0.42.2/pixman/pixman-combine-float.c:655:1: ../pixman-0.42.2/pixman/pixman-combine-float.c:370:5: error: inlining failed in call to ‘always_inline’ ‘combine_soft_light_c’: function not considered for inlining 370 | combine_ ## name ## _c (float sa, float s, float da, float d) Signed-off-by: Changqing Li --- ...loat.c-fix-inlining-failed-in-call-t.patch | 56 +++++++++++++++++++ ...float.c-replace-force_inline-with-__.patch | 36 ------------ .../xorg-lib/pixman_0.42.2.bb | 2 +- 3 files changed, 57 insertions(+), 37 deletions(-) create mode 100644 meta/recipes-graphics/xorg-lib/pixman/0001-pixman-combine-float.c-fix-inlining-failed-in-call-t.patch delete mode 100644 meta/recipes-graphics/xorg-lib/pixman/0001-pixman-combine-float.c-replace-force_inline-with-__.patch diff --git a/meta/recipes-graphics/xorg-lib/pixman/0001-pixman-combine-float.c-fix-inlining-failed-in-call-t.patch b/meta/recipes-graphics/xorg-lib/pixman/0001-pixman-combine-float.c-fix-inlining-failed-in-call-t.patch new file mode 100644 index 0000000000..5c79754e50 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/pixman/0001-pixman-combine-float.c-fix-inlining-failed-in-call-t.patch @@ -0,0 +1,56 @@ +From 1e32984ccd58da1a66ca918d170a6b1829ef9df2 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Tue, 16 Jul 2024 15:31:16 +0800 +Subject: [PATCH] pixman-combine-float.c: fix inlining failed in call to + always_inline +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Refer [1], always-inline is not suggested to be used if you have indirect +calls. so replace force_inline with inline to fix error: +In function ‘combine_inner’, + inlined from ‘combine_soft_light_ca_float’ at ../pixman/pixman-combine-float.c:655:511: +../pixman/pixman-combine-float.c:655:211: error: inlining failed in call to ‘always_inline’ ‘combine_soft_light_c’: function not considered for inlining + +[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115679 + +Upstream-Status: Submitted [https://www.mail-archive.com/pixman@lists.freedesktop.org/msg04812.html] + +Signed-off-by: Changqing Li +--- + pixman/pixman-combine-float.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/pixman/pixman-combine-float.c b/pixman/pixman-combine-float.c +index f5145bc..f65eb5f 100644 +--- a/pixman/pixman-combine-float.c ++++ b/pixman/pixman-combine-float.c +@@ -261,7 +261,7 @@ get_factor (combine_factor_t factor, float sa, float da) + } + + #define MAKE_PD_COMBINERS(name, a, b) \ +- static float force_inline \ ++ static float inline \ + pd_combine_ ## name (float sa, float s, float da, float d) \ + { \ + const float fa = get_factor (a, sa, da); \ +@@ -360,13 +360,13 @@ MAKE_PD_COMBINERS (conjoint_xor, ONE_MINUS_DA_OVER_SA, ONE_MINUS_SA_OVER_DA) + */ + + #define MAKE_SEPARABLE_PDF_COMBINERS(name) \ +- static force_inline float \ ++ static inline float \ + combine_ ## name ## _a (float sa, float s, float da, float d) \ + { \ + return da + sa - da * sa; \ + } \ + \ +- static force_inline float \ ++ static inline float \ + combine_ ## name ## _c (float sa, float s, float da, float d) \ + { \ + float f = (1 - sa) * d + (1 - da) * s; \ +-- +2.25.1 + diff --git a/meta/recipes-graphics/xorg-lib/pixman/0001-pixman-combine-float.c-replace-force_inline-with-__.patch b/meta/recipes-graphics/xorg-lib/pixman/0001-pixman-combine-float.c-replace-force_inline-with-__.patch deleted file mode 100644 index cae201629f..0000000000 --- a/meta/recipes-graphics/xorg-lib/pixman/0001-pixman-combine-float.c-replace-force_inline-with-__.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 49a1644015d073829c17dcd977aab6fdda1ebdee Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Fri, 5 Jul 2024 07:33:44 +0000 -Subject: [PATCH] pixman-combine-float.c: replace force_inline with __inline__ - -Refer [1], always-inline is not suggested to be used if you have indirect -calls. so replace force_inline with __inline__ to fix error: -In function ‘combine_inner’, - inlined from ‘combine_soft_light_ca_float’ at ../pixman/pixman-combine-float.c:655:511: -../pixman/pixman-combine-float.c:655:211: error: inlining failed in call to ‘always_inline’ ‘combine_soft_light_c’: function not considered for inlining - -[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115679 - -Upstream-Status: Submitted [https://www.mail-archive.com/pixman@lists.freedesktop.org/msg04812.html] - -Signed-off-by: Changqing Li ---- - pixman/pixman-combine-float.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pixman/pixman-combine-float.c b/pixman/pixman-combine-float.c -index f5145bc..52400f4 100644 ---- a/pixman/pixman-combine-float.c -+++ b/pixman/pixman-combine-float.c -@@ -44,7 +44,7 @@ - - typedef float (* combine_channel_t) (float sa, float s, float da, float d); - --static force_inline void -+static __inline__ void - combine_inner (pixman_bool_t component, - float *dest, const float *src, const float *mask, int n_pixels, - combine_channel_t combine_a, combine_channel_t combine_c) --- -2.44.0 - diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.42.2.bb b/meta/recipes-graphics/xorg-lib/pixman_0.42.2.bb index 88eef50f7b..3c55c1705a 100644 --- a/meta/recipes-graphics/xorg-lib/pixman_0.42.2.bb +++ b/meta/recipes-graphics/xorg-lib/pixman_0.42.2.bb @@ -9,7 +9,7 @@ DEPENDS = "zlib" SRC_URI = "https://www.cairographics.org/releases/${BP}.tar.gz \ file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ - file://0001-pixman-combine-float.c-replace-force_inline-with-__.patch \ + file://0001-pixman-combine-float.c-fix-inlining-failed-in-call-t.patch \ " SRC_URI[sha256sum] = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e"