[Zlib-devel] infnew-5b available for testing
Greg Roelofs
newt at pobox.com
Fri Jan 3 01:12:02 EST 2003
> Version 5c of the new inflate code is available for testing here:
> http://www.alumni.caltech.edu/~madler/infnew-5c.tar.gz
> This version is actually exactly the same inflate code as infnew-5, but
> I have added the files crc32.c and crc32.h to this tarball for faster
> crc calculations, and I have updated ung.c to use direct i/o for speed
> comparison with gzip. This ung.c has been updated from infnew-5b with
> a "-t" option to test the integrity of the listed gzip files. The -t
> option should be used for speed testing, since it takes writing the
> output to /dev/null out of the equation. So you could:
Since minigzip doesn't have a -t option and gzip doesn't use zlib, I
redid my final test without it for comparison:
>> I did a similar test with a 313 MB archive on a Linux box, gcc 2.95.3,
>> 1.400 GHz Athlon XP:
>>
>> meltdown:/util/compression/zlib-1.1.4-infnew 226> time ./minigzip-static.stock -d < /backups/quantum-TM3200A-archive.tgz > /dev/null
>> 14.760u 1.000s 0:19.88 79.2% 0+0k 0+0io 115pf+0w
>> 14.940u 1.110s 0:19.86 80.8% 0+0k 0+0io 115pf+0w
>> 14.580u 1.110s 0:19.69 79.6% 0+0k 0+0io 115pf+0w
>> 14.720u 1.040s 0:19.40 81.2% 0+0k 0+0io 115pf+0w
>> 14.630u 0.920s 0:19.64 79.1% 0+0k 0+0io 115pf+0w
>>
>> meltdown:/util/compression/zlib-1.1.4-infnew 231> time ./minigzip-static -d < /backups/quantum-TM3200A-archive.tgz > /dev/null
>> 13.830u 1.060s 0:19.06 78.1% 0+0k 0+0io 112pf+0w
>> 13.770u 1.300s 0:19.00 79.3% 0+0k 0+0io 112pf+0w
>> 13.680u 1.250s 0:19.08 78.2% 0+0k 0+0io 112pf+0w
>> 14.030u 0.950s 0:18.84 79.5% 0+0k 0+0io 112pf+0w
>> 13.980u 1.000s 0:19.00 78.8% 0+0k 0+0io 112pf+0w
>>
>> meltdown:/util/compression/zlib-1.1.4-infnew 244> time ./ung-static < /backups/quantum-TM3200A-archive.tgz > /dev/null
>> 13.220u 1.160s 0:18.33 78.4% 0+0k 0+0io 99pf+0w
>> 13.280u 1.110s 0:18.26 78.8% 0+0k 0+0io 99pf+0w
>> 13.480u 1.020s 0:18.14 79.9% 0+0k 0+0io 99pf+0w
>> 13.350u 1.030s 0:18.27 78.7% 0+0k 0+0io 99pf+0w
>> 13.280u 1.020s 0:18.25 78.3% 0+0k 0+0io 99pf+0w
>>
>> 16% reduction in page faults for ung.c, 7.3% faster (wallclock).
meltdown:/util/compression/zlib-1.1.4-infnew 324> time ./ung-static < /backups/quantum-TM3200A-archive.tgz > /dev/null
11.000u 1.090s 0:15.58 77.5% 0+0k 0+0io 92pf+0w
11.260u 0.830s 0:15.35 78.7% 0+0k 0+0io 92pf+0w
11.030u 1.020s 0:15.35 78.5% 0+0k 0+0io 92pf+0w
10.830u 1.160s 0:15.16 79.0% 0+0k 0+0io 92pf+0w
10.850u 1.250s 0:15.43 78.4% 0+0k 0+0io 92pf+0w
meltdown:/util/compression/zlib-1.1.4-infnew 329> time ./ung-static -t /backups/quantum-TM3200A-archive.tgz
10.830u 1.280s 0:15.41 78.5% 0+0k 0+0io 92pf+0w
10.790u 1.150s 0:15.43 77.3% 0+0k 0+0io 92pf+0w
10.720u 1.200s 0:15.52 76.8% 0+0k 0+0io 92pf+0w
11.140u 0.980s 0:15.45 78.4% 0+0k 0+0io 92pf+0w
11.030u 1.090s 0:15.52 78.0% 0+0k 0+0io 92pf+0w
So -t is actually a teeny bit slower. But the new ung.c is definitely
faster; there's an 18% reduction in page faults and an overall wallclock
improvement of 22% over the stock 1.1.4 minigzip.
> As I mentioned in the last email, I think this code is ready for a
> wider beta audience. Please send me your suggestions for email lists
> on which I should announce the availability of a new beta version of
> zlib for testing. Thanks.
comp.compression, png-implement, info-zip, libtiff.org, apache.org, possibly
freshmeat.net...depends how wide you want it to be.
One big wishlist item for a near-future zlib beta, however: a better
configure script. The current one blows big-time; I detest being unable
to compile both static and shared versions without overwriting everything
in a second configure-compile-link cycle. I know this is Jean-loup's baby,
but if you're feeling industrious, perhaps you could adapt the appended
Makefile (for Linux) to be the new Makefile.in (and hack configure to
support simultaneous -static and -shared options). There are subtleties
to doing shared libraries on some systems, but that's irrelevant to this;
whatever old zlib's configure did should continue to work. The only real
trickery is using .pic.o as a secondary suffix for object files, but I
think .SUFFIXES is relatively well-supported across makes.
Thanks,
Greg
# Makefile for zlib
# Copyright (C) 1995-2002 Jean-loup Gailly.
# For conditions of distribution and use, see copyright notice in zlib.h
# To compile and test, type:
# ./configure; make test
# The call of configure is optional if you don't have special requirements
# If you wish to build zlib as a shared library, use: ./configure -s
# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
# make install
# To install in $HOME instead of /usr/local, use:
# make install prefix=$HOME
CC=gcc
#CFLAGS=-O3 -DASMV -DHAVE_UNISTD_H -DUSE_MMAP
#CFLAGS=-O3 -DHAVE_UNISTD_H -DUSE_MMAP
# GRR 20000717: added -fomit-frame-pointer on basis of Glenn's PNG report
CFLAGS=-O3 -DHAVE_UNISTD_H -DUSE_MMAP -fomit-frame-pointer
#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
#CFLAGS=-g -DDEBUG
#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
# -Wstrict-prototypes -Wmissing-prototypes
LDFLAGS=-L. -lz
LDSHARED=gcc -shared -Wl,-soname,libz.so.1
CPP=gcc -E -DNO_UNDERLINE
VER=1.1.4
SHAREDLIB=libz.so
LIBS=$(SHAREDLIB).$(VER) libz.a
AR=ar rc
RANLIB=ranlib
TAR=tar
SHELL=/bin/sh
prefix =/usr/local
exec_prefix =${prefix}
libdir =${exec_prefix}/lib
includedir =${prefix}/include
.SUFFIXES: .c .o .pic.o
OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
zutil.o inflate.o infback.o inftrees.o inffast.o
#OBJA = match.o
# to use the asm code: make OBJA=match.o
OBJSDLL = $(OBJS:.o=.pic.o)
OBJADLL = $(OBJA:.o=.pic.o)
.c.pic.o:
$(CC) -c $(CFLAGS) -fPIC -o $@ $*.c
TEST_OBJS = example.o minigzip.o
DISTFILES = README FAQ INDEX ChangeLog configure Make*[a-z0-9] *.[ch] *.mms \
algorithm.txt zlib.3 zlib.html \
msdos/Make*[a-z0-9] msdos/zlib.def msdos/zlib.rc \
nt/Make*[a-z0-9] nt/zlib.dnt amiga/Make*.??? os2/M*.os2 os2/zlib.def \
contrib/RE*.contrib contrib/*.txt contrib/asm386/*.asm contrib/asm386/*.c \
contrib/asm386/*.bat contrib/asm386/zlibvc.d?? contrib/asm[56]86/*.?86 \
contrib/asm[56]86/*.S contrib/iostream/*.cpp \
contrib/iostream/*.h contrib/iostream2/*.h contrib/iostream2/*.cpp \
contrib/untgz/Makefile contrib/untgz/*.c contrib/untgz/*.w32 \
contrib/minizip/[CM]*[pe] contrib/minizip/*.[ch] contrib/minizip/*.[td]?? \
contrib/delphi*/*.???
all: example minigzip
test: all
@LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
echo hello world | ./minigzip | ./minigzip -d || \
echo ' *** minigzip test FAILED ***' ; \
if ./example; then \
echo ' *** zlib test OK ***'; \
else \
echo ' *** zlib test FAILED ***'; \
fi
libz.a: $(OBJS) $(OBJA)
$(AR) $@ $(OBJS) $(OBJA)
-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
match.o: match.S
$(CPP) match.S > _match.s
$(CC) -c _match.s
mv _match.o match.o
rm -f _match.s
match.pic.o: match.S
$(CPP) match.S > _match.s
$(CC) -c -fPIC _match.s
mv _match.o match.pic.o
rm -f _match.s
$(SHAREDLIB).$(VER): $(OBJSDLL) $(OBJADLL)
$(LDSHARED) -o $@ $(OBJSDLL) $(OBJADLL)
rm -f $(SHAREDLIB) $(SHAREDLIB).1
ln -s $@ $(SHAREDLIB)
ln -s $@ $(SHAREDLIB).1
example: example.o $(LIBS)
$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
minigzip: minigzip.o $(LIBS)
$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
install: $(LIBS)
- at if [ ! -d $(includedir) ]; then mkdir $(includedir); fi
- at if [ ! -d $(libdir) ]; then mkdir $(libdir); fi
cp zlib.h zconf.h $(includedir)
chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
cp $(LIBS) $(libdir)
cd $(libdir); chmod 755 $(LIBS)
-@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
cd $(libdir); if test -f $(SHAREDLIB).$(VER); then \
rm -f $(SHAREDLIB) $(SHAREDLIB).1; \
ln -s $(SHAREDLIB).$(VER) $(SHAREDLIB); \
ln -s $(SHAREDLIB).$(VER) $(SHAREDLIB).1; \
(ldconfig || true) >/dev/null 2>&1; \
fi
# The ranlib in install is needed on NeXTSTEP which checks file times
# ldconfig is for Linux
uninstall:
cd $(includedir); \
v=$(VER); \
if test -f zlib.h; then \
v=`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`; \
rm -f zlib.h zconf.h; \
fi; \
cd $(libdir); rm -f libz.a; \
if test -f $(SHAREDLIB).$$v; then \
rm -f $(SHAREDLIB).$$v $(SHAREDLIB) $(SHAREDLIB).1; \
fi
clean:
rm -f *.o *~ example minigzip libz.a libz.so* foo.gz so_locations \
_match.s maketree
distclean: clean
zip:
mv Makefile Makefile~; cp -p Makefile.in Makefile
rm -f test.c ztest*.c contrib/minizip/test.zip
v=`sed -n -e 's/\.//g' -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
zip -ul9 zlib$$v $(DISTFILES)
mv Makefile~ Makefile
dist:
mv Makefile Makefile~; cp -p Makefile.in Makefile
rm -f test.c ztest*.c contrib/minizip/test.zip
d=zlib-`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
rm -f $$d.tar.gz; \
if test ! -d ../$$d; then rm -f ../$$d; ln -s `pwd` ../$$d; fi; \
files=""; \
for f in $(DISTFILES); do files="$$files $$d/$$f"; done; \
cd ..; \
GZIP=-9 $(TAR) chofz $$d/$$d.tar.gz $$files; \
if test ! -d $$d; then rm -f $$d; fi
mv Makefile~ Makefile
tags:
etags *.[ch]
depend:
makedepend -- $(CFLAGS) -- *.[ch]
# DO NOT DELETE THIS LINE -- make depend depends on it.
adler32.o adler32.pic.o: zlib.h zconf.h
compress.o compress.pic.o: zlib.h zconf.h
crc32.o crc32.pic.o: crc32.h zlib.h zconf.h
deflate.o deflate.pic.o: deflate.h zutil.h zlib.h zconf.h
example.o example.pic.o: zlib.h zconf.h
gzio.o gzio.pic.o: zutil.h zlib.h zconf.h
inffast.o inffast.pic.o: zutil.h zlib.h zconf.h inftrees.h inflate.h \
inffast.h
inflate.o inflate.pic.o: zutil.h zlib.h zconf.h inftrees.h inflate.h \
inffast.h
infback.o infback.pic.o: zutil.h zlib.h zconf.h inftrees.h inflate.h \
inffast.h
inftrees.o inftrees.pic.o: zutil.h zlib.h zconf.h inftrees.h
minigzip.o minigzip.pic.o: zlib.h zconf.h
trees.o trees.pic.o: deflate.h zutil.h zlib.h zconf.h trees.h
uncompr.o uncompr.pic.o: zlib.h zconf.h
zutil.o zutil.pic.o: zutil.h zlib.h zconf.h
More information about the Zlib-devel
mailing list