in hpel search, merge two 16x16 mc calls into one 16x17. 15% faster hpel, .3% overall.

[x264] / Makefile

diff --git a/Makefile b/Makefile
index c00452803f043032a244158ed80b3902841ae49f..8e81ba04f188a230a28fbbae6e350865bb8a668e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,8 +43,10 @@ endif
 
 # AltiVec optims
 ifeq ($(ARCH),PPC)
-SRCS += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c \
-       common/ppc/quant.c
+ALTIVECSRC += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c \
+              common/ppc/quant.c
+SRCS += $(ALTIVECSRC)
+$(ALTIVECSRC:%.c=%.o): CFLAGS += $(ALTIVECFLAGS)
 endif
 
 # VIS optims
@@ -92,7 +94,7 @@ common/i386/*.o: common/i386/i386inc.asm
 .depend: config.mak
        rm -f .depend
 # Hacky - because gcc 2.9x doesn't have -MT
-       $(foreach SRC, $(SRCS) $(SRCCLI), ( $(ECHON) "`dirname $(SRC)`/" && $(CC) $(CFLAGS) $(SRC) -MM -g0 ) 1>> .depend;)
+       $(foreach SRC, $(SRCS) $(SRCCLI), ( $(ECHON) "`dirname $(SRC)`/" && $(CC) $(CFLAGS) $(ALTIVECFLAGS) $(SRC) -MM -g0 ) 1>> .depend;)
 
 config.mak: $(wildcard .svn/entries */.svn/entries */*/.svn/entries)
        ./configure $(CONFIGURE_ARGS)
@@ -112,7 +114,7 @@ ifeq (,$(VIDS))
 fprofiled:
        @echo 'usage: make fprofiled VIDS="infile1 infile2 ..."'
        @echo 'where infiles are anything that x264 understands,'
-       @echo 'i.e. YUV with resolution in the filename, or avisynth.'
+       @echo 'i.e. YUV with resolution in the filename, y4m, or avisynth.'
 else
 fprofiled:
        $(MAKE) clean
@@ -168,9 +170,15 @@ TAGS:
 dox:
        doxygen Doxyfile
 
-# usage is same as for fprofiled
+ifeq (,$(VIDS))
+test:
+       @echo 'usage: make test VIDS="infile1 infile2 ..."'
+       @echo 'where infiles are anything that x264 understands,'
+       @echo 'i.e. YUV with resolution in the filename, y4m, or avisynth.'
+else
 test:
        perl tools/regression-test.pl --version=head,current --options='$(OPT0)' --options='$(OPT1)' --options='$(OPT2)' $(VIDS:%=--input=%)
+endif
 
 testclean:
        rm -f test/*.log test/*.264