external-repos/squoosh
1
0
Fork 1
mirror of https://github.com/GoogleChromeLabs/squoosh.git synced 2025-11-14 01:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Node 14 for SIMD tests

Browse Source
This commit is contained in:
Surma
2020-08-05 17:20:33 +01:00
parent d0f5d5a644
commit 0e90f805a4
6 changed files with 51 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
codecs/cpp.Dockerfile
View File

@@ -5,5 +5,7 @@ ENV CXXFLAGS "${CFLAGS} -std=c++17"
ENV LDFLAGS "${CFLAGS}" ENV LDFLAGS "${CFLAGS}"
# Build and cache standard libraries with these flags # Build and cache standard libraries with these flags
RUN emcc ${CXXFLAGS} --bind -xc++ /dev/null -o /dev/null RUN emcc ${CXXFLAGS} --bind -xc++ /dev/null -o /dev/null
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash
RUN /bin/bash -ic 'nvm install 14.7.0'
WORKDIR /src WORKDIR /src
CMD ["sh", "-c", "emmake make -j`nproc`"] CMD ["sh", "-c", "emmake make -j`nproc`"]

13
codecs/mozjpeg_enc/.emscripten Normal file
View File

@@ -0,0 +1,13 @@
import os
emsdk_path = "/emsdk/"
#NODE_JS = emsdk_path + '/node/12.18.1_64bit/bin/node'
# We need a newer version of Node that supports the most recent iteration of Wasm SIMD
# and need to enable that experimental support via flag so that autoconf can successfully
# detect SIMD support.
NODE_JS=["/root/.nvm/versions/node/v14.7.0/bin/node", "--experimental-wasm-simd"]
LLVM_ROOT = emsdk_path + '/upstream/bin'
BINARYEN_ROOT = emsdk_path + '/upstream'
EMSCRIPTEN_ROOT = emsdk_path + '/upstream/emscripten'
TEMP_DIR = emsdk_path + '/tmp'
COMPILER_ENGINE = NODE_JS
JS_ENGINES = [NODE_JS]

10
codecs/mozjpeg_enc/Makefile
View File

@@ -5,11 +5,21 @@ CODEC_OUT := $(addprefix $(CODEC_DIR)/, $(CODEC_OUT_RELATIVE))
OUT_JS := mozjpeg_enc.js OUT_JS := mozjpeg_enc.js
OUT_WASM := $(OUT_JS:.js=.wasm) OUT_WASM := $(OUT_JS:.js=.wasm)
CFLAGS += -msimd128 -msse --em-config /src/.emscripten
CXXFLAGS += -msimd128 -msse --em-config /src/.emscripten
#override CFLAGS += "-msimd128 -msse"
#override CXXFLAGS += "-msimd128 -msse"
.PHONY: all clean .PHONY: all clean
all: $(OUT_JS) all: $(OUT_JS)
%.js: %.cpp $(CODEC_OUT) %.js: %.cpp $(CODEC_OUT)
# We just to disable the overridden NODE_JS binary because
# `--closure 1` can’t handle arrays in `.emscripten` it seems.
# https://github.com/emscripten-core/emsdk/issues/583
export EM_NODE_JS='/root/.nvm/versions/node/v14.7.0/bin/node' && \
$(CXX) \ $(CXX) \
-I $(CODEC_DIR) \ -I $(CODEC_DIR) \
${CXXFLAGS} \ ${CXXFLAGS} \

44
codecs/mozjpeg_enc/example.html
View File

@@ -1,26 +1,14 @@
<!doctype html> <!doctype html>
<script src='mozjpeg_enc.js'></script> <script src='mozjpeg_enc.js'></script>
<script> <script>
const module = mozjpeg_enc(); const module = mozjpeg_enc({
loadFile() {
async function loadImage(src) { return "./mozjpeg_enc.wasm";
// Load image },
const img = document.createElement('img'); async onRuntimeInitialized() {
img.src = src; //console.log('Version:', module.version().toString(16));
await new Promise(resolve => img.onload = resolve);
// Make canvas same size as image
const canvas = document.createElement('canvas');
[canvas.width, canvas.height] = [img.width, img.height];
// Draw image onto canvas
const ctx = canvas.getContext('2d');
ctx.drawImage(img, 0, 0);
return ctx.getImageData(0, 0, img.width, img.height);
}
module.onRuntimeInitialized = async _ => {
console.log('Version:', module.version().toString(16));
const image = await loadImage('../example.png'); const image = await loadImage('../example.png');
const result = module.encode(image.data, image.width, image.height, { const result = this.encode(image.data, image.width, image.height, {
quality: 75, quality: 75,
baseline: false, baseline: false,
arithmetic: false, arithmetic: false,
@@ -44,5 +32,21 @@
const img = document.createElement('img'); const img = document.createElement('img');
img.src = blobURL; img.src = blobURL;
document.body.appendChild(img); document.body.appendChild(img);
}; }
});
async function loadImage(src) {
// Load image
const img = document.createElement('img');
img.src = src;
await new Promise(resolve => img.onload = resolve);
// Make canvas same size as image
const canvas = document.createElement('canvas');
[canvas.width, canvas.height] = [img.width, img.height];
// Draw image onto canvas
const ctx = canvas.getContext('2d');
ctx.drawImage(img, 0, 0);
return ctx.getImageData(0, 0, img.width, img.height);
}
</script> </script>

2
codecs/mozjpeg_enc/mozjpeg_enc.cpp
View File

@@ -1,5 +1,7 @@
#include <emscripten/bind.h> #include <emscripten/bind.h>
#include <emscripten/val.h> #include <emscripten/val.h>
#include <wasm_simd128.h>
#include <xmmintrin.h>
#include <inttypes.h> #include <inttypes.h>
#include <setjmp.h> #include <setjmp.h>
#include <stdio.h> #include <stdio.h>

BIN
codecs/mozjpeg_enc/mozjpeg_enc.wasm
View File

Binary file not shown.