From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1880) id 65BB93858D32; Mon, 27 Feb 2023 12:07:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 65BB93858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1677499631; bh=NPOvIBcqK7LiNELJDh544ljPMmM0gJ452e96ENiKxcU=; h=From:To:Subject:Date:From; b=BBj5Wae1uwueRVwCkqomvZ8HUNtjXeRgVxgim5Xq3JPpL71NxTamupcFfaEVG89rX GY3GvFIoMZWEocyORwhCdHfrm0RRmeCq6cGwloqRZALQoZQ7mZeQL3F+YyRfa1bRxb C4q0Q4qaPAB1Lbyy9X97B1bbFRXiLpFFDHTKAtr8= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Max Filippov To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-6355] gcc: xtensa: add XCHAL_HAVE_{CLAMPS, DEPBITS, EXCLUSIVE, XEA3} to dynconfig X-Act-Checkin: gcc X-Git-Author: Max Filippov X-Git-Refname: refs/heads/master X-Git-Oldrev: 16cfd803db832dffe718fd88df78b7b203d8c791 X-Git-Newrev: 999b7aab21ca96d58a1dc99f52a3c01cd8760c72 Message-Id: <20230227120711.65BB93858D32@sourceware.org> Date: Mon, 27 Feb 2023 12:07:11 +0000 (GMT) List-Id: https://gcc.gnu.org/g:999b7aab21ca96d58a1dc99f52a3c01cd8760c72 commit r13-6355-g999b7aab21ca96d58a1dc99f52a3c01cd8760c72 Author: Max Filippov Date: Sun Feb 26 17:46:08 2023 -0800 gcc: xtensa: add XCHAL_HAVE_{CLAMPS,DEPBITS,EXCLUSIVE,XEA3} to dynconfig gcc/ * config/xtensa/xtensa-dynconfig.cc (xtensa_get_config_v2) (xtensa_get_config_v3): New functions. include/ * xtensa-dynconfig.h (xtensa_config_v3): New struct. (xtensa_get_config_v3): New declaration. (XCHAL_HAVE_CLAMPS, XCHAL_HAVE_DEPBITS, XCHAL_HAVE_EXCLUSIVE) (XCHAL_HAVE_XEA3, XTENSA_CONFIG_V3_ENTRY_LIST): New definitions. (XTENSA_CONFIG_INSTANCE_LIST): Add xtensa_config_v3 instance. (XTENSA_CONFIG_ENTRY_LIST): Add XTENSA_CONFIG_V3_ENTRY_LIST. Diff: --- gcc/config/xtensa/xtensa-dynconfig.cc | 24 +++++++++++++++++ include/xtensa-dynconfig.h | 50 ++++++++++++++++++++++++++++++++++- 2 files changed, 73 insertions(+), 1 deletion(-) diff --git a/gcc/config/xtensa/xtensa-dynconfig.cc b/gcc/config/xtensa/xtensa-dynconfig.cc index db8ff43c498..9aea9f253c2 100644 --- a/gcc/config/xtensa/xtensa-dynconfig.cc +++ b/gcc/config/xtensa/xtensa-dynconfig.cc @@ -158,6 +158,30 @@ const struct xtensa_config_v1 *xtensa_get_config_v1 (void) return config; } +const struct xtensa_config_v2 *xtensa_get_config_v2 (void) +{ + static const struct xtensa_config_v2 *config; + static struct xtensa_config_v2 def; + + if (!config) + config = (const struct xtensa_config_v2 *) xtensa_load_config ("xtensa_config_v2", + &xtensa_config_v2, + &def); + return config; +} + +const struct xtensa_config_v3 *xtensa_get_config_v3 (void) +{ + static const struct xtensa_config_v3 *config; + static struct xtensa_config_v3 def; + + if (!config) + config = (const struct xtensa_config_v3 *) xtensa_load_config ("xtensa_config_v3", + &xtensa_config_v3, + &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 bb72d6ab22d..2cc15cc9911 100644 --- a/include/xtensa-dynconfig.h +++ b/include/xtensa-dynconfig.h @@ -104,6 +104,14 @@ struct xtensa_config_v2 int xtensa_march_earliest; }; +struct xtensa_config_v3 +{ + int xchal_have_clamps; + int xchal_have_depbits; + int xchal_have_exclusive; + int xchal_have_xea3; +}; + typedef struct xtensa_isa_internal_struct xtensa_isa_internal; extern const void *xtensa_load_config (const char *name, @@ -111,6 +119,7 @@ extern const void *xtensa_load_config (const char *name, const void *no_name_def); 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); #ifdef XTENSA_CONFIG_DEFINITION @@ -182,6 +191,22 @@ extern const struct xtensa_config_v2 *xtensa_get_config_v2 (void); #define XTENSA_MARCH_EARLIEST 0 #endif +#ifndef XCHAL_HAVE_CLAMPS +#define XCHAL_HAVE_CLAMPS 0 +#endif + +#ifndef XCHAL_HAVE_DEPBITS +#define XCHAL_HAVE_DEPBITS 0 +#endif + +#ifndef XCHAL_HAVE_EXCLUSIVE +#define XCHAL_HAVE_EXCLUSIVE 0 +#endif + +#ifndef XCHAL_HAVE_XEA3 +#define XCHAL_HAVE_XEA3 0 +#endif + #define XTENSA_CONFIG_ENTRY(a) a #define XTENSA_CONFIG_V1_ENTRY_LIST \ @@ -245,17 +270,27 @@ extern const struct xtensa_config_v2 *xtensa_get_config_v2 (void); XTENSA_CONFIG_ENTRY(XTENSA_MARCH_LATEST), \ XTENSA_CONFIG_ENTRY(XTENSA_MARCH_EARLIEST) +#define XTENSA_CONFIG_V3_ENTRY_LIST \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_CLAMPS), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_DEPBITS), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_EXCLUSIVE), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_XEA3) + #define XTENSA_CONFIG_INSTANCE_LIST \ const struct xtensa_config_v1 xtensa_config_v1 = { \ XTENSA_CONFIG_V1_ENTRY_LIST, \ }; \ const struct xtensa_config_v2 xtensa_config_v2 = { \ XTENSA_CONFIG_V2_ENTRY_LIST, \ +}; \ +const struct xtensa_config_v3 xtensa_config_v3 = { \ + XTENSA_CONFIG_V3_ENTRY_LIST, \ } #define XTENSA_CONFIG_ENTRY_LIST \ XTENSA_CONFIG_V1_ENTRY_LIST, \ - XTENSA_CONFIG_V2_ENTRY_LIST + XTENSA_CONFIG_V2_ENTRY_LIST, \ + XTENSA_CONFIG_V3_ENTRY_LIST #else /* XTENSA_CONFIG_DEFINITION */ @@ -434,6 +469,19 @@ const struct xtensa_config_v2 xtensa_config_v2 = { \ #undef XTENSA_MARCH_EARLIEST #define XTENSA_MARCH_EARLIEST (xtensa_get_config_v2 ()->xtensa_march_earliest) + +#undef XCHAL_HAVE_CLAMPS +#define XCHAL_HAVE_CLAMPS (xtensa_get_config_v3 ()->xchal_have_clamps) + +#undef XCHAL_HAVE_DEPBITS +#define XCHAL_HAVE_DEPBITS (xtensa_get_config_v3 ()->xchal_have_depbits) + +#undef XCHAL_HAVE_EXCLUSIVE +#define XCHAL_HAVE_EXCLUSIVE (xtensa_get_config_v3 ()->xchal_have_exclusive) + +#undef XCHAL_HAVE_XEA3 +#define XCHAL_HAVE_XEA3 (xtensa_get_config_v3 ()->xchal_have_xea3) + #endif /* XTENSA_CONFIG_DEFINITION */ #ifdef __cplusplus