Skip to content

feat: Generate for Emscripten 3.1.12 and SIMD features #2259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattleibow merged 3 commits into from
Sep 29, 2022
Merged

feat: Generate for Emscripten 3.1.12 and SIMD features #2259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
410028b
chore: Remove unused emscripten versions
jeromelaban Sep 20, 2022
6715fa8
feat: Generate for Emscripten 3.1.12 and SIMD features
jeromelaban Sep 28, 2022
b2ae1a5
chore: Adjust for 3.1.12 folder strurcture to use `st` (single-threaded)
jeromelaban Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions native/wasm/build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ DirectoryPath OUTPUT_PATH = MakeAbsolute(ROOT_PATH.Combine("output/native"));

string SUPPORT_GPU_VAR = Argument("supportGpu", EnvironmentVariable("SUPPORT_GPU") ?? "true").ToLower();
string EMSCRIPTEN_VERSION = Argument("emscriptenVersion", EnvironmentVariable("EMSCRIPTEN_VERSION") ?? "").ToLower();
string[] EMSCRIPTEN_FEATURES =
Argument("emscriptenFeatures", EnvironmentVariable("EMSCRIPTEN_FEATURES") ?? "")
.ToLower()
.Split(",")
.Where(f => f != "none")
.ToArray();
bool SUPPORT_GPU = SUPPORT_GPU_VAR == "1" || SUPPORT_GPU_VAR == "true";

string CC = Argument("cc", "emcc");
Expand All @@ -17,6 +23,7 @@ Task("libSkiaSharp")
.WithCriteria(IsRunningOnLinux())
.Does(() =>
{
bool hasSimdEnabled = EMSCRIPTEN_FEATURES.Contains("simd");

GnNinja($"wasm", "SkiaSharp",
$"target_os='linux' " +
Expand Down Expand Up @@ -51,10 +58,11 @@ Task("libSkiaSharp")
$"use_PIC=false " +
$"extra_cflags=[ " +
$" '-DSKIA_C_DLL', '-DXML_POOR_ENTROPY', " +
$" '-DSKNX_NO_SIMD', '-DSK_DISABLE_AAA', '-DGR_GL_CHECK_ALLOC_WITH_GET_ERROR=0', " +
$" {(!hasSimdEnabled ? "'-DSKNX_NO_SIMD', " : "")} '-DSK_DISABLE_AAA', '-DGR_GL_CHECK_ALLOC_WITH_GET_ERROR=0', " +
$" '-s', 'WARN_UNALIGNED=1' " + // '-s', 'USE_WEBGL2=1' (experimental)
$"] " +
$"extra_cflags_cc=[ '-frtti' ] " +
// SIMD support is based on https://github.com/google/skia/blob/1f193df9b393d50da39570dab77a0bb5d28ec8ef/modules/canvaskit/compile.sh#L57
$"extra_cflags_cc=[ '-frtti' { (hasSimdEnabled ? ", '-msimd128'" : "") } ] " +
COMPILERS +
ADDITIONAL_GN_ARGS);

Expand Down Expand Up @@ -88,6 +96,8 @@ Task("libSkiaSharp")
var outDir = OUTPUT_PATH.Combine($"wasm");
if (!string.IsNullOrEmpty(EMSCRIPTEN_VERSION))
outDir = outDir.Combine("libSkiaSharp.a").Combine(EMSCRIPTEN_VERSION);
if (EMSCRIPTEN_FEATURES.Length != 0)
outDir = outDir.Combine(string.Join(",", EMSCRIPTEN_FEATURES));
EnsureDirectoryExists(outDir);
CopyFileToDirectory(a, outDir);
});
Expand Down
27 changes: 20 additions & 7 deletions scripts/azure-templates-stages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,13 +368,26 @@ stages:
vmImage: ${{ parameters.VM_IMAGE_LINUX_NATIVE }}
artifactName: native
emscripten:
- 2.0.5
- 2.0.6
- 2.0.9
- 2.0.11
- 2.0.12
- 2.0.23
- 3.1.7
- 2.0.6:
displayName: 2.0.6
version: 2.0.6
features: none
- 2.0.23:
displayName: 2.0.23
version: 2.0.23
features: none
- 3.1.7:
displayName: 3.1.7
version: 3.1.7
features: none
- 3.1.12:
displayName: 3.1.12
version: 3.1.12
features: st
- 3.1.12:
displayName: '3.1.12_SIMD'
version: 3.1.12
features: simd

- ${{ if ne(parameters.buildPipelineType, 'tests') }}:
- stage: managed
Expand Down
8 changes: 4 additions & 4 deletions scripts/azure-templates-wasm-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ jobs:
- ${{ each version in parameters.emscripten }}:
- template: azure-templates-bootstrapper.yml
parameters:
name: native_wasm_${{ replace(version, '.', '_') }}_linux
displayName: WASM (${{ version }})
name: native_wasm_${{ replace(version.displayName, '.', '_') }}_linux
displayName: WASM (${{ version.displayName }})
buildExternals: ${{ parameters.buildExternals }}
buildPipelineType: ${{ parameters.buildPipelineType }}
vmImage: ${{ parameters.vmImage }}
docker: scripts/Docker/wasm
target: externals-wasm
dockerArgs: --build-arg EMSCRIPTEN_VERSION=${{ version }}
additionalArgs: --emscriptenVersion=${{ version }}
dockerArgs: --build-arg EMSCRIPTEN_VERSION=${{ version.version }}
additionalArgs: --emscriptenVersion=${{ version.version }} --emscriptenFeatures="${{ version.features }}"
artifactName: ${{ parameters.artifactName }}
postBuildSteps:
- task: PublishBuildArtifacts@1
Expand Down