flasn4nt
/
graal
mirror of https://github.com/oracle/graal.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[GR-59098] Use default devtools for WABT and bump to 1.0.36

This commit is contained in:
Bernhard Urban-Forster 2024-10-17 10:40:27 +02:00
parent 0518461551
commit ba8d60df92
4 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ci/common.jsonnet
View File

@ -259,6 +259,15 @@ local common_json = import "../common.json";
} else {},
},
wasm:: {
downloads+: {
WABT_DIR: {name: 'wabt', version: '1.0.36', platformspecific: true},
},
environment+: {
WABT_DIR: '$WABT_DIR/bin',
},
},
fastr:: {
# Note: On both Linux and MacOS, FastR depends on the gnur module and on gfortran
# of a specific version (4.8.5 on Linux, 10.2.0 on MacOS)

14
vm/ci/ci_common/common-bench.jsonnet
View File

@ -94,19 +94,7 @@ local repo_config = import '../../../ci/repo-configuration.libsonnet';
timelimit: if (is_gate) then '1:00:00' else '1:30:00',
},
local wabt = {
packages+: {
gcc: '==8.3.0',
},
downloads+: {
WABT_DIR: {name: 'wabt', version: '1.0.32', platformspecific: true},
},
environment+: {
WABT_DIR: '$WABT_DIR/bin',
},
},
vm_bench_polybench_linux_common(env='polybench-${VM_ENV}', is_gate=false): vm_common.svm_common + vm_common.truffleruby + vm_common.graalpy + vm.custom_vm + self.vm_bench_common + wabt {
vm_bench_polybench_linux_common(env='polybench-${VM_ENV}', is_gate=false): vm_common.svm_common + vm_common.truffleruby + vm_common.graalpy + vm.custom_vm + self.vm_bench_common + vm_common.wasm {
base_cmd:: ['mx', '--env', env],
bench_cmd:: self.base_cmd + ['benchmark'] + (if (is_gate) then ['--fail-fast'] else []),
interpreter_bench_cmd(vmConfig):: self.bench_cmd +

3
vm/ci/ci_common/common.jsonnet
View File

@ -88,6 +88,9 @@ local devkits = graal_common.devkits;
# GRAALPYTHON
graalpy: self.sulong + graal_common.deps.graalpy,
# WASM
wasm: graal_common.deps.wasm,
vm_linux_amd64_common: graal_common.deps.svm {
capabilities+: ['manycores', 'ram16gb', 'fast'],
},

20
wasm/ci/ci_common/common.jsonnet
View File

@ -48,20 +48,6 @@ local graal_suite_root = root_ci.graal_suite_root;
windows_amd64:: common.windows_amd64 + self.windows_common,
wabt:: {
downloads+: {
WABT_DIR: {name: 'wabt', version: '1.0.32', platformspecific: true},
},
environment+: {
WABT_DIR: '$WABT_DIR/bin',
},
packages+: if self.os == "linux" then {
# wabt was built with GCC 8 and needs a newer version of libstdc++.so.6
# than what is typically available on OL7
gcc: '==8.3.0',
} else {},
},
emsdk:: {
downloads+: {
EMSDK_DIR: {name: 'emsdk', version: '1.39.13', platformspecific: true},
@ -126,7 +112,7 @@ local graal_suite_root = root_ci.graal_suite_root;
},
},
gate_graalwasm_full:: self.wabt + self.setup_common + {
gate_graalwasm_full:: common.deps.wasm + self.setup_common + {
run+: [
gate_cmd_full
],
@ -177,7 +163,7 @@ local graal_suite_root = root_ci.graal_suite_root;
},
eclipse_jdt :: common.deps.pylint + common.deps.eclipse + common.deps.jdt,
wabt_emsdk :: self.wabt + self.emsdk,
wabt_emsdk_ocamlbuild :: self.wabt + self.emsdk + self.ocamlbuild,
wabt_emsdk :: common.deps.wasm + self.emsdk,
wabt_emsdk_ocamlbuild :: common.deps.wasm + self.emsdk + self.ocamlbuild,
}