From 1542bfb7fd707ba1e7637044bca7d2441a6f2c2c Mon Sep 17 00:00:00 2001 From: Ingvar Stepanyan Date: Mon, 11 May 2020 21:21:07 +0100 Subject: [PATCH] Tweak up compile flags - Remove unnecessary `-x c++`. - Improve rebuild speed by caching: - Remove `-f` from `autoreconf` to reuse generated configure scripts. - Remove `--rm` from `docker run` to avoid rebuilding Emscripten stdlib. - Add `-C` to `./configure` to reuse stored information about `emcc`. - Remove `rm -rf build` from WebP encoder/decoder. --- codecs/hqx/package.json | 2 +- codecs/imagequant/build.sh | 1 - codecs/imagequant/package.json | 2 +- codecs/mozjpeg_enc/build.sh | 15 ++++++--------- codecs/mozjpeg_enc/mozjpeg_enc.cpp | 3 +++ codecs/mozjpeg_enc/mozjpeg_enc.wasm | Bin 228590 -> 228472 bytes codecs/mozjpeg_enc/package.json | 2 +- codecs/oxipng/package.json | 2 +- codecs/resize/package.json | 2 +- codecs/rotate/package.json | 2 +- codecs/webp_dec/build.sh | 10 +++------- codecs/webp_dec/package.json | 2 +- codecs/webp_enc/build.sh | 10 +++------- codecs/webp_enc/package.json | 2 +- 14 files changed, 23 insertions(+), 32 deletions(-) diff --git a/codecs/hqx/package.json b/codecs/hqx/package.json index 9c50eb01..55123770 100644 --- a/codecs/hqx/package.json +++ b/codecs/hqx/package.json @@ -2,6 +2,6 @@ "name": "hqx", "scripts": { "build:image": "docker build -t squoosh-hqx .", - "build": "docker run --rm -v $(pwd):/src squoosh-hqx ./build.sh" + "build": "docker run -v $(pwd):/src squoosh-hqx ./build.sh" } } diff --git a/codecs/imagequant/build.sh b/codecs/imagequant/build.sh index 9029af40..eb85850e 100755 --- a/codecs/imagequant/build.sh +++ b/codecs/imagequant/build.sh @@ -29,7 +29,6 @@ echo "=============================================" -I node_modules/libimagequant \ -o ./imagequant.js \ --std=c++11 \ - -x c++ \ imagequant.cpp \ node_modules/libimagequant/libimagequant.a ) diff --git a/codecs/imagequant/package.json b/codecs/imagequant/package.json index 7797faa7..01da35ff 100644 --- a/codecs/imagequant/package.json +++ b/codecs/imagequant/package.json @@ -2,7 +2,7 @@ "name": "imagequant", "scripts": { "install": "napa", - "build": "docker run --rm -v $(pwd):/src trzeci/emscripten-upstream ./build.sh" + "build": "docker run -v $(pwd):/src trzeci/emscripten-upstream ./build.sh" }, "napa": { "libimagequant": "ImageOptim/libimagequant#2.12.1" diff --git a/codecs/mozjpeg_enc/build.sh b/codecs/mozjpeg_enc/build.sh index 3382901e..22cb7b21 100755 --- a/codecs/mozjpeg_enc/build.sh +++ b/codecs/mozjpeg_enc/build.sh @@ -15,9 +15,9 @@ echo "Compiling mozjpeg" echo "=============================================" ( cd node_modules/mozjpeg - autoreconf -fiv - emconfigure ./configure --without-simd - emmake make libjpeg.la -j`nproc` + autoreconf -iv + emconfigure ./configure -C --without-simd + emmake make libjpeg.la rdswitch.o -j`nproc` ) echo "=============================================" echo "Compiling mozjpeg done" @@ -31,18 +31,15 @@ echo "=============================================" --bind \ ${OPTIMIZE} \ --closure 1 \ - -s WASM=1 \ -s ALLOW_MEMORY_GROWTH=1 \ -s MODULARIZE=1 \ -s 'EXPORT_NAME="mozjpeg_enc"' \ -I node_modules/mozjpeg \ -o ./mozjpeg_enc.js \ - -Wno-deprecated-register \ - -Wno-writable-strings \ - node_modules/mozjpeg/rdswitch.c \ - -x c++ -std=c++11 \ + -std=c++11 \ mozjpeg_enc.cpp \ - node_modules/mozjpeg/.libs/libjpeg.a + node_modules/mozjpeg/.libs/libjpeg.a \ + node_modules/mozjpeg/rdswitch.o ) echo "=============================================" echo "Compiling wasm bindings done" diff --git a/codecs/mozjpeg_enc/mozjpeg_enc.cpp b/codecs/mozjpeg_enc/mozjpeg_enc.cpp index a2a31db5..19615252 100644 --- a/codecs/mozjpeg_enc/mozjpeg_enc.cpp +++ b/codecs/mozjpeg_enc/mozjpeg_enc.cpp @@ -7,7 +7,10 @@ #include #include "config.h" #include "jpeglib.h" + +extern "C" { #include "cdjpeg.h" +} using namespace emscripten; diff --git a/codecs/mozjpeg_enc/mozjpeg_enc.wasm b/codecs/mozjpeg_enc/mozjpeg_enc.wasm index cdabb9e0bfd0a385f27c57dd880421c8f61e01c9..c41ae62a9d7ae2d398edb57c6c11f3cb666498f4 100644 GIT binary patch delta 5817 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 E-%?!EdH?_b delta 5868 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 diff --git a/codecs/mozjpeg_enc/package.json b/codecs/mozjpeg_enc/package.json index 67ab47dc..3ef467fd 100644 --- a/codecs/mozjpeg_enc/package.json +++ b/codecs/mozjpeg_enc/package.json @@ -2,7 +2,7 @@ "name": "mozjpeg_enc", "scripts": { "install": "napa", - "build": "docker run --rm -v $(pwd):/src trzeci/emscripten-upstream ./build.sh" + "build": "docker run -v $(pwd):/src trzeci/emscripten-upstream ./build.sh" }, "napa": { "mozjpeg": "mozilla/mozjpeg#v3.3.1" diff --git a/codecs/oxipng/package.json b/codecs/oxipng/package.json index 391c50cf..a8214274 100644 --- a/codecs/oxipng/package.json +++ b/codecs/oxipng/package.json @@ -2,6 +2,6 @@ "name": "oxipng", "scripts": { "build:image": "docker build -t squoosh-oxipng .", - "build": "docker run --rm -v $(pwd):/src squoosh-oxipng ./build.sh" + "build": "docker run -v $(pwd):/src squoosh-oxipng ./build.sh" } } diff --git a/codecs/resize/package.json b/codecs/resize/package.json index 439f4262..f0d0e462 100644 --- a/codecs/resize/package.json +++ b/codecs/resize/package.json @@ -2,6 +2,6 @@ "name": "resize", "scripts": { "build:image": "docker build -t squoosh-resize .", - "build": "docker run --rm -v $(pwd):/src squoosh-resize ./build.sh" + "build": "docker run -v $(pwd):/src squoosh-resize ./build.sh" } } diff --git a/codecs/rotate/package.json b/codecs/rotate/package.json index add6a95a..5ce6f41e 100644 --- a/codecs/rotate/package.json +++ b/codecs/rotate/package.json @@ -2,7 +2,7 @@ "name": "rotate", "scripts": { "build:image": "docker build -t squoosh-rotate .", - "build": "docker run --rm -v $(pwd):/src squoosh-rotate ./build.sh", + "build": "docker run -v $(pwd):/src squoosh-rotate ./build.sh", "benchmark": "echo File size after gzip && npm run benchmark:filesize && echo Optimizing && npm run -s benchmark:optimizing", "benchmark:baseline": "v8 --liftoff --no-wasm-tier-up --no-opt ./benchmark.js", "benchmark:optimizing": "v8 --no-liftoff --no-wasm-tier-up ./benchmark.js", diff --git a/codecs/webp_dec/build.sh b/codecs/webp_dec/build.sh index e17d29c9..a85a3a64 100755 --- a/codecs/webp_dec/build.sh +++ b/codecs/webp_dec/build.sh @@ -14,10 +14,8 @@ echo "Compiling libwebp" echo "=============================================" test -n "$SKIP_LIBWEBP" || ( cd node_modules/libwebp - autoreconf -fiv - rm -rf build || true - mkdir -p build && cd build - emconfigure ../configure \ + autoreconf -iv + emconfigure ./configure -C \ --disable-libwebpdemux \ --disable-wic \ --disable-gif \ @@ -44,12 +42,10 @@ echo "=============================================" -s ALLOW_MEMORY_GROWTH=1 \ -s MODULARIZE=1 \ -s 'EXPORT_NAME="webp_dec"' \ - --std=c++11 \ -I node_modules/libwebp \ -o ./webp_dec.js \ - -x c++ \ webp_dec.cpp \ - node_modules/libwebp/build/src/.libs/libwebp.a + node_modules/libwebp/src/.libs/libwebp.a ) echo "=============================================" echo "Compiling wasm bindings done" diff --git a/codecs/webp_dec/package.json b/codecs/webp_dec/package.json index 53abd454..dcd40203 100644 --- a/codecs/webp_dec/package.json +++ b/codecs/webp_dec/package.json @@ -2,7 +2,7 @@ "name": "webp_dec", "scripts": { "install": "napa", - "build": "docker run --rm -v $(pwd):/src trzeci/emscripten-upstream ./build.sh" + "build": "docker run -v $(pwd):/src trzeci/emscripten-upstream ./build.sh" }, "napa": { "libwebp": "webmproject/libwebp#v1.0.2" diff --git a/codecs/webp_enc/build.sh b/codecs/webp_enc/build.sh index 4fa61ee1..e81c44bc 100755 --- a/codecs/webp_enc/build.sh +++ b/codecs/webp_enc/build.sh @@ -15,10 +15,8 @@ echo "Compiling libwebp" echo "=============================================" test -n "$SKIP_LIBWEBP" || ( cd node_modules/libwebp - autoreconf -fiv - rm -rf build || true - mkdir -p build && cd build - emconfigure ../configure \ + autoreconf -iv + emconfigure ./configure -C \ --disable-libwebpdemux \ --disable-wic \ --disable-gif \ @@ -45,12 +43,10 @@ echo "=============================================" -s ALLOW_MEMORY_GROWTH=1 \ -s MODULARIZE=1 \ -s 'EXPORT_NAME="webp_enc"' \ - --std=c++11 \ -I node_modules/libwebp \ -o ./webp_enc.js \ - -x c++ \ webp_enc.cpp \ - node_modules/libwebp/build/src/.libs/libwebp.a + node_modules/libwebp/src/.libs/libwebp.a ) echo "=============================================" echo "Compiling wasm bindings done" diff --git a/codecs/webp_enc/package.json b/codecs/webp_enc/package.json index 406979a3..9ba163eb 100644 --- a/codecs/webp_enc/package.json +++ b/codecs/webp_enc/package.json @@ -2,7 +2,7 @@ "name": "webp_enc", "scripts": { "install": "napa", - "build": "docker run --rm -v $(pwd):/src trzeci/emscripten-upstream ./build.sh" + "build": "docker run -v $(pwd):/src trzeci/emscripten-upstream ./build.sh" }, "napa": { "libwebp": "webmproject/libwebp#v1.0.2"