From patchwork Mon Jun 19 15:54:59 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: 1796731 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=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=AxnoS2k0; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QlDvx2zxmz20Z9 for ; Tue, 20 Jun 2023 01:58:53 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qBHFK-0007y8-Jh; Mon, 19 Jun 2023 11:56:50 -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 1qBHFF-0007f0-Ut for qemu-devel@nongnu.org; Mon, 19 Jun 2023 11:56:45 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qBHFE-00057D-EX for qemu-devel@nongnu.org; Mon, 19 Jun 2023 11:56:45 -0400 Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-519f6e1a16cso4291155a12.2 for ; Mon, 19 Jun 2023 08:56:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687190203; x=1689782203; 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=CM6xj41eYNrEaAsuFr1fglVypk0YHAp2sQb5Kbf2Uig=; b=AxnoS2k03oE3hczaGbZ/THmqMx7hPXAn4+UFWCIrrk+tonUFx31Gvayxv6UPrAdwNi WhDy4AG/l9uIQpaqPKNt/fiDoNcK4THBu5K9UipJHYDiP+IhnlE+qGhZoPiOMWKippfG CtvOgyEBic0qeX0PrjGR+eGXIl9TDfUb512bdDTodDBD7vGXOn/+xdrv/0Xg/fwFZsdO SDUndFseGuo0RR7vImJCE2M7PH4dAnifYI+A8OfWQAdZBui3SRpkWHmWyQGA33wXHwxM 2lfnaH+OpuROo115Km4MCDO1MKPoCw30Liyiw1+/MKDVbnhUC2DeJ5bSnlbDlaqq6xvH NmMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687190203; x=1689782203; 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=CM6xj41eYNrEaAsuFr1fglVypk0YHAp2sQb5Kbf2Uig=; b=Hb4SIiPte8l0xlXAnoWe+N8kQh+Ph89ZFh7He7ytAG8JpQ4ndXhrzizuarVSb2PPea Bi++L70nrWfhiNy2uIWIBadOm1YQK0mVKjzJPRxQ6mwD5bywxPMeN+hwfm31ujS3X85K 3zQUtL7upjlqHLPN6OGqwubERAp/kPsE7SFF67I54uMjyNqh4ZBjIZLNbgxNDqljPbnH k/C1cirmU5E0YSvPNcdoA4UzwIudBYvIqDdWn5VqaYoB8vi1qF/IHdv/VgQy9npBOwVm OA/suv2VZ1S5Cm+Agi29gsDFcNK6hgSeOQptrN1R34J4kN0OthcWpms1xAm73ChuwKro 6jwA== X-Gm-Message-State: AC+VfDwcDtcT54ZLR/mLeTl9y9VBxeLjd834X2+SivnaC085QWhi7XLA eA9kXs5CDtTb09fQiLfNjYdiWX/uCT6XTWrF6S/+zQ== X-Google-Smtp-Source: ACHHUZ7XgEvvJJWAK3ogWR80Bp3m2misxWDt7qEXUeVci3azai7YBsMez6MnJ7B+7h0loll6Brk6NA== X-Received: by 2002:a05:6402:204a:b0:518:7cc1:757f with SMTP id bc10-20020a056402204a00b005187cc1757fmr6978108edb.5.1687190202780; Mon, 19 Jun 2023 08:56:42 -0700 (PDT) Received: from m1x-phil.lan (sar95-h02-176-184-10-225.dsl.sta.abo.bbox.fr. [176.184.10.225]) by smtp.gmail.com with ESMTPSA id p4-20020a05640210c400b005158563be4asm13201146edu.33.2023.06.19.08.56.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 19 Jun 2023 08:56:42 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PATCH v3 23/34] target/arm/tcg: Reduce 'helper-mve.h.inc' inclusion Date: Mon, 19 Jun 2023 17:54:59 +0200 Message-Id: <20230619155510.80991-11-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230619155510.80991-1-philmd@linaro.org> References: <20230619154302.80350-1-philmd@linaro.org> <20230619155510.80991-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=philmd@linaro.org; helo=mail-ed1-x52c.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.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 e132969837..6ea6384855 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -115,5 +115,3 @@ DEF_HELPER_FLAGS_3(crc32c, TCG_CALL_NO_RWG_SE, i32, i32, i32, i32) #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 ddc9baeafb..a71c60f4fb 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