Ensure that the wasm builds always, even when passing -Ox flags from the CLI, use...

FossilOrigin-Name: 27d24d5d270e272af07d96cf07bdbe79ba07a9c69ba3c70beb76ebf4f90fc97a

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index e9652e1da9e32b20e243715d7d62657f4a4a17bd..ab687d1e46b8c30f0cc69a927b342bf93263c149 100644 (file)
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -77,12 +77,17 @@ SQLITE_OPT = \
 # and friends may be NULL.
 
 ifneq (,$(filter release,$(MAKECMDGOALS)))
-emcc_opt ?= -Oz -g3 -flto
+emcc_opt ?= -Oz -flto
 else
-emcc_opt ?= -O0 -g3
+emcc_opt ?= -O0
 # ^^^^ build times for -O levels higher than 0 are painful at
 # dev-time.
 endif
+# When passing emcc_opt from the CLI, += and re-assignment have no
+# effect, so emcc_opt+=-g3 doesn't work. So...
+emcc_opt_full := $(emcc_opt) -g3
+# ^^^ ALWAYS use -g3. See below for why.
+#
 # ^^^ -flto improves runtime speed at -O0 considerably but doubles
 # build time.
 #
@@ -102,6 +107,8 @@ endif
 # -Os: not quite 1% in some completely unscientific tests. Runtime
 # speed for the unit tests is all over the place either way so it's
 # difficult to say whether -Os gives any speed benefit over -Oz.
+#
+# (Much later: -O2 consistently gives the best speeds.)
 ########################################################################
 
 
@@ -273,7 +280,7 @@ define WASM_C_COMPILE
 $(1).o := $$(subst .c,.o,$(1))
 sqlite3.wasm.obj += $$($(1).o)
 $$($(1).o): $$(MAKEFILE) $(1)
-       $$(emcc.bin) $$(emcc_opt) $$(emcc.flags) $$(emcc.cflags) -c $(1) -o $$@
+       $$(emcc.bin) $$(emcc_opt_full) $$(emcc.flags) $$(emcc.cflags) -c $(1) -o $$@
 CLEAN_FILES += $$($(1).o)
 endef
 $(foreach c,$(sqlite3-wasm.c) $(jaccwabyt_test.c),$(eval $(call WASM_C_COMPILE,$(c))))
@@ -281,7 +288,7 @@ $(sqlite3.js): $(MAKEFILE) $(sqlite3.wasm.obj) \
     EXPORTED_FUNCTIONS.api \
     $(post-jses.deps)
        @echo "Building $@ ..."
-       $(emcc.bin) -o $@ $(emcc_opt) $(emcc.flags) $(emcc.jsflags) $(sqlite3.wasm.obj)
+       $(emcc.bin) -o $@ $(emcc_opt_full) $(emcc.flags) $(emcc.jsflags) $(sqlite3.wasm.obj)
        chmod -x $(sqlite3.wasm)
        $(maybe-wasm-strip) $(sqlite3.wasm)
        @ls -la $@ $(sqlite3.wasm)
@@ -318,7 +325,7 @@ all: batch
 # speedtest1.js...
 # speedtest1-common.eflags = emcc flags used by multiple builds of speedtest1
 # speedtest1.eflags = emcc flags used by main build of speedtest1
-speedtest1-common.eflags := -g $(emcc_opt)
+speedtest1-common.eflags := $(emcc_opt_full)
 speedtest1.eflags :=
 speedtest1.eflags += -sENVIRONMENT=web
 speedtest1-common.eflags += -sINVOKE_RUN=0
@@ -426,18 +433,18 @@ o-xtra += -flto
 # doubles the build time and seems to have negligible effect on
 # higher optimization levels.
 o0: clean
-       $(MAKE) -e "emcc_opt=-O0 $(o-xtra)" fiddle_opt=-O0
+       $(MAKE) -e "emcc_opt=-O0 $(o-xtra)"
 o1: clean
-       $(MAKE) -e "emcc_opt=-O1 $(o-xtra)" fiddle_opt=-O1
+       $(MAKE) -e "emcc_opt=-O1 $(o-xtra)"
 o2: clean
-       $(MAKE) -e "emcc_opt=-O2 $(o-xtra)" fiddle_opt=-O2
+       $(MAKE) -e "emcc_opt=-O2 $(o-xtra)"
 o3: clean
-       $(MAKE) -e "emcc_opt=-O3 $(o-xtra)" fiddle_opt=-O3
+       $(MAKE) -e "emcc_opt=-O3 $(o-xtra)"
 os: clean
        @echo "WARNING: -Os can result in a build with mysteriously missing pieces!"
-       $(MAKE) -e "emcc_opt=-Os $(o-xtra)" fiddle_opt=-Os
+       $(MAKE) -e "emcc_opt=-Os $(o-xtra)"
 oz: clean
-       $(MAKE) -e "emcc_opt=-Oz $(o-xtra)" fiddle_opt=-Oz
+       $(MAKE) -e "emcc_opt=-Oz $(o-xtra)"
 
 ########################################################################
 # Sub-makes...

diff --git a/ext/wasm/fiddle.make b/ext/wasm/fiddle.make
index a98806f5ebfbf56e171d466c86717a9a9dd80eeb..c3892263a7d469de4e96df0b98a55f42e0339b24 100644 (file)
--- a/ext/wasm/fiddle.make
+++ b/ext/wasm/fiddle.make
@@ -24,7 +24,7 @@ $(dir.top)/shell.c: $(SHELL_SRC) $(dir.top)/tool/mkshellc.tcl
 ########################################################################
 
 fiddle.emcc-flags = \
