From: stephan <stephan@noemail.net>
Date: Sun, 9 Oct 2022 11:42:12 +0000 (+0000)
Subject: Add -DSQLITE_OS_KV_OPTIONAL to speedtest1 flags for kvvfs testing purposes.
X-Git-Tag: version-3.40.0~169^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6555726ed43a97ea2da6029caeb8ccaedcbc9dc;p=thirdparty%2Fsqlite.git

Add -DSQLITE_OS_KV_OPTIONAL to speedtest1 flags for kvvfs testing purposes.

FossilOrigin-Name: 92b500da70a3dc64e910c232a2cac7620b6609162c2a5058b269d3b83d763c02
---

diff --git a/Makefile.in b/Makefile.in
index f570c7d374..895520c570 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -635,6 +635,7 @@ FUZZCHECK_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
 FUZZCHECK_OPT += -DSQLITE_ENABLE_BYTECODE_VTAB
 FUZZCHECK_SRC = $(TOP)/test/fuzzcheck.c $(TOP)/test/ossfuzz.c $(TOP)/test/fuzzinvariants.c
 DBFUZZ_OPT =
+ST_OPT = -DSQLITE_OS_KV_OPTIONAL
 
 # This is the default Makefile target.  The objects listed here
 # are what get build when you type just "make" with no arguments.
@@ -1392,7 +1393,7 @@ LogEst$(TEXE):	$(TOP)/tool/logest.c sqlite3.h
 wordcount$(TEXE):	$(TOP)/test/wordcount.c sqlite3.lo
 	$(LTLINK) -o $@ $(TOP)/test/wordcount.c sqlite3.lo $(TLIBS)
 
-speedtest1$(TEXE):	$(TOP)/test/speedtest1.c sqlite3.c
+speedtest1$(TEXE):	$(TOP)/test/speedtest1.c sqlite3.c Makefile
 	$(LTLINK) $(ST_OPT) -o $@ $(TOP)/test/speedtest1.c sqlite3.c $(TLIBS)
 
 startup$(TEXE):	$(TOP)/test/startup.c sqlite3.c
