AuroraMiddleware/zstd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
master
zstd/lib/Makefile

452 lines
14 KiB
Makefile
Raw Permalink Normal View History

last batch of header files changed to reflect new license (#825) only remains to update contrib/linux-kernel (@terrelln)
2017-08-31 19:20:50 +00:00
# ################################################################
Fix copyright and license lines * All copyright lines now have -2020 instead of -present * All copyright lines include "Facebook, Inc" * All licenses are now standardized The copyright in `threading.{h,c}` is not changed because it comes from zstdmt. The copyright and license of `divsufsort.{h,c}` is not changed.
2020-03-26 22:19:05 +00:00
# Copyright (c) 2015-2020, Yann Collet, Facebook, Inc.
Initial release
2015-01-24 00:58:16 +00:00
# All rights reserved.
moved xxhash to lib/common
2016-05-28 23:06:30 +00:00
#
last batch of header files changed to reflect new license (#825) only remains to update contrib/linux-kernel (@terrelln)
2017-08-31 19:20:50 +00:00
# This source code is licensed under both the BSD-style license (found in the
# LICENSE file in the root directory of this source tree) and the GPLv2 (found
# in the COPYING file in the root directory of this source tree).
Fix copyright and license lines * All copyright lines now have -2020 instead of -present * All copyright lines include "Facebook, Inc" * All licenses are now standardized The copyright in `threading.{h,c}` is not changed because it comes from zstdmt. The copyright and license of `divsufsort.{h,c}` is not changed.
2020-03-26 22:19:05 +00:00
# You may select, at your option, one of the above-listed licenses.
last batch of header files changed to reflect new license (#825) only remains to update contrib/linux-kernel (@terrelln)
2017-08-31 19:20:50 +00:00
# ################################################################
Initial release
2015-01-24 00:58:16 +00:00
simplified silent mode maintenance
2020-10-23 17:41:17 +00:00
.PHONY: default
default: lib-release
simplified silent mode
2020-10-23 17:22:52 +00:00
# define silent mode as default (verbose mode with V=1 or VERBOSE=1)
$(V)$(VERBOSE).SILENT:
support for verbose make A commonly accepted makefile idiom is V=1 or VERBOSE=1 to request the printing of all commands. This is not "default" though, and must be manually added. Example : Before : ``` make libzstd compiling dynamic library 1.4.5 creating versioned links make libzstd V=1 compiling dynamic library 1.4.5 creating versioned links ``` After : ``` make libzstd compiling dynamic library 1.4.5 creating versioned links make libzstd V=1 compiling dynamic library 1.4.5 cc -DXXH_NAMESPACE=ZSTD_ -DZSTD_LEGACY_SUPPORT=5 -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes -Wundef -Wpointer-arith -Wvla -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings -Wredundant-decls -Wmissing-prototypes -Wc++-compat -O3 common/debug.c common/entropy_common.c common/error_private.c common/fse_decompress.c common/pool.c common/threading.c common/xxhash.c common/zstd_common.c compress/fse_compress.c compress/hist.c compress/huf_compress.c compress/zstd_compress.c compress/zstd_compress_literals.c compress/zstd_compress_sequences.c compress/zstd_compress_superblock.c compress/zstd_double_fast.c compress/zstd_fast.c compress/zstd_lazy.c compress/zstd_ldm.c compress/zstd_opt.c compress/zstdmt_compress.c decompress/huf_decompress.c decompress/zstd_ddict.c decompress/zstd_decompress.c decompress/zstd_decompress_block.c deprecated/zbuff_common.c deprecated/zbuff_compress.c deprecated/zbuff_decompress.c dictBuilder/cover.c dictBuilder/divsufsort.c dictBuilder/fastcover.c dictBuilder/zdict.c legacy/zstd_v05.c legacy/zstd_v06.c legacy/zstd_v07.c -shared -fPIC -fvisibility=hidden -Wl,-soname=libzstd.so.1 -o libzstd.so.1.4.5 creating versioned links ln -sf libzstd.so.1.4.5 libzstd.so.1 ln -sf libzstd.so.1.4.5 libzstd.so ```
2020-05-07 14:59:56 +00:00
consolidated vpath
2020-10-21 11:01:01 +00:00
# When cross-compiling from linux to windows,
minor Makefile refactor hopefully improving readability
2020-10-28 16:39:15 +00:00
# one might need to specify TARGET_SYSTEM as "Windows."
# Building from Fedora fails without it.
# (but Ubuntu and Debian don't need to set anything)
adding
2020-05-08 03:07:40 +00:00
TARGET_SYSTEM ?= $(OS)
Initial release
2015-01-24 00:58:16 +00:00
# Version numbers
moved `zstd.h` to `/lib`
2016-07-17 18:42:21 +00:00
LIBVER_MAJOR_SCRIPT:=`sed -n '/define ZSTD_VERSION_MAJOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < ./zstd.h`
LIBVER_MINOR_SCRIPT:=`sed -n '/define ZSTD_VERSION_MINOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < ./zstd.h`
LIBVER_PATCH_SCRIPT:=`sed -n '/define ZSTD_VERSION_RELEASE/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < ./zstd.h`
Makefile version automatically follows zstd.h
2015-12-30 18:52:08 +00:00
LIBVER_SCRIPT:= $(LIBVER_MAJOR_SCRIPT).$(LIBVER_MINOR_SCRIPT).$(LIBVER_PATCH_SCRIPT)
LIBVER_MAJOR := $(shell echo $(LIBVER_MAJOR_SCRIPT))
LIBVER_MINOR := $(shell echo $(LIBVER_MINOR_SCRIPT))
LIBVER_PATCH := $(shell echo $(LIBVER_PATCH_SCRIPT))
LIBVER := $(shell echo $(LIBVER_SCRIPT))
update version to 0.4.6
2015-12-31 17:32:15 +00:00
VERSION?= $(LIBVER)
perf improvements for zstd decode (#1668) * perf improvements for zstd decode tldr: 7.5% average decode speedup on silesia corpus at compression levels 1-3 (sandy bridge) Background: while investigating zstd perf differences between clang and gcc I noticed that even though gcc is vectorizing the loop in in wildcopy, it was not being done as well as could be done by hand. The sites where wildcopy is invoked have an interesting distribution of lengths to be copied. The loop trip count is rarely above 1, yet long copies are common enough to make their performance important.The code in zstd_decompress.c to invoke wildcopy handles the latter well but the gcc autovectorizer introduces a needlessly expensive startup check for vectorization. See how GCC autovectorizes the loop here: https://godbolt.org/z/apr0x0 Here is the code after this diff has been applied: (left hand side is the good one, right is with vectorizer on) After: https://godbolt.org/z/OwO4F8 Note that autovectorization still does not do a good job on the optimized version, so it's turned off\ via attribute and flag. I found that neither attribute nor command-line flag were entirely successful in turning off vectorization, which is why there were both. silesia benchmark data - second triad of each file is with the original code: file orig compressedratio encode decode change 1#dickens 10192446-> 4268865(2.388), 198.9MB/s 709.6MB/s 2#dickens 10192446-> 3876126(2.630), 128.7MB/s 552.5MB/s 3#dickens 10192446-> 3682956(2.767), 104.6MB/s 537MB/s 1#dickens 10192446-> 4268865(2.388), 195.4MB/s 659.5MB/s 7.60% 2#dickens 10192446-> 3876126(2.630), 127MB/s 516.3MB/s 7.01% 3#dickens 10192446-> 3682956(2.767), 105MB/s 479.5MB/s 11.99% 1#mozilla 51220480-> 20117517(2.546), 285.4MB/s 734.9MB/s 2#mozilla 51220480-> 19067018(2.686), 220.8MB/s 686.3MB/s 3#mozilla 51220480-> 18508283(2.767), 152.2MB/s 669.4MB/s 1#mozilla 51220480-> 20117517(2.546), 283.4MB/s 697.9MB/s 5.30% 2#mozilla 51220480-> 19067018(2.686), 225.9MB/s 665MB/s 3.20% 3#mozilla 51220480-> 18508283(2.767), 154.5MB/s 640.6MB/s 4.50% 1#mr 9970564-> 3840242(2.596), 262.4MB/s 899.8MB/s 2#mr 9970564-> 3600976(2.769), 181.2MB/s 717.9MB/s 3#mr 9970564-> 3563987(2.798), 116.3MB/s 620MB/s 1#mr 9970564-> 3840242(2.596), 253.2MB/s 827.3MB/s 8.76% 2#mr 9970564-> 3600976(2.769), 177.4MB/s 655.4MB/s 9.54% 3#mr 9970564-> 3563987(2.798), 111.2MB/s 564.2MB/s 9.89% 1#nci 33553445-> 2849306(11.78), 575.2MB/s , 1335.8MB/s 2#nci 33553445-> 2890166(11.61), 509.3MB/s , 1238.1MB/s 3#nci 33553445-> 2857408(11.74), 431MB/s , 1210.7MB/s 1#nci 33553445-> 2849306(11.78), 565.4MB/s , 1220.2MB/s 9.47% 2#nci 33553445-> 2890166(11.61), 508.2MB/s , 1128.4MB/s 9.72% 3#nci 33553445-> 2857408(11.74), 429.1MB/s , 1097.7MB/s 10.29% 1#ooffice 6152192-> 3590954(1.713), 231.4MB/s , 662.6MB/s 2#ooffice 6152192-> 3323931(1.851), 162.8MB/s , 592.6MB/s 3#ooffice 6152192-> 3145625(1.956), 99.9MB/s , 549.6MB/s 1#ooffice 6152192-> 3590954(1.713), 224.7MB/s , 624.2MB/s 6.15% 2#ooffice 6152192-> 3323931 (1.851), 155MB/s , 564.5MB/s 4.98% 3#ooffice 6152192-> 3145625(1.956), 101.1MB/s , 521.2MB/s 5.45% 1#osdb 10085684-> 3739042(2.697), 271.9MB/s 876.4MB/s 2#osdb 10085684-> 3493875(2.887), 208.2MB/s 857MB/s 3#osdb 10085684-> 3515831(2.869), 135.3MB/s 805.4MB/s 1#osdb 10085684-> 3739042(2.697), 257.4MB/s 793.8MB/s 10.41% 2#osdb 10085684-> 3493875(2.887), 209.7MB/s 776.1MB/s 10.42% 3#osdb 10085684-> 3515831(2.869), 130.6MB/s 727.7MB/s 10.68% 1#reymont 6627202-> 2152771(3.078), 198.9MB/s 696.2MB/s 2#reymont 6627202-> 2071140(3.200), 170MB/s 595.2MB/s 3#reymont 6627202-> 1953597(3.392), 128.5MB/s 609.7MB/s 1#reymont 6627202-> 2152771(3.078), 199.6MB/s 655.2MB/s 6.26% 2#reymont 6627202-> 2071140(3.200), 168.2MB/s 554.4MB/s 7.36% 3#reymont 6627202-> 1953597(3.392), 128.7MB/s 557.4MB/s 9.38% 1#samba 21606400-> 5510994(3.921), 338.1MB/s 1066MB/s 2#samba 21606400-> 5240208(4.123), 258.7MB/s 992.3MB/s 3#samba 21606400-> 5003358(4.318), 200.2MB/s 991.1MB/s 1#samba 21606400-> 5510994(3.921), 330.8MB/s 974MB/s 9.45% 2#samba 21606400-> 5240208(4.123), 257.9MB/s 919.4MB/s 7.93% 3#samba 21606400-> 5003358(4.318), 198.5MB/s 908.9MB/s 9.04% 1#sao 7251944-> 6256401(1.159), 194.6MB/s 602.2MB/s 2#sao 7251944-> 5808761(1.248), 128.2MB/s 532.1MB/s 3#sao 7251944-> 5556318(1.305), 73MB/s 509.4MB/s 1#sao 7251944-> 6256401(1.159), 198.7MB/s 580.7MB/s 3.70% 2#sao 7251944-> 5808761(1.248), 129.1MB/s 502.7MB/s 5.85% 3#sao 7251944-> 5556318(1.305), 74.6MB/s 493.1MB/s 3.31% 1#webster 41458703-> 13692222(3.028), 222.3MB/s 752MB/s 2#webster 41458703-> 12842646(3.228), 157.6MB/s 532.2MB/s 3#webster 41458703-> 12191964(3.400), 124MB/s 468.5MB/s 1#webster 41458703-> 13692222(3.028), 219.7MB/s 697MB/s 7.89% 2#webster 41458703-> 12842646(3.228), 153.9MB/s 495.4MB/s 7.43% 3#webster 41458703-> 12191964(3.400), 124.8MB/s 444.8MB/s 5.33% 1#xml 5345280-> 696652(7.673), 485MB/s , 1333.9MB/s 2#xml 5345280-> 681492(7.843), 405.2MB/s , 1237.5MB/s 3#xml 5345280-> 639057(8.364), 328.5MB/s , 1281.3MB/s 1#xml 5345280-> 696652(7.673), 473.1MB/s , 1232.4MB/s 8.24% 2#xml 5345280-> 681492(7.843), 398.6MB/s , 1145.9MB/s 7.99% 3#xml 5345280-> 639057(8.364), 327.1MB/s , 1175MB/s 9.05% 1#x-ray 8474240-> 6772557(1.251), 521.3MB/s 762.6MB/s 2#x-ray 8474240-> 6684531(1.268), 230.5MB/s 688.5MB/s 3#x-ray 8474240-> 6166679(1.374), 68.7MB/s 478.8MB/s 1#x-ray 8474240-> 6772557(1.251), 502.8MB/s 736.7MB/s 3.52% 2#x-ray 8474240-> 6684531(1.268), 224.4MB/s 662MB/s 4.00% 3#x-ray 8474240-> 6166679(1.374), 67.3MB/s 437.8MB/s 9.37% 7.51% * makefile changed to only pass -fno-tree-vectorize to gcc * <Replace this line with a title. Use 1 line only, 67 chars or less> Don't add "no-tree-vectorize" attribute on clang (which defines __GNUC__) * fix for warning/error with subtraction of void* pointers * fix c90 conformance issue - ISO C90 forbids mixed declarations and code * Fix assert for negative diff, only when there is no overlap * fix overflow revealed in fuzzing tests * tweak for small speed increase
2019-07-11 22:31:07 +00:00
CCVER := $(shell $(CC) --version)
Initial release
2015-01-24 00:58:16 +00:00
minor Makefile refactor hopefully improving readability
2020-10-28 16:39:15 +00:00
# ZSTD_LIB_MINIFY is a helper variable that
# configures a bunch of other variables to space-optimized defaults.
Fix Makefile Variable Concatenation Order Previously, this construct would add `-O3` onto the end of the compiler flags variable, **after** `MOREFLAGS`, which meant that it was impossible to over- ride. This commit fixes this order and should otherwise be a no-op.
2020-09-03 21:28:37 +00:00
ZSTD_LIB_MINIFY ?= 0
ifneq ($(ZSTD_LIB_MINIFY), 0)
minor cleaning
2020-10-21 10:22:27 +00:00
HAVE_CC_OZ ?= $(shell echo "" | $(CC) -Oz -x c -c - -o /dev/null 2> /dev/null && echo 1 || echo 0)
ZSTD_LEGACY_SUPPORT ?= 0
ZSTD_LIB_DEPRECATED ?= 0
HUF_FORCE_DECOMPRESS_X1 ?= 1
ZSTD_FORCE_DECOMPRESS_SHORT ?= 1
ZSTD_NO_INLINE ?= 1
ZSTD_STRIP_ERROR_STRINGS ?= 1
ifneq ($(HAVE_CC_OZ), 0)
# Some compilers (clang) support an even more space-optimized setting.
CFLAGS += -Oz
Fix Makefile Variable Concatenation Order Previously, this construct would add `-O3` onto the end of the compiler flags variable, **after** `MOREFLAGS`, which meant that it was impossible to over- ride. This commit fixes this order and should otherwise be a no-op.
2020-09-03 21:28:37 +00:00
else
minor cleaning
2020-10-21 10:22:27 +00:00
CFLAGS += -Os
endif
CFLAGS += -fno-stack-protector -fomit-frame-pointer -fno-ident \
-DDYNAMIC_BMI2=0 -DNDEBUG
else
CFLAGS += -O3
Fix Makefile Variable Concatenation Order Previously, this construct would add `-O3` onto the end of the compiler flags variable, **after** `MOREFLAGS`, which meant that it was impossible to over- ride. This commit fixes this order and should otherwise be a no-op.
2020-09-03 21:28:37 +00:00
endif
automatically detect configuration changes Makefile now automatically detects modifications of compilation flags, and produce object files in directories dedicated to this compilation flags. This makes it possible, for example, to compile libzstd with different DEBUGLEVEL. Object files sharing the same configration will be generated into their dedicated directories. Also : new compilation variables - DEBUGLEVEL : select the debug level (assert & traces) inserted during compilation (default == 0 == release) - HASH : select a hash function to differentiate configuration (default == md5sum) - BUILD_DIR : skip the hash stage, store object files into manually specified directory
2020-10-22 02:22:45 +00:00
DEBUGLEVEL ?= 0
CPPFLAGS += -DXXH_NAMESPACE=ZSTD_ -DDEBUGLEVEL=$(DEBUGLEVEL)
adding
2020-05-08 03:07:40 +00:00
ifeq ($(TARGET_SYSTEM),Windows_NT) # MinGW assumed
automatically detect configuration changes Makefile now automatically detects modifications of compilation flags, and produce object files in directories dedicated to this compilation flags. This makes it possible, for example, to compile libzstd with different DEBUGLEVEL. Object files sharing the same configration will be generated into their dedicated directories. Also : new compilation variables - DEBUGLEVEL : select the debug level (assert & traces) inserted during compilation (default == 0 == release) - HASH : select a hash function to differentiate configuration (default == md5sum) - BUILD_DIR : skip the hash stage, store object files into manually specified directory
2020-10-22 02:22:45 +00:00
CPPFLAGS += -D__USE_MINGW_ANSI_STDIO # compatibility with %zu formatting
fix %zu support under minGW and relevant test on Appveyor
2018-07-30 14:56:18 +00:00
endif
first sketch for largeNbDicts test program
2018-08-27 02:29:12 +00:00
DEBUGFLAGS= -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
removed gcc compilation flag -Wbad-function-cast It makes it more difficult to directly cast the result of a function, requiring to store the result in an intermediate variable. It does not necessarily help readability, and this restriction can be difficult to overcome in some constructions, like some macros. also : fixed minor Visual conversion warnings in datagencli.c
2017-05-16 18:34:38 +00:00
-Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \
-Wformat-security not needed with -Wformat=2
2019-02-01 09:31:02 +00:00
-Wstrict-prototypes -Wundef -Wpointer-arith \
removed gcc compilation flag -Wbad-function-cast It makes it more difficult to directly cast the result of a function, requiring to store the result in an intermediate variable. It does not necessarily help readability, and this restriction can be difficult to overcome in some constructions, like some macros. also : fixed minor Visual conversion warnings in datagencli.c
2017-05-16 18:34:38 +00:00
-Wvla -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings \
added flag -Wc++-compat for library and cli
2018-10-26 23:38:23 +00:00
-Wredundant-decls -Wmissing-prototypes -Wc++-compat
automatically detect configuration changes Makefile now automatically detects modifications of compilation flags, and produce object files in directories dedicated to this compilation flags. This makes it possible, for example, to compile libzstd with different DEBUGLEVEL. Object files sharing the same configration will be generated into their dedicated directories. Also : new compilation variables - DEBUGLEVEL : select the debug level (assert & traces) inserted during compilation (default == 0 == release) - HASH : select a hash function to differentiate configuration (default == md5sum) - BUILD_DIR : skip the hash stage, store object files into manually specified directory
2020-10-22 02:22:45 +00:00
CFLAGS += $(DEBUGFLAGS) $(MOREFLAGS)
FLAGS = $(CPPFLAGS) $(CFLAGS)
Initial release
2015-01-24 00:58:16 +00:00
check availability of --color=never command on grep and egrep before applying them. Fixes #1436
2018-12-03 23:46:55 +00:00
HAVE_COLORNEVER = $(shell echo a | grep --color=never a > /dev/null 2> /dev/null && echo 1 || echo 0)
GREP_OPTIONS ?=
ifeq ($HAVE_COLORNEVER, 1)
minor cleaning
2020-10-21 10:22:27 +00:00
GREP_OPTIONS += --color=never
check availability of --color=never command on grep and egrep before applying them. Fixes #1436
2018-12-03 23:46:55 +00:00
endif
GREP = grep $(GREP_OPTIONS)
Add variable for sed extended RE option (defaults to -E)
2020-06-29 20:44:23 +00:00
SED_ERE_OPT ?= -E
fixed usage of grep in Makefile when terminal uses colors as suggested by @danielshir (#1294)
2018-09-25 23:56:53 +00:00
Created Macros
2018-06-04 16:56:29 +00:00
ZSTDCOMMON_FILES := $(sort $(wildcard common/*.c))
ZSTDCOMP_FILES := $(sort $(wildcard compress/*.c))
ZSTDDECOMP_FILES := $(sort $(wildcard decompress/*.c))
ZDICT_FILES := $(sort $(wildcard dictBuilder/*.c))
ZDEPR_FILES := $(sort $(wildcard deprecated/*.c))
ZSTD_FILES := $(ZSTDCOMMON_FILES)
perf improvements for zstd decode (#1668) * perf improvements for zstd decode tldr: 7.5% average decode speedup on silesia corpus at compression levels 1-3 (sandy bridge) Background: while investigating zstd perf differences between clang and gcc I noticed that even though gcc is vectorizing the loop in in wildcopy, it was not being done as well as could be done by hand. The sites where wildcopy is invoked have an interesting distribution of lengths to be copied. The loop trip count is rarely above 1, yet long copies are common enough to make their performance important.The code in zstd_decompress.c to invoke wildcopy handles the latter well but the gcc autovectorizer introduces a needlessly expensive startup check for vectorization. See how GCC autovectorizes the loop here: https://godbolt.org/z/apr0x0 Here is the code after this diff has been applied: (left hand side is the good one, right is with vectorizer on) After: https://godbolt.org/z/OwO4F8 Note that autovectorization still does not do a good job on the optimized version, so it's turned off\ via attribute and flag. I found that neither attribute nor command-line flag were entirely successful in turning off vectorization, which is why there were both. silesia benchmark data - second triad of each file is with the original code: file orig compressedratio encode decode change 1#dickens 10192446-> 4268865(2.388), 198.9MB/s 709.6MB/s 2#dickens 10192446-> 3876126(2.630), 128.7MB/s 552.5MB/s 3#dickens 10192446-> 3682956(2.767), 104.6MB/s 537MB/s 1#dickens 10192446-> 4268865(2.388), 195.4MB/s 659.5MB/s 7.60% 2#dickens 10192446-> 3876126(2.630), 127MB/s 516.3MB/s 7.01% 3#dickens 10192446-> 3682956(2.767), 105MB/s 479.5MB/s 11.99% 1#mozilla 51220480-> 20117517(2.546), 285.4MB/s 734.9MB/s 2#mozilla 51220480-> 19067018(2.686), 220.8MB/s 686.3MB/s 3#mozilla 51220480-> 18508283(2.767), 152.2MB/s 669.4MB/s 1#mozilla 51220480-> 20117517(2.546), 283.4MB/s 697.9MB/s 5.30% 2#mozilla 51220480-> 19067018(2.686), 225.9MB/s 665MB/s 3.20% 3#mozilla 51220480-> 18508283(2.767), 154.5MB/s 640.6MB/s 4.50% 1#mr 9970564-> 3840242(2.596), 262.4MB/s 899.8MB/s 2#mr 9970564-> 3600976(2.769), 181.2MB/s 717.9MB/s 3#mr 9970564-> 3563987(2.798), 116.3MB/s 620MB/s 1#mr 9970564-> 3840242(2.596), 253.2MB/s 827.3MB/s 8.76% 2#mr 9970564-> 3600976(2.769), 177.4MB/s 655.4MB/s 9.54% 3#mr 9970564-> 3563987(2.798), 111.2MB/s 564.2MB/s 9.89% 1#nci 33553445-> 2849306(11.78), 575.2MB/s , 1335.8MB/s 2#nci 33553445-> 2890166(11.61), 509.3MB/s , 1238.1MB/s 3#nci 33553445-> 2857408(11.74), 431MB/s , 1210.7MB/s 1#nci 33553445-> 2849306(11.78), 565.4MB/s , 1220.2MB/s 9.47% 2#nci 33553445-> 2890166(11.61), 508.2MB/s , 1128.4MB/s 9.72% 3#nci 33553445-> 2857408(11.74), 429.1MB/s , 1097.7MB/s 10.29% 1#ooffice 6152192-> 3590954(1.713), 231.4MB/s , 662.6MB/s 2#ooffice 6152192-> 3323931(1.851), 162.8MB/s , 592.6MB/s 3#ooffice 6152192-> 3145625(1.956), 99.9MB/s , 549.6MB/s 1#ooffice 6152192-> 3590954(1.713), 224.7MB/s , 624.2MB/s 6.15% 2#ooffice 6152192-> 3323931 (1.851), 155MB/s , 564.5MB/s 4.98% 3#ooffice 6152192-> 3145625(1.956), 101.1MB/s , 521.2MB/s 5.45% 1#osdb 10085684-> 3739042(2.697), 271.9MB/s 876.4MB/s 2#osdb 10085684-> 3493875(2.887), 208.2MB/s 857MB/s 3#osdb 10085684-> 3515831(2.869), 135.3MB/s 805.4MB/s 1#osdb 10085684-> 3739042(2.697), 257.4MB/s 793.8MB/s 10.41% 2#osdb 10085684-> 3493875(2.887), 209.7MB/s 776.1MB/s 10.42% 3#osdb 10085684-> 3515831(2.869), 130.6MB/s 727.7MB/s 10.68% 1#reymont 6627202-> 2152771(3.078), 198.9MB/s 696.2MB/s 2#reymont 6627202-> 2071140(3.200), 170MB/s 595.2MB/s 3#reymont 6627202-> 1953597(3.392), 128.5MB/s 609.7MB/s 1#reymont 6627202-> 2152771(3.078), 199.6MB/s 655.2MB/s 6.26% 2#reymont 6627202-> 2071140(3.200), 168.2MB/s 554.4MB/s 7.36% 3#reymont 6627202-> 1953597(3.392), 128.7MB/s 557.4MB/s 9.38% 1#samba 21606400-> 5510994(3.921), 338.1MB/s 1066MB/s 2#samba 21606400-> 5240208(4.123), 258.7MB/s 992.3MB/s 3#samba 21606400-> 5003358(4.318), 200.2MB/s 991.1MB/s 1#samba 21606400-> 5510994(3.921), 330.8MB/s 974MB/s 9.45% 2#samba 21606400-> 5240208(4.123), 257.9MB/s 919.4MB/s 7.93% 3#samba 21606400-> 5003358(4.318), 198.5MB/s 908.9MB/s 9.04% 1#sao 7251944-> 6256401(1.159), 194.6MB/s 602.2MB/s 2#sao 7251944-> 5808761(1.248), 128.2MB/s 532.1MB/s 3#sao 7251944-> 5556318(1.305), 73MB/s 509.4MB/s 1#sao 7251944-> 6256401(1.159), 198.7MB/s 580.7MB/s 3.70% 2#sao 7251944-> 5808761(1.248), 129.1MB/s 502.7MB/s 5.85% 3#sao 7251944-> 5556318(1.305), 74.6MB/s 493.1MB/s 3.31% 1#webster 41458703-> 13692222(3.028), 222.3MB/s 752MB/s 2#webster 41458703-> 12842646(3.228), 157.6MB/s 532.2MB/s 3#webster 41458703-> 12191964(3.400), 124MB/s 468.5MB/s 1#webster 41458703-> 13692222(3.028), 219.7MB/s 697MB/s 7.89% 2#webster 41458703-> 12842646(3.228), 153.9MB/s 495.4MB/s 7.43% 3#webster 41458703-> 12191964(3.400), 124.8MB/s 444.8MB/s 5.33% 1#xml 5345280-> 696652(7.673), 485MB/s , 1333.9MB/s 2#xml 5345280-> 681492(7.843), 405.2MB/s , 1237.5MB/s 3#xml 5345280-> 639057(8.364), 328.5MB/s , 1281.3MB/s 1#xml 5345280-> 696652(7.673), 473.1MB/s , 1232.4MB/s 8.24% 2#xml 5345280-> 681492(7.843), 398.6MB/s , 1145.9MB/s 7.99% 3#xml 5345280-> 639057(8.364), 327.1MB/s , 1175MB/s 9.05% 1#x-ray 8474240-> 6772557(1.251), 521.3MB/s 762.6MB/s 2#x-ray 8474240-> 6684531(1.268), 230.5MB/s 688.5MB/s 3#x-ray 8474240-> 6166679(1.374), 68.7MB/s 478.8MB/s 1#x-ray 8474240-> 6772557(1.251), 502.8MB/s 736.7MB/s 3.52% 2#x-ray 8474240-> 6684531(1.268), 224.4MB/s 662MB/s 4.00% 3#x-ray 8474240-> 6166679(1.374), 67.3MB/s 437.8MB/s 9.37% 7.51% * makefile changed to only pass -fno-tree-vectorize to gcc * <Replace this line with a title. Use 1 line only, 67 chars or less> Don't add "no-tree-vectorize" attribute on clang (which defines __GNUC__) * fix for warning/error with subtraction of void* pointers * fix c90 conformance issue - ISO C90 forbids mixed declarations and code * Fix assert for negative diff, only when there is no overlap * fix overflow revealed in fuzzing tests * tweak for small speed increase
2019-07-11 22:31:07 +00:00
ifeq ($(findstring GCC,$(CCVER)),GCC)
build libzstd.so from object files %.o object files generated for dynamic library must be different from those generated for static library. Due to this difference, %.o were so far only generated for the static library. The dynamic library was rebuilt from %.c source. This meant that, for every minor change, the entire dynamic library had to be rebuilt. This is fixed in this PR : only the modified %.c source get rebuilt.
2020-10-21 05:19:57 +00:00
decompress/zstd_decompress_block.o : CFLAGS+=-fno-tree-vectorize
perf improvements for zstd decode (#1668) * perf improvements for zstd decode tldr: 7.5% average decode speedup on silesia corpus at compression levels 1-3 (sandy bridge) Background: while investigating zstd perf differences between clang and gcc I noticed that even though gcc is vectorizing the loop in in wildcopy, it was not being done as well as could be done by hand. The sites where wildcopy is invoked have an interesting distribution of lengths to be copied. The loop trip count is rarely above 1, yet long copies are common enough to make their performance important.The code in zstd_decompress.c to invoke wildcopy handles the latter well but the gcc autovectorizer introduces a needlessly expensive startup check for vectorization. See how GCC autovectorizes the loop here: https://godbolt.org/z/apr0x0 Here is the code after this diff has been applied: (left hand side is the good one, right is with vectorizer on) After: https://godbolt.org/z/OwO4F8 Note that autovectorization still does not do a good job on the optimized version, so it's turned off\ via attribute and flag. I found that neither attribute nor command-line flag were entirely successful in turning off vectorization, which is why there were both. silesia benchmark data - second triad of each file is with the original code: file orig compressedratio encode decode change 1#dickens 10192446-> 4268865(2.388), 198.9MB/s 709.6MB/s 2#dickens 10192446-> 3876126(2.630), 128.7MB/s 552.5MB/s 3#dickens 10192446-> 3682956(2.767), 104.6MB/s 537MB/s 1#dickens 10192446-> 4268865(2.388), 195.4MB/s 659.5MB/s 7.60% 2#dickens 10192446-> 3876126(2.630), 127MB/s 516.3MB/s 7.01% 3#dickens 10192446-> 3682956(2.767), 105MB/s 479.5MB/s 11.99% 1#mozilla 51220480-> 20117517(2.546), 285.4MB/s 734.9MB/s 2#mozilla 51220480-> 19067018(2.686), 220.8MB/s 686.3MB/s 3#mozilla 51220480-> 18508283(2.767), 152.2MB/s 669.4MB/s 1#mozilla 51220480-> 20117517(2.546), 283.4MB/s 697.9MB/s 5.30% 2#mozilla 51220480-> 19067018(2.686), 225.9MB/s 665MB/s 3.20% 3#mozilla 51220480-> 18508283(2.767), 154.5MB/s 640.6MB/s 4.50% 1#mr 9970564-> 3840242(2.596), 262.4MB/s 899.8MB/s 2#mr 9970564-> 3600976(2.769), 181.2MB/s 717.9MB/s 3#mr 9970564-> 3563987(2.798), 116.3MB/s 620MB/s 1#mr 9970564-> 3840242(2.596), 253.2MB/s 827.3MB/s 8.76% 2#mr 9970564-> 3600976(2.769), 177.4MB/s 655.4MB/s 9.54% 3#mr 9970564-> 3563987(2.798), 111.2MB/s 564.2MB/s 9.89% 1#nci 33553445-> 2849306(11.78), 575.2MB/s , 1335.8MB/s 2#nci 33553445-> 2890166(11.61), 509.3MB/s , 1238.1MB/s 3#nci 33553445-> 2857408(11.74), 431MB/s , 1210.7MB/s 1#nci 33553445-> 2849306(11.78), 565.4MB/s , 1220.2MB/s 9.47% 2#nci 33553445-> 2890166(11.61), 508.2MB/s , 1128.4MB/s 9.72% 3#nci 33553445-> 2857408(11.74), 429.1MB/s , 1097.7MB/s 10.29% 1#ooffice 6152192-> 3590954(1.713), 231.4MB/s , 662.6MB/s 2#ooffice 6152192-> 3323931(1.851), 162.8MB/s , 592.6MB/s 3#ooffice 6152192-> 3145625(1.956), 99.9MB/s , 549.6MB/s 1#ooffice 6152192-> 3590954(1.713), 224.7MB/s , 624.2MB/s 6.15% 2#ooffice 6152192-> 3323931 (1.851), 155MB/s , 564.5MB/s 4.98% 3#ooffice 6152192-> 3145625(1.956), 101.1MB/s , 521.2MB/s 5.45% 1#osdb 10085684-> 3739042(2.697), 271.9MB/s 876.4MB/s 2#osdb 10085684-> 3493875(2.887), 208.2MB/s 857MB/s 3#osdb 10085684-> 3515831(2.869), 135.3MB/s 805.4MB/s 1#osdb 10085684-> 3739042(2.697), 257.4MB/s 793.8MB/s 10.41% 2#osdb 10085684-> 3493875(2.887), 209.7MB/s 776.1MB/s 10.42% 3#osdb 10085684-> 3515831(2.869), 130.6MB/s 727.7MB/s 10.68% 1#reymont 6627202-> 2152771(3.078), 198.9MB/s 696.2MB/s 2#reymont 6627202-> 2071140(3.200), 170MB/s 595.2MB/s 3#reymont 6627202-> 1953597(3.392), 128.5MB/s 609.7MB/s 1#reymont 6627202-> 2152771(3.078), 199.6MB/s 655.2MB/s 6.26% 2#reymont 6627202-> 2071140(3.200), 168.2MB/s 554.4MB/s 7.36% 3#reymont 6627202-> 1953597(3.392), 128.7MB/s 557.4MB/s 9.38% 1#samba 21606400-> 5510994(3.921), 338.1MB/s 1066MB/s 2#samba 21606400-> 5240208(4.123), 258.7MB/s 992.3MB/s 3#samba 21606400-> 5003358(4.318), 200.2MB/s 991.1MB/s 1#samba 21606400-> 5510994(3.921), 330.8MB/s 974MB/s 9.45% 2#samba 21606400-> 5240208(4.123), 257.9MB/s 919.4MB/s 7.93% 3#samba 21606400-> 5003358(4.318), 198.5MB/s 908.9MB/s 9.04% 1#sao 7251944-> 6256401(1.159), 194.6MB/s 602.2MB/s 2#sao 7251944-> 5808761(1.248), 128.2MB/s 532.1MB/s 3#sao 7251944-> 5556318(1.305), 73MB/s 509.4MB/s 1#sao 7251944-> 6256401(1.159), 198.7MB/s 580.7MB/s 3.70% 2#sao 7251944-> 5808761(1.248), 129.1MB/s 502.7MB/s 5.85% 3#sao 7251944-> 5556318(1.305), 74.6MB/s 493.1MB/s 3.31% 1#webster 41458703-> 13692222(3.028), 222.3MB/s 752MB/s 2#webster 41458703-> 12842646(3.228), 157.6MB/s 532.2MB/s 3#webster 41458703-> 12191964(3.400), 124MB/s 468.5MB/s 1#webster 41458703-> 13692222(3.028), 219.7MB/s 697MB/s 7.89% 2#webster 41458703-> 12842646(3.228), 153.9MB/s 495.4MB/s 7.43% 3#webster 41458703-> 12191964(3.400), 124.8MB/s 444.8MB/s 5.33% 1#xml 5345280-> 696652(7.673), 485MB/s , 1333.9MB/s 2#xml 5345280-> 681492(7.843), 405.2MB/s , 1237.5MB/s 3#xml 5345280-> 639057(8.364), 328.5MB/s , 1281.3MB/s 1#xml 5345280-> 696652(7.673), 473.1MB/s , 1232.4MB/s 8.24% 2#xml 5345280-> 681492(7.843), 398.6MB/s , 1145.9MB/s 7.99% 3#xml 5345280-> 639057(8.364), 327.1MB/s , 1175MB/s 9.05% 1#x-ray 8474240-> 6772557(1.251), 521.3MB/s 762.6MB/s 2#x-ray 8474240-> 6684531(1.268), 230.5MB/s 688.5MB/s 3#x-ray 8474240-> 6166679(1.374), 68.7MB/s 478.8MB/s 1#x-ray 8474240-> 6772557(1.251), 502.8MB/s 736.7MB/s 3.52% 2#x-ray 8474240-> 6684531(1.268), 224.4MB/s 662MB/s 4.00% 3#x-ray 8474240-> 6166679(1.374), 67.3MB/s 437.8MB/s 9.37% 7.51% * makefile changed to only pass -fno-tree-vectorize to gcc * <Replace this line with a title. Use 1 line only, 67 chars or less> Don't add "no-tree-vectorize" attribute on clang (which defines __GNUC__) * fix for warning/error with subtraction of void* pointers * fix c90 conformance issue - ISO C90 forbids mixed declarations and code * Fix assert for negative diff, only when there is no overlap * fix overflow revealed in fuzzing tests * tweak for small speed increase
2019-07-11 22:31:07 +00:00
endif
Add Space-Optimized Helper Variable to Lib Makefile This diff reorganizes the `lib/Makefile` to extract various settings that a user would normally invoke together (supposing that they were aware of them) if they were trying to build the smallest `libzstd` possible. It collects these settings under a master setting `ZSTD_LIB_MIN_SIZE`. Also document this new option.
2020-01-27 22:14:08 +00:00
# Modules
Created Macros
2018-06-04 16:56:29 +00:00
ZSTD_LIB_COMPRESSION ?= 1
ZSTD_LIB_DECOMPRESSION ?= 1
ZSTD_LIB_DICTBUILDER ?= 1
ZSTD_LIB_DEPRECATED ?= 1
Add Space-Optimized Helper Variable to Lib Makefile This diff reorganizes the `lib/Makefile` to extract various settings that a user would normally invoke together (supposing that they were aware of them) if they were trying to build the smallest `libzstd` possible. It collects these settings under a master setting `ZSTD_LIB_MIN_SIZE`. Also document this new option.
2020-01-27 22:14:08 +00:00
# Legacy support
ZSTD_LEGACY_SUPPORT ?= 5
ZSTD_LEGACY_MULTITHREADED_API ?= 0
# Build size optimizations
Add Logic to Makefile to Convert Make Vars to Defines
2018-12-06 20:32:32 +00:00
HUF_FORCE_DECOMPRESS_X1 ?= 0
HUF_FORCE_DECOMPRESS_X2 ?= 0
ZSTD_FORCE_DECOMPRESS_SHORT ?= 0
ZSTD_FORCE_DECOMPRESS_LONG ?= 0
ZSTD_NO_INLINE ?= 0
ZSTD_STRIP_ERROR_STRINGS ?= 0
Fix Typos
2018-06-05 00:19:06 +00:00
Created Macros
2018-06-04 16:56:29 +00:00
ifeq ($(ZSTD_LIB_COMPRESSION), 0)
minor cleaning
2020-10-21 10:22:27 +00:00
ZSTD_LIB_DICTBUILDER = 0
ZSTD_LIB_DEPRECATED = 0
Created Macros
2018-06-04 16:56:29 +00:00
endif
ifeq ($(ZSTD_LIB_DECOMPRESSION), 0)
minor cleaning
2020-10-21 10:22:27 +00:00
ZSTD_LEGACY_SUPPORT = 0
ZSTD_LIB_DEPRECATED = 0
Created Macros
2018-06-04 16:56:29 +00:00
endif
ifneq ($(ZSTD_LIB_COMPRESSION), 0)
minor cleaning
2020-10-21 10:22:27 +00:00
ZSTD_FILES += $(ZSTDCOMP_FILES)
Created Macros
2018-06-04 16:56:29 +00:00
endif
ifneq ($(ZSTD_LIB_DECOMPRESSION), 0)
minor cleaning
2020-10-21 10:22:27 +00:00
ZSTD_FILES += $(ZSTDDECOMP_FILES)
Created Macros
2018-06-04 16:56:29 +00:00
endif
Fix Typos
2018-06-05 00:19:06 +00:00
ifneq ($(ZSTD_LIB_DEPRECATED), 0)
minor cleaning
2020-10-21 10:22:27 +00:00
ZSTD_FILES += $(ZDEPR_FILES)
Created Macros
2018-06-04 16:56:29 +00:00
endif
ifneq ($(ZSTD_LIB_DICTBUILDER), 0)
minor cleaning
2020-10-21 10:22:27 +00:00
ZSTD_FILES += $(ZDICT_FILES)
Created Macros
2018-06-04 16:56:29 +00:00
endif
ZSTD_LEGACY_SUPPORT defines lowest supported version
2017-03-13 21:32:30 +00:00
Add Logic to Makefile to Convert Make Vars to Defines
2018-12-06 20:32:32 +00:00
ifneq ($(HUF_FORCE_DECOMPRESS_X1), 0)
minor cleaning
2020-10-21 10:22:27 +00:00
CFLAGS += -DHUF_FORCE_DECOMPRESS_X1
Add Logic to Makefile to Convert Make Vars to Defines
2018-12-06 20:32:32 +00:00
endif
ifneq ($(HUF_FORCE_DECOMPRESS_X2), 0)
minor cleaning
2020-10-21 10:22:27 +00:00
CFLAGS += -DHUF_FORCE_DECOMPRESS_X2
Add Logic to Makefile to Convert Make Vars to Defines
2018-12-06 20:32:32 +00:00
endif
ifneq ($(ZSTD_FORCE_DECOMPRESS_SHORT), 0)
minor cleaning
2020-10-21 10:22:27 +00:00
CFLAGS += -DZSTD_FORCE_DECOMPRESS_SHORT
Add Logic to Makefile to Convert Make Vars to Defines
2018-12-06 20:32:32 +00:00
endif
ifneq ($(ZSTD_FORCE_DECOMPRESS_LONG), 0)
minor cleaning
2020-10-21 10:22:27 +00:00
CFLAGS += -DZSTD_FORCE_DECOMPRESS_LONG
Add Logic to Makefile to Convert Make Vars to Defines
2018-12-06 20:32:32 +00:00
endif
ifneq ($(ZSTD_NO_INLINE), 0)
minor cleaning
2020-10-21 10:22:27 +00:00
CFLAGS += -DZSTD_NO_INLINE
Add Logic to Makefile to Convert Make Vars to Defines
2018-12-06 20:32:32 +00:00
endif
ifneq ($(ZSTD_STRIP_ERROR_STRINGS), 0)
minor cleaning
2020-10-21 10:22:27 +00:00
CFLAGS += -DZSTD_STRIP_ERROR_STRINGS
Add Logic to Makefile to Convert Make Vars to Defines
2018-12-06 20:32:32 +00:00
endif
[libzstd] Remove ZSTDMT from the shared object * Remove ZSTDMT from the shared object by default. * Provide a macro `ZSTD_LEGACY_MULTITHREADED_API` to override it. * Document it in `lib/README.md`.
2019-04-08 01:47:52 +00:00
ifneq ($(ZSTD_LEGACY_MULTITHREADED_API), 0)
minor cleaning
2020-10-21 10:22:27 +00:00
CFLAGS += -DZSTD_LEGACY_MULTITHREADED_API
[libzstd] Remove ZSTDMT from the shared object * Remove ZSTDMT from the shared object by default. * Provide a macro `ZSTD_LEGACY_MULTITHREADED_API` to override it. * Document it in `lib/README.md`.
2019-04-08 01:47:52 +00:00
endif
ZSTD_LEGACY_SUPPORT defines lowest supported version
2017-03-13 21:32:30 +00:00
ifneq ($(ZSTD_LEGACY_SUPPORT), 0)
ifeq ($(shell test $(ZSTD_LEGACY_SUPPORT) -lt 8; echo $$?), 0)
minor cleaning
2020-10-21 10:22:27 +00:00
ZSTD_FILES += $(shell ls legacy/*.c | $(GREP) 'v0[$(ZSTD_LEGACY_SUPPORT)-7]')
ZSTD_LEGACY_SUPPORT defines lowest supported version
2017-03-13 21:32:30 +00:00
endif
Fixed #80 (reported by @luben) Added : tests for ZSTD_LEGACY=disable build mode extended ZSTD_LEGACY=disable to dll build
2015-11-30 10:53:11 +00:00
endif
ZSTD_LEGACY_SUPPORT defines lowest supported version
2017-03-13 21:32:30 +00:00
CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
Fixed #80 (reported by @luben) Added : tests for ZSTD_LEGACY=disable build mode extended ZSTD_LEGACY=disable to dll build
2015-11-30 10:53:11 +00:00
automatic %.h header dependency tracking also : BUILD_DIR can be manually specified
2020-10-22 00:25:07 +00:00
ZSTD_LOCAL_SRC := $(notdir $(ZSTD_FILES))
ZSTD_LOCAL_OBJ := $(ZSTD_LOCAL_SRC:.c=.o)
build libzstd.so from object files %.o object files generated for dynamic library must be different from those generated for static library. Due to this difference, %.o were so far only generated for the static library. The dynamic library was rebuilt from %.c source. This meant that, for every minor change, the entire dynamic library had to be rebuilt. This is fixed in this PR : only the modified %.c source get rebuilt.
2020-10-21 05:19:57 +00:00
automatic %.h header dependency tracking also : BUILD_DIR can be manually specified
2020-10-22 00:25:07 +00:00
ZSTD_SUBDIR := common compress decompress dictBuilder legacy deprecated
vpath %.c $(ZSTD_SUBDIR)
build libzstd.so from object files %.o object files generated for dynamic library must be different from those generated for static library. Due to this difference, %.o were so far only generated for the static library. The dynamic library was rebuilt from %.c source. This meant that, for every minor change, the entire dynamic library had to be rebuilt. This is fixed in this PR : only the modified %.c source get rebuilt.
2020-10-21 05:19:57 +00:00
automatically detect configuration changes Makefile now automatically detects modifications of compilation flags, and produce object files in directories dedicated to this compilation flags. This makes it possible, for example, to compile libzstd with different DEBUGLEVEL. Object files sharing the same configration will be generated into their dedicated directories. Also : new compilation variables - DEBUGLEVEL : select the debug level (assert & traces) inserted during compilation (default == 0 == release) - HASH : select a hash function to differentiate configuration (default == md5sum) - BUILD_DIR : skip the hash stage, store object files into manually specified directory
2020-10-22 02:22:45 +00:00
UNAME := $(shell uname)
can integrate later dynamic flags changes for example `libzstd-mt` is `differentiated from `libzstd`
2020-10-23 01:48:06 +00:00
minor Makefile refactor hopefully improving readability
2020-10-28 16:39:15 +00:00
ifndef BUILD_DIR
automatically detect configuration changes Makefile now automatically detects modifications of compilation flags, and produce object files in directories dedicated to this compilation flags. This makes it possible, for example, to compile libzstd with different DEBUGLEVEL. Object files sharing the same configration will be generated into their dedicated directories. Also : new compilation variables - DEBUGLEVEL : select the debug level (assert & traces) inserted during compilation (default == 0 == release) - HASH : select a hash function to differentiate configuration (default == md5sum) - BUILD_DIR : skip the hash stage, store object files into manually specified directory
2020-10-22 02:22:45 +00:00
ifeq ($(UNAME), Darwin)
HASH ?= md5
make zstd is now differentiated from zstd-nomt avoids mixing object files using different flags
2020-10-23 23:08:21 +00:00
else ifeq ($(UNAME), FreeBSD)
automatically detect configuration changes Makefile now automatically detects modifications of compilation flags, and produce object files in directories dedicated to this compilation flags. This makes it possible, for example, to compile libzstd with different DEBUGLEVEL. Object files sharing the same configration will be generated into their dedicated directories. Also : new compilation variables - DEBUGLEVEL : select the debug level (assert & traces) inserted during compilation (default == 0 == release) - HASH : select a hash function to differentiate configuration (default == md5sum) - BUILD_DIR : skip the hash stage, store object files into manually specified directory
2020-10-22 02:22:45 +00:00
HASH ?= gmd5sum
make zstd is now differentiated from zstd-nomt avoids mixing object files using different flags
2020-10-23 23:08:21 +00:00
else ifeq ($(UNAME), OpenBSD)
automatically detect configuration changes Makefile now automatically detects modifications of compilation flags, and produce object files in directories dedicated to this compilation flags. This makes it possible, for example, to compile libzstd with different DEBUGLEVEL. Object files sharing the same configration will be generated into their dedicated directories. Also : new compilation variables - DEBUGLEVEL : select the debug level (assert & traces) inserted during compilation (default == 0 == release) - HASH : select a hash function to differentiate configuration (default == md5sum) - BUILD_DIR : skip the hash stage, store object files into manually specified directory
2020-10-22 02:22:45 +00:00
HASH ?= md5
endif
HASH ?= md5sum
Merge branch 'dev' into libzstd_autoconf_full
2020-10-27 22:45:30 +00:00
HASH_DIR = conf_$(shell echo $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(ZSTD_FILES) | $(HASH) | cut -f 1 -d " " )
can integrate later dynamic flags changes for example `libzstd-mt` is `differentiated from `libzstd`
2020-10-23 01:48:06 +00:00
HAVE_HASH :=$(shell echo 1 | $(HASH) > /dev/null && echo 1 || echo 0)
ifeq ($(HAVE_HASH),0)
$(info warning : could not find HASH ($(HASH)), needed to differentiate builds using different flags)
BUILD_DIR := obj/generic_noconf
automatically detect configuration changes Makefile now automatically detects modifications of compilation flags, and produce object files in directories dedicated to this compilation flags. This makes it possible, for example, to compile libzstd with different DEBUGLEVEL. Object files sharing the same configration will be generated into their dedicated directories. Also : new compilation variables - DEBUGLEVEL : select the debug level (assert & traces) inserted during compilation (default == 0 == release) - HASH : select a hash function to differentiate configuration (default == md5sum) - BUILD_DIR : skip the hash stage, store object files into manually specified directory
2020-10-22 02:22:45 +00:00
endif
minor Makefile refactor hopefully improving readability
2020-10-28 16:39:15 +00:00
endif # BUILD_DIR
automatically detect configuration changes Makefile now automatically detects modifications of compilation flags, and produce object files in directories dedicated to this compilation flags. This makes it possible, for example, to compile libzstd with different DEBUGLEVEL. Object files sharing the same configration will be generated into their dedicated directories. Also : new compilation variables - DEBUGLEVEL : select the debug level (assert & traces) inserted during compilation (default == 0 == release) - HASH : select a hash function to differentiate configuration (default == md5sum) - BUILD_DIR : skip the hash stage, store object files into manually specified directory
2020-10-22 02:22:45 +00:00
Fix name of macOS
2018-06-09 19:31:17 +00:00
# macOS linker doesn't support -soname, and use different extension
Initial release
2015-01-24 00:58:16 +00:00
# see : https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/DynamicLibraries/100-Articles/DynamicLibraryDesignGuidelines.html
programs/zstd also automatically generate object dir per conf same rules as lib/libzstd can also be controlled via HASH and BUILD_DIR
2020-10-22 06:38:33 +00:00
ifeq ($(UNAME), Darwin)
build libzstd.so from object files %.o object files generated for dynamic library must be different from those generated for static library. Due to this difference, %.o were so far only generated for the static library. The dynamic library was rebuilt from %.c source. This meant that, for every minor change, the entire dynamic library had to be rebuilt. This is fixed in this PR : only the modified %.c source get rebuilt.
2020-10-21 05:19:57 +00:00
SHARED_EXT = dylib
SHARED_EXT_MAJOR = $(LIBVER_MAJOR).$(SHARED_EXT)
SHARED_EXT_VER = $(LIBVER).$(SHARED_EXT)
SONAME_FLAGS = -install_name $(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR) -compatibility_version $(LIBVER_MAJOR) -current_version $(LIBVER)
Initial release
2015-01-24 00:58:16 +00:00
else
build libzstd.so from object files %.o object files generated for dynamic library must be different from those generated for static library. Due to this difference, %.o were so far only generated for the static library. The dynamic library was rebuilt from %.c source. This meant that, for every minor change, the entire dynamic library had to be rebuilt. This is fixed in this PR : only the modified %.c source get rebuilt.
2020-10-21 05:19:57 +00:00
SONAME_FLAGS = -Wl,-soname=libzstd.$(SHARED_EXT).$(LIBVER_MAJOR)
SHARED_EXT = so
SHARED_EXT_MAJOR = $(SHARED_EXT).$(LIBVER_MAJOR)
SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER)
Initial release
2015-01-24 00:58:16 +00:00
endif
minor Makefile refactor hopefully improving readability
2020-10-28 16:39:15 +00:00
SET_CACHE_DIRECTORY = \
$(MAKE) --no-print-directory $@ \
BUILD_DIR=obj/$(HASH_DIR) \
CPPFLAGS="$(CPPFLAGS)" \
CFLAGS="$(CFLAGS)" \
LDFLAGS="$(LDFLAGS)"
Initial release
2015-01-24 00:58:16 +00:00
minor Makefile refactor hopefully improving readability
2020-10-28 16:39:15 +00:00
.PHONY: lib-all all clean install uninstall
update library builder
2015-11-19 10:23:44 +00:00
Add libzstd.pc Build to More Aggregate Targets in Makefiles
2020-05-08 17:06:31 +00:00
# alias
lib-all: all
Only Trigger libzstd.pc Build on Unix-Like Platforms We don't even define the rule on unsupported platforms.
2020-05-08 20:01:26 +00:00
all: lib
update library builder
2015-11-19 10:23:44 +00:00
minor Makefile refactor hopefully improving readability
2020-10-28 16:39:15 +00:00
.PHONY: libzstd.a # must be run every time
ifndef BUILD_DIR
# determine BUILD_DIR from compilation flags
can integrate later dynamic flags changes for example `libzstd-mt` is `differentiated from `libzstd`
2020-10-23 01:48:06 +00:00
libzstd.a:
minor Makefile refactor hopefully improving readability
2020-10-28 16:39:15 +00:00
$(SET_CACHE_DIRECTORY)
can integrate later dynamic flags changes for example `libzstd-mt` is `differentiated from `libzstd`
2020-10-23 01:48:06 +00:00
else
minor Makefile refactor hopefully improving readability
2020-10-28 16:39:15 +00:00
# BUILD_DIR is defined
can integrate later dynamic flags changes for example `libzstd-mt` is `differentiated from `libzstd`
2020-10-23 01:48:06 +00:00
fixed building libzstd with manual BUILD_DIR and when HASH is not found
2020-10-23 17:14:04 +00:00
ZSTD_STATLIB_DIR := $(BUILD_DIR)/static
ZSTD_STATLIB := $(ZSTD_STATLIB_DIR)/libzstd.a
ZSTD_STATLIB_OBJ := $(addprefix $(ZSTD_STATLIB_DIR)/,$(ZSTD_LOCAL_OBJ))
simplified silent mode maintenance
2020-10-23 17:41:17 +00:00
$(ZSTD_STATLIB): ARFLAGS = rcs
fixed building libzstd with manual BUILD_DIR and when HASH is not found
2020-10-23 17:14:04 +00:00
$(ZSTD_STATLIB): | $(ZSTD_STATLIB_DIR)
can integrate later dynamic flags changes for example `libzstd-mt` is `differentiated from `libzstd`
2020-10-23 01:48:06 +00:00
$(ZSTD_STATLIB): $(ZSTD_STATLIB_OBJ)
Initial release
2015-01-24 00:58:16 +00:00
@echo compiling static library
simplified silent mode
2020-10-23 17:22:52 +00:00
$(AR) $(ARFLAGS) $@ $^
Fix #419 : no warning when setting custom LDFLAGS
2016-11-03 00:02:45 +00:00
fixed building libzstd with manual BUILD_DIR and when HASH is not found
2020-10-23 17:14:04 +00:00
libzstd.a: $(ZSTD_STATLIB)
replace final links by direct copy link can behave slightly differently from real binaries, breaking a few scripts relying on "real binary" assumption.
2020-12-10 21:25:08 +00:00
cp -f $< $@
automatically detect configuration changes Makefile now automatically detects modifications of compilation flags, and produce object files in directories dedicated to this compilation flags. This makes it possible, for example, to compile libzstd with different DEBUGLEVEL. Object files sharing the same configration will be generated into their dedicated directories. Also : new compilation variables - DEBUGLEVEL : select the debug level (assert & traces) inserted during compilation (default == 0 == release) - HASH : select a hash function to differentiate configuration (default == md5sum) - BUILD_DIR : skip the hash stage, store object files into manually specified directory
2020-10-22 02:22:45 +00:00
can integrate later dynamic flags changes for example `libzstd-mt` is `differentiated from `libzstd`
2020-10-23 01:48:06 +00:00
endif
adding
2020-05-08 03:07:40 +00:00
ifneq (,$(filter Windows%,$(TARGET_SYSTEM)))
avoid recompiling dll every time under mingw
2018-09-22 00:40:30 +00:00
Fixed dll path in case of cross-compilation
2020-10-11 18:51:44 +00:00
LIBZSTD = dll/libzstd.dll
fixed libzstd.dll compilation on mingw and zstd linking
2020-10-22 18:28:46 +00:00
$(LIBZSTD): $(ZSTD_FILES)
Initial release
2015-01-24 00:58:16 +00:00
@echo compiling dynamic library $(LIBVER)
Fixed dll path in case of cross-compilation
2020-10-11 18:51:44 +00:00
$(CC) $(FLAGS) -DZSTD_DLL_EXPORT=1 -Wl,--out-implib,dll/libzstd.dll.a -shared $^ -o $@
avoid recompiling dll every time under mingw
2018-09-22 00:40:30 +00:00
minor Makefile refactor hopefully improving readability
2020-10-28 16:39:15 +00:00
else # not Windows
avoid recompiling dll every time under mingw
2018-09-22 00:40:30 +00:00
LIBZSTD = libzstd.$(SHARED_EXT_VER)
minor Makefile refactor hopefully improving readability
2020-10-28 16:39:15 +00:00
.PHONY: $(LIBZSTD) # must be run every time
can integrate later dynamic flags changes for example `libzstd-mt` is `differentiated from `libzstd`
2020-10-23 01:48:06 +00:00
$(LIBZSTD): CFLAGS += -fPIC
$(LIBZSTD): LDFLAGS += -shared -fvisibility=hidden
minor Makefile refactor hopefully improving readability
2020-10-28 16:39:15 +00:00
ifndef BUILD_DIR
# determine BUILD_DIR from compilation flags
can integrate later dynamic flags changes for example `libzstd-mt` is `differentiated from `libzstd`
2020-10-23 01:48:06 +00:00
$(LIBZSTD):
minor Makefile refactor hopefully improving readability
2020-10-28 16:39:15 +00:00
$(SET_CACHE_DIRECTORY)
can integrate later dynamic flags changes for example `libzstd-mt` is `differentiated from `libzstd`
2020-10-23 01:48:06 +00:00
else
minor Makefile refactor hopefully improving readability
2020-10-28 16:39:15 +00:00
# BUILD_DIR is defined
can integrate later dynamic flags changes for example `libzstd-mt` is `differentiated from `libzstd`
2020-10-23 01:48:06 +00:00
fixed building libzstd with manual BUILD_DIR and when HASH is not found
2020-10-23 17:14:04 +00:00
ZSTD_DYNLIB_DIR := $(BUILD_DIR)/dynamic
ZSTD_DYNLIB := $(ZSTD_DYNLIB_DIR)/$(LIBZSTD)
ZSTD_DYNLIB_OBJ := $(addprefix $(ZSTD_DYNLIB_DIR)/,$(ZSTD_LOCAL_OBJ))
can integrate later dynamic flags changes for example `libzstd-mt` is `differentiated from `libzstd`
2020-10-23 01:48:06 +00:00
fixed building libzstd with manual BUILD_DIR and when HASH is not found
2020-10-23 17:14:04 +00:00
$(ZSTD_DYNLIB): | $(ZSTD_DYNLIB_DIR)
can integrate later dynamic flags changes for example `libzstd-mt` is `differentiated from `libzstd`
2020-10-23 01:48:06 +00:00
$(ZSTD_DYNLIB): $(ZSTD_DYNLIB_OBJ)
avoid recompiling dll every time under mingw
2018-09-22 00:40:30 +00:00
@echo compiling dynamic library $(LIBVER)
simplified silent mode
2020-10-23 17:22:52 +00:00
$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
Initial release
2015-01-24 00:58:16 +00:00
@echo creating versioned links
simplified silent mode
2020-10-23 17:22:52 +00:00
ln -sf $@ libzstd.$(SHARED_EXT_MAJOR)
ln -sf $@ libzstd.$(SHARED_EXT)
avoid recompiling dll every time under mingw
2018-09-22 00:40:30 +00:00
can integrate later dynamic flags changes for example `libzstd-mt` is `differentiated from `libzstd`
2020-10-23 01:48:06 +00:00
$(LIBZSTD): $(ZSTD_DYNLIB)
replace final links by direct copy link can behave slightly differently from real binaries, breaking a few scripts relying on "real binary" assumption.
2020-12-10 21:25:08 +00:00
cp -f $< $@
automatically detect configuration changes Makefile now automatically detects modifications of compilation flags, and produce object files in directories dedicated to this compilation flags. This makes it possible, for example, to compile libzstd with different DEBUGLEVEL. Object files sharing the same configration will be generated into their dedicated directories. Also : new compilation variables - DEBUGLEVEL : select the debug level (assert & traces) inserted during compilation (default == 0 == release) - HASH : select a hash function to differentiate configuration (default == md5sum) - BUILD_DIR : skip the hash stage, store object files into manually specified directory
2020-10-22 02:22:45 +00:00
minor Makefile refactor hopefully improving readability
2020-10-28 16:39:15 +00:00
endif # ifndef BUILD_DIR
can integrate later dynamic flags changes for example `libzstd-mt` is `differentiated from `libzstd`
2020-10-23 01:48:06 +00:00
endif # if windows
fixed libzstd.dll compilation on mingw and zstd linking
2020-10-22 18:28:46 +00:00
support for verbose make A commonly accepted makefile idiom is V=1 or VERBOSE=1 to request the printing of all commands. This is not "default" though, and must be manually added. Example : Before : ``` make libzstd compiling dynamic library 1.4.5 creating versioned links make libzstd V=1 compiling dynamic library 1.4.5 creating versioned links ``` After : ``` make libzstd compiling dynamic library 1.4.5 creating versioned links make libzstd V=1 compiling dynamic library 1.4.5 cc -DXXH_NAMESPACE=ZSTD_ -DZSTD_LEGACY_SUPPORT=5 -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes -Wundef -Wpointer-arith -Wvla -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings -Wredundant-decls -Wmissing-prototypes -Wc++-compat -O3 common/debug.c common/entropy_common.c common/error_private.c common/fse_decompress.c common/pool.c common/threading.c common/xxhash.c common/zstd_common.c compress/fse_compress.c compress/hist.c compress/huf_compress.c compress/zstd_compress.c compress/zstd_compress_literals.c compress/zstd_compress_sequences.c compress/zstd_compress_superblock.c compress/zstd_double_fast.c compress/zstd_fast.c compress/zstd_lazy.c compress/zstd_ldm.c compress/zstd_opt.c compress/zstdmt_compress.c decompress/huf_decompress.c decompress/zstd_ddict.c decompress/zstd_decompress.c decompress/zstd_decompress_block.c deprecated/zbuff_common.c deprecated/zbuff_compress.c deprecated/zbuff_decompress.c dictBuilder/cover.c dictBuilder/divsufsort.c dictBuilder/fastcover.c dictBuilder/zdict.c legacy/zstd_v05.c legacy/zstd_v06.c legacy/zstd_v07.c -shared -fPIC -fvisibility=hidden -Wl,-soname=libzstd.so.1 -o libzstd.so.1.4.5 creating versioned links ln -sf libzstd.so.1.4.5 libzstd.so.1 ln -sf libzstd.so.1.4.5 libzstd.so ```
2020-05-07 14:59:56 +00:00
.PHONY: libzstd
Fix #419 : no warning when setting custom LDFLAGS
2016-11-03 00:02:45 +00:00
libzstd : $(LIBZSTD)
support for verbose make A commonly accepted makefile idiom is V=1 or VERBOSE=1 to request the printing of all commands. This is not "default" though, and must be manually added. Example : Before : ``` make libzstd compiling dynamic library 1.4.5 creating versioned links make libzstd V=1 compiling dynamic library 1.4.5 creating versioned links ``` After : ``` make libzstd compiling dynamic library 1.4.5 creating versioned links make libzstd V=1 compiling dynamic library 1.4.5 cc -DXXH_NAMESPACE=ZSTD_ -DZSTD_LEGACY_SUPPORT=5 -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes -Wundef -Wpointer-arith -Wvla -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings -Wredundant-decls -Wmissing-prototypes -Wc++-compat -O3 common/debug.c common/entropy_common.c common/error_private.c common/fse_decompress.c common/pool.c common/threading.c common/xxhash.c common/zstd_common.c compress/fse_compress.c compress/hist.c compress/huf_compress.c compress/zstd_compress.c compress/zstd_compress_literals.c compress/zstd_compress_sequences.c compress/zstd_compress_superblock.c compress/zstd_double_fast.c compress/zstd_fast.c compress/zstd_lazy.c compress/zstd_ldm.c compress/zstd_opt.c compress/zstdmt_compress.c decompress/huf_decompress.c decompress/zstd_ddict.c decompress/zstd_decompress.c decompress/zstd_decompress_block.c deprecated/zbuff_common.c deprecated/zbuff_compress.c deprecated/zbuff_decompress.c dictBuilder/cover.c dictBuilder/divsufsort.c dictBuilder/fastcover.c dictBuilder/zdict.c legacy/zstd_v05.c legacy/zstd_v06.c legacy/zstd_v07.c -shared -fPIC -fvisibility=hidden -Wl,-soname=libzstd.so.1 -o libzstd.so.1.4.5 creating versioned links ln -sf libzstd.so.1.4.5 libzstd.so.1 ln -sf libzstd.so.1.4.5 libzstd.so ```
2020-05-07 14:59:56 +00:00
.PHONY: lib
fix libzstd-mt underlinking issue fix #2045 When compiling `libzstd` in multithreading mode, the `libzstd-mt` recipe would not include `-pthread`, resulting in an underlinked dynamic library. Added a test on Travis to check that the library is fully linked. This makes it possible, in some future release, to build a multi-threaded `libzstd` dynamic library by default as it would no longer impact the build script of user programs.
2020-04-29 01:29:20 +00:00
lib : libzstd.a libzstd
store %.o object files into obj/ both static and dynamic libraries have their own object directory
2020-10-21 10:44:38 +00:00
fixed default rule for lib/Makefile default rule is `lib-release` `lib-release` wasn't working : it was just skipped. Removing `lib-release` from the list of .PHONY targets fixes it. Same for `lib-mt`.
2020-05-25 13:50:45 +00:00
# note : do not define lib-mt or lib-release as .PHONY
# make does not consider implicit pattern rule for .PHONY target
fix libzstd-mt underlinking issue fix #2045 When compiling `libzstd` in multithreading mode, the `libzstd-mt` recipe would not include `-pthread`, resulting in an underlinked dynamic library. Added a test on Travis to check that the library is fully linked. This makes it possible, in some future release, to build a multi-threaded `libzstd` dynamic library by default as it would no longer impact the build script of user programs.
2020-04-29 01:29:20 +00:00
%-mt : CPPFLAGS += -DZSTD_MULTITHREAD
%-mt : LDFLAGS += -pthread
generalized pattern rules
2020-04-29 01:43:55 +00:00
%-mt : %
@echo multi-threading build completed
Add MT enabled targets for libzstd
2017-04-18 21:13:01 +00:00
fix libzstd-mt underlinking issue fix #2045 When compiling `libzstd` in multithreading mode, the `libzstd-mt` recipe would not include `-pthread`, resulting in an underlinked dynamic library. Added a test on Travis to check that the library is fully linked. This makes it possible, in some future release, to build a multi-threaded `libzstd` dynamic library by default as it would no longer impact the build script of user programs.
2020-04-29 01:29:20 +00:00
%-release : DEBUGFLAGS :=
generalized pattern rules
2020-04-29 01:43:55 +00:00
%-release : %
@echo release build completed
automatic %.h header dependency tracking also : BUILD_DIR can be manually specified
2020-10-22 00:25:07 +00:00
# Generate .h dependencies automatically
DEPFLAGS = -MT $@ -MMD -MP -MF
fixed building libzstd with manual BUILD_DIR and when HASH is not found
2020-10-23 17:14:04 +00:00
$(ZSTD_DYNLIB_DIR)/%.o : %.c $(ZSTD_DYNLIB_DIR)/%.d | $(ZSTD_DYNLIB_DIR)
make install only rebuild binaries if they don't exist Now `make` followed by `make install` doesn't rebuild binaries also : only generated target directories if they don't already exist
2020-10-23 23:46:49 +00:00
@echo CC $@
simplified silent mode
2020-10-23 17:22:52 +00:00
$(COMPILE.c) $(DEPFLAGS) $(ZSTD_DYNLIB_DIR)/$*.d $(OUTPUT_OPTION) $<
fixed building libzstd with manual BUILD_DIR and when HASH is not found
2020-10-23 17:14:04 +00:00
$(ZSTD_STATLIB_DIR)/%.o : %.c $(ZSTD_STATLIB_DIR)/%.d | $(ZSTD_STATLIB_DIR)
make install only rebuild binaries if they don't exist Now `make` followed by `make install` doesn't rebuild binaries also : only generated target directories if they don't already exist
2020-10-23 23:46:49 +00:00
@echo CC $@
simplified silent mode
2020-10-23 17:22:52 +00:00
$(COMPILE.c) $(DEPFLAGS) $(ZSTD_STATLIB_DIR)/$*.d $(OUTPUT_OPTION) $<
store %.o object files into obj/ both static and dynamic libraries have their own object directory
2020-10-21 10:44:38 +00:00
MKDIR ?= mkdir
fixed building libzstd with manual BUILD_DIR and when HASH is not found
2020-10-23 17:14:04 +00:00
$(BUILD_DIR) $(ZSTD_DYNLIB_DIR) $(ZSTD_STATLIB_DIR):
simplified silent mode
2020-10-23 17:22:52 +00:00
$(MKDIR) -p $@
automatic %.h header dependency tracking also : BUILD_DIR can be manually specified
2020-10-22 00:25:07 +00:00
DEPFILES := $(ZSTD_DYNLIB_OBJ:.o=.d) $(ZSTD_STATLIB_OBJ:.o=.d)
$(DEPFILES):
include $(wildcard $(DEPFILES))
release builds use less debug symbols and warnings release build are triggered through either `make`, or their specific target `make zstd-release` and `make lib-release`.
2017-02-03 04:54:14 +00:00
makes it possible to compile libzstd in single-thread mode without zstdmt_compress.c (#819)
2017-09-11 21:09:34 +00:00
# Special case : building library in single-thread mode _and_ without zstdmt_compress.c
ZSTDMT_FILES = compress/zstdmt_compress.c
ZSTD_NOMT_FILES = $(filter-out $(ZSTDMT_FILES),$(ZSTD_FILES))
libzstd-nomt: LDFLAGS += -shared -fPIC -fvisibility=hidden
libzstd-nomt: $(ZSTD_NOMT_FILES)
@echo compiling single-thread dynamic library $(LIBVER)
@echo files : $(ZSTD_NOMT_FILES)
simplified silent mode
2020-10-23 17:22:52 +00:00
$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
makes it possible to compile libzstd in single-thread mode without zstdmt_compress.c (#819)
2017-09-11 21:09:34 +00:00
Initial release
2015-01-24 00:58:16 +00:00
clean:
simplified silent mode
2020-10-23 17:22:52 +00:00
$(RM) -r *.dSYM # macOS-specific
$(RM) core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
$(RM) dll/libzstd.dll dll/libzstd.lib libzstd-nomt*
$(RM) -r obj/*
Initial release
2015-01-24 00:58:16 +00:00
@echo Cleaning library completed
BSD: improved "make install"
2016-12-23 09:05:49 +00:00
#-----------------------------------------------------------------------------
support for verbose make A commonly accepted makefile idiom is V=1 or VERBOSE=1 to request the printing of all commands. This is not "default" though, and must be manually added. Example : Before : ``` make libzstd compiling dynamic library 1.4.5 creating versioned links make libzstd V=1 compiling dynamic library 1.4.5 creating versioned links ``` After : ``` make libzstd compiling dynamic library 1.4.5 creating versioned links make libzstd V=1 compiling dynamic library 1.4.5 cc -DXXH_NAMESPACE=ZSTD_ -DZSTD_LEGACY_SUPPORT=5 -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes -Wundef -Wpointer-arith -Wvla -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings -Wredundant-decls -Wmissing-prototypes -Wc++-compat -O3 common/debug.c common/entropy_common.c common/error_private.c common/fse_decompress.c common/pool.c common/threading.c common/xxhash.c common/zstd_common.c compress/fse_compress.c compress/hist.c compress/huf_compress.c compress/zstd_compress.c compress/zstd_compress_literals.c compress/zstd_compress_sequences.c compress/zstd_compress_superblock.c compress/zstd_double_fast.c compress/zstd_fast.c compress/zstd_lazy.c compress/zstd_ldm.c compress/zstd_opt.c compress/zstdmt_compress.c decompress/huf_decompress.c decompress/zstd_ddict.c decompress/zstd_decompress.c decompress/zstd_decompress_block.c deprecated/zbuff_common.c deprecated/zbuff_compress.c deprecated/zbuff_decompress.c dictBuilder/cover.c dictBuilder/divsufsort.c dictBuilder/fastcover.c dictBuilder/zdict.c legacy/zstd_v05.c legacy/zstd_v06.c legacy/zstd_v07.c -shared -fPIC -fvisibility=hidden -Wl,-soname=libzstd.so.1 -o libzstd.so.1.4.5 creating versioned links ln -sf libzstd.so.1.4.5 libzstd.so.1 ln -sf libzstd.so.1.4.5 libzstd.so ```
2020-05-07 14:59:56 +00:00
# make install is validated only for below listed environments
BSD: improved "make install"
2016-12-23 09:05:49 +00:00
#-----------------------------------------------------------------------------
programs/zstd also automatically generate object dir per conf same rules as lib/libzstd can also be controlled via HASH and BUILD_DIR
2020-10-22 06:38:33 +00:00
ifneq (,$(filter $(UNAME),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku))
Solaris: working "make -C lib install"
2016-12-22 19:14:37 +00:00
Only Trigger libzstd.pc Build on Unix-Like Platforms We don't even define the rule on unsupported platforms.
2020-05-08 20:01:26 +00:00
all: libzstd.pc
Avoid Use of Regexes in Building Package-Config File
2020-12-09 01:10:05 +00:00
HAS_EXPLICIT_EXEC_PREFIX := $(if $(or $(EXEC_PREFIX),$(exec_prefix)),1,)
lib/Makefile : better support for GNU conventions see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html
2017-09-06 23:35:49 +00:00
DESTDIR ?=
# directory variables : GNU conventions prefer lowercase
# see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html
# support both lower and uppercase (BSD), use uppercase in script
prefix ?= /usr/local
PREFIX ?= $(prefix)
exec_prefix ?= $(PREFIX)
Fix pkg-config File Generation Again Again Resubmission of #2001. This switches the `sed` invocations to use `-E`, extended regex syntax, which is better standardized across platforms. I guess. Same test plan: ``` make -C lib clean libzstd.pc cat lib/libzstd.pc echo # should fail make -C lib clean libzstd.pc LIBDIR=/foo make -C lib clean libzstd.pc INCLUDEDIR=/foo make -C lib clean libzstd.pc LIBDIR=/usr/localfoo make -C lib clean libzstd.pc INCLUDEDIR=/usr/localfoo make -C lib clean libzstd.pc LIBDIR=/usr/local/lib prefix=/foo make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/include prefix=/foo echo # should succeed make -C lib clean libzstd.pc LIBDIR=/usr/local/foo make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/foo make -C lib clean libzstd.pc LIBDIR=/usr/local/ make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/ make -C lib clean libzstd.pc LIBDIR=/usr/local make -C lib clean libzstd.pc INCLUDEDIR=/usr/local make -C lib clean libzstd.pc LIBDIR=/tmp/foo prefix=/tmp make -C lib clean libzstd.pc INCLUDEDIR=/tmp/foo prefix=/tmp make -C lib clean libzstd.pc LIBDIR=/tmp/foo prefix=/tmp/foo make -C lib clean libzstd.pc INCLUDEDIR=/tmp/foo prefix=/tmp/foo echo # should also succeed make -C lib clean libzstd.pc prefix=/foo LIBDIR=/foo/bar INCLUDEDIR=/foo/ cat lib/libzstd.pc mkdir out cd out cmake ../build/cmake make cat lib/libzstd.pc ```
2020-05-07 17:12:59 +00:00
EXEC_PREFIX ?= $(exec_prefix)
libdir ?= $(EXEC_PREFIX)/lib
lib/Makefile : better support for GNU conventions see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html
2017-09-06 23:35:49 +00:00
LIBDIR ?= $(libdir)
includedir ?= $(PREFIX)/include
INCLUDEDIR ?= $(includedir)
Solaris: working "make -C lib install"
2016-12-22 19:14:37 +00:00
Avoid Use of Regexes in Building Package-Config File
2020-12-09 01:10:05 +00:00
PCINCDIR := $(patsubst $(PREFIX)%,%,$(INCLUDEDIR))
PCLIBDIR := $(patsubst $(EXEC_PREFIX)%,%,$(LIBDIR))
Fix pkg-config File Generation Again Again Resubmission of #2001. This switches the `sed` invocations to use `-E`, extended regex syntax, which is better standardized across platforms. I guess. Same test plan: ``` make -C lib clean libzstd.pc cat lib/libzstd.pc echo # should fail make -C lib clean libzstd.pc LIBDIR=/foo make -C lib clean libzstd.pc INCLUDEDIR=/foo make -C lib clean libzstd.pc LIBDIR=/usr/localfoo make -C lib clean libzstd.pc INCLUDEDIR=/usr/localfoo make -C lib clean libzstd.pc LIBDIR=/usr/local/lib prefix=/foo make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/include prefix=/foo echo # should succeed make -C lib clean libzstd.pc LIBDIR=/usr/local/foo make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/foo make -C lib clean libzstd.pc LIBDIR=/usr/local/ make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/ make -C lib clean libzstd.pc LIBDIR=/usr/local make -C lib clean libzstd.pc INCLUDEDIR=/usr/local make -C lib clean libzstd.pc LIBDIR=/tmp/foo prefix=/tmp make -C lib clean libzstd.pc INCLUDEDIR=/tmp/foo prefix=/tmp make -C lib clean libzstd.pc LIBDIR=/tmp/foo prefix=/tmp/foo make -C lib clean libzstd.pc INCLUDEDIR=/tmp/foo prefix=/tmp/foo echo # should also succeed make -C lib clean libzstd.pc prefix=/foo LIBDIR=/foo/bar INCLUDEDIR=/foo/ cat lib/libzstd.pc mkdir out cd out cmake ../build/cmake make cat lib/libzstd.pc ```
2020-05-07 17:12:59 +00:00
Avoid Use of Regexes in Building Package-Config File
2020-12-09 01:10:05 +00:00
# If we successfully stripped off a prefix, we'll add a reference to the
# relevant pc variable.
PCINCPREFIX := $(if $(findstring $(INCLUDEDIR),$(PCINCDIR)),,$${prefix})
PCLIBPREFIX := $(if $(findstring $(LIBDIR),$(PCLIBDIR)),,$${exec_prefix})
Fix pkg-config File Generation Again Again Resubmission of #2001. This switches the `sed` invocations to use `-E`, extended regex syntax, which is better standardized across platforms. I guess. Same test plan: ``` make -C lib clean libzstd.pc cat lib/libzstd.pc echo # should fail make -C lib clean libzstd.pc LIBDIR=/foo make -C lib clean libzstd.pc INCLUDEDIR=/foo make -C lib clean libzstd.pc LIBDIR=/usr/localfoo make -C lib clean libzstd.pc INCLUDEDIR=/usr/localfoo make -C lib clean libzstd.pc LIBDIR=/usr/local/lib prefix=/foo make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/include prefix=/foo echo # should succeed make -C lib clean libzstd.pc LIBDIR=/usr/local/foo make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/foo make -C lib clean libzstd.pc LIBDIR=/usr/local/ make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/ make -C lib clean libzstd.pc LIBDIR=/usr/local make -C lib clean libzstd.pc INCLUDEDIR=/usr/local make -C lib clean libzstd.pc LIBDIR=/tmp/foo prefix=/tmp make -C lib clean libzstd.pc INCLUDEDIR=/tmp/foo prefix=/tmp make -C lib clean libzstd.pc LIBDIR=/tmp/foo prefix=/tmp/foo make -C lib clean libzstd.pc INCLUDEDIR=/tmp/foo prefix=/tmp/foo echo # should also succeed make -C lib clean libzstd.pc prefix=/foo LIBDIR=/foo/bar INCLUDEDIR=/foo/ cat lib/libzstd.pc mkdir out cd out cmake ../build/cmake make cat lib/libzstd.pc ```
2020-05-07 17:12:59 +00:00
Avoid Use of Regexes in Building Package-Config File
2020-12-09 01:10:05 +00:00
# If no explicit EXEC_PREFIX was set by the caller, write it out as a reference
# to PREFIX, rather than as a resolved value.
PCEXEC_PREFIX := $(if $(HAS_EXPLICIT_EXEC_PREFIX),$(EXEC_PREFIX),$${prefix})
Fix pkg-config File Generation Again Again Resubmission of #2001. This switches the `sed` invocations to use `-E`, extended regex syntax, which is better standardized across platforms. I guess. Same test plan: ``` make -C lib clean libzstd.pc cat lib/libzstd.pc echo # should fail make -C lib clean libzstd.pc LIBDIR=/foo make -C lib clean libzstd.pc INCLUDEDIR=/foo make -C lib clean libzstd.pc LIBDIR=/usr/localfoo make -C lib clean libzstd.pc INCLUDEDIR=/usr/localfoo make -C lib clean libzstd.pc LIBDIR=/usr/local/lib prefix=/foo make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/include prefix=/foo echo # should succeed make -C lib clean libzstd.pc LIBDIR=/usr/local/foo make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/foo make -C lib clean libzstd.pc LIBDIR=/usr/local/ make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/ make -C lib clean libzstd.pc LIBDIR=/usr/local make -C lib clean libzstd.pc INCLUDEDIR=/usr/local make -C lib clean libzstd.pc LIBDIR=/tmp/foo prefix=/tmp make -C lib clean libzstd.pc INCLUDEDIR=/tmp/foo prefix=/tmp make -C lib clean libzstd.pc LIBDIR=/tmp/foo prefix=/tmp/foo make -C lib clean libzstd.pc INCLUDEDIR=/tmp/foo prefix=/tmp/foo echo # should also succeed make -C lib clean libzstd.pc prefix=/foo LIBDIR=/foo/bar INCLUDEDIR=/foo/ cat lib/libzstd.pc mkdir out cd out cmake ../build/cmake make cat lib/libzstd.pc ```
2020-05-07 17:12:59 +00:00
programs/zstd also automatically generate object dir per conf same rules as lib/libzstd can also be controlled via HASH and BUILD_DIR
2020-10-22 06:38:33 +00:00
ifneq (,$(filter $(UNAME),FreeBSD NetBSD DragonFly))
minor cleaning
2020-10-21 10:22:27 +00:00
PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig
Solaris: working "make -C lib install"
2016-12-22 19:14:37 +00:00
else
minor cleaning
2020-10-21 10:22:27 +00:00
PKGCONFIGDIR ?= $(LIBDIR)/pkgconfig
Solaris: working "make -C lib install"
2016-12-22 19:14:37 +00:00
endif
programs/zstd also automatically generate object dir per conf same rules as lib/libzstd can also be controlled via HASH and BUILD_DIR
2020-10-22 06:38:33 +00:00
ifneq (,$(filter $(UNAME),SunOS))
minor cleaning
2020-10-21 10:22:27 +00:00
INSTALL ?= ginstall
lib/Makefile : better support for GNU conventions see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html
2017-09-06 23:35:49 +00:00
else
minor cleaning
2020-10-21 10:22:27 +00:00
INSTALL ?= install
lib/Makefile : better support for GNU conventions see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html
2017-09-06 23:35:49 +00:00
endif
INSTALL_PROGRAM ?= $(INSTALL)
INSTALL_DATA ?= $(INSTALL) -m 644
Initial release
2015-01-24 00:58:16 +00:00
Revert "Fix pkg-config File Generation Again" (#2016)
2020-02-26 18:52:49 +00:00
libzstd.pc:
Makefile version automatically follows zstd.h
2015-12-30 18:52:08 +00:00
libzstd.pc: libzstd.pc.in
Initial release
2015-01-24 00:58:16 +00:00
@echo creating pkgconfig
Avoid Use of Regexes in Building Package-Config File
2020-12-09 01:10:05 +00:00
@sed $(SED_ERE_OPT) \
-e 's|@PREFIX@|$(PREFIX)|' \
-e 's|@EXEC_PREFIX@|$(PCEXEC_PREFIX)|' \
-e 's|@INCLUDEDIR@|$(PCINCPREFIX)$(PCINCDIR)|' \
-e 's|@LIBDIR@|$(PCLIBPREFIX)$(PCLIBDIR)|' \
Fix pkg-config File Generation Again Again Resubmission of #2001. This switches the `sed` invocations to use `-E`, extended regex syntax, which is better standardized across platforms. I guess. Same test plan: ``` make -C lib clean libzstd.pc cat lib/libzstd.pc echo # should fail make -C lib clean libzstd.pc LIBDIR=/foo make -C lib clean libzstd.pc INCLUDEDIR=/foo make -C lib clean libzstd.pc LIBDIR=/usr/localfoo make -C lib clean libzstd.pc INCLUDEDIR=/usr/localfoo make -C lib clean libzstd.pc LIBDIR=/usr/local/lib prefix=/foo make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/include prefix=/foo echo # should succeed make -C lib clean libzstd.pc LIBDIR=/usr/local/foo make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/foo make -C lib clean libzstd.pc LIBDIR=/usr/local/ make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/ make -C lib clean libzstd.pc LIBDIR=/usr/local make -C lib clean libzstd.pc INCLUDEDIR=/usr/local make -C lib clean libzstd.pc LIBDIR=/tmp/foo prefix=/tmp make -C lib clean libzstd.pc INCLUDEDIR=/tmp/foo prefix=/tmp make -C lib clean libzstd.pc LIBDIR=/tmp/foo prefix=/tmp/foo make -C lib clean libzstd.pc INCLUDEDIR=/tmp/foo prefix=/tmp/foo echo # should also succeed make -C lib clean libzstd.pc prefix=/foo LIBDIR=/foo/bar INCLUDEDIR=/foo/ cat lib/libzstd.pc mkdir out cd out cmake ../build/cmake make cat lib/libzstd.pc ```
2020-05-07 17:12:59 +00:00
-e 's|@VERSION@|$(VERSION)|' \
$< >$@
Initial release
2015-01-24 00:58:16 +00:00
Split library install target into pc, static, shared and include only target Signed-off-by: Peter Seiderer <ps.report@gmx.net>
2018-04-16 18:44:49 +00:00
install: install-pc install-static install-shared install-includes
@echo zstd static and shared library installed
install-pc: libzstd.pc
make install only rebuild binaries if they don't exist Now `make` followed by `make install` doesn't rebuild binaries also : only generated target directories if they don't already exist
2020-10-23 23:46:49 +00:00
[ -e $(DESTDIR)$(PKGCONFIGDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/
simplified silent mode
2020-10-23 17:22:52 +00:00
$(INSTALL_DATA) libzstd.pc $(DESTDIR)$(PKGCONFIGDIR)/
Split library install target into pc, static, shared and include only target Signed-off-by: Peter Seiderer <ps.report@gmx.net>
2018-04-16 18:44:49 +00:00
make install only rebuild binaries if they don't exist Now `make` followed by `make install` doesn't rebuild binaries also : only generated target directories if they don't already exist
2020-10-23 23:46:49 +00:00
install-static:
# only generate libzstd.a if it's not already present
[ -e libzstd.a ] || $(MAKE) libzstd.a-release
[ -e $(DESTDIR)$(LIBDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
Split library install target into pc, static, shared and include only target Signed-off-by: Peter Seiderer <ps.report@gmx.net>
2018-04-16 18:44:49 +00:00
@echo Installing static library
simplified silent mode
2020-10-23 17:22:52 +00:00
$(INSTALL_DATA) libzstd.a $(DESTDIR)$(LIBDIR)
Split library install target into pc, static, shared and include only target Signed-off-by: Peter Seiderer <ps.report@gmx.net>
2018-04-16 18:44:49 +00:00
make install only rebuild binaries if they don't exist Now `make` followed by `make install` doesn't rebuild binaries also : only generated target directories if they don't already exist
2020-10-23 23:46:49 +00:00
install-shared:
# only generate libzstd.so if it's not already present
[ -e $(LIBZSTD) ] || $(MAKE) libzstd-release
[ -e $(DESTDIR)$(LIBDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
Split library install target into pc, static, shared and include only target Signed-off-by: Peter Seiderer <ps.report@gmx.net>
2018-04-16 18:44:49 +00:00
@echo Installing shared library
simplified silent mode
2020-10-23 17:22:52 +00:00
$(INSTALL_PROGRAM) $(LIBZSTD) $(DESTDIR)$(LIBDIR)
ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
Split library install target into pc, static, shared and include only target Signed-off-by: Peter Seiderer <ps.report@gmx.net>
2018-04-16 18:44:49 +00:00
install-includes:
make install only rebuild binaries if they don't exist Now `make` followed by `make install` doesn't rebuild binaries also : only generated target directories if they don't already exist
2020-10-23 23:46:49 +00:00
[ -e $(DESTDIR)$(INCLUDEDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(INCLUDEDIR)/
Solaris: working "make -C lib install"
2016-12-22 19:14:37 +00:00
@echo Installing includes
simplified silent mode
2020-10-23 17:22:52 +00:00
$(INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR)
$(INSTALL_DATA) common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR)
$(INSTALL_DATA) dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)
Initial release
2015-01-24 00:58:16 +00:00
uninstall:
simplified silent mode
2020-10-23 17:22:52 +00:00
$(RM) $(DESTDIR)$(LIBDIR)/libzstd.a
$(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
$(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
$(RM) $(DESTDIR)$(LIBDIR)/$(LIBZSTD)
$(RM) $(DESTDIR)$(PKGCONFIGDIR)/libzstd.pc
$(RM) $(DESTDIR)$(INCLUDEDIR)/zstd.h
$(RM) $(DESTDIR)$(INCLUDEDIR)/zstd_errors.h
$(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h
Initial release
2015-01-24 00:58:16 +00:00
@echo zstd libraries successfully uninstalled
endif
Reference in New Issue Copy Permalink