From nobody Sun May 11 12:14:10 2025 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686307829; cv=none; d=zohomail.com; s=zohoarc; b=mMZDlUnRUg4dVS96QYTblJJ4tcCCUZwU9WUU86pfDq3Kx/KnAMVsO5gGcFHmTJJH0Q2txktrg5RKG0mDVKZgLhZHo4gam1DbEkxmHfyV+2kRmPptZugg/Vzq+CNKS3dUvXafGChtS5mbjVl0AN8a99GFQlEVAcMt/lKQkWNndvo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686307829; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HO4ElovXhPPVqY3d9dQ5jLZihQteSgO+eNPRlElmN8w=; b=IWtqS2jY/LPUeuA5d3uPu+UxHlis2w+tSke8qeOhrsj2qq64ULHsFmZzgGnBB5dpFWB0kzF6b9GjQlpz0EgfEDgR9rJGfoNnJmxcaLnlicTgmvYda59AgGEPR1PfTyzWxT4W3s3lKLimNUlIP03ufaB9jjwnRmaf2vmGQHA+it8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686307829990325.3908701508291; Fri, 9 Jun 2023 03:50:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7Zg7-00066e-9W; Fri, 09 Jun 2023 06:49:11 -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 1q7Zg5-0005sN-6m for qemu-devel@nongnu.org; Fri, 09 Jun 2023 06:49:09 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7Zg2-0001bX-5c for qemu-devel@nongnu.org; Fri, 09 Jun 2023 06:49:08 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-3f736e0c9a8so12008175e9.2 for ; Fri, 09 Jun 2023 03:49:05 -0700 (PDT) Received: from localhost.localdomain (23.171.88.92.rev.sfr.net. [92.88.171.23]) by smtp.gmail.com with ESMTPSA id f26-20020a1c6a1a000000b003f7ea771b5dsm2352825wmc.1.2023.06.09.03.49.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 09 Jun 2023 03:49:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686307744; x=1688899744; 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=HO4ElovXhPPVqY3d9dQ5jLZihQteSgO+eNPRlElmN8w=; b=Jle23IzQ28tPPzxtw2cQdi42GOaXWglmO/Zdd6mx8lpnwmly55BsPm573Kf1f33JBL i0pT5UzsKV3rCc+2CzwYi0aixtrdOnXRVNkPyIYVCsxSKchJ6e3sKzcouMAE0sCfTB88 KDFlIF+eE0rcTIW+sZvDB89LDzLVQg9x0Zqqu9ucpUxhktFZkwgjiDL5amEJdb9SxDFJ QyKOLYaFq29kNXSjWcgFfXaEkfhIAaIqTHjS3yScf6TEUkMSYleX7KXWcHjzf7dZiGxm OUkktRcxyMjg9xTvZixHg4kwU335gfrY4Ce6TsE/GfcWaAGa0L5KW+OlWRhx6bJl6LEE 2pGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686307744; x=1688899744; 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=HO4ElovXhPPVqY3d9dQ5jLZihQteSgO+eNPRlElmN8w=; b=hRQFVLEVNEpcVPWkqTWcR/QIqT3KEwYq1B4smeJ4fq2E1uBaqn6WRy851q+Q7dEuUf Tk0Z1vajG22MUXdH5EutoBzUYuwYZSnPRclDG+eGfkNpqystX8HhdYqmnXcjB+9Lx3a8 DwISCIASEDESQgDJVnnjloW5FIFubW5yVBVdAw82+D/Ru14xLmpTVWjDN6buXSoWkRC/ YHqWSV91AjIzl3YYVpL2SPsEnjyPyj0kG5SSikaqCBY0fRnXxfM7xCrvq4LofNOMHqtO 6ALafdMn6gTheMnJYiuhJaX35732vOk5LB47TBh1p4qDHNwWAaIL92cDdS/boXwjtwsV ZSvg== X-Gm-Message-State: AC+VfDxmEN7t3zbo+OHH3mc/cSioJ99QsxjrE9Jn741/i09hQZGJIyqS cP4zTDvQtPCF2gVrSetGni8z01pX6Av9qxmQGqTlaw== X-Google-Smtp-Source: ACHHUZ7WxM7kLOxUQSH25LNzliFLoGD1ctHQE2T14TL2vPcS1N4bn5s68Av02FiLy+zgrVMUeIYfjg== X-Received: by 2002:a7b:c4d0:0:b0:3f7:376a:ee60 with SMTP id g16-20020a7bc4d0000000b003f7376aee60mr653047wmk.6.1686307744381; Fri, 09 Jun 2023 03:49:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 16/22] target/arm/tcg: Reduce 'helper-sve.h.inc' inclusion Date: Fri, 9 Jun 2023 12:47:11 +0200 Message-Id: <20230609104717.95555-17-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230609104717.95555-1-philmd@linaro.org> References: <20230609104717.95555-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686307831562100003 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=C3=A9 --- target/arm/helper.h | 1 - target/arm/tcg/sve_helper.c | 5 +++++ target/arm/tcg/translate-sme.c | 5 +++++ target/arm/tcg/translate-sve.c | 5 +++++ target/arm/tcg/vec_helper.c | 5 +++++ 5 files changed, 20 insertions(+), 1 deletion(-) diff --git a/target/arm/helper.h b/target/arm/helper.h index 0cbffa4097..8983489cf0 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -558,7 +558,6 @@ DEF_HELPER_FLAGS_5(gvec_uclamp_d, TCG_CALL_NO_RWG, =20 #ifdef TARGET_AARCH64 #include "tcg/helper-a64.h.inc" -#include "tcg/helper-sve.h.inc" #include "tcg/helper-sme.h.inc" #endif =20 diff --git a/target/arm/tcg/sve_helper.c b/target/arm/tcg/sve_helper.c index 121859f66f..01dd13c955 100644 --- a/target/arm/tcg/sve_helper.c +++ b/target/arm/tcg/sve_helper.c @@ -34,6 +34,11 @@ #include "exec/helper-gen.h.inc" #undef HELPER_H =20 +#define HELPER_H "tcg/helper-sve.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.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 9419aaca4a..571bc10471 100644 --- a/target/arm/tcg/translate-sme.c +++ b/target/arm/tcg/translate-sme.c @@ -26,6 +26,11 @@ #include "exec/helper-gen.h.inc" #undef HELPER_H =20 +#define HELPER_H "tcg/helper-sve.h.inc" +#include "exec/helper-proto.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" =20 +#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 =20 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 9b00085095..972f538c63 100644 --- a/target/arm/tcg/vec_helper.c +++ b/target/arm/tcg/vec_helper.c @@ -35,6 +35,11 @@ #include "exec/helper-gen.h.inc" #undef HELPER_H =20 +#define HELPER_H "tcg/helper-sve.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H + /* * Data for expanding active predicate bits to bytes, for byte elements. * --=20 2.38.1