mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
Christian Hewitt
GitHub
commit
39eed676b9
@ -0,0 +1,140 @@
|
|||||||
|
From 308656a1992c1df76a3fe1902a228cc98dfb7c8f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Rudi Heitbaum <rudi@heitbaum.com>
|
||||||
|
Date: Wed, 15 Jan 2025 02:16:29 +0000
|
||||||
|
Subject: [PATCH] Allow compile with -std=c23
|
||||||
|
|
||||||
|
When compiling with -std=c23 the following errors are observed.
|
||||||
|
|
||||||
|
common/qtypes.h:37:15: error: cannot use keyword 'false' as enumeration constant
|
||||||
|
37 | typedef enum{ false, true, ENSURE_INT_QBOOL = 0x70000000 } qboolean;
|
||||||
|
| ^~~~~
|
||||||
|
common/qtypes.h:37:23: error: cannot use keyword 'true' as enumeration constant
|
||||||
|
37 | typedef enum{ false, true, ENSURE_INT_QBOOL = 0x70000000 } qboolean;
|
||||||
|
| ^~~~
|
||||||
|
|
||||||
|
common/net_main.c:869:9: error: too many arguments to function 'pp->procedure'; expected 0, have 1
|
||||||
|
869 | pp->procedure(pp->arg);
|
||||||
|
| ^~ ~~~~~~~
|
||||||
|
common/net.h:320:12: note: declared here
|
||||||
|
320 | void (*procedure) ();
|
||||||
|
| ^~~~~~~~~
|
||||||
|
|
||||||
|
common/net_main.c:112:56: error: initialization of 'void (*)(void *)' from incompatible pointer type 'void (*)(void)' [-Wincompatible-pointer-types]
|
||||||
|
112 | static PollProcedure slistSendProcedure = { NULL, 0.0, Slist_Send };
|
||||||
|
| ^~~~~~~~~~
|
||||||
|
common/net_main.c:113:56: error: initialization of 'void (*)(void *)' from incompatible pointer type 'void (*)(void)' [-Wincompatible-pointer-types]
|
||||||
|
113 | static PollProcedure slistPollProcedure = { NULL, 0.0, Slist_Poll };
|
||||||
|
| ^~~~~~~~~~
|
||||||
|
common/net_dgrm.c:512:8: error: initialization of 'void (*)(void *)' from incompatible pointer type 'void (*)(struct test_poll_state *)' [-Wincompatible-pointer-types]
|
||||||
|
512 | Test_Poll,
|
||||||
|
| ^~~~~~~~~
|
||||||
|
common/net_dgrm.c:647:7: error: initialization of 'void (*)(void *)' from incompatible pointer type 'void (*)(struct test_poll_state *)' [-Wincompatible-pointer-types]
|
||||||
|
647 | Test2_Poll,
|
||||||
|
| ^~~~~~~~~~
|
||||||
|
|
||||||
|
Fix:
|
||||||
|
- update enum as false0 and true1 as the enum are already 0 and 1, and map to false/true
|
||||||
|
- Update the function declarations to pass (void *) as procedure
|
||||||
|
---
|
||||||
|
common/net.h | 2 +-
|
||||||
|
common/net_dgrm.c | 6 ++++--
|
||||||
|
common/net_main.c | 8 ++++----
|
||||||
|
common/qtypes.h | 2 +-
|
||||||
|
4 files changed, 10 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/common/net.h b/common/net.h
|
||||||
|
index d5b57c8e..bdc0acc0 100644
|
||||||
|
--- a/common/net.h
|
||||||
|
+++ b/common/net.h
|
||||||
|
@@ -317,7 +317,7 @@ void NET_Poll(void);
|
||||||
|
typedef struct _PollProcedure {
|
||||||
|
struct _PollProcedure *next;
|
||||||
|
double nextTime;
|
||||||
|
- void (*procedure) ();
|
||||||
|
+ void (*procedure) (void *);
|
||||||
|
void *arg;
|
||||||
|
} PollProcedure;
|
||||||
|
|
||||||
|
diff --git a/common/net_dgrm.c b/common/net_dgrm.c
|
||||||
|
index fd1d2fbd..f5533680 100644
|
||||||
|
--- a/common/net_dgrm.c
|
||||||
|
+++ b/common/net_dgrm.c
|
||||||
|
@@ -434,7 +434,7 @@ struct test_poll_state
|
||||||
|
|
||||||
|
|
||||||
|
static void
|
||||||
|
-Test_Poll(struct test_poll_state *state)
|
||||||
|
+Test_Poll(void *vstate)
|
||||||
|
{
|
||||||
|
netadr_t clientaddr;
|
||||||
|
int control;
|
||||||
|
@@ -445,6 +445,7 @@ Test_Poll(struct test_poll_state *state)
|
||||||
|
int frags;
|
||||||
|
int connectTime;
|
||||||
|
byte playerNumber;
|
||||||
|
+ struct test_poll_state *state = (struct test_poll_state *) vstate;
|
||||||
|
|
||||||
|
while (1) {
|
||||||
|
len = state->driver->Read(state->socket, net_message.data,
|
||||||
|
@@ -570,13 +571,14 @@ Test_f(void)
|
||||||
|
|
||||||
|
|
||||||
|
static void
|
||||||
|
-Test2_Poll(struct test_poll_state *state)
|
||||||
|
+Test2_Poll(void *vstate)
|
||||||
|
{
|
||||||
|
netadr_t clientaddr;
|
||||||
|
int control;
|
||||||
|
int len;
|
||||||
|
char *name;
|
||||||
|
char *value;
|
||||||
|
+ struct test_poll_state *state = (struct test_poll_state *) vstate;
|
||||||
|
|
||||||
|
len = state->driver->Read(state->socket, net_message.data,
|
||||||
|
net_message.maxsize, &clientaddr);
|
||||||
|
diff --git a/common/net_main.c b/common/net_main.c
|
||||||
|
index 190baa76..954e1445 100644
|
||||||
|
--- a/common/net_main.c
|
||||||
|
+++ b/common/net_main.c
|
||||||
|
@@ -107,8 +107,8 @@ qboolean slistLocal = true;
|
||||||
|
static double slistStartTime;
|
||||||
|
static int slistLastShown;
|
||||||
|
|
||||||
|
-static void Slist_Send(void);
|
||||||
|
-static void Slist_Poll(void);
|
||||||
|
+static void Slist_Send(void *);
|
||||||
|
+static void Slist_Poll(void *);
|
||||||
|
static PollProcedure slistSendProcedure = { NULL, 0.0, Slist_Send };
|
||||||
|
static PollProcedure slistPollProcedure = { NULL, 0.0, Slist_Poll };
|
||||||
|
|
||||||
|
@@ -370,7 +370,7 @@ NET_Slist_f(void)
|
||||||
|
|
||||||
|
|
||||||
|
static void
|
||||||
|
-Slist_Send(void)
|
||||||
|
+Slist_Send(void *arg)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
@@ -391,7 +391,7 @@ Slist_Send(void)
|
||||||
|
|
||||||
|
|
||||||
|
static void
|
||||||
|
-Slist_Poll(void)
|
||||||
|
+Slist_Poll(void *arg)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
diff --git a/common/qtypes.h b/common/qtypes.h
|
||||||
|
index ecb39ea9..a339b706 100644
|
||||||
|
--- a/common/qtypes.h
|
||||||
|
+++ b/common/qtypes.h
|
||||||
|
@@ -34,7 +34,7 @@ typedef unsigned char byte;
|
||||||
|
typedef enum{ false, true };
|
||||||
|
typedef int qboolean;
|
||||||
|
#else
|
||||||
|
-typedef enum{ false, true, ENSURE_INT_QBOOL = 0x70000000 } qboolean;
|
||||||
|
+typedef enum{ false0, true1, ENSURE_INT_QBOOL = 0x70000000 } qboolean;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef offsetof
|
||||||
@ -3,8 +3,8 @@
|
|||||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||||
|
|
||||||
PKG_NAME="gcc"
|
PKG_NAME="gcc"
|
||||||
PKG_VERSION="14.2.0"
|
PKG_VERSION="15.1.0"
|
||||||
PKG_SHA256="a7b39bc69cbf9e25826c5a60ab26477001f7c08d85cec04bc0e29cabed6f3cc9"
|
PKG_SHA256="e2b09ec21660f01fecffb715e0120265216943f038d0e48a9868713e54f06cea"
|
||||||
PKG_LICENSE="GPL-2.0-or-later"
|
PKG_LICENSE="GPL-2.0-or-later"
|
||||||
PKG_SITE="https://gcc.gnu.org/"
|
PKG_SITE="https://gcc.gnu.org/"
|
||||||
PKG_URL="https://ftpmirror.gnu.org/gcc/${PKG_NAME}-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
PKG_URL="https://ftpmirror.gnu.org/gcc/${PKG_NAME}-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||||
|
|||||||
@ -1,83 +0,0 @@
|
|||||||
From 6e17b356a78635e66d1a895b86fbcc0bde0589bb Mon Sep 17 00:00:00 2001
|
|
||||||
From: Hannes Braun <hannes@hannesbraun.net>
|
|
||||||
Date: Thu, 20 Feb 2025 15:09:41 +0100
|
|
||||||
Subject: [PATCH] arm: Fix signedness of vld1q intrinsic parms [PR118942]
|
|
||||||
|
|
||||||
vld1q_s8_x3, vld1q_s16_x3, vld1q_s8_x4 and vld1q_s16_x4 were expecting
|
|
||||||
pointers to unsigned integers. These parameters should be pointers to
|
|
||||||
signed integers.
|
|
||||||
|
|
||||||
gcc/ChangeLog:
|
|
||||||
PR target/118942
|
|
||||||
* config/arm/arm_neon.h (vld1q_s8_x3): Use int8_t instead of
|
|
||||||
uint16_t.
|
|
||||||
(vld1q_s16_x3): Use int16_t instead of uint16_t.
|
|
||||||
(vld1q_s8_x4): Likewise.
|
|
||||||
(vld1q_s16_x4): Likewise.
|
|
||||||
|
|
||||||
gcc/testsuite/ChangeLog:
|
|
||||||
PR target/118942
|
|
||||||
* gcc.target/arm/simd/vld1q_base_xN_1.c: Add -Wpointer-sign.
|
|
||||||
|
|
||||||
Signed-off-by: Hannes Braun <hannes@hannesbraun.net>
|
|
||||||
(cherry picked from commit 4d0a333ef13e2da140cd44c4941b20f48a80dc0f)
|
|
||||||
---
|
|
||||||
gcc/config/arm/arm_neon.h | 8 ++++----
|
|
||||||
gcc/testsuite/gcc.target/arm/simd/vld1q_base_xN_1.c | 2 +-
|
|
||||||
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/gcc/config/arm/arm_neon.h b/gcc/config/arm/arm_neon.h
|
|
||||||
index 8e70c7177315..11d2dc06877a 100644
|
|
||||||
--- a/gcc/config/arm/arm_neon.h
|
|
||||||
+++ b/gcc/config/arm/arm_neon.h
|
|
||||||
@@ -10854,7 +10854,7 @@ vld1q_s64_x2 (const int64_t * __a)
|
|
||||||
|
|
||||||
__extension__ extern __inline int8x16x3_t
|
|
||||||
__attribute__ ((__always_inline__, __gnu_inline__, __artificial__))
|
|
||||||
-vld1q_s8_x3 (const uint8_t * __a)
|
|
||||||
+vld1q_s8_x3 (const int8_t * __a)
|
|
||||||
{
|
|
||||||
union { int8x16x3_t __i; __builtin_neon_ci __o; } __rv;
|
|
||||||
__rv.__o = __builtin_neon_vld1q_x3v16qi ((const __builtin_neon_qi *) __a);
|
|
||||||
@@ -10863,7 +10863,7 @@ vld1q_s8_x3 (const uint8_t * __a)
|
|
||||||
|
|
||||||
__extension__ extern __inline int16x8x3_t
|
|
||||||
__attribute__ ((__always_inline__, __gnu_inline__, __artificial__))
|
|
||||||
-vld1q_s16_x3 (const uint16_t * __a)
|
|
||||||
+vld1q_s16_x3 (const int16_t * __a)
|
|
||||||
{
|
|
||||||
union { int16x8x3_t __i; __builtin_neon_ci __o; } __rv;
|
|
||||||
__rv.__o = __builtin_neon_vld1q_x3v8hi ((const __builtin_neon_hi *) __a);
|
|
||||||
@@ -10890,7 +10890,7 @@ vld1q_s64_x3 (const int64_t * __a)
|
|
||||||
|
|
||||||
__extension__ extern __inline int8x16x4_t
|
|
||||||
__attribute__ ((__always_inline__, __gnu_inline__, __artificial__))
|
|
||||||
-vld1q_s8_x4 (const uint8_t * __a)
|
|
||||||
+vld1q_s8_x4 (const int8_t * __a)
|
|
||||||
{
|
|
||||||
union { int8x16x4_t __i; __builtin_neon_xi __o; } __rv;
|
|
||||||
__rv.__o = __builtin_neon_vld1q_x4v16qi ((const __builtin_neon_qi *) __a);
|
|
||||||
@@ -10899,7 +10899,7 @@ vld1q_s8_x4 (const uint8_t * __a)
|
|
||||||
|
|
||||||
__extension__ extern __inline int16x8x4_t
|
|
||||||
__attribute__ ((__always_inline__, __gnu_inline__, __artificial__))
|
|
||||||
-vld1q_s16_x4 (const uint16_t * __a)
|
|
||||||
+vld1q_s16_x4 (const int16_t * __a)
|
|
||||||
{
|
|
||||||
union { int16x8x4_t __i; __builtin_neon_xi __o; } __rv;
|
|
||||||
__rv.__o = __builtin_neon_vld1q_x4v8hi ((const __builtin_neon_hi *) __a);
|
|
||||||
diff --git a/gcc/testsuite/gcc.target/arm/simd/vld1q_base_xN_1.c b/gcc/testsuite/gcc.target/arm/simd/vld1q_base_xN_1.c
|
|
||||||
index 01b29b600847..c73afe2b723b 100644
|
|
||||||
--- a/gcc/testsuite/gcc.target/arm/simd/vld1q_base_xN_1.c
|
|
||||||
+++ b/gcc/testsuite/gcc.target/arm/simd/vld1q_base_xN_1.c
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
/* { dg-do assemble } */
|
|
||||||
/* { dg-require-effective-target arm_neon_ok } */
|
|
||||||
-/* { dg-options "-save-temps -O2" } */
|
|
||||||
+/* { dg-options "-save-temps -O2 -Wpointer-sign" } */
|
|
||||||
/* { dg-add-options arm_neon } */
|
|
||||||
|
|
||||||
#include "arm_neon.h"
|
|
||||||
--
|
|
||||||
2.43.5
|
|
||||||
|
|
||||||
@ -1,199 +0,0 @@
|
|||||||
From 32b21292adb6ad6b5e1d60d923a773e4d0daca7b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Richard Sandiford <richard.sandiford@arm.com>
|
|
||||||
Date: Fri, 16 Aug 2024 07:53:01 +0100
|
|
||||||
Subject: [PATCH] aarch64: Fix invalid nested subregs [PR115464]
|
|
||||||
|
|
||||||
The testcase extracts one arm_neon.h vector from a pair (one subreg)
|
|
||||||
and then reinterprets the result as an SVE vector (another subreg).
|
|
||||||
Each subreg makes sense individually, but we can't fold them together
|
|
||||||
into a single subreg: it's 32 bytes -> 16 bytes -> 16*N bytes,
|
|
||||||
but the interpretation of 32 bytes -> 16*N bytes depends on
|
|
||||||
whether N==1 or N>1.
|
|
||||||
|
|
||||||
Since the second subreg makes sense individually, simplify_subreg
|
|
||||||
should bail out rather than ICE on it. simplify_gen_subreg will
|
|
||||||
then do the same (because it already checks validate_subreg).
|
|
||||||
This leaves simplify_gen_subreg returning null, requiring the
|
|
||||||
caller to take appropriate action.
|
|
||||||
|
|
||||||
I think this is relatively likely to occur elsewhere, so the patch
|
|
||||||
adds a helper for forcing a subreg, allowing a temporary pseudo to
|
|
||||||
be created where necessary.
|
|
||||||
|
|
||||||
I'll follow up by using force_subreg in more places. This patch
|
|
||||||
is intended to be a minimal backportable fix for the PR.
|
|
||||||
|
|
||||||
gcc/
|
|
||||||
PR target/115464
|
|
||||||
* simplify-rtx.cc (simplify_context::simplify_subreg): Don't try
|
|
||||||
to fold two subregs together if their relationship isn't known
|
|
||||||
at compile time.
|
|
||||||
* explow.h (force_subreg): Declare.
|
|
||||||
* explow.cc (force_subreg): New function.
|
|
||||||
* config/aarch64/aarch64-sve-builtins-base.cc
|
|
||||||
(svset_neonq_impl::expand): Use it instead of simplify_gen_subreg.
|
|
||||||
|
|
||||||
gcc/testsuite/
|
|
||||||
PR target/115464
|
|
||||||
* gcc.target/aarch64/sve/acle/general/pr115464.c: New test.
|
|
||||||
|
|
||||||
(cherry picked from commit 0970ff46ba6330fc80e8736fc05b2eaeeae0b6a0)
|
|
||||||
---
|
|
||||||
gcc/config/aarch64/aarch64-sve-builtins-base.cc | 2 +-
|
|
||||||
gcc/explow.cc | 15 +++++++++++++++
|
|
||||||
gcc/explow.h | 2 ++
|
|
||||||
gcc/simplify-rtx.cc | 5 +++++
|
|
||||||
.../aarch64/sve/acle/general/pr115464.c | 13 +++++++++++++
|
|
||||||
5 files changed, 36 insertions(+), 1 deletion(-)
|
|
||||||
create mode 100644 gcc/testsuite/gcc.target/aarch64/sve/acle/general/pr115464.c
|
|
||||||
|
|
||||||
diff --git a/gcc/config/aarch64/aarch64-sve-builtins-base.cc b/gcc/config/aarch64/aarch64-sve-builtins-base.cc
|
|
||||||
index 0d2edf3f19e..c9182594bc1 100644
|
|
||||||
--- a/gcc/config/aarch64/aarch64-sve-builtins-base.cc
|
|
||||||
+++ b/gcc/config/aarch64/aarch64-sve-builtins-base.cc
|
|
||||||
@@ -1174,7 +1174,7 @@ public:
|
|
||||||
Advanced SIMD argument as an SVE vector. */
|
|
||||||
if (!BYTES_BIG_ENDIAN
|
|
||||||
&& is_undef (CALL_EXPR_ARG (e.call_expr, 0)))
|
|
||||||
- return simplify_gen_subreg (mode, e.args[1], GET_MODE (e.args[1]), 0);
|
|
||||||
+ return force_subreg (mode, e.args[1], GET_MODE (e.args[1]), 0);
|
|
||||||
|
|
||||||
rtx_vector_builder builder (VNx16BImode, 16, 2);
|
|
||||||
for (unsigned int i = 0; i < 16; i++)
|
|
||||||
diff --git a/gcc/explow.cc b/gcc/explow.cc
|
|
||||||
index 8e5f6b8e680..f6843398c4b 100644
|
|
||||||
--- a/gcc/explow.cc
|
|
||||||
+++ b/gcc/explow.cc
|
|
||||||
@@ -745,6 +745,21 @@ force_reg (machine_mode mode, rtx x)
|
|
||||||
return temp;
|
|
||||||
}
|
|
||||||
|
|
||||||
+/* Like simplify_gen_subreg, but force OP into a new register if the
|
|
||||||
+ subreg cannot be formed directly. */
|
|
||||||
+
|
|
||||||
+rtx
|
|
||||||
+force_subreg (machine_mode outermode, rtx op,
|
|
||||||
+ machine_mode innermode, poly_uint64 byte)
|
|
||||||
+{
|
|
||||||
+ rtx x = simplify_gen_subreg (outermode, op, innermode, byte);
|
|
||||||
+ if (x)
|
|
||||||
+ return x;
|
|
||||||
+
|
|
||||||
+ op = copy_to_mode_reg (innermode, op);
|
|
||||||
+ return simplify_gen_subreg (outermode, op, innermode, byte);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
/* If X is a memory ref, copy its contents to a new temp reg and return
|
|
||||||
that reg. Otherwise, return X. */
|
|
||||||
|
|
||||||
diff --git a/gcc/explow.h b/gcc/explow.h
|
|
||||||
index 16aa02cfb68..cbd1fcb7eb3 100644
|
|
||||||
--- a/gcc/explow.h
|
|
||||||
+++ b/gcc/explow.h
|
|
||||||
@@ -42,6 +42,8 @@ extern rtx copy_to_suggested_reg (rtx, rtx, machine_mode);
|
|
||||||
Args are mode (in case value is a constant) and the value. */
|
|
||||||
extern rtx force_reg (machine_mode, rtx);
|
|
||||||
|
|
||||||
+extern rtx force_subreg (machine_mode, rtx, machine_mode, poly_uint64);
|
|
||||||
+
|
|
||||||
/* Return given rtx, copied into a new temp reg if it was in memory. */
|
|
||||||
extern rtx force_not_mem (rtx);
|
|
||||||
|
|
||||||
diff --git a/gcc/simplify-rtx.cc b/gcc/simplify-rtx.cc
|
|
||||||
index dceaa13333c..729d408aa55 100644
|
|
||||||
--- a/gcc/simplify-rtx.cc
|
|
||||||
+++ b/gcc/simplify-rtx.cc
|
|
||||||
@@ -7612,6 +7612,11 @@ simplify_context::simplify_subreg (machine_mode outermode, rtx op,
|
|
||||||
poly_uint64 innermostsize = GET_MODE_SIZE (innermostmode);
|
|
||||||
rtx newx;
|
|
||||||
|
|
||||||
+ /* Make sure that the relationship between the two subregs is
|
|
||||||
+ known at compile time. */
|
|
||||||
+ if (!ordered_p (outersize, innermostsize))
|
|
||||||
+ return NULL_RTX;
|
|
||||||
+
|
|
||||||
if (outermode == innermostmode
|
|
||||||
&& known_eq (byte, 0U)
|
|
||||||
&& known_eq (SUBREG_BYTE (op), 0))
|
|
||||||
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general/pr115464.c b/gcc/testsuite/gcc.target/aarch64/sve/acle/general/pr115464.c
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000000..d728d1325ed
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general/pr115464.c
|
|
||||||
@@ -0,0 +1,13 @@
|
|
||||||
+/* { dg-options "-O2" } */
|
|
||||||
+
|
|
||||||
+#include <arm_neon.h>
|
|
||||||
+#include <arm_sve.h>
|
|
||||||
+#include <arm_neon_sve_bridge.h>
|
|
||||||
+
|
|
||||||
+svuint16_t
|
|
||||||
+convolve4_4_x (uint16x8x2_t permute_tbl)
|
|
||||||
+{
|
|
||||||
+ return svset_neonq_u16 (svundef_u16 (), permute_tbl.val[1]);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/* { dg-final { scan-assembler {\tmov\tz0\.d, z1\.d\n} } } */
|
|
||||||
--
|
|
||||||
2.43.5
|
|
||||||
|
|
||||||
From 86dacfb06b90371458d58872f461d358a0834305 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Richard Sandiford <richard.sandiford@arm.com>
|
|
||||||
Date: Fri, 16 Aug 2024 07:53:02 +0100
|
|
||||||
Subject: [PATCH] aarch64: Add another use of force_subreg [PR115464]
|
|
||||||
|
|
||||||
This patch includes the testcase from r15-1399 plus a miminal
|
|
||||||
fix for it, without the other proactive uses of force_subreg.
|
|
||||||
We can backport other force_subreg calls later if they're shown
|
|
||||||
to be needed.
|
|
||||||
|
|
||||||
gcc/
|
|
||||||
PR target/115464
|
|
||||||
* config/aarch64/aarch64-sve-builtins-base.cc
|
|
||||||
(svset_neonq_impl::expand): Use force_subreg instead of
|
|
||||||
lowpart_subreg.
|
|
||||||
|
|
||||||
gcc/testsuite/
|
|
||||||
PR target/115464
|
|
||||||
* gcc.target/aarch64/sve/acle/general/pr115464_2.c: New test.
|
|
||||||
---
|
|
||||||
gcc/config/aarch64/aarch64-sve-builtins-base.cc | 4 +++-
|
|
||||||
.../gcc.target/aarch64/sve/acle/general/pr115464_2.c | 11 +++++++++++
|
|
||||||
2 files changed, 14 insertions(+), 1 deletion(-)
|
|
||||||
create mode 100644 gcc/testsuite/gcc.target/aarch64/sve/acle/general/pr115464_2.c
|
|
||||||
|
|
||||||
diff --git a/gcc/config/aarch64/aarch64-sve-builtins-base.cc b/gcc/config/aarch64/aarch64-sve-builtins-base.cc
|
|
||||||
index c9182594bc1..241a249503f 100644
|
|
||||||
--- a/gcc/config/aarch64/aarch64-sve-builtins-base.cc
|
|
||||||
+++ b/gcc/config/aarch64/aarch64-sve-builtins-base.cc
|
|
||||||
@@ -1185,7 +1185,9 @@ public:
|
|
||||||
if (BYTES_BIG_ENDIAN)
|
|
||||||
return e.use_exact_insn (code_for_aarch64_sve_set_neonq (mode));
|
|
||||||
insn_code icode = code_for_vcond_mask (mode, mode);
|
|
||||||
- e.args[1] = lowpart_subreg (mode, e.args[1], GET_MODE (e.args[1]));
|
|
||||||
+ e.args[1] = force_subreg (mode, e.args[1], GET_MODE (e.args[1]),
|
|
||||||
+ subreg_lowpart_offset (mode,
|
|
||||||
+ GET_MODE (e.args[1])));
|
|
||||||
e.add_output_operand (icode);
|
|
||||||
e.add_input_operand (icode, e.args[1]);
|
|
||||||
e.add_input_operand (icode, e.args[0]);
|
|
||||||
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general/pr115464_2.c b/gcc/testsuite/gcc.target/aarch64/sve/acle/general/pr115464_2.c
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000000..f561c34f732
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general/pr115464_2.c
|
|
||||||
@@ -0,0 +1,11 @@
|
|
||||||
+/* { dg-options "-O2" } */
|
|
||||||
+
|
|
||||||
+#include <arm_neon.h>
|
|
||||||
+#include <arm_sve.h>
|
|
||||||
+#include <arm_neon_sve_bridge.h>
|
|
||||||
+
|
|
||||||
+svuint16_t
|
|
||||||
+convolve4_4_x (uint16x8x2_t permute_tbl, svuint16_t a)
|
|
||||||
+{
|
|
||||||
+ return svset_neonq_u16 (a, permute_tbl.val[1]);
|
|
||||||
+}
|
|
||||||
--
|
|
||||||
2.43.5
|
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user