Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dce3a7a4 authored by Vladimir Dronnikov's avatar Vladimir Dronnikov Committed by NeilBrown
Browse files

md: drivers/md/unroll.pl replaced with awk analog 



drivers/md/unroll.pl replaced by awk script to drop build-time
dependency on perl

Signed-off-by: default avatarVladimir Dronnikov <dronnikov@gmail.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent ae8fa283

drivers/md/Makefile

+11 −11
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ obj-$(CONFIG_DM_LOG_USERSPACE) += dm-log-userspace.o 
obj-$(CONFIG_DM_ZERO)		+= dm-zero.o



quiet_cmd_unroll = UNROLL  $@

      cmd_unroll = $(PERL) $(srctree)/$(src)/unroll.pl $(UNROLL) \

      cmd_unroll = $(AWK) -f$(srctree)/$(src)/unroll.awk -vN=$(UNROLL) \

                   < $< > $@ || ( rm -f $@ && exit 1 )



ifeq ($(CONFIG_ALTIVEC),y)
@@ -59,56 +59,56 @@ endif 


targets += raid6int1.c

$(obj)/raid6int1.c:   UNROLL := 1

$(obj)/raid6int1.c:   $(src)/raid6int.uc $(src)/unroll.pl FORCE

$(obj)/raid6int1.c:   $(src)/raid6int.uc $(src)/unroll.awk FORCE

	$(call if_changed,unroll)



targets += raid6int2.c

$(obj)/raid6int2.c:   UNROLL := 2

$(obj)/raid6int2.c:   $(src)/raid6int.uc $(src)/unroll.pl FORCE

$(obj)/raid6int2.c:   $(src)/raid6int.uc $(src)/unroll.awk FORCE

	$(call if_changed,unroll)



targets += raid6int4.c

$(obj)/raid6int4.c:   UNROLL := 4

$(obj)/raid6int4.c:   $(src)/raid6int.uc $(src)/unroll.pl FORCE

$(obj)/raid6int4.c:   $(src)/raid6int.uc $(src)/unroll.awk FORCE

	$(call if_changed,unroll)



targets += raid6int8.c

$(obj)/raid6int8.c:   UNROLL := 8

$(obj)/raid6int8.c:   $(src)/raid6int.uc $(src)/unroll.pl FORCE

$(obj)/raid6int8.c:   $(src)/raid6int.uc $(src)/unroll.awk FORCE

	$(call if_changed,unroll)



targets += raid6int16.c

$(obj)/raid6int16.c:  UNROLL := 16

$(obj)/raid6int16.c:  $(src)/raid6int.uc $(src)/unroll.pl FORCE

$(obj)/raid6int16.c:  $(src)/raid6int.uc $(src)/unroll.awk FORCE

	$(call if_changed,unroll)



targets += raid6int32.c

$(obj)/raid6int32.c:  UNROLL := 32

$(obj)/raid6int32.c:  $(src)/raid6int.uc $(src)/unroll.pl FORCE

$(obj)/raid6int32.c:  $(src)/raid6int.uc $(src)/unroll.awk FORCE

	$(call if_changed,unroll)



CFLAGS_raid6altivec1.o += $(altivec_flags)

targets += raid6altivec1.c

$(obj)/raid6altivec1.c:   UNROLL := 1

$(obj)/raid6altivec1.c:   $(src)/raid6altivec.uc $(src)/unroll.pl FORCE

$(obj)/raid6altivec1.c:   $(src)/raid6altivec.uc $(src)/unroll.awk FORCE

	$(call if_changed,unroll)



CFLAGS_raid6altivec2.o += $(altivec_flags)

targets += raid6altivec2.c

$(obj)/raid6altivec2.c:   UNROLL := 2

$(obj)/raid6altivec2.c:   $(src)/raid6altivec.uc $(src)/unroll.pl FORCE

$(obj)/raid6altivec2.c:   $(src)/raid6altivec.uc $(src)/unroll.awk FORCE

	$(call if_changed,unroll)



CFLAGS_raid6altivec4.o += $(altivec_flags)

targets += raid6altivec4.c

$(obj)/raid6altivec4.c:   UNROLL := 4

$(obj)/raid6altivec4.c:   $(src)/raid6altivec.uc $(src)/unroll.pl FORCE

$(obj)/raid6altivec4.c:   $(src)/raid6altivec.uc $(src)/unroll.awk FORCE

	$(call if_changed,unroll)



CFLAGS_raid6altivec8.o += $(altivec_flags)

targets += raid6altivec8.c

$(obj)/raid6altivec8.c:   UNROLL := 8

$(obj)/raid6altivec8.c:   $(src)/raid6altivec.uc $(src)/unroll.pl FORCE

$(obj)/raid6altivec8.c:   $(src)/raid6altivec.uc $(src)/unroll.awk FORCE

	$(call if_changed,unroll)



