From patchwork Sun Jun 11 08:58:38 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: 691356 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp1572472wru; Sun, 11 Jun 2023 02:05:26 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ48ui0T6r4KXvtPTk9KaX5YeTkfNNDzhvwA/EsEg3tVaRKkdIh9OT5Ho4IO5RTVlIZBkfPU X-Received: by 2002:a05:6214:c83:b0:5ef:519:b1a with SMTP id r3-20020a0562140c8300b005ef05190b1amr7623337qvr.24.1686474326459; Sun, 11 Jun 2023 02:05:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686474326; cv=none; d=google.com; s=arc-20160816; b=REu9yrebp+ZY+p5wqYXYNqPymhCJfVaN7AP5cXG3FqNTZK1sVdTTm/ULQEINjX71kd EB5QXoKP5gTqAvz7aA7nXGMOky6b4B0n38iNa7JgcOj5B342BkG29jMqyws1mjpMTZYs +5/ncsnuJU9JMBFF4MbrcJwZ6QRQucy7E81tH8k0Bph3Oi7bp5JSwLaeO/JMMYaVx9v4 LdcT4xUcS6dnrS3/iOAQK+cFJnc6z+7VcmAS96zG9JsYM/jH+ECYrto3/ksDZe/Qj+I8 i4l4dFxZ6Cjjzp8YD8r3aChut1IjVY/AWWSUv3jIKLuA4ONVoFEA2Sp8UvLGFcGtH3hB GgoA== 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=6fgvCMeWGWtzi1ogVNS3n2ceF5EfOYaR43hCpswXEso=; b=gxN92sRYZfge9xtRW8AFJi4Ve6yfEDM2AifDtfZj5ySxkRwWPydyNjaay77l36cB1G EhiKNb4ack/KoDRL9Adr+eKeNJFrIDtYq91qSHd1h9/DinS60aHQ105y17ZWgdYBbXa+ yARUotio6DTCzkF40e4FSX56KY8ojrRcaUJ/I0lPXkkTXmlRVEBvYtvWRRBOoDgJrTdP lASaPtAsRwpSBCXOOAkaQ3lAWVhQTjs/cBC/GDKgfFCd4hnuDmzzoYkurb3vnKhufn4W H5iQHheIaxRhWiSM3HkwUO6VovN0mmAbC0XQlzI7c/jU6X2ugWzYbq/zh+KUJ8C7e5Gz oOfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="j/qXLV/9"; 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 gs7-20020a056214226700b0062b5c0de754si4461668qvb.590.2023.06.11.02.05.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 Jun 2023 02:05:26 -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="j/qXLV/9"; 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 1q8Gxj-0005dE-Qq; Sun, 11 Jun 2023 05:02:15 -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 1q8Gvk-0002hr-7Y for qemu-devel@nongnu.org; Sun, 11 Jun 2023 05:00:19 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q8Gvg-000401-Ef for qemu-devel@nongnu.org; Sun, 11 Jun 2023 05:00:11 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-30af56f5f52so2111512f8f.1 for ; Sun, 11 Jun 2023 02:00:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686474006; x=1689066006; 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=6fgvCMeWGWtzi1ogVNS3n2ceF5EfOYaR43hCpswXEso=; b=j/qXLV/9sVhsCh+/pKikW540b9dVvIF3Gz9WWELqLKNQlKcGmEF5gPf7nAgeWOgq47 XoXJP28L1REftwOig/rwqZGN8S0/Wu172rPjgq4sllTA6cpMDWLhAjS5GItSRC3N/gTt SstZ5wQhZtF6QGFoEvIhbcsWfnqDAT0UzPDZL4jz+Bfqnx9URfWKFvayiIdZg+/EPAXN ZIFAhK2cBbJ9X8/UdCquuy4MkCyavks7G8IDoLu9EDB2BoEb0L27vGpMYv8NLTG2hLNu h1/+QAe9Zhk8KrGMCfVz7end6nU3woQqAh+QmD6Q38wyDJv2kJIohIzdNtFwSwa274lg ewug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686474006; x=1689066006; 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=6fgvCMeWGWtzi1ogVNS3n2ceF5EfOYaR43hCpswXEso=; b=KDKNVGJxiaKNZ/e+BtCU8kvClaoer0DksXlzvz0b9Uyp54hOZhsuHRfGH9He0tISQJ 59QVzRUXsYGgygjuKI1oHuZdUDqO19q0lTW+JNP9PkW8CO7H9JnOZmk7kYC6zU0mW8iD J6+K3QkXRhBMZvvk2VcXj4JuToGc38Juh7VClcKzTSuzFkRbym86CFZvouHVV2vcryMR e+OAL0YJkJVDRXWJKV+VBJKQph97E8/lMhDU4FGI/E1IBUE2RisVjHWViOeo18E3+dhu 98U1iLnyFNtL60GkL6LfEBw1gvls4OqRA8e1+G09c9Bb1qY5IN4wD0sbZ3qqrH3FhK+J joEQ== X-Gm-Message-State: AC+VfDxb+riMjmaOdONg66WKZVhWSzt5LwGUc2qderLTRNeRi4B8z56A CyflSbgWFEuNV9wmr8gFlO0GN9DT6MnCX/MKPdw= X-Received: by 2002:a5d:5491:0:b0:30f:bb97:37e8 with SMTP id h17-20020a5d5491000000b0030fbb9737e8mr916769wrv.47.1686474006262; Sun, 11 Jun 2023 02:00:06 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id d17-20020adffbd1000000b0030fb4b55c13sm3028336wrs.96.2023.06.11.02.00.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 11 Jun 2023 02:00:05 -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 18/26] target/arm/tcg: Reduce 'helper-sme.h.inc' inclusion Date: Sun, 11 Jun 2023 10:58:38 +0200 Message-Id: <20230611085846.21415-19-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::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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-sme.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/sme_helper.c | 5 ++++- target/arm/tcg/translate-a64.c | 4 ++++ target/arm/tcg/translate-sme.c | 6 ++++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/target/arm/helper.h b/target/arm/helper.h index 61cd8fd21e..b7201eb89c 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -539,5 +539,4 @@ DEF_HELPER_FLAGS_5(gvec_uclamp_d, TCG_CALL_NO_RWG, #ifdef TARGET_AARCH64 #include "tcg/helper-a64.h.inc" -#include "tcg/helper-sme.h.inc" #endif diff --git a/target/arm/tcg/sme_helper.c b/target/arm/tcg/sme_helper.c index 1e67fcac30..04170ad18d 100644 --- a/target/arm/tcg/sme_helper.c +++ b/target/arm/tcg/sme_helper.c @@ -21,7 +21,6 @@ #include "cpu.h" #include "internals.h" #include "tcg/tcg-gvec-desc.h" -#include "exec/helper-proto.h" #include "exec/cpu_ldst.h" #include "exec/exec-all.h" #include "qemu/int128.h" @@ -29,6 +28,10 @@ #include "vec_internal.h" #include "sve_ldst_internal.h" +#define HELPER_H "tcg/helper-sme.h.inc" +#include "exec/helper-proto.h.inc" +#undef HELPER_H + void helper_set_svcr(CPUARMState *env, uint32_t val, uint32_t mask) { aarch64_set_svcr(env, val, mask); diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 22caf89bb0..d1ab1edf6d 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -34,6 +34,10 @@ #include "exec/helper-gen.h.inc" #undef HELPER_H +#define HELPER_H "tcg/helper-sme.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H + static TCGv_i64 cpu_X[32]; static TCGv_i64 cpu_pc; diff --git a/target/arm/tcg/translate-sme.c b/target/arm/tcg/translate-sme.c index e63b9883a9..fa0dc20bf2 100644 --- a/target/arm/tcg/translate-sme.c +++ b/target/arm/tcg/translate-sme.c @@ -29,6 +29,12 @@ #include "exec/helper-gen.h.inc" #undef HELPER_H +#define HELPER_H "tcg/helper-sme.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#include "exec/helper-info.c.inc" +#undef HELPER_H + /* * Include the generated decoder. */