From 73cc5bba5f17d6a574aee6d537a94e109f26b95f Mon Sep 17 00:00:00 2001 From: dzaima Date: Tue, 16 May 2023 00:13:26 +0300 Subject: [PATCH] more proper fix for wasm; test arch=generic in moreCfgs.sh --- build/src/build.bqn | 3 +-- test/moreCfgs.sh | 56 ++++++++++++++++++++++----------------------- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/build/src/build.bqn b/build/src/build.bqn index 1a88f64f..694eaae0 100755 --- a/build/src/build.bqn +++ b/build/src/build.bqn @@ -271,8 +271,7 @@ po ← { # parsed options ⟨"-Wno-parentheses"⟩ # gcc ⟨ # clang "-Wno-microsoft-anon-tag", "-Wno-bitwise-instead-of-logical", "-Wno-unknown-warning-option" - ⟩ - (¬wasm)/⟨"-mllvm", "--x86-cmov-converter=0"⟩ # thing that converts `cmov`s to branching sometimes (?), but we don't want that + ⟩ ∾ (¬wasm)/⟨"-mllvm", "--x86-cmov-converter=0"⟩ # thing that converts `cmov`s to branching sometimes (?), but we don't want that ⟩ args∾↩ 0⊑GetLibs@ diff --git a/test/moreCfgs.sh b/test/moreCfgs.sh index 9e9d204a..9e354adb 100755 --- a/test/moreCfgs.sh +++ b/test/moreCfgs.sh @@ -3,33 +3,33 @@ if [ "$#" -ne 1 ]; then echo "Usage: $0 path/to/mlochbaum/BQN" exit fi -make && ./BQN -p 2+2 || exit -make single-debug && ./BQN -p 2+2 || exit -make heapverify && ./BQN -p 2+2 || exit -make rtverify && ./BQN -p 2+2 || exit -build/build f='-DDEBUG -DDEBUG_VM' c && ./BQN -p 2+2 2>&1 | tail -2 || exit -build/build f='-DWARN_SLOW' c && ./BQN -p 2+2 2> /dev/null || exit -build/build f='-DMM=0 -DENABLE_GC=0' c && ./BQN -p 2+2 || exit -build/build f='-DMM=1' c && ./BQN -p 2+2 || exit -build/build f='-DMM=2' debug c && ./BQN "$1/test/this.bqn" || exit -build/build usz=64 debug c && ./BQN "$1/test/this.bqn" || exit -build/build f='-DTYPED_ARITH=0' c && ./BQN -p 2+2 || exit -build/build f='-DFAKE_RUNTIME' c && ./BQN -p 2+2 || exit -build/build f='-DALL_R0' c && ./BQN -p 2+2 || exit -build/build f='-DALL_R1' c && ./BQN -p 2+2 || exit -build/build f='-DALL_R0 -DALL_R1' c && ./BQN -p 2+2 || exit -build/build f='-DSFNS_FILLS=0' c && ./BQN -p 2+2 || exit -build/build f='-DFORMATTER=0' c && ./BQN -p 2+2 || exit -build/build f='-DVMPOS=0' c && ./BQN -p 2+2 || exit -build/build f='-DDONT_FREE' c && ./BQN -p 2+2 || exit -build/build f='-DOBJ_COUNTER' c && ./BQN -p 2+2 || exit -build/build f='-DNO_RT' c && ./BQN -p 2+2 || exit -build/build f='-DNATIVE_COMPILER' c && ./BQN -p 2+2 || exit +make && ./BQN -p 2+2 || exit +make single-debug && ./BQN -p 2+2 || exit +make heapverify && ./BQN -p 2+2 || exit +make rtverify && ./BQN -p 2+2 || exit +build/build f='-DDEBUG -DDEBUG_VM' c && ./BQN -p 2+2 2>&1 | tail -2 || exit +build/build f='-DWARN_SLOW' c && ./BQN -p 2+2 2> /dev/null || exit +build/build f='-DMM=0 -DENABLE_GC=0' c && ./BQN -p 2+2 || exit +build/build f='-DMM=1' c && ./BQN -p 2+2 || exit +build/build f='-DMM=2' debug c && ./BQN "$1/test/this.bqn" || exit +build/build usz=64 debug c && ./BQN "$1/test/this.bqn" || exit +build/build f='-DTYPED_ARITH=0' c && ./BQN -p 2+2 || exit +build/build f='-DFAKE_RUNTIME' c && ./BQN -p 2+2 || exit +build/build f='-DALL_R0' c && ./BQN -p 2+2 || exit +build/build f='-DALL_R1' c && ./BQN -p 2+2 || exit +build/build f='-DALL_R0 -DALL_R1' c && ./BQN -p 2+2 || exit +build/build f='-DSFNS_FILLS=0' c && ./BQN -p 2+2 || exit +build/build f='-DFORMATTER=0' c && ./BQN -p 2+2 || exit +build/build f='-DVMPOS=0' c && ./BQN -p 2+2 || exit +build/build f='-DDONT_FREE' c && ./BQN -p 2+2 || exit +build/build f='-DOBJ_COUNTER' c && ./BQN -p 2+2 || exit +build/build f='-DNO_RT' c && ./BQN -p 2+2 || exit +build/build f='-DNATIVE_COMPILER' c && ./BQN -p 2+2 || exit build/build f='-DNATIVE_COMPILER -DONLY_NATIVE_COMP -DFORMATTER=0 -DNO_RT -DNO_EXPLAIN' c && ./BQN -p 2+2 || exit -build/build f='-DLOG_GC' c && ./BQN -p 2+2 || exit -build/build f='-DUSE_PERF' c && ./BQN -p 2+2 || exit -build/build f='-DREPL_INTERRUPT=0' c && ./BQN -p 2+2 || exit -build/build f='-DREPL_INTERRUPT=1' c && ./BQN -p 2+2 || exit -build/build FFI=0 c && ./BQN -p 2+2 || exit +build/build f='-DLOG_GC' arch=generic c && ./BQN -p 2+2 || exit +build/build f='-DUSE_PERF' c && ./BQN -p 2+2 || exit +build/build f='-DREPL_INTERRUPT=0' c && ./BQN -p 2+2 || exit +build/build f='-DREPL_INTERRUPT=1' c && ./BQN -p 2+2 || exit +build/build FFI=0 c && ./BQN -p 2+2 || exit build/obj2/for_build2 test/precompiled.bqn "$1" "$PATH" '2+2' || exit -build/build f='-DNO_RT -DPRECOMP' c && ./BQN || exit +build/build f='-DNO_RT -DPRECOMP' c && ./BQN || exit