From patchwork Mon Feb 27 12:08:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 1748672 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=AgW4zM+j; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PQK685smFz1yX2 for ; Mon, 27 Feb 2023 23:08:47 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4B3AA3858C2B for ; Mon, 27 Feb 2023 12:08:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4B3AA3858C2B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1677499725; bh=z7Zye/J2tNHsE/AJWMx3ntvN504ujV21r8r69DbuwC4=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=AgW4zM+jaeCPCCH0z7F1zUlZM3ffXsCYhrJXetAH+h0RlU1yRS3jN4ROPCs0Vgplu T5Szvbx05zMde+DndbYN5XONSfBXNnkCbXEJP4Dii0FHhKswdPENDCq+MZLtTPb9i1 09lh8Ekna3o6MPKZsnMy2cqzyq/IskUUDa9u9Pxo= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) by sourceware.org (Postfix) with ESMTPS id A6DA03858D32 for ; Mon, 27 Feb 2023 12:08:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A6DA03858D32 Received: by mail-pg1-x534.google.com with SMTP id 132so3364125pgh.13 for ; Mon, 27 Feb 2023 04:08:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=z7Zye/J2tNHsE/AJWMx3ntvN504ujV21r8r69DbuwC4=; b=6+SAvQ2ZhhdUlPP1Im3szn5EcXJcd+WXHUgGP+mHOqXtR/SZUQDt+ymE4PuwnxCEos uKqBPR97KVo93OqvJ0K47fFeVpUHDCdsl0mwtXeiuvHXfs5vwbXgh+r1k4xr25xVypJ1 ba9FXnFn9xwEi9NNrSL0Nc9zIqLJ337pI/LaEyzI52F5fPuqMFvzKGn4aCtN/FowHyrf urUxG7qo0pFVNpSzltS4SqCIrPHVB2zTC9Wy9J2vYVaQ6aOgHidj9nM7eHYy8VMK95oi sKFN95RUSeBrLa2tjjs3L+tTH3qL7tuJf+v9u3ymz3woKXRRC2r3kYLIc85XPtNZ3hWb 4Hzw== X-Gm-Message-State: AO0yUKWVEfcUUuYkhjf+500CpotkKjT9G/VEc5N+l1kGCurZMhoeGgNu oKE3XEXhgWgrNyf3y6u6HPfklZmadoU= X-Google-Smtp-Source: AK7set/RD1in/miyyj0u38NxBCM2umpvklELRx86Av14wag4umGe8BVgBPysd8h0lvlrmPSwz//2Pg== X-Received: by 2002:a05:6a00:14d0:b0:5a8:4c8a:2ce4 with SMTP id w16-20020a056a0014d000b005a84c8a2ce4mr8175806pfu.3.1677499703225; Mon, 27 Feb 2023 04:08:23 -0800 (PST) Received: from octofox.hsd1.ca.comcast.net ([2601:641:401:1d20:b3bf:95e8:a911:a79]) by smtp.gmail.com with ESMTPSA id a3-20020aa78643000000b005a8b28c644esm4121311pfo.4.2023.02.27.04.08.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Feb 2023 04:08:22 -0800 (PST) To: gcc-patches@gcc.gnu.org Cc: Takayuki 'January June' Suwa , Max Filippov Subject: [PATCH] gcc: xtensa: add XCHAL_HAVE_{CLAMPS, DEPBITS, EXCLUSIVE, XEA3} to dynconfig Date: Mon, 27 Feb 2023 04:08:16 -0800 Message-Id: <20230227120816.3642952-1-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-8.9 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 autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Max Filippov via Gcc-patches From: Max Filippov Reply-To: Max Filippov Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" 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. --- 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 db8ff43c498b..9aea9f253c25 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 bb72d6ab22d7..2cc15cc99112 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