From patchwork Fri Jun 9 10:47:12 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: 690910 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp747273wru; Fri, 9 Jun 2023 03:50:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4czNDFiVF1jH8WpLK0EGB1xgZWJeTYXtuyFv6d4rJ1jZ3bFlj04SSbDcokeqFccrswaxsI X-Received: by 2002:a05:620a:40d1:b0:75b:23a1:41d with SMTP id g17-20020a05620a40d100b0075b23a1041dmr820262qko.51.1686307820013; Fri, 09 Jun 2023 03:50:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686307819; cv=none; d=google.com; s=arc-20160816; b=M7DfOU61nPQbRfWMRR9oX335tofxOZ9zFXRlRlziZtY4gBMCLhn38RTbA0hEd6ARBm +o1nc2osiQK2caiuSdsPAumKhMYMBmG6+uPo+n2hW2RjV2B+b8zBJ2aBieO3m6PFEM6C 0+m5qUGn0o+JsyS8Bg/oCkUyeBkLvFkiRtNAQuK2XUNcoChKl/ZNJi2oSiCPdiycAVCZ j0SEuZi1KFY5r3J6dQmtodD2tY2QY0uTmGjCitp71FZBa0wRk1CnMRDl7S9fOZTemzcw fBH2Yt9AC8CRCF9mILGgvWuxIwm37u2YZcYfWDpxQKCHV7NmZd3a/Ae1L+QjQnFln9+p x5nw== 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=9vVibkDFYfG6DFhVF0ZSzLEwHPzqjB5BANscN4p9qZ4=; b=tFlHQu+gKHQ05oyK0U3feORZCVZEetMOw8bmhesDUi6b4epNwXJBkOGh18CVdjBE4/ dmIbvyjrgZpbLhFAxwnN/z3TgTKwNtU6PAx5RR9+YxMOxrey3X4uOzKJedkVo+/Os7Kd sjyWDMYSzy6AZBUsFgzbxsm8Sqrh87hTUlpG62vAgEVC4QqWPkwgiJelO7xh3XZZg0Pl YU9ms8Y2JKWC+uwTdyBxvsoHarxuGI+JNGPemyF3HlpDh5MOVu6diiiZMinObRRl3qEW sX5ddZ91jWBzmaW2HviXv4FnPBk4O9/PdaYfVrkOShk5RPFXl9nTOgWT92i08stXKxOf /+6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=snXUvl+D; 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 j5-20020a37c245000000b0075b285ea25dsi1863064qkm.727.2023.06.09.03.50.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 09 Jun 2023 03:50:19 -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=snXUvl+D; 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 1q7ZgC-0006yE-Ia; Fri, 09 Jun 2023 06:49:16 -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 1q7ZgA-0006k2-Sz for qemu-devel@nongnu.org; Fri, 09 Jun 2023 06:49:14 -0400 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7Zg8-0001eO-V6 for qemu-devel@nongnu.org; Fri, 09 Jun 2023 06:49:14 -0400 Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-4f64fb05a8aso2071420e87.0 for ; Fri, 09 Jun 2023 03:49:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686307751; x=1688899751; 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=9vVibkDFYfG6DFhVF0ZSzLEwHPzqjB5BANscN4p9qZ4=; b=snXUvl+Dkxo33YpZvAGQs08bEAuQ30El4p/XugjuVXSuXKj03u5wrU6aN8mwkPLPRo kun/4YMok3Cr9orZTqTO9ZjGfOJgZ9UlULxMXyY2HQterlpglIgPkQxeYhdo4pbdlMAx MZN18La3m7W15scj9K/kmbqo/So5epWv9y9R9CbYn03yNZTgLivxM4eRwlc7Pllr/GoA xWYB0HwlLz3GwRdrHFcODEsSP0tCIm/BWyBs6uOjR/e/4ssU4dnrT+G5cXPxwNVUmPiF eVRcSUPZE1TzKtEtb1+LlhkW3gUSQ4NllDru2dBYxhUFaTAmJ8bnn4FYh3Up7x2EmHFI RnAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686307751; x=1688899751; 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=9vVibkDFYfG6DFhVF0ZSzLEwHPzqjB5BANscN4p9qZ4=; b=ObcnJOtjYsu6ukBwv7fGyg5JpqsuMMEnswb1mfBgHcf7XHLXsj7jn2Yy5JFgniKgWk pQNPWgrdDUbbMe8QpehVKrZ3/Q30EIgAo5iQECdERAetjiRU7LAjq+rcv0dmLNpYM+/u y88V8WuHGNmZFjXiiHN0ysMq+J1MqlEYBU7cKZ1BW+J5NhTUwsc8xZPjVcMdQ4IVK0i+ 1AsCnR4y4EH8HcuUOcd1NcmZuobyrT/pfUT1eOMHHIIajNJUceBvZ0MO6zIjp6lHobwN eAfnzZUmf1y3y3K+EqyqfJQqTPySAuA2rzZs0HNgd9iAXrMbYa/mi2pbHVCXqxEY8c+t WaZw== X-Gm-Message-State: AC+VfDxtKlteQrJpcy//Qb4nYz5F7UTe4uf0v0c4pKTsxTiDKp5vkFno dKkpacOjm8ANb627jI/deYACNXxzd1yRp4+0rUxNSg== X-Received: by 2002:a05:6512:b0e:b0:4f3:bb14:6bac with SMTP id w14-20020a0565120b0e00b004f3bb146bacmr599722lfu.56.1686307750991; Fri, 09 Jun 2023 03:49:10 -0700 (PDT) Received: from localhost.localdomain (23.171.88.92.rev.sfr.net. [92.88.171.23]) by smtp.gmail.com with ESMTPSA id w11-20020a1cf60b000000b003f7ff6b1201sm2231660wmc.29.2023.06.09.03.49.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 09 Jun 2023 03:49:10 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH 17/22] target/arm/tcg: Reduce 'helper-mve.h.inc' inclusion Date: Fri, 9 Jun 2023 12:47:12 +0200 Message-Id: <20230609104717.95555-18-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 Received-SPF: pass client-ip=2a00:1450:4864:20::12b; envelope-from=philmd@linaro.org; helo=mail-lf1-x12b.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é --- target/arm/helper.h | 2 -- target/arm/tcg/mve_helper.c | 5 +++++ target/arm/tcg/translate-mve.c | 6 ++++++ target/arm/tcg/translate.c | 5 +++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/target/arm/helper.h b/target/arm/helper.h index 8983489cf0..4e431c2116 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -560,5 +560,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 9914f45b16..fc003b7c7d 100644 --- a/target/arm/tcg/mve_helper.c +++ b/target/arm/tcg/mve_helper.c @@ -32,6 +32,11 @@ #include "exec/helper-gen.h.inc" #undef HELPER_H +#define HELPER_H "tcg/helper-mve.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.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 7bfced1bc6..da3e0445b2 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -34,6 +34,11 @@ #include "exec/helper-gen.h.inc" #undef HELPER_H +#define HELPER_H "tcg/helper-mve.h.inc" +#include "exec/helper-proto.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