-  $(emcc.cflags) $(emcc_opt) \
+  $(emcc.cflags) $(emcc_opt_full) \
   --minify 0 \
   -sALLOW_TABLE_GROWTH \
   -sABORTING_MALLOC \

diff --git a/ext/wasm/wasmfs.make b/ext/wasm/wasmfs.make
index 20ddcdb9e295e78d25e114fdab57280c595b96aa..b93f2ab0c854a58cb168f2da83b437827e0a8570 100644 (file)
--- a/ext/wasm/wasmfs.make
+++ b/ext/wasm/wasmfs.make
@@ -82,7 +82,7 @@ $(sqlite3-wasmfs.js): $(sqlite3-wasmfs.wasm.c) $(sqlite3-wasm.c) $(sqlite3-wasmf
     EXPORTED_FUNCTIONS.api $(sqlite3-wasm.js) $(MAKEFILE) $(MAKEFILE.wasmfs) \
     $(post-jses.deps)
        @echo "Building $@ ..."
-       $(emcc.bin) -o $@ $(emcc_opt) $(emcc.flags) \
+       $(emcc.bin) -o $@ $(emcc_opt_full) $(emcc.flags) \
       $(sqlite3-wasmfs.cflags) $(sqlite3-wasmfs.jsflags) $(sqlite3-wasmfs.wasm.c) $(sqlite3-wasmfs.extra.c)
        chmod -x $(sqlite3-wasmfs.wasm)
        $(maybe-wasm-strip) $(sqlite3-wasmfs.wasm)

diff --git a/manifest b/manifest
index 8502c199d71f65ed05ab3bf4a7c7d08cc9f0c5eb..cf04cf881bbb8e03d4fba4cc737089cef7879b61 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Finish\seliminating\sexplicit\sEmscripten\smodule\sdependencies\sin\stest\scode\sand\sfiddle.\sThe\sonly\sremnant\sin\spublic\scode\sis\sthe\sEmscripten-generated\smodule\sload/init\sinterface.
-D 2022-09-29T16:54:23.260
+C Ensure\sthat\sthe\swasm\sbuilds\salways,\seven\swhen\spassing\s-Ox\sflags\sfrom\sthe\sCLI,\suse\s-g3\sto\savoid\sproblems\scaused\sby\ssymbol\sminification\swith\soptimization\slevels\s-O2\sand\shigher.
+D 2022-09-29T17:35:25.209
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
-F ext/wasm/GNUmakefile 7cf6c4346edd6656d5b9f258049ca56af7d7b8b10da3d21edcc3717015bc6511
+F ext/wasm/GNUmakefile 4446cf935dcf2eee505b142cc754f5e191cf1fdaebace8934551e38502616cc4
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77a5ee8bd209b5e75dd0e822bc3f6e7319dc9b36431463d4175c775170f92126
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -501,7 +501,7 @@ F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b
 F ext/wasm/demo-123.js 35de7c544b9190759fcbf4ca125a674d3f6db03614b9a2175efaa1fbf363ef6f
 F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424d6f5a0ea5e7f
 F ext/wasm/demo-kvvfs1.js d1126c3b08099dc1279f353b298ee90f6d374ab6ca2b4cf412031fc992e51d35
-F ext/wasm/fiddle.make 1595178ee6e6bb645d2be5b6c349cb3604182106ca3fd6bf3336be51432cfb19
+F ext/wasm/fiddle.make ef1d58c3d349d92a64e74908eceb2b2084e67b4aef0f3b0e46c9d89a04461041
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js 2a7107b06e5be3b9b063c340ec952f687e37ba6e0aa736b58c280dfb5e16625a
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
@@ -531,7 +531,7 @@ F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d766
 F ext/wasm/testing1.js 06b9a439ada636c5478c581c86b2b968f799e0468eae54dc5a4565dfd7afbb88
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 34737da985c4cbd4812b2e7f200942662cae991c5a58ffa5d0350be089d0d410
-F ext/wasm/wasmfs.make d53146b062386b01f7b0b0d498335b33c11548cf3d1706cff472d6cbd42a9c95
+F ext/wasm/wasmfs.make d8f44636517c3af1317c8bd8c37522810af89476a552695fc17c93fbbb7f0070
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2027,8 +2027,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 0dbaa0e2b5abf5c23e2039ec90a3055ebb3c063aaf4e556c42546defe6fbb86d
-R 5ed3f961358b68dff72339b628086e3f
+P 7be78dd4efc410f13ff1ceda1fad82b309cc24de2d5106c8bd6b2adeaa13b106
+R 2804880c8426c1f64b82815d3b92b5d3
 U stephan
-Z 127c84518f22055431ece9a85dc4b451
+Z 18007cf5e3a926a3d20573198e330337
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 5c3a00deefd14e841d5f718b812f360861ef7a76..c0f2a9817157ebd2d75bc13c7c328f98470e41e7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7be78dd4efc410f13ff1ceda1fad82b309cc24de2d5106c8bd6b2adeaa13b106
\ No newline at end of file
+27d24d5d270e272af07d96cf07bdbe79ba07a9c69ba3c70beb76ebf4f90fc97a
\ No newline at end of file