From patchwork Sun Jun 11 08:58:37 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: 691365 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp1572835wru; Sun, 11 Jun 2023 02:06:57 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7g+uWkQRLbGf2BBu1s2kfQwOZT0mp9oKVBOFJtxNR/Z89gMc6SymkYFCjLK4wzYSveaUG1 X-Received: by 2002:a05:620a:c46:b0:75e:d987:9d36 with SMTP id u6-20020a05620a0c4600b0075ed9879d36mr6428089qki.16.1686474417365; Sun, 11 Jun 2023 02:06:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686474417; cv=none; d=google.com; s=arc-20160816; b=l6fhfWOTcdonU/pJUZKa7cYRj/G+KfpLD907fEo2WdU7a2wpsrSPHzvOZ75hQAHxP3 H2NVfCVwEs6AJbSlUTQrHSxBVyAfW/xz9NvJWdSGUBWbBKyhRmLMSA+oE6cdI6h+gYs5 ewhoUdlVGCqP40IM/BAOkHIdfM/M4F9pz4R02MHNn9T64KhPEBOVSnvvqjGjgh/vWZD1 Bt2vaRXQXMdYJlorHDYQiEmnGRRhE9oKFHH2zGo3czY8AyBm4w+KgBzAROcjZKcV20YG rsl8RJYUVcwCpa3zTIY8mkZgTrDcUqmgACQ1Q/DZFE+qx2ybWCKGi3O6VtItUJHTsNUa vvlw== 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=btom/u1hZkX8UjQkUT1e66Oa9l3yd2W6yx3XFKKVFxk=; b=Klwt4+qrsd3mhf93yJRhwUeqe7C8Krkubbeu4w+GDGgTFCW0//B1Icl1hSK+GNLwXT GkZgsRUfpmbHFcHH48QU11H0ODe5WrUe5AITHZVQQO7zSJ0E5yx5GstkZYMIBzDg2DPj IYqpYCWd4KCa3Dqi1SixL/wXC89EwNm0PA595Fo/PMuRjR/jZQNn7ObicG4EYbkkf3bQ //D0L5lRz6RgkUZe92sj2IxGIX1SkR4Tln4WaTRbGN+/Oc8HmVASBWedMLaFdZKYAlJa WyV62yFVD8HUmaE/gPCN4l+5P0u+vI9EXW3jrENXgO/eEUZ0UxJ9ipWmQiHGpR9dw+PM kgOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WBikaPQO; 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 s17-20020ae9f711000000b0075cb204ab14si4350244qkg.697.2023.06.11.02.06.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 Jun 2023 02:06:57 -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=WBikaPQO; 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 1q8GxW-0004UR-Bl; Sun, 11 Jun 2023 05:02:02 -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 1q8Gvg-0002fl-QD for qemu-devel@nongnu.org; Sun, 11 Jun 2023 05:00:15 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q8Gvc-0003oM-VC for qemu-devel@nongnu.org; Sun, 11 Jun 2023 05:00:06 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-30fbf6603d2so125911f8f.0 for ; Sun, 11 Jun 2023 02:00:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686474002; x=1689066002; 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=btom/u1hZkX8UjQkUT1e66Oa9l3yd2W6yx3XFKKVFxk=; b=WBikaPQO1TstEK7K2PjFrb1eYs8oL0HBtvj5KQKxNj6x0QBlOzZU87/x8IC6iqMqKP R4hsQYLfLPHItor73LkzF3hSdAbCD0nvVt7kSlnAhXfGCvLpZveQWjeHPxOqxRSczeWS umVGj65oO96m+mXZ/K+M0M/PKAe7/ZpyNG0KJF6H9Y6IKSCB15LjTtZ5fmmfzgke6Sko AtTkDoezZ2J97S+d5UcD28WawD8BrFL+5goYaDx9EaY37tucBKee3A0fWzMyCtdEqnOM xVQPhJAHdgmLHtUxpxX/rGI0Qj+iq2NIQGeh8wWCn/w9kewqSFcAzvq63WTv6eiauwX4 RsvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686474002; x=1689066002; 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=btom/u1hZkX8UjQkUT1e66Oa9l3yd2W6yx3XFKKVFxk=; b=iZYioWqbwZDIKVS+61iBGj8/NThBgzOUOFTsBvUZyXal4NC+5cL9A4IOUGl6l6gicq IUqNMM6qpHJDXpzolJr2+SF+reRqPU8cGHVHicKLM9V4YmrAgEUqLdnEqTNAfrQ8jl97 vqbjhcahcca5jIfFbf5+j2lsFHFGykcIsW9CEij4AOaRFF7YoPBS4AA8OuTgHYY49YGg Wngq6vI/zec1O03y16duL77gX+3oVodV93VszKg36yDf+U/Khj2nWojFlDmSMXnYDmI7 wiJVCP7f/ocpwHogrIqrjWn9ac+NWCZRTQNZK+sBk1qcZkjeY9XahA5kVM8orw7KVJZ9 6mMg== X-Gm-Message-State: AC+VfDxqe6p+B89AXS3sL73vOdF0Jfd0uiD6AUX7cwbWyMwTNHkGnEvp S6aqonTwUbcoQMGh/Aae7k99Fgz6c1qBGVzkBjM= X-Received: by 2002:a5d:6682:0:b0:30f:bafb:2469 with SMTP id l2-20020a5d6682000000b0030fbafb2469mr1238430wru.53.1686474001951; Sun, 11 Jun 2023 02:00:01 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id cr5-20020a05600004e500b0030c6751a49dsm9070871wrb.115.2023.06.11.02.00.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 11 Jun 2023 02:00:01 -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 17/26] target/arm/tcg: Reduce 'helper-mve.h.inc' inclusion Date: Sun, 11 Jun 2023 10:58:37 +0200 Message-Id: <20230611085846.21415-18-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::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.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-mve.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 | 2 -- target/arm/tcg/mve_helper.c | 5 ++++- target/arm/tcg/translate-mve.c | 6 ++++++ target/arm/tcg/translate.c | 4 ++++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/target/arm/helper.h b/target/arm/helper.h index 134d428175..61cd8fd21e 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -541,5 +541,3 @@ DEF_HELPER_FLAGS_5(gvec_uclamp_d, TCG_CALL_NO_RWG, #include "tcg/helper-a64.h.inc" #include "tcg/helper-sme.h.inc" #endif - -#include "tcg/helper-mve.h.inc" diff --git a/target/arm/tcg/mve_helper.c b/target/arm/tcg/mve_helper.c index d8ba5a9e60..a3fca486e0 100644 --- a/target/arm/tcg/mve_helper.c +++ b/target/arm/tcg/mve_helper.c @@ -21,7 +21,6 @@ #include "cpu.h" #include "internals.h" #include "vec_internal.h" -#include "exec/helper-proto.h" #include "exec/cpu_ldst.h" #include "exec/exec-all.h" #include "tcg/tcg.h" @@ -31,6 +30,10 @@ #include "exec/helper-proto.h.inc" #undef HELPER_H +#define HELPER_H "tcg/helper-mve.h.inc" +#include "exec/helper-proto.h.inc" +#undef HELPER_H + static uint16_t mve_eci_mask(CPUARMState *env) { /* diff --git a/target/arm/tcg/translate-mve.c b/target/arm/tcg/translate-mve.c index bbc7b3f4ce..8577dc4377 100644 --- a/target/arm/tcg/translate-mve.c +++ b/target/arm/tcg/translate-mve.c @@ -21,6 +21,12 @@ #include "translate.h" #include "translate-a32.h" +#define HELPER_H "tcg/helper-mve.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#include "exec/helper-info.c.inc" +#undef HELPER_H + static inline int vidup_imm(DisasContext *s, int x) { return 1 << x; diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c index 2b3951cece..d88b355230 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -33,6 +33,10 @@ #include "exec/helper-gen.h.inc" #undef HELPER_H +#define HELPER_H "tcg/helper-mve.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H + #define HELPER_H "helper.h" #include "exec/helper-info.c.inc" #undef HELPER_H