* [PATCH 1/2] gcc: xtensa: add data alignment properties to dynconfig
@ 2023-02-28 13:51 Max Filippov
2023-02-28 13:51 ` [PATCH 2/2] gcc: xtensa: adjust STRICT_ALIGNMENT per hardware capabilities Max Filippov
0 siblings, 1 reply; 2+ messages in thread
From: Max Filippov @ 2023-02-28 13:51 UTC (permalink / raw)
To: gcc-patches; +Cc: Takayuki 'January June' Suwa, Max Filippov
gcc/
* config/xtensa/xtensa-dynconfig.cc (xtensa_get_config_v4): New
function.
include/
* xtensa-dynconfig.h (xtensa_config_v4): New struct.
(XCHAL_DATA_WIDTH, XCHAL_UNALIGNED_LOAD_EXCEPTION)
(XCHAL_UNALIGNED_STORE_EXCEPTION, XCHAL_UNALIGNED_LOAD_HW)
(XCHAL_UNALIGNED_STORE_HW, XTENSA_CONFIG_V4_ENTRY_LIST): New
definitions.
(XTENSA_CONFIG_INSTANCE_LIST): Add xtensa_config_v4 instance.
(XTENSA_CONFIG_ENTRY_LIST): Add XTENSA_CONFIG_V4_ENTRY_LIST.
---
gcc/config/xtensa/xtensa-dynconfig.cc | 18 ++++++++
include/xtensa-dynconfig.h | 59 ++++++++++++++++++++++++++-
2 files changed, 76 insertions(+), 1 deletion(-)
diff --git a/gcc/config/xtensa/xtensa-dynconfig.cc b/gcc/config/xtensa/xtensa-dynconfig.cc
index 9aea9f253c25..12dce4d1b2aa 100644
--- a/gcc/config/xtensa/xtensa-dynconfig.cc
+++ b/gcc/config/xtensa/xtensa-dynconfig.cc
@@ -182,6 +182,24 @@ const struct xtensa_config_v3 *xtensa_get_config_v3 (void)
return config;
}
+const struct xtensa_config_v4 *xtensa_get_config_v4 (void)
+{
+ static const struct xtensa_config_v4 *config;
+ static const struct xtensa_config_v4 def = {
+ 16, /* xchal_data_width */
+ 1, /* xchal_unaligned_load_exception */
+ 1, /* xchal_unaligned_store_exception */
+ 0, /* xchal_unaligned_load_hw */
+ 0, /* xchal_unaligned_store_hw */
+ };
+
+ if (!config)
+ config = (const struct xtensa_config_v4 *) xtensa_load_config ("xtensa_config_v4",
+ &xtensa_config_v4,
+ &def);
+ return config;
+}
+
const char * const *xtensa_get_config_strings (void)
{
static const char * const *config_strings;
diff --git a/include/xtensa-dynconfig.h b/include/xtensa-dynconfig.h
index 2cc15cc99112..48877ebb6b61 100644
--- a/include/xtensa-dynconfig.h
+++ b/include/xtensa-dynconfig.h
@@ -112,6 +112,15 @@ struct xtensa_config_v3
int xchal_have_xea3;
};
+struct xtensa_config_v4
+{
+ int xchal_data_width;
+ int xchal_unaligned_load_exception;
+ int xchal_unaligned_store_exception;
+ int xchal_unaligned_load_hw;
+ int xchal_unaligned_store_hw;
+};
+
typedef struct xtensa_isa_internal_struct xtensa_isa_internal;
extern const void *xtensa_load_config (const char *name,
@@ -120,6 +129,7 @@ extern const void *xtensa_load_config (const char *name,
extern const struct xtensa_config_v1 *xtensa_get_config_v1 (void);
extern const struct xtensa_config_v2 *xtensa_get_config_v2 (void);
extern const struct xtensa_config_v3 *xtensa_get_config_v3 (void);
+extern const struct xtensa_config_v4 *xtensa_get_config_v4 (void);
#ifdef XTENSA_CONFIG_DEFINITION
@@ -207,6 +217,26 @@ extern const struct xtensa_config_v3 *xtensa_get_config_v3 (void);
#define XCHAL_HAVE_XEA3 0
#endif
+#ifndef XCHAL_DATA_WIDTH
+#define XCHAL_DATA_WIDTH 16
+#endif
+
+#ifndef XCHAL_UNALIGNED_LOAD_EXCEPTION
+#define XCHAL_UNALIGNED_LOAD_EXCEPTION 1
+#endif
+
+#ifndef XCHAL_UNALIGNED_STORE_EXCEPTION
+#define XCHAL_UNALIGNED_STORE_EXCEPTION 1
+#endif
+
+#ifndef XCHAL_UNALIGNED_LOAD_HW
+#define XCHAL_UNALIGNED_LOAD_HW 0
+#endif
+
+#ifndef XCHAL_UNALIGNED_STORE_HW
+#define XCHAL_UNALIGNED_STORE_HW 0
+#endif
+
#define XTENSA_CONFIG_ENTRY(a) a
#define XTENSA_CONFIG_V1_ENTRY_LIST \
@@ -276,6 +306,13 @@ extern const struct xtensa_config_v3 *xtensa_get_config_v3 (void);
XTENSA_CONFIG_ENTRY(XCHAL_HAVE_EXCLUSIVE), \
XTENSA_CONFIG_ENTRY(XCHAL_HAVE_XEA3)
+#define XTENSA_CONFIG_V4_ENTRY_LIST \
+ XTENSA_CONFIG_ENTRY(XCHAL_DATA_WIDTH), \
+ XTENSA_CONFIG_ENTRY(XCHAL_UNALIGNED_LOAD_EXCEPTION), \
+ XTENSA_CONFIG_ENTRY(XCHAL_UNALIGNED_STORE_EXCEPTION), \
+ XTENSA_CONFIG_ENTRY(XCHAL_UNALIGNED_LOAD_HW), \
+ XTENSA_CONFIG_ENTRY(XCHAL_UNALIGNED_STORE_HW)
+
#define XTENSA_CONFIG_INSTANCE_LIST \
const struct xtensa_config_v1 xtensa_config_v1 = { \
XTENSA_CONFIG_V1_ENTRY_LIST, \
@@ -285,12 +322,16 @@ const struct xtensa_config_v2 xtensa_config_v2 = { \
}; \
const struct xtensa_config_v3 xtensa_config_v3 = { \
XTENSA_CONFIG_V3_ENTRY_LIST, \
+}; \
+const struct xtensa_config_v4 xtensa_config_v4 = { \
+ XTENSA_CONFIG_V4_ENTRY_LIST, \
}
#define XTENSA_CONFIG_ENTRY_LIST \
XTENSA_CONFIG_V1_ENTRY_LIST, \
XTENSA_CONFIG_V2_ENTRY_LIST, \
- XTENSA_CONFIG_V3_ENTRY_LIST
+ XTENSA_CONFIG_V3_ENTRY_LIST, \
+ XTENSA_CONFIG_V4_ENTRY_LIST
#else /* XTENSA_CONFIG_DEFINITION */
@@ -482,6 +523,22 @@ const struct xtensa_config_v3 xtensa_config_v3 = { \
#undef XCHAL_HAVE_XEA3
#define XCHAL_HAVE_XEA3 (xtensa_get_config_v3 ()->xchal_have_xea3)
+
+#undef XCHAL_DATA_WIDTH
+#define XCHAL_DATA_WIDTH (xtensa_get_config_v4 ()->xchal_data_width)
+
+#undef XCHAL_UNALIGNED_LOAD_EXCEPTION
+#define XCHAL_UNALIGNED_LOAD_EXCEPTION (xtensa_get_config_v4 ()->xchal_unaligned_load_exception)
+
+#undef XCHAL_UNALIGNED_STORE_EXCEPTION
+#define XCHAL_UNALIGNED_STORE_EXCEPTION (xtensa_get_config_v4 ()->xchal_unaligned_store_exception)
+
+#undef XCHAL_UNALIGNED_LOAD_HW
+#define XCHAL_UNALIGNED_LOAD_HW (xtensa_get_config_v4 ()->xchal_unaligned_load_hw)
+
+#undef XCHAL_UNALIGNED_STORE_HW
+#define XCHAL_UNALIGNED_STORE_HW (xtensa_get_config_v4 ()->xchal_unaligned_store_hw)
+
#endif /* XTENSA_CONFIG_DEFINITION */
#ifdef __cplusplus
--
2.30.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 2/2] gcc: xtensa: adjust STRICT_ALIGNMENT per hardware capabilities
2023-02-28 13:51 [PATCH 1/2] gcc: xtensa: add data alignment properties to dynconfig Max Filippov
@ 2023-02-28 13:51 ` Max Filippov
0 siblings, 0 replies; 2+ messages in thread
From: Max Filippov @ 2023-02-28 13:51 UTC (permalink / raw)
To: gcc-patches; +Cc: Takayuki 'January June' Suwa, Max Filippov
gcc/
* config/xtensa/xtensa.h (STRICT_ALIGNMENT): Make it 0 when the
hardware supports both unaligned loads and stores.
---
gcc/config/xtensa/xtensa.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h
index 058602e44ee2..49ec9147b543 100644
--- a/gcc/config/xtensa/xtensa.h
+++ b/gcc/config/xtensa/xtensa.h
@@ -143,7 +143,8 @@ along with GCC; see the file COPYING3. If not see
/* Set this nonzero if move instructions will actually fail to work
when given unaligned data. */
-#define STRICT_ALIGNMENT 1
+#define STRICT_ALIGNMENT (!XCHAL_UNALIGNED_LOAD_HW \
+ || !XCHAL_UNALIGNED_STORE_HW)
/* Promote integer modes smaller than a word to SImode. Set UNSIGNEDP
for QImode, because there is no 8-bit load from memory with sign
--
2.30.2
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-02-28 13:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-28 13:51 [PATCH 1/2] gcc: xtensa: add data alignment properties to dynconfig Max Filippov
2023-02-28 13:51 ` [PATCH 2/2] gcc: xtensa: adjust STRICT_ALIGNMENT per hardware capabilities Max Filippov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).