From patchwork Mon Oct 24 09:13:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 13016937 X-Patchwork-Delegate: palmer@dabbelt.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 119E0ECDFA1 for ; Mon, 24 Oct 2022 09:13:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=jbT2CgotN4TrBSCMjUGSJcxVG1JQFsoRt4o6mUGnpd4=; b=u0tyDR/3RrVjkC 7cKZ4Xa/EaCBvPSb3e0hnC/GvYX3S112R1+4ghGL3lLeYsoK0vSZDfYZ0A2MBiHgzLuT3UEPdx5hh 8F/wk57TXy133V9RFQQrma8D1nOMybV3LaJJATKbkZ+mlxpLYPvb4ABT280ZNzyS+krw2D5M02Dkd 633UxK5DGf9KQYIgrGIPzObpoUCM3NVPAIVtdEHKDw3Sstrhjpbcb4zc0WxyiZ1XouyMoBG4Bz7nj tU60RJOXMY5/tE0UFMzkvq6N+cuCLP1BOh92PgAUUo2kRslymC4iQ0CF2r2G7OeK0ASGa5L5/f/Hk ydhZCmySPzi8gErwYKrA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1omtWG-000Ks8-By; Mon, 24 Oct 2022 09:13:16 +0000 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1omtWD-000Kpp-NK for linux-riscv@lists.infradead.org; Mon, 24 Oct 2022 09:13:15 +0000 Received: by mail-ed1-x536.google.com with SMTP id a13so28852361edj.0 for ; Mon, 24 Oct 2022 02:13:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; 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=JIwER8k8IhcgA23J4foB45LX9cZVbH0ppYWu1nj+Z1Q=; b=OcUwolJU9LdhXRMhQCV2+/zP9uNQuXMRbW4bTxss2F5b0bYpKJW6LLpKBTnjpwEWCY axJJjhJIV56oKmFwWWY5/MozZy1YY2Kuy9k4ZYqL0J0eIHrqOlHXupquhtnrh7/Gfp+n 4y1OEsssV5s6lwHJMOJ9/9UnYOVqF1Egtw8NQE1byDQq7FET8gpxBZNqxRo5nLpssUws kRfbDeJPkogVUgasno3O4660mc8wuZofV32QAaQMW5zK402WTA1A7TRCdMiIBo20GaFs TFYOFDXmkXIC+vVTnY8WLktSXpAb+T+uCJUNE1lVSZ5sAGRYD1zCBdfd9hQLt/uQ59zs hN0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=JIwER8k8IhcgA23J4foB45LX9cZVbH0ppYWu1nj+Z1Q=; b=wS/SKOyNtzJUizUwy25N161BOuVEpvlNSqP6YvVGfbdZHGbvVr91MYu5RWD987mPN7 FCE44b7TGpHr29GzhMnFlTMnnXVkAICqznG4RF+XKgFy3y21sVChuKgIsL/HEtUJH1Ki gyqC8H9maKOsalIn31vkKKfMewvM5XZHenZbEA41ufp4bn31r1fmERiMXaJR6WS2kQnh P8rUIu4PXiJmSbE5TrDCoQNmxy1+DJLxhqHySv+JToBe7bjnuVN0htm8N6DQJqZTmy7r 0CEJbhFyjoxo4EO/q1m5V0rn5G43qx9uXJcISqL8/xDXv9z9PcKm08NQbxpTC0jdCFAv zI2w== X-Gm-Message-State: ACrzQf0tfuWrTY6/zRCmuztEgFcK5Ja5WrfPSTpNJRCgfvEKDPGNw8vm b+C3sjdNuoPkNH0Vx88JJ6Odwldmjj++LQ== X-Google-Smtp-Source: AMsMyM77KP2+Ur6xHAKk1pyxNc0J33dOTjJSNopxwILfvZNwEWxGEOGTRUAsTeiOxp+iMKkFFgiYuA== X-Received: by 2002:a05:6402:2813:b0:461:e7bc:560a with SMTP id h19-20020a056402281300b00461e7bc560amr1255448ede.340.1666602792149; Mon, 24 Oct 2022 02:13:12 -0700 (PDT) Received: from localhost (cst2-173-61.cust.vodafone.cz. [31.30.173.61]) by smtp.gmail.com with ESMTPSA id l3-20020aa7cac3000000b0045723aa48ccsm17850061edt.93.2022.10.24.02.13.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Oct 2022 02:13:11 -0700 (PDT) From: Andrew Jones To: linux-riscv@lists.infradead.org Cc: Palmer Dabbelt , Paul Walmsley , Albert Ou , Conor Dooley , Heiko Stuebner , Anup Patel , Atish Patra Subject: [PATCH v2 1/3] RISC-V: Improve use of isa2hwcap[] Date: Mon, 24 Oct 2022 11:13:07 +0200 Message-Id: <20221024091309.406906-2-ajones@ventanamicro.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221024091309.406906-1-ajones@ventanamicro.com> References: <20221024091309.406906-1-ajones@ventanamicro.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221024_021313_781968_529CF286 X-CRM114-Status: GOOD ( 10.79 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Improve isa2hwcap[] by removing it from static storage, as riscv_fill_hwcap() is only called once, and by reducing its size from 256 bytes to 26. The latter improvement is possible because isa2hwcap[] will never be indexed with capital letters and we can precompute the offsets from 'a'. No functional change intended. Signed-off-by: Andrew Jones Reviewed-by: Conor Dooley Reviewed-by: Heiko Stuebner --- arch/riscv/kernel/cpufeature.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c index 694267d1fe81..4677320d7e31 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -74,15 +74,15 @@ void __init riscv_fill_hwcap(void) const char *isa; char print_str[NUM_ALPHA_EXTS + 1]; int i, j, rc; - static unsigned long isa2hwcap[256] = {0}; + unsigned long isa2hwcap[26] = {0}; unsigned long hartid; - isa2hwcap['i'] = isa2hwcap['I'] = COMPAT_HWCAP_ISA_I; - isa2hwcap['m'] = isa2hwcap['M'] = COMPAT_HWCAP_ISA_M; - isa2hwcap['a'] = isa2hwcap['A'] = COMPAT_HWCAP_ISA_A; - isa2hwcap['f'] = isa2hwcap['F'] = COMPAT_HWCAP_ISA_F; - isa2hwcap['d'] = isa2hwcap['D'] = COMPAT_HWCAP_ISA_D; - isa2hwcap['c'] = isa2hwcap['C'] = COMPAT_HWCAP_ISA_C; + isa2hwcap['i' - 'a'] = COMPAT_HWCAP_ISA_I; + isa2hwcap['m' - 'a'] = COMPAT_HWCAP_ISA_M; + isa2hwcap['a' - 'a'] = COMPAT_HWCAP_ISA_A; + isa2hwcap['f' - 'a'] = COMPAT_HWCAP_ISA_F; + isa2hwcap['d' - 'a'] = COMPAT_HWCAP_ISA_D; + isa2hwcap['c' - 'a'] = COMPAT_HWCAP_ISA_C; elf_hwcap = 0; @@ -196,8 +196,10 @@ void __init riscv_fill_hwcap(void) if (unlikely(ext_err)) continue; if (!ext_long) { - this_hwcap |= isa2hwcap[(unsigned char)(*ext)]; - set_bit(*ext - 'a', this_isa); + int nr = *ext - 'a'; + + this_hwcap |= isa2hwcap[nr]; + set_bit(nr, this_isa); } else { SET_ISA_EXT_MAP("sscofpmf", RISCV_ISA_EXT_SSCOFPMF); SET_ISA_EXT_MAP("svpbmt", RISCV_ISA_EXT_SVPBMT);