quiet_cmd_mktable = TABLE   $@

drivers/md/raid6altivec.uc

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 *

 * $#-way unrolled portable integer math RAID-6 instruction set

 *

 * This file is postprocessed using unroll.pl

 * This file is postprocessed using unroll.awk

 *

 * <benh> hpa: in process,

 * you can just "steal" the vec unit with enable_kernel_altivec() (but

drivers/md/raid6int.uc

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 *

 * $#-way unrolled portable integer math RAID-6 instruction set

 *

 * This file is postprocessed using unroll.pl

 * This file is postprocessed using unroll.awk

 */



#include <linux/raid/pq.h>

drivers/md/raid6test/Makefile

+21 −21
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ CC = gcc 
OPTFLAGS = -O2			# Adjust as desired

CFLAGS	 = -I.. -I ../../../include -g $(OPTFLAGS)

LD	 = ld

PERL	 = perl

AWK	 = awk

AR	 = ar

RANLIB	 = ranlib
@@ -35,35 +35,35 @@ raid6.a: raid6int1.o raid6int2.o raid6int4.o raid6int8.o raid6int16.o \ 
raid6test: test.c raid6.a

	$(CC) $(CFLAGS) -o raid6test $^



raid6altivec1.c: raid6altivec.uc ../unroll.pl

	$(PERL) ../unroll.pl 1 < raid6altivec.uc > $@

raid6altivec1.c: raid6altivec.uc ../unroll.awk

	$(AWK) ../unroll.awk -vN=1 < raid6altivec.uc > $@



raid6altivec2.c: raid6altivec.uc ../unroll.pl

	$(PERL) ../unroll.pl 2 < raid6altivec.uc > $@

raid6altivec2.c: raid6altivec.uc ../unroll.awk

	$(AWK) ../unroll.awk -vN=2 < raid6altivec.uc > $@



raid6altivec4.c: raid6altivec.uc ../unroll.pl

	$(PERL) ../unroll.pl 4 < raid6altivec.uc > $@

raid6altivec4.c: raid6altivec.uc ../unroll.awk

	$(AWK) ../unroll.awk -vN=4 < raid6altivec.uc > $@



raid6altivec8.c: raid6altivec.uc ../unroll.pl

	$(PERL) ../unroll.pl 8 < raid6altivec.uc > $@

raid6altivec8.c: raid6altivec.uc ../unroll.awk

	$(AWK) ../unroll.awk -vN=8 < raid6altivec.uc > $@



raid6int1.c: raid6int.uc ../unroll.pl

	$(PERL) ../unroll.pl 1 < raid6int.uc > $@

raid6int1.c: raid6int.uc ../unroll.awk

	$(AWK) ../unroll.awk -vN=1 < raid6int.uc > $@



raid6int2.c: raid6int.uc ../unroll.pl

	$(PERL) ../unroll.pl 2 < raid6int.uc > $@

raid6int2.c: raid6int.uc ../unroll.awk

	$(AWK) ../unroll.awk -vN=2 < raid6int.uc > $@



raid6int4.c: raid6int.uc ../unroll.pl

	$(PERL) ../unroll.pl 4 < raid6int.uc > $@

raid6int4.c: raid6int.uc ../unroll.awk

	$(AWK) ../unroll.awk -vN=4 < raid6int.uc > $@



raid6int8.c: raid6int.uc ../unroll.pl

	$(PERL) ../unroll.pl 8 < raid6int.uc > $@

raid6int8.c: raid6int.uc ../unroll.awk

	$(AWK) ../unroll.awk -vN=8 < raid6int.uc > $@



raid6int16.c: raid6int.uc ../unroll.pl

	$(PERL) ../unroll.pl 16 < raid6int.uc > $@

raid6int16.c: raid6int.uc ../unroll.awk

	$(AWK) ../unroll.awk -vN=16 < raid6int.uc > $@



raid6int32.c: raid6int.uc ../unroll.pl

	$(PERL) ../unroll.pl 32 < raid6int.uc > $@

raid6int32.c: raid6int.uc ../unroll.awk

	$(AWK) ../unroll.awk -vN=32 < raid6int.uc > $@



raid6tables.c: mktables

	./mktables > raid6tables.c

drivers/md/unroll.awk

0 → 100644
+20 −0
Original line number Diff line number Diff line 


# This filter requires one command line option of form -vN=n

# where n must be a decimal number.

#

# Repeat each input line containing $$ n times, replacing $$ with 0...n-1.

# Replace each $# with n, and each $* with a single $.



BEGIN {

	n = N + 0

}

{

	if (/\$\$/) { rep = n } else { rep = 1 }

	for (i = 0; i < rep; ++i) {

		tmp = $0

		gsub(/\$\$/, i, tmp)

		gsub(/\$\#/, n, tmp)

		gsub(/\$\*/, "$", tmp)

		print tmp

	}

}