From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by sourceware.org (Postfix) with ESMTPS id 414023858D33 for ; Wed, 19 Apr 2023 19:46:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 414023858D33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1a68d61579bso3010375ad.1 for ; Wed, 19 Apr 2023 12:46:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681933617; x=1684525617; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ON5IMsZb75gB9tZ4cjUZUWo/q0TshrtD9Whgj77uJNM=; b=Ymu3PjUHbVa4k+PRTrikKTeZK0ACHwBPhXVu53eFi38l1ZyRX6RZ7a8wFfQdhJLtKH 7luuqEaVuPhulUzt/32aSnGtrxK9Mx+SL/808PlaIYyRU+nMsQfbhEkjuG3Qt9Zo6Hoc NmCkOlfqVCYkztMMM0Dkfn54b1Ul/nrAmVpwbpDbaU52h5NRMJNlY87SnwFTOrZBBsQ9 Ff2yLpjVGB+HB4+HaYI4cSK/eILB9cg5Mkt7umTZESHTgSL7vhD83PDrTKDBak0KhM53 JdvqDRIyarqRRoDamD1kfvg8JzQ6Poui7ULApSbaPLM9ySC3LKeL8WwMxl4ag0ndC9U/ Zxhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681933617; x=1684525617; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ON5IMsZb75gB9tZ4cjUZUWo/q0TshrtD9Whgj77uJNM=; b=P39esv7G7nr2v3IR8lVBR0yo9ED2/9gl28e6TAoWaDmfpQ07id6oiSadh/ivsxPknl fzyy5hwWbP+Dwx/AgHaWHMQDMbbp3wZKoLEepk2dEX7s35i6zjBmiC7sVmK5c2g0945Y 6uZ4qRHag6WZTYTnLgift85btSUnNrwUSBNxjAMUblQkWzkdxbqOFCylaJ/eFhLSeMCg Uj79S2UtyneV/Kg/55KjJrrjeRAZVbitm+4nfQ9himqbOhDfbXeNEZ2wmC3JH9qMQeFq lNAQ1xbl0L9vOrQG/hbILdTmc3if/MAq+hbJItsoxdc0oWfV3teQ87/8B9wbyPm5nppA hSfA== X-Gm-Message-State: AAQBX9eJfTt1aEd7dnfLZw/OETyROyY3dkJSqiPiMmAorBuCw+Fyfkhf 9LohZUbJw3NYWRI54bTh9Z901Mb+bE4= X-Google-Smtp-Source: AKy350YYrAXinJYwCdcSmdOCerbDmblIR37jIl2OVTgClanX2L/Ib4JP93Um0qUilRYRMRXKVnrR8Q== X-Received: by 2002:a17:902:f681:b0:1a5:1e7:86d7 with SMTP id l1-20020a170902f68100b001a501e786d7mr7300459plg.52.1681933616943; Wed, 19 Apr 2023 12:46:56 -0700 (PDT) Received: from octofox.hsd1.ca.comcast.net ([2601:641:401:1d20:5bf7:6c23:b234:17fe]) by smtp.gmail.com with ESMTPSA id g20-20020a170902869400b001a681d123a0sm11749576plo.297.2023.04.19.12.46.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Apr 2023 12:46:56 -0700 (PDT) From: Max Filippov To: gcc-patches@gcc.gnu.org Cc: Max Filippov Subject: [COMMITTED 1/2] gcc: xtensa: add data alignment properties to dynconfig Date: Wed, 19 Apr 2023 12:46:35 -0700 Message-Id: <20230419194636.4006880-1-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,FROM_LOCAL_NOVOWEL,GIT_PATCH_0,HK_RANDOM_ENVFROM,HK_RANDOM_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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