From patchwork Sun Jun 11 08:58:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 691351 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp1572243wru; Sun, 11 Jun 2023 02:04:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6gOfgcISN6pxjHExLQdXRzSAHT3eYj8UxR9MLnr9BA4XBlE/dJZEhN869fiIK1RDgeozXk X-Received: by 2002:a05:620a:398b:b0:75e:d0bf:5e4c with SMTP id ro11-20020a05620a398b00b0075ed0bf5e4cmr5424182qkn.16.1686474276128; Sun, 11 Jun 2023 02:04:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686474276; cv=none; d=google.com; s=arc-20160816; b=EvZXTIKQ+NC9x7s73yiBs9/jBQgHKv7N3qb3thu2VUZWzLg49cUopJFtSFTqcOEz0G XH3MlN3PrEBRdBdlweMmwRELSd04QqAyr4V2S9t4Fdehu6rEK8aMj8ElLMvY/skRZUcL WYYYvIZGKHkeGte+uJYsVuLCC60cEgt/mgzW/xyhRFe8Z7LGJXBvdD8O7SLNmDJh6od3 vRVb0rkyx30xf7QWbxKu0ir4zQxhZL7pjUyAXO3CHh9eThI+tsniBmwJvVmC92R6Ywb3 gD166z/CqnbIAEtuwYUSgdEV7R4auKK7Lxq1pKohWc6HT5CrisTrqyPzH+Ntya0sLg7Y Y2iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=dviO6n8wA4yJsaVpJ1+rfxPOtVuyVvqQ3eDo42v2ZSU=; b=YzWJ4235Zp8KGvJNSBUsBFEeoxJlOY3k8DnaojcnFLV+e5PpwsGaGZVam+RXcvJr91 kddyg1xT8gv/CY9Z5brKBKnJeTFZuPE1CFvDtvju2gZIDy2+vMSHZANalp6NTY+BC5aF HU1TQ01Empe/fuC/O3lWlHvc+MI0t4tydWEnOyt2XxwALjX3ORiKZfiRnIkMxo9MZSNZ T0x0rCk0+gXvc92fgEyKuNX3HM3DXFWdyGwwptIbgMbz877b5YrOuo3ncfIWoExsU/T5 g/nEVbehCS561Bwv4xjeYeE9Zx3A4GKMH/Xv3uXkt6+syjZ2+M8s00PgdDi6LkcH8w3R aBOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FzYjyNIZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d16-20020a05620a141000b0075931a2b4cbsi4411249qkj.374.2023.06.11.02.04.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 Jun 2023 02:04:36 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FzYjyNIZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8GwW-0003RS-5J; Sun, 11 Jun 2023 05:01:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q8Gvd-0002eH-7f for qemu-devel@nongnu.org; Sun, 11 Jun 2023 05:00:12 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q8GvZ-0003mf-79 for qemu-devel@nongnu.org; Sun, 11 Jun 2023 05:00:04 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3f7f4819256so24011395e9.1 for ; Sun, 11 Jun 2023 01:59:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686473997; x=1689065997; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dviO6n8wA4yJsaVpJ1+rfxPOtVuyVvqQ3eDo42v2ZSU=; b=FzYjyNIZ89jTf4B24vWsducejgSoVidmsAWdRaMygMznHXqyaFDP0uj69dI2Axh7GO zRm/pWmzW2WEZrCkfiVRV8a43pYNLmpayWl7QmiRGyk+CyTMpkglYdEmyDggp6lZty4d b30dPyAGEHUSVkjDlY8/GemwEMffcASa9h45sfqC3fAe18Y5G3rVBJNYUGxoYw6kJPS6 HUsDXfEfdxRibps3oJMgFObmyWzmuA4G11dd8GdBlO8Q5RcIYG+uHVgn5FnY+28jRK/W /wfg6K+LO5Re32dHdQ2iiSMgqkTSCsPXtloslkh/iS6blG5106zXc0ur6spJbak+5rWD C+XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686473997; x=1689065997; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dviO6n8wA4yJsaVpJ1+rfxPOtVuyVvqQ3eDo42v2ZSU=; b=ljiUtsSCHG5RQz41q4iwXEY9TfysgZMs3hkVOXFqxAG1AJZSgMUYbJAb9XJiqYRmRa ulo6WVw8QNrX9MRSGfVW2ufrfhc6OMVdR+RbLHC2+IWdfMROXnayidcZvykhtLjF16yd 2xfxuuUwKWF++HcgmWruRe6HH6Ouh75qMkrDbUvI8TyQyT1mgyvZcFPmZbccN5hwOHXY 1Pm+Fnld3ckqJ0mCI0/f4Apz06oWoT9WEYrqtULXqZGW4/setRgp2esRoE9socjr4daz PScWF/D3cSix5tChOyL6etLJj/tgIig0+PR6I40cf7ZDSvQEwN69zmL8D1rUBN6tnllB iL/g== X-Gm-Message-State: AC+VfDxEBCKaRdZ75EUMNQruRWlPTZ/cQV6xJZOmDyd1wXOS0RXyk6e1 lBNugS2ff052qLcbUB1g3AMrJbhgng/4CL7zoH8= X-Received: by 2002:a05:600c:2212:b0:3f4:23b9:eed2 with SMTP id z18-20020a05600c221200b003f423b9eed2mr4821369wml.38.1686473997621; Sun, 11 Jun 2023 01:59:57 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id w25-20020a1cf619000000b003f7f52c9988sm7877641wmc.21.2023.06.11.01.59.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 11 Jun 2023 01:59:57 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Peter Maydell , qemu-arm@nongnu.org, =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 16/26] target/arm/tcg: Reduce 'helper-sve.h.inc' inclusion Date: Sun, 11 Jun 2023 10:58:36 +0200 Message-Id: <20230611085846.21415-17-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230611085846.21415-1-philmd@linaro.org> References: <20230611085846.21415-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Instead of including helper-sve.h.inc via helper.h which is included by all TCG files, restrict it to the few files that require it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/arm/helper.h | 1 - target/arm/tcg/sve_helper.c | 4 ++++ target/arm/tcg/translate-sme.c | 4 ++++ target/arm/tcg/translate-sve.c | 5 +++++ target/arm/tcg/vec_helper.c | 4 ++++ 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/target/arm/helper.h b/target/arm/helper.h index 444be99c96..134d428175 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -539,7 +539,6 @@ DEF_HELPER_FLAGS_5(gvec_uclamp_d, TCG_CALL_NO_RWG, #ifdef TARGET_AARCH64 #include "tcg/helper-a64.h.inc" -#include "tcg/helper-sve.h.inc" #include "tcg/helper-sme.h.inc" #endif diff --git a/target/arm/tcg/sve_helper.c b/target/arm/tcg/sve_helper.c index 8a0d966aae..79a42af591 100644 --- a/target/arm/tcg/sve_helper.c +++ b/target/arm/tcg/sve_helper.c @@ -33,6 +33,10 @@ #include "exec/helper-proto.h.inc" #undef HELPER_H +#define HELPER_H "tcg/helper-sve.h.inc" +#include "exec/helper-proto.h.inc" +#undef HELPER_H + /* Return a value for NZCV as per the ARM PredTest pseudofunction. * * The return value has bit 31 set if N is set, bit 1 set if Z is clear, diff --git a/target/arm/tcg/translate-sme.c b/target/arm/tcg/translate-sme.c index 24796e5d9e..e63b9883a9 100644 --- a/target/arm/tcg/translate-sme.c +++ b/target/arm/tcg/translate-sme.c @@ -25,6 +25,10 @@ #include "exec/helper-gen.h.inc" #undef HELPER_H +#define HELPER_H "tcg/helper-sve.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H + /* * Include the generated decoder. */ diff --git a/target/arm/tcg/translate-sve.c b/target/arm/tcg/translate-sve.c index ff050626e6..45a36760fd 100644 --- a/target/arm/tcg/translate-sve.c +++ b/target/arm/tcg/translate-sve.c @@ -22,6 +22,11 @@ #include "translate-a64.h" #include "fpu/softfloat.h" +#define HELPER_H "tcg/helper-sve.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#include "exec/helper-info.c.inc" +#undef HELPER_H typedef void GVecGen2sFn(unsigned, uint32_t, uint32_t, TCGv_i64, uint32_t, uint32_t); diff --git a/target/arm/tcg/vec_helper.c b/target/arm/tcg/vec_helper.c index af325577f0..d93960198f 100644 --- a/target/arm/tcg/vec_helper.c +++ b/target/arm/tcg/vec_helper.c @@ -33,6 +33,10 @@ #include "exec/helper-proto.h.inc" #undef HELPER_H +#define HELPER_H "tcg/helper-sve.h.inc" +#include "exec/helper-proto.h.inc" +#undef HELPER_H + /* * Data for expanding active predicate bits to bytes, for byte elements. *