Merge pull request #1 from inikep/dev

Dev

Makefile

@@ -16,15 +16,15 @@ endif
 
 
 ifeq ($(BUILD_ARCH),64-bit)
- DEFINES += -D__x86_64__
+ DEFINES += -D__x86_64__ -D__SSE2__
  LDFLAGS += -static -L C:\Aplikacje\win-builds64\lib
 else
  LDFLAGS += -static -L C:\Aplikacje\win-builds32\lib
 endif
 
 
 #DEFINES += -DBENCH_REMOVE_XXX
-DEFINES += -I. -DFREEARC_INTEL_BYTE_ORDER -D_UNICODE -DUNICODE
+DEFINES += -I. -DFREEARC_INTEL_BYTE_ORDER -D_UNICODE -DUNICODE -DHAVE_CONFIG_H
 CODE_FLAGS = -Wno-unknown-pragmas -Wno-sign-compare -Wno-conversion
 OPT_FLAGS = -fomit-frame-pointer -fstrict-aliasing -fforce-addr -ffast-math
 
@@ -100,9 +100,20 @@ BROTLI_FILES += brotli/enc/metablock.o brotli/enc/static_dict.o brotli/enc/strea
 
 ZSTD_FILES = zstd/fse.o zstd/huff0.o zstd/zstd.o zstd/zstdhc.o 
 
+LZLIB_FILES = lzlib/lzlib.o
+
+BRIEFLZ_FILES = brieflz/brieflz.o brieflz/depacks.o 
+
+LIBLZG_FILES = liblzg/decode.o liblzg/encode.o liblzg/checksum.o 
+
 MISC_FILES = crush/crush.o shrinker/shrinker.o yappy/yappy.o fastlz/fastlz.o tornado/tor_test.o pithy/pithy.o lzjb/lzjb2010.o wflz/wfLZ.o
 
-lzbench: $(LZF_FILES) $(LZRW_FILES) $(ZSTD_FILES) $(BROTLI_FILES) $(CSC_FILES) $(LZMA_FILES) $(DENSITY_FILES) $(ZLING_FILES) $(QUICKLZ_FILES) $(SNAPPY_FILES) $(ZLIB_FILES) $(LZHAM_FILES) $(LZO_FILES) $(UCL_FILES) $(LZMAT_FILES) $(LZ4_FILES) $(MISC_FILES) _lzbench/lzbench.o _lzbench/compressors.o
+XZ_FILES = xz/lzma_decoder.o xz/lzma_encoder.o xz/common.o xz/price_table.o xz/fastpos_table.o xz/lzma_encoder_optimum_fast.o xz/lzma_encoder_optimum_normal.o
+XZ_FILES += xz/lz_decoder.o xz/lz_encoder.o xz/lz_encoder_mf.o xz/alone_encoder.o xz/alone_decoder.o xz/lzma_encoder_presets.o xz/crc32_table.o
+
+_lzbench/lzbench.o: _lzbench/lzbench.h
+
+lzbench: $(XZ_FILES) $(LIBLZG_FILES) $(BRIEFLZ_FILES) $(LZLIB_FILES) $(LZF_FILES) $(LZRW_FILES) $(ZSTD_FILES) $(BROTLI_FILES) $(CSC_FILES) $(LZMA_FILES) $(DENSITY_FILES) $(ZLING_FILES) $(QUICKLZ_FILES) $(SNAPPY_FILES) $(ZLIB_FILES) $(LZHAM_FILES) $(LZO_FILES) $(UCL_FILES) $(LZMAT_FILES) $(LZ4_FILES) $(MISC_FILES) _lzbench/lzbench.o _lzbench/compressors.o
  $(GPP) $^ -o $@ $(LDFLAGS)
 
 .c.o:
@@ -115,4 +126,4 @@ lzbench: $(LZF_FILES) $(LZRW_FILES) $(ZSTD_FILES) $(BROTLI_FILES) $(CSC_FILES) $
  $(GPP) $(CFLAGS) $< -c -o $@
 
 clean:
