From patchwork Sun Jun 16 17:48:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 166962 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1932080ilk; Sun, 16 Jun 2019 10:50:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqzLeSovTZQwjnLJiNA5GESxJfs+QyQGublZyV3zrgIOIj7ReY+SeppssDdOzPB6Z3KYIZtn X-Received: by 2002:a17:90a:2224:: with SMTP id c33mr22023269pje.22.1560707403462; Sun, 16 Jun 2019 10:50:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560707403; cv=none; d=google.com; s=arc-20160816; b=nAMVIJdm1/oxZIvUxXz9mBfrIDxUCnQwmcMlHDkmujpol5fH9nGH77wB8NAmFMEqO4 YqowpFABoenFvlqUuRRaJ0vYBf0JkaA7azA4fekOJfPd5ciffyddMWi3bavK7FJ4F9Wy zEVCCVmwh0488KvBWN64WBuIKBG7vUF1AOY+NV0P9z0G1+2nxNr9TZxtJVkzhtJI95ug pufUjDFWoaYeMi8oqrGgios3EFsLfq22yL18w4P9Y9jAKa3uUNDNVrRLbzE5EQr2C0cT w/Ibhz3NQWcN9hfxg1f6QDcXnb5ZWSI5jR3BupMJRRaXrdTVmezloUcEllgCRRIK2mKs QadA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=Te693hygqCk6T69KjghvaUj9Rx8zaxGUTGHMI/OphOA=; b=knPIBLR36bJKYzdesuGM27zvRLUBtt3LldI4VAV+NARh3gbWJtBasZWHM7x0wr59Wu BkMVh/Fa0RMco91DrsjU3348i8tNo313tFLuzKSiZg1QfXhDVTgQ+3aPHrr/mXswfrdu OuUbIzkrH83sR5KjiuCr/4462W4nYjQOjt7+nsjNvIf9sUGiIn2JsdpqflBYuTPJFQD5 10KFA/BBp57D5Fc/kicNrxuHiW3KIGoOJN5779dXlfTCWgGplfmPUIOogQXMp7tsjkla St+7NUXn2bN1Dawdt/n+IAjdjVReseNfbQOBKrTzkoa/uO73mhpPuR5gv0Czrv7xstvF orKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=JTjezIzO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h11si7747985pls.374.2019.06.16.10.50.03; Sun, 16 Jun 2019 10:50:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=JTjezIzO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727406AbfFPRuB (ORCPT + 21 others); Sun, 16 Jun 2019 13:50:01 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:52511 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726121AbfFPRuB (ORCPT ); Sun, 16 Jun 2019 13:50:01 -0400 Received: from grover.flets-west.jp (softbank126125154139.bbtec.net [126.125.154.139]) (authenticated) by conuserg-10.nifty.com with ESMTP id x5GHmCb3032735; Mon, 17 Jun 2019 02:48:12 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com x5GHmCb3032735 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1560707293; bh=Te693hygqCk6T69KjghvaUj9Rx8zaxGUTGHMI/OphOA=; h=From:To:Cc:Subject:Date:From; b=JTjezIzOW7STPIX7uzZ/YRLpPKesR4u7WdeD2VTiUifcJfYIklwCHHte5/8XmYhUw b/A+3Fh4o8in3SEUdbrr6cy2EheRPJZeoArTjyU+B7iTUPt6egppuZQlS2BNic1HJ7 tDVg9OGLnL5GAF3627aTM06Nh4LETvKqfU2aMivm+pxJlVitS3yNL2PZH/NrEAzH92 4BB5yRA25f0ERq92WeQ+iGnJRLNPnDMGAxf+B4HWGrU1EYGRQj59EiKzqMGaDrnA00 OXRWMXevCHvrx/pZ+ZQ032xkvar2tYJ9M8cze6vwgl6O2p1eSVNTOh1Y3EAN3W2tHH o13UcG2csZAaQ== X-Nifty-SrcIP: [126.125.154.139] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Michael Ellerman , linux-kernel@vger.kernel.org, Russell King , Stefan Agner , Joel Stanley , Nick Desaulniers , Nathan Chancellor Subject: [PATCH 1/2] lib/raid6: remove duplicated CFLAGS_REMOVE_altivec8.o Date: Mon, 17 Jun 2019 02:48:04 +0900 Message-Id: <20190616174805.3069-1-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org No intended change in behavior. Signed-off-by: Masahiro Yamada --- lib/raid6/Makefile | 1 - 1 file changed, 1 deletion(-) -- 2.17.1 diff --git a/lib/raid6/Makefile b/lib/raid6/Makefile index e723eacf7868..74004037033f 100644 --- a/lib/raid6/Makefile +++ b/lib/raid6/Makefile @@ -26,7 +26,6 @@ CFLAGS_REMOVE_altivec1.o += -msoft-float CFLAGS_REMOVE_altivec2.o += -msoft-float CFLAGS_REMOVE_altivec4.o += -msoft-float CFLAGS_REMOVE_altivec8.o += -msoft-float -CFLAGS_REMOVE_altivec8.o += -msoft-float CFLAGS_REMOVE_vpermxor1.o += -msoft-float CFLAGS_REMOVE_vpermxor2.o += -msoft-float CFLAGS_REMOVE_vpermxor4.o += -msoft-float From patchwork Sun Jun 16 17:48:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 166961 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1931740ilk; Sun, 16 Jun 2019 10:49:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqxy/5AODGukdZ37O4my2qkV1q+46TVcJO/TkqZzefpTGpmiPB7sw3GMcWEKGUk/wlBjrgyH X-Received: by 2002:a63:8dc4:: with SMTP id z187mr46023816pgd.337.1560707364500; Sun, 16 Jun 2019 10:49:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560707364; cv=none; d=google.com; s=arc-20160816; b=yybHSE4/JfKbmBFPHF4wToyYH28/A5nkwB4n5aXWHZBXAt7CDSgpjas4zx2AmhoMr/ OeuC6aIEIvjPzd/qvBK9oBYpJX0ROt+IsajNa+TMnsAIHBrDKztxBQizJ+uY8XTayvqw Ad0KHsV39WobR/luoxvt4nVdUyoiPZzwlRdgAZiKzHB8IPOtvDeVodoL39HXBy3qn20l aAd78PG+kx4HYz73YtOiAcJoqFGDabiqJPjRYZyVEEjv+VjriW9JUk/OMRY/ggeGvzcI v9qmI4pGTAxlf+zxd9ZacdSHNnwkWIZUzeYLBnCe6GZwu8b2WvCudW/aA5Bg0vfuAabQ ggUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=IpZflS0Negz+N4Cq4nFYbftm4U1eCdP1v9vv3Zq7pwI=; b=TgNNRPPje4rzFk1OTbt4fs03x9cyThvpjbBEZPQIofAka7KUFKnFffcLhnlPO66tMa tBwaj/fRe/n2y2mESqdteH/B9wmZ4WcbnBEJ3Hav7fSzpnzEAsFrWkfVuscvQK7PV2iL 4ly28b/DLdrLa7Ns+bn2cNz+RANfv06EnWdj5+XQnnXR8AT9P2sBf/mp92SkCIC0FT37 WyBqTZfFEZIPtfUBEKsYd76VkTsk7LB/9QpTqGojVAdZp0cv8LAHxTVEBSPZViH0dKJD cEcprSjUtNL4VxkLnAxpzl1EEZz8Y2vnXb7gDOPuLU6kC2nXSA/1C2HXscPxMzZKaBnC 5uuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=mjEKkL6z; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d1si8065305pjs.107.2019.06.16.10.49.24; Sun, 16 Jun 2019 10:49:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=mjEKkL6z; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727360AbfFPRtW (ORCPT + 21 others); Sun, 16 Jun 2019 13:49:22 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:51789 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726121AbfFPRtW (ORCPT ); Sun, 16 Jun 2019 13:49:22 -0400 Received: from grover.flets-west.jp (softbank126125154139.bbtec.net [126.125.154.139]) (authenticated) by conuserg-10.nifty.com with ESMTP id x5GHmCb4032735; Mon, 17 Jun 2019 02:48:13 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com x5GHmCb4032735 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1560707293; bh=IpZflS0Negz+N4Cq4nFYbftm4U1eCdP1v9vv3Zq7pwI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mjEKkL6zNDPWDoUcT/TJNVOlI+a4xtqrjGbKOTyWo9iroqkzg3fr+Rj6ni7MzLyCX iO8khdgXDuCB31K0oaafZxyMjaSEYsr0PQ5JKdEGftIv/I9n50ERN9lNIFU0LyMuT7 4kO+jOKYxzCW5Xy0svE49IBOpi1zMIlVe6s5AKkIEFccIsWRqvvpju8xWXBAu+j3s9 2pljdiYPJUwnHxlr0Ot0VhG504dhsWfz6fGs9r+qa1bJ+/knWwDu6rlcAqsT/GHH5t ohS6znaFFlM0ATXD0EsMGVzZ2XSPseCWTz93mBxwvDYZT7HVPWmw6/AjuTCoqZ7FzD z9eHvTbt3XV3w== X-Nifty-SrcIP: [126.125.154.139] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Michael Ellerman , linux-kernel@vger.kernel.org, Joel Stanley , Nick Desaulniers , Nathan Chancellor Subject: [PATCH 2/2] lib/raid6: refactor unroll rules with pattern rules Date: Mon, 17 Jun 2019 02:48:05 +0900 Message-Id: <20190616174805.3069-2-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190616174805.3069-1-yamada.masahiro@socionext.com> References: <20190616174805.3069-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This Makefile repeats very similar rules. Let's use pattern rules. $(UNROLL) can be replaced with $*. No intended change in behavior. Signed-off-by: Masahiro Yamada --- lib/raid6/Makefile | 97 ++++++---------------------------------------- 1 file changed, 11 insertions(+), 86 deletions(-) -- 2.17.1 diff --git a/lib/raid6/Makefile b/lib/raid6/Makefile index 74004037033f..42695bc8d451 100644 --- a/lib/raid6/Makefile +++ b/lib/raid6/Makefile @@ -12,9 +12,6 @@ raid6_pq-$(CONFIG_S390) += s390vx8.o recov_s390xc.o hostprogs-y += mktables -quiet_cmd_unroll = UNROLL $@ - cmd_unroll = $(AWK) -f$(srctree)/$(src)/unroll.awk -vN=$(UNROLL) < $< > $@ - ifeq ($(CONFIG_ALTIVEC),y) altivec_flags := -maltivec $(call cc-option,-mabi=altivec) @@ -50,111 +47,39 @@ CFLAGS_REMOVE_neon8.o += -mgeneral-regs-only endif endif -targets += int1.c -$(obj)/int1.c: UNROLL := 1 -$(obj)/int1.c: $(src)/int.uc $(src)/unroll.awk FORCE - $(call if_changed,unroll) - -targets += int2.c -$(obj)/int2.c: UNROLL := 2 -$(obj)/int2.c: $(src)/int.uc $(src)/unroll.awk FORCE - $(call if_changed,unroll) - -targets += int4.c -$(obj)/int4.c: UNROLL := 4 -$(obj)/int4.c: $(src)/int.uc $(src)/unroll.awk FORCE - $(call if_changed,unroll) - -targets += int8.c -$(obj)/int8.c: UNROLL := 8 -$(obj)/int8.c: $(src)/int.uc $(src)/unroll.awk FORCE - $(call if_changed,unroll) - -targets += int16.c -$(obj)/int16.c: UNROLL := 16 -$(obj)/int16.c: $(src)/int.uc $(src)/unroll.awk FORCE - $(call if_changed,unroll) +quiet_cmd_unroll = UNROLL $@ + cmd_unroll = $(AWK) -f$(srctree)/$(src)/unroll.awk -vN=$* < $< > $@ -targets += int32.c -$(obj)/int32.c: UNROLL := 32 -$(obj)/int32.c: $(src)/int.uc $(src)/unroll.awk FORCE +targets += int1.c int2.c int4.c int8.c int16.c int32.c +$(obj)/int%.c: $(src)/int.uc $(src)/unroll.awk FORCE $(call if_changed,unroll) CFLAGS_altivec1.o += $(altivec_flags) -targets += altivec1.c -$(obj)/altivec1.c: UNROLL := 1 -$(obj)/altivec1.c: $(src)/altivec.uc $(src)/unroll.awk FORCE - $(call if_changed,unroll) - CFLAGS_altivec2.o += $(altivec_flags) -targets += altivec2.c -$(obj)/altivec2.c: UNROLL := 2 -$(obj)/altivec2.c: $(src)/altivec.uc $(src)/unroll.awk FORCE - $(call if_changed,unroll) - CFLAGS_altivec4.o += $(altivec_flags) -targets += altivec4.c -$(obj)/altivec4.c: UNROLL := 4 -$(obj)/altivec4.c: $(src)/altivec.uc $(src)/unroll.awk FORCE - $(call if_changed,unroll) - CFLAGS_altivec8.o += $(altivec_flags) -targets += altivec8.c -$(obj)/altivec8.c: UNROLL := 8 -$(obj)/altivec8.c: $(src)/altivec.uc $(src)/unroll.awk FORCE +targets += altivec1.c altivec2.c altivec4.c altivec8.c +$(obj)/altivec%.c: $(src)/altivec.uc $(src)/unroll.awk FORCE $(call if_changed,unroll) CFLAGS_vpermxor1.o += $(altivec_flags) -targets += vpermxor1.c -$(obj)/vpermxor1.c: UNROLL := 1 -$(obj)/vpermxor1.c: $(src)/vpermxor.uc $(src)/unroll.awk FORCE - $(call if_changed,unroll) - CFLAGS_vpermxor2.o += $(altivec_flags) -targets += vpermxor2.c -$(obj)/vpermxor2.c: UNROLL := 2 -$(obj)/vpermxor2.c: $(src)/vpermxor.uc $(src)/unroll.awk FORCE - $(call if_changed,unroll) - CFLAGS_vpermxor4.o += $(altivec_flags) -targets += vpermxor4.c -$(obj)/vpermxor4.c: UNROLL := 4 -$(obj)/vpermxor4.c: $(src)/vpermxor.uc $(src)/unroll.awk FORCE - $(call if_changed,unroll) - CFLAGS_vpermxor8.o += $(altivec_flags) -targets += vpermxor8.c -$(obj)/vpermxor8.c: UNROLL := 8 -$(obj)/vpermxor8.c: $(src)/vpermxor.uc $(src)/unroll.awk FORCE +targets += vpermxor1.o vpermxor2.o vpermxor4.o vpermxor8.o +$(obj)/vpermxor%.c: $(src)/vpermxor.uc $(src)/unroll.awk FORCE $(call if_changed,unroll) CFLAGS_neon1.o += $(NEON_FLAGS) -targets += neon1.c -$(obj)/neon1.c: UNROLL := 1 -$(obj)/neon1.c: $(src)/neon.uc $(src)/unroll.awk FORCE - $(call if_changed,unroll) - CFLAGS_neon2.o += $(NEON_FLAGS) -targets += neon2.c -$(obj)/neon2.c: UNROLL := 2 -$(obj)/neon2.c: $(src)/neon.uc $(src)/unroll.awk FORCE - $(call if_changed,unroll) - CFLAGS_neon4.o += $(NEON_FLAGS) -targets += neon4.c -$(obj)/neon4.c: UNROLL := 4 -$(obj)/neon4.c: $(src)/neon.uc $(src)/unroll.awk FORCE - $(call if_changed,unroll) - CFLAGS_neon8.o += $(NEON_FLAGS) -targets += neon8.c -$(obj)/neon8.c: UNROLL := 8 -$(obj)/neon8.c: $(src)/neon.uc $(src)/unroll.awk FORCE +targets += neon1.c neon2.c neon4.c neon8.c +$(obj)/neon%.c: $(src)/neon.uc $(src)/unroll.awk FORCE $(call if_changed,unroll) targets += s390vx8.c -$(obj)/s390vx8.c: UNROLL := 8 -$(obj)/s390vx8.c: $(src)/s390vx.uc $(src)/unroll.awk FORCE +$(obj)/s390vx%.c: $(src)/s390vx.uc $(src)/unroll.awk FORCE $(call if_changed,unroll) quiet_cmd_mktable = TABLE $@