Commit6acf777

authored

gh-120507: Double WASI memory (#120648)

Use 16 MiB stack with 40 MiB memory limit, instead of 8 MiB stackwith 20 MiB memory limit.

1 parent0506f75 commit6acf777Copy full SHA for 6acf777

File tree

-9

lines changed

-9

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -280,9 +280,8 @@ def main():`
`280`	`280`	`default_host_runner= (f"{shutil.which('wasmtime')} run "`
`281`	`281`	`# Make sure the stack size will work for a pydebug`
`282`	`282`	`# build.`
`283`		-# The 8388608 value comes from `ulimit -s` under Linux
`284`		`-# which equates to 8291 KiB.`
`285`		`-"--wasm max-wasm-stack=8388608 "`
	`283`	`+# Use 16 MiB stack.`
	`284`	`+"--wasm max-wasm-stack=16777216 "`
`286`	`285`	`# Use WASI 0.2 primitives.`
`287`	`286`	`"--wasi preview2 "`
`288`	`287`	`# Enable thread support; causes use of preview1.`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ def _check_wasi() -> None:`
`329`	`329`	`# workaround for https://github.com/python/cpython/issues/95952`
`330`	`330`	`"HOSTRUNNER": (`
`331`	`331`	`"wasmtime run "`
`332`		`-"--wasm max-wasm-stack=8388608 "`
	`332`	`+"--wasm max-wasm-stack=16777216 "`
`333`	`333`	`"--wasi preview2 "`
`334`	`334`	`"--dir {srcdir}::/ "`
`335`	`335`	`"--env PYTHONPATH=/{relbuilddir}/build/lib.wasi-wasm32-{version}:/Lib"`

Lines changed: 2 additions & 2 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1609,7 +1609,7 @@ then`
`1609`	`1609`	`dnl TODO: support other WASI runtimes`
`1610`	`1610`	`dnl wasmtime starts the proces with "/" as CWD. For OOT builds add the`
`1611`	`1611`	`dnl directory containing _sysconfigdata to PYTHONPATH.`
`1612`		`-[WASI/*],[HOSTRUNNER='wasmtime run --wasm max-wasm-stack=8388608 --wasi preview2 --env PYTHONPATH=/$(shell realpath --relative-to $(abs_srcdir) $(abs_builddir))/$(shell cat pybuilddir.txt):/Lib --dir $(srcdir)::/'],`
	`1612`	`+[WASI/*],[HOSTRUNNER='wasmtime run --wasm max-wasm-stack=16777216 --wasi preview2 --env PYTHONPATH=/$(shell realpath --relative-to $(abs_srcdir) $(abs_builddir))/$(shell cat pybuilddir.txt):/Lib --dir $(srcdir)::/'],`
`1613`	`1613`	`[HOSTRUNNER='']`
`1614`	`1614`	`)`
`1615`	`1615`	`fi`
`@@ -2403,10 +2403,10 @@ AS_CASE([$ac_sys_system],`
`2403`	`2403`	`AS_VAR_APPEND([LDFLAGS_NODIST],[" -Wl,--max-memory=10485760"])`
`2404`	`2404`	`])`
`2405`	`2405`
`2406`		`- dnl gh-117645: Set the memory size to20 MiB, the stack size to8 MiB,`
	`2406`	`+ dnl gh-117645: Set the memory size to40 MiB, the stack size to16 MiB,`
`2407`	`2407`	`dnl and move the stack first.`
`2408`	`2408`	`dnl https://github.com/WebAssembly/wasi-libc/issues/233`
`2409`		`-AS_VAR_APPEND([LDFLAGS_NODIST],[" -z stack-size=8388608 -Wl,--stack-first -Wl,--initial-memory=20971520"])`
	`2409`	`+AS_VAR_APPEND([LDFLAGS_NODIST],[" -z stack-size=16777216 -Wl,--stack-first -Wl,--initial-memory=41943040"])`
`2410`	`2410`	`]`
`2411`	`2411`	`)`
`2412`	`2412`

Comments

(0)