- rm -f _lzbench/*.o brotli/enc/*.o brotli/dec/*.o libcsc/*.o wflz/*.o lzjb/*.o lzma/*.o density/spookyhash/*.o density/*.o pithy/*.o zstd/*.o libzling/*.o yappy/*.o shrinker/*.o fastlz/*.o ucl/*.o zlib/*.o lzham/*.o lzmat/*.o lz5/*.o lz4/*.o crush/*.o lzf/*.o lzrw/*.o lzo/*.o snappy/*.o quicklz/*.o tornado/*.o *.o *.exe
+ rm -f _lzbench/*.o xz/*.o liblzg/*.o lzlib/*.o brieflz/*.o brotli/enc/*.o brotli/dec/*.o libcsc/*.o wflz/*.o lzjb/*.o lzma/*.o density/spookyhash/*.o density/*.o pithy/*.o zstd/*.o libzling/*.o yappy/*.o shrinker/*.o fastlz/*.o ucl/*.o zlib/*.o lzham/*.o lzmat/*.o lz5/*.o lz4/*.o crush/*.o lzf/*.o lzrw/*.o lzo/*.o snappy/*.o quicklz/*.o tornado/*.o *.o *.exe

NEWS

@@ -1,3 +1,16 @@
+v.0.8
+- the "-cX" option: sort results by column number X
+- the "-eX" option where X = compressors separated by '/' with parameters specified after ','
+ Examples:
+ lzbench -ebrotli filename - selects all levels of brotli
+ lzbench -ebrotli,2,5/zstd filename - selects levels 2 & 5 of brotli and zstd
+- added lzg 1.0.8
+- added lzlib 1.7 (http://www.nongnu.org/lzip/lzlib.html)
+- added brieflz 1.1.0
+- added yalz77 2015-09-19
+- added xz 5.2.2
+- zstd updated to v0.3.6
+
 v.0.7.1 
 - tornado updated to version 0.6a
 - lz5/lz5hc updated to version r131b

README.md

@@ -15,9 +15,15 @@ Usage
 usage: lzbench [options] input_file
 
 where options are:
- -iX: selects number of iterations (default 1) and displays best time of X iterations.
  -bX: divides input data in blocks/chunks of size X KB (default = 2097152 KB)
- -sX: selects only compressors with compression speed over X MB (default = 100 MB)
+ -cX: sort results by column number X
+ -eX: X = compressors separated by '/' with parameters specified after ','
+ -iX: selects number of iterations (default 1) and displays best time of X iterations.
+ -sX: use only compressors with compression speed over X MB (default = 0 MB)
+
+Example usage:
+ lzbench -ebrotli filename - selects all levels of brotli
+ lzbench -ebrotli,2,5/zstd filename - selects levels 2 & 5 of brotli and zstd
 ```
 
 
@@ -38,32 +44,37 @@ To remove one of compressors you can add -DBENCH_REMOVE_XXX to $DEFINES in Makef
 Supported compressors
 -------------------------
 ```
+brieflz 1.1.0
 brotli 2015-10-29
 crush 1.0
 csc 3.3
 density 0.12.5 beta
 fastlz 0.1
 lz4/lz4hc r131
 lz5/lz5hc r131b
-lzf
+lzf 3.6
+lzg 1.0.8
 lzham 1.0
 lzjb 2010
+lzlib 1.7
 lzma 9.38
 lzmat 1.01
 lzo 2.09
-lzrw
+lzrw 15-Jul-1991
 pithy 2011-12-24
 quicklz 1.5.0
-quicklz 1.5.1 b7
-shrinker
+shrinker 0.1
 snappy 1.1.3
 tornado 0.6a
 ucl 1.03
-yappy
+wflz 2015-09-16
+xz 5.2.2
+yalz77 2015-09-19
+yappy 2014-03-22
 zlib 1.2.8
 zling 2015-09-15
-zstd v0.3
-zstd_HC v0.3
+zstd v0.3.6
+zstd_HC v0.3.6
 ```
 
 Benchmarks