diff --git a/ext/wasm/kvvfs.make b/ext/wasm/kvvfs.make
new file mode 100644
index 0000000000..83a2691370
--- /dev/null
+++ b/ext/wasm/kvvfs.make
@@ -0,0 +1,82 @@
+#!/usr/bin/make
+#^^^^ help emacs select makefile mode
+#
+# This is a sub-make for building a standalone kvvfs-based
+# sqlite3.wasm.  It is intended to be "include"d from the main
+# GNUMakefile.
+#
+# Notable potential TODOs:
+#
+# - Trim down a custom sqlite3-api.js for this build. We can elimate
+#   the jaccwabyt dependency, for example, because this build won't
+#   make use of the VFS bits. Similarly, we can eliminate or replace
+#   parts of the OO1 API, or provide a related API which manages
+#   singletons of the localStorage/sessionStorage instances.
+#
+########################################################################
+MAKEFILE.kvvfs := $(lastword $(MAKEFILE_LIST))
+
+kvvfs.js     := sqlite3-kvvfs.js
+kvvfs.wasm   := sqlite3-kvvfs.wasm
+kvvfs.wasm.c := $(dir.api)/sqlite3-wasm.c
+
+CLEAN_FILES += $(kvvfs.js) $(kvvfs.wasm)
+
+########################################################################
+# emcc flags for .c/.o/.wasm.
+kvvfs.flags =
+#kvvfs.flags += -v # _very_ loud but also informative about what it's doing
+
+########################################################################
+# emcc flags for .c/.o.
+kvvfs.cflags :=
+kvvfs.cflags += -std=c99 -fPIC
+kvvfs.cflags += -I. -I$(dir.top)
+kvvfs.cflags += -DSQLITE_OS_KV=1 $(SQLITE_OPT)
+
+########################################################################
+# emcc flags specific to building the final .js/.wasm file...
+kvvfs.jsflags := -fPIC
+kvvfs.jsflags += --no-entry
+kvvfs.jsflags += -sENVIRONMENT=web
+kvvfs.jsflags += -sMODULARIZE
+kvvfs.jsflags += -sSTRICT_JS
+kvvfs.jsflags += -sDYNAMIC_EXECUTION=0
+kvvfs.jsflags += -sNO_POLYFILL
+kvvfs.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.api)/EXPORTED_FUNCTIONS.sqlite3-api
+kvvfs.jsflags += -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory,allocateUTF8OnStack
+                                            # wasmMemory ==> for -sIMPORTED_MEMORY
+                                            # allocateUTF8OnStack ==> kvvfs internals
+kvvfs.jsflags += -sUSE_CLOSURE_COMPILER=0
+kvvfs.jsflags += -sIMPORTED_MEMORY
+#kvvfs.jsflags += -sINITIAL_MEMORY=13107200
+#kvvfs.jsflags += -sTOTAL_STACK=4194304
+kvvfs.jsflags += -sEXPORT_NAME=sqlite3InitModule
+kvvfs.jsflags += -sGLOBAL_BASE=4096 # HYPOTHETICALLY keep func table indexes from overlapping w/ heap addr.
+kvvfs.jsflags += --post-js=$(post-js.js)
+#kvvfs.jsflags += -sFILESYSTEM=0 # only for experimentation. sqlite3 needs the FS API
+#                                Perhaps the kvvfs build doesn't?
+#kvvfs.jsflags += -sABORTING_MALLOC
+kvvfs.jsflags += -sALLOW_MEMORY_GROWTH
+kvvfs.jsflags += -sALLOW_TABLE_GROWTH
+kvvfs.jsflags += -Wno-limited-postlink-optimizations
+# ^^^^^ it likes to warn when we have "limited optimizations" via the -g3 flag.
+kvvfs.jsflags += -sERROR_ON_UNDEFINED_SYMBOLS=0
+kvvfs.jsflags += -sLLD_REPORT_UNDEFINED
+#kvvfs.jsflags += --import-undefined
+kvvfs.jsflags += -sMEMORY64=0
+ifneq (0,$(enable_bigint))
+kvvfs.jsflags += -sWASM_BIGINT
+endif
+
+$(kvvfs.js): $(MAKEFILE) $(MAKEFILE.kvvfs) $(kvvfs.wasm.c) \
+    EXPORTED_FUNCTIONS.api \
+    $(post-js.js)
+	$(emcc.bin) -o $@ $(emcc_opt) $(emcc.flags) $(kvvfs.cflags) $(kvvfs.jsflags) $(kvvfs.wasm.c)
+	chmod -x $(kvvfs.wasm)
+ifneq (,$(wasm-strip))
+	$(wasm-strip) $(kvvfs.wasm)
+endif
+	@ls -la $@ $(kvvfs.wasm)
+
+kvvfs: $(kvvfs.js)
diff --git a/manifest b/manifest
index 2bda31e933..badd503248 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Replace\stime-based\sauto-unlock\sof\sopfs\ssync\shandles\swith\slock\sacquisition/release\svia\ssqlite3_io_methods::xLock/xUnlock().
-D 2022-10-04T17:06:51.812
+C Add\s-DSQLITE_OS_KV_OPTIONAL\sto\sspeedtest1\sflags\sfor\skvvfs\stesting\spurposes.
+D 2022-10-09T11:42:12.888
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 2fbc1de74212fba94e0c3eca5549b894c91c1c17fb5e6fd23ca90a616523c5f5
+F Makefile.in c6ec4ad6d44bab836eb7b2c142c43388b79c3729cdfd770450dc73df126620f5
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
 F Makefile.msc d547a2fdba38a1c6cd1954977d0b0cc017f5f8fbfbc65287bf8d335808938016
 F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
@@ -513,6 +513,7 @@ F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab26
 F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
+F ext/wasm/kvvfs.make 7cc9cf10e744c3ba523c3eaf5c4af47028f3a5bb76db304ea8044a9b2a9d496f
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
 F ext/wasm/scratchpad-wasmfs-main.js 1aa32c1035cf1440a226a28fefcbb5762fbbcb020ccbe5895f8736d701695c63
 F ext/wasm/speedtest1-wasmfs.html bc28eb29b69a73864b8d7aae428448f8b7e1de81d8bfb9bba99541322054dbd0
@@ -2029,8 +2030,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 35f33c23e5849de1c43c4499ee0a7fa11d26ae34949c1e820c3fa8e8873f9c2b
-R 447ab40d8f9d9bacdb3bbf1fc5e8416f
+P 2625b7cfe1640c1d7e779ec1f37db970541598c0dc3e22e5eecf3c772d95ad40
+R 7aaffd9c020ac6e72a26849a8062d65e
 U stephan
-Z 1f6ebc0e7b8d0de3ff6621f210427c47
+Z 7690e0fae23fd2c65e8199412cec0d90
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b47bd0f8b4..7a8500c47f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2625b7cfe1640c1d7e779ec1f37db970541598c0dc3e22e5eecf3c772d95ad40
\ No newline at end of file
+92b500da70a3dc64e910c232a2cac7620b6609162c2a5058b269d3b83d763c02
\ No newline at end of file