From patchwork Fri Dec 8 05:54:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 175592 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp5263086vqy; Thu, 7 Dec 2023 21:55:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IE0U7bokjkfV16F78YdpO+SYcLMvhNV5/StJll88/td0KCnc43fe4JQOKMyUbHN0F5lG+Tb X-Received: by 2002:a05:6808:2223:b0:3b8:b063:6b99 with SMTP id bd35-20020a056808222300b003b8b0636b99mr4270111oib.72.1702014932478; Thu, 07 Dec 2023 21:55:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702014932; cv=none; d=google.com; s=arc-20160816; b=ZVFJFMYPEMy1IM+Hbey5A1u6TOirQBYjoR0wNtky+KukkztY7mNucb3Df17vLEzo7G gIlPbtPwBWrPOuUaCQEsY7NvqAOcqIG0OKDi+gQT2bg9+yjalSz4KbzorT5ijAK0OjdS ds0veV0bM/AqHC8BhI3pIiQtaWe57r4/fwDyAo2kyphDf1YO2SXJLsAV02XG5fMQsgRG X/zj6sLTiheUoIh26NyLavpYU+LRDiZSDhClM7OtUgy0ofEumWcjBy0WFuWif7k7v6Ln IVf94nAuvrTEdJ1jecNS7NHnSq2VEdFekJdIy70RBm8+IvdPa4TbxxmFQaJrM6rDVC/8 Iq3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=oJ/tAo5hDwQPfRruz9afcRfXvkx00dxKddYKFVNcdvc=; fh=GWiN7/yH5ZaeB7dNf34H6takS9oI70VVB29etA3Fg9Y=; b=Z/53SCZ1uajI48AIyAVbwI/ig4wCPNNHX2KQfuaJ5kK4ikfjSuHKZImwolMvqJnR1x k/8H2ddVULgcSc8gem3PKfvuUTH0mWaiPEBrwKj/TzutQYW8eOM7AK1QXtBu1RDlqZdt dQzesaBDDKlbg8RIMTkCfvcdxdT79hNSx5DjgYtvBZd6gpTjvaPNIjWFKajrOo/CS+PU jeiqV5uqYgtdDC0uRLhk+ZdBmNigNG0qF88EGY4yf8HqcQJrigvGS4uJBatXAfUT/wKT 27KX0lj8IpeiUkqrgICeLNWic1LXSZGrKRhVfpgvgTBNFK3PHd8WxVIS+bRLntfLF/+S kBVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=eSoaiv3R; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=sifive.com Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id l66-20020a632545000000b005c6890308d2si957517pgl.72.2023.12.07.21.55.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 21:55:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=eSoaiv3R; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=sifive.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 2961D80E9EB7; Thu, 7 Dec 2023 21:55:30 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233325AbjLHFzR (ORCPT + 99 others); Fri, 8 Dec 2023 00:55:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1573208AbjLHFzF (ORCPT ); Fri, 8 Dec 2023 00:55:05 -0500 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 908E9172D for ; Thu, 7 Dec 2023 21:55:09 -0800 (PST) Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-6ce831cbba6so1082184b3a.2 for ; Thu, 07 Dec 2023 21:55:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1702014909; x=1702619709; darn=vger.kernel.org; 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=oJ/tAo5hDwQPfRruz9afcRfXvkx00dxKddYKFVNcdvc=; b=eSoaiv3RAbbY2NaBNjD878XjrSAtvRe+3gHiselTxD5LVxCdzAFJf3dY3hr/jLeYk7 PekZeG3b5R+Lmmx9dNz9Wq/CHdjgfDr7R1sQ0s8pz8crm88wE8ASkmflaBxGJfDCU6dJ A0hVT1oPsgguypJ9Id+kQMcPMgmWiwzWKPByYuv14A7eZ4lmnjVsKX+VJ5CXCIh4+2pl EsC8EsynuDG0k8s6zxAhLj6Eogtxp62jGP6/561coWy1rkOTpDRkRuYSCyqPXER73H7P 3rebnT7DlUAm6M8RF/g3LnFxcRZ0QfUS2lVfOHFExBEJN6FzaGhhyKC+3oRfzdy2NNd6 s5gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702014909; x=1702619709; 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=oJ/tAo5hDwQPfRruz9afcRfXvkx00dxKddYKFVNcdvc=; b=O4vRRkw1G+j7awv3C/VRlCfwg7xt2sGyITcFdq8ewTIIpXbEZ4jiXVJl4Y0LYBauvp EjOIiDonPDjSxJzjJ6zWWcxZpXOSggaQcIxP+fpcCEBELSwhh+yK/Z3fk8Fck8tAAcgr EovyWi1hnYp5K3tRcO3Eu9rY8LHDMWfJRAsW/RJ9pWJb5S2mfs51pw1B/xvyneR/erqZ UWbb+Up0kphF7APlkTZ7QlADi2V3y9jKql1h7a5HU8/YW/SGGI3qrenbdnMjb/0HOD3m KcOsECmtbUTndN5RHF6sZdfCrz+rIbtIJmDaXz7JhCfTNf+JC6F4Vpjc/EKL9gYztCiF R5MA== X-Gm-Message-State: AOJu0Yyra66cAMkhPitCFwsCo8v9DFIPe7eAU2oxdI1m/diAzrNErrla 4W5Sj5L/mt2n3p8WhUl91fOn/Q== X-Received: by 2002:a05:6a20:4282:b0:181:74fe:ba83 with SMTP id o2-20020a056a20428200b0018174feba83mr4264495pzj.40.1702014909013; Thu, 07 Dec 2023 21:55:09 -0800 (PST) Received: from sw06.internal.sifive.com ([4.53.31.132]) by smtp.gmail.com with ESMTPSA id s22-20020a170902989600b001ce5b859a59sm786250plp.305.2023.12.07.21.55.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 21:55:08 -0800 (PST) From: Samuel Holland To: linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, linuxppc-dev@lists.ozlabs.org, x86@kernel.org, linux-riscv@lists.infradead.org, Christoph Hellwig Cc: linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, linux-arch@vger.kernel.org, Samuel Holland Subject: [RFC PATCH 05/12] lib/raid6: Use CC_FLAGS_FPU for NEON CFLAGS Date: Thu, 7 Dec 2023 21:54:35 -0800 Message-ID: <20231208055501.2916202-6-samuel.holland@sifive.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231208055501.2916202-1-samuel.holland@sifive.com> References: <20231208055501.2916202-1-samuel.holland@sifive.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Thu, 07 Dec 2023 21:55:30 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784692009357362473 X-GMAIL-MSGID: 1784692009357362473 Now that CC_FLAGS_FPU is exported and can be used anywhere in the source tree, use it instead of duplicating the flags here. Signed-off-by: Samuel Holland Reviewed-by: Christoph Hellwig --- lib/raid6/Makefile | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/lib/raid6/Makefile b/lib/raid6/Makefile index 1c5420ff254e..309fea97efc6 100644 --- a/lib/raid6/Makefile +++ b/lib/raid6/Makefile @@ -33,25 +33,6 @@ CFLAGS_REMOVE_vpermxor8.o += -msoft-float endif endif -# The GCC option -ffreestanding is required in order to compile code containing -# ARM/NEON intrinsics in a non C99-compliant environment (such as the kernel) -ifeq ($(CONFIG_KERNEL_MODE_NEON),y) -NEON_FLAGS := -ffreestanding -# Enable -NEON_FLAGS += -isystem $(shell $(CC) -print-file-name=include) -ifeq ($(ARCH),arm) -NEON_FLAGS += -march=armv7-a -mfloat-abi=softfp -mfpu=neon -endif -CFLAGS_recov_neon_inner.o += $(NEON_FLAGS) -ifeq ($(ARCH),arm64) -CFLAGS_REMOVE_recov_neon_inner.o += -mgeneral-regs-only -CFLAGS_REMOVE_neon1.o += -mgeneral-regs-only -CFLAGS_REMOVE_neon2.o += -mgeneral-regs-only -CFLAGS_REMOVE_neon4.o += -mgeneral-regs-only -CFLAGS_REMOVE_neon8.o += -mgeneral-regs-only -endif -endif - quiet_cmd_unroll = UNROLL $@ cmd_unroll = $(AWK) -v N=$* -f $(srctree)/$(src)/unroll.awk < $< > $@ @@ -75,10 +56,14 @@ targets += vpermxor1.c vpermxor2.c vpermxor4.c vpermxor8.c $(obj)/vpermxor%.c: $(src)/vpermxor.uc $(src)/unroll.awk FORCE $(call if_changed,unroll) -CFLAGS_neon1.o += $(NEON_FLAGS) -CFLAGS_neon2.o += $(NEON_FLAGS) -CFLAGS_neon4.o += $(NEON_FLAGS) -CFLAGS_neon8.o += $(NEON_FLAGS) +CFLAGS_neon1.o += $(CC_FLAGS_FPU) +CFLAGS_neon2.o += $(CC_FLAGS_FPU) +CFLAGS_neon4.o += $(CC_FLAGS_FPU) +CFLAGS_neon8.o += $(CC_FLAGS_FPU) +CFLAGS_REMOVE_neon1.o += $(CC_FLAGS_NO_FPU) +CFLAGS_REMOVE_neon2.o += $(CC_FLAGS_NO_FPU) +CFLAGS_REMOVE_neon4.o += $(CC_FLAGS_NO_FPU) +CFLAGS_REMOVE_neon8.o += $(CC_FLAGS_NO_FPU) targets += neon1.c neon2.c neon4.c neon8.c $(obj)/neon%.c: $(src)/neon.uc $(src)/unroll.awk FORCE $(call if_changed,unroll)