Performance improvements

.github/workflows/build.yml

@@ -20,10 +20,6 @@ concurrency:
 
 jobs:
   build-qgis-js:
-    env:
-      qt: "6.5.2"
-      qtModules: "qt5compat"
-      pythonVersion: "3.12"
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
@@ -44,51 +40,11 @@ jobs:
           pkg-config
           flex
           bison
-      - name: Fix to install python with "actions/setup-python@v4" on act
-        if: ${{ env.ACT }}
-        run: |
-          # Hack to get setup-python to work on act
-          # (see https://github.com/nektos/act/issues/251)
-          if [ ! -f "/etc/lsb-release" ] ; then
-            echo "DISTRIB_RELEASE=20.04" > /etc/lsb-release
-          fi
-      - uses: actions/setup-python@v4
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
         with:
-          python-version: ${{env.pythonVersion}}
-      # - name: Restore Qt cache
-      #   uses: actions/cache@v2
-      #   id: cache-qt
-      #   with:
-      #     path: ${{runner.workspace}}/Qt/${{env.qt}}
-      #     key: ${{runner.os}}-qt-${{env.qt}}
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v3
-        with:
-          dir: "${{ github.workspace }}/build"
-          # cached: ${{steps.cache-qt.outputs.cache-hit}}
-          setup-python: "false"
-          set-env: "false"
-          # from https://ddalcino.github.io/aqt-list-server/
-          aqtversion: "==3.1.*"
-          version: ${{env.qt}}
-          host: "linux"
-          target: "desktop"
-          arch: "wasm_multithread"
-          # qt modules required by qgis-js
-          modules: ${{env.qtModules}}
-          # workaround for gcc_64 host tools (see https://github.com/jurplel/install-qt-action/issues/181)
-          py7zrversion: "==0.20.*"
-          extra: "--autodesktop"
-      - name: Patch Qt
-        run: |
-          (
-            cd ${{ github.workspace }}/build/Qt/${{env.qt}};
-            patch -p0 < ${{ github.workspace }}/build/qt-patches/egl.patch &&
-            patch -p0 < ${{ github.workspace }}/build/qt-patches/exceptions.patch
-          )
-      - name: Set QGIS_JS_QT
-        run: |
-          echo "QGIS_JS_QT=${{ github.workspace }}/build/Qt/${{env.qt}}" >> "$GITHUB_ENV"
+          tool-cache: false
+          swap-storage: false
       - name: Setup node from package.json
         uses: actions/setup-node@v4
         with:

.vscode/c_cpp_properties.json

@@ -3,13 +3,6 @@
     {
       "name": "Linux",
       "includePath": [
-        "${env:HOME}/Qt/6.5.2/wasm_multithread/include",
-        "${env:HOME}/Qt/6.5.2/wasm_multithread/include/QtCore",
-        "${env:HOME}/Qt/6.5.2/wasm_multithread/include/QtGui",
-        "${env:HOME}/Qt/6.5.2/wasm_multithread/include/QtWidgets",
-        "${env:HOME}/Qt/6.5.2/wasm_multithread/include/QtNetwork",
-        "${env:HOME}/Qt/6.5.2/wasm_multithread/include/QtConcurrent",
-        "${env:HOME}/Qt/6.5.2/wasm_multithread/include/QtXml",
         "${workspaceFolder}/build/wasm/vcpkg_installed/wasm32-emscripten-qt-threads/include",
         "${workspaceFolder}/build/wasm/vcpkg_installed/wasm32-emscripten-qt-threads/include/qgis",
         "${workspaceFolder}/build/emsdk/upstream/emscripten/system/include"

.vscode/settings.json

@@ -28,8 +28,6 @@
   "C_Cpp.clang_format_path": "${workspaceRoot}/node_modules/clang-format/bin/linux_x64/clang-format",
   "cmake.cmakePath": "${workspaceFolder}/build/vcpkg/downloads/tools/cmake-3.27.1-linux/cmake-3.27.1-linux-x86_64/bin/cmake",
   "cmake.environment": {
-    "QT_HOST_PATH": "${userHome}/Qt/6.5.2/gcc_64",
-    "Qt6_DIR": "${userHome}/Qt/6.5.2/wasm_multithread",
     "VCPKG_BINARY_SOURCES": "clear"
   },
   "cmake.configureSettings": {

CMakeLists.txt

@@ -28,7 +28,7 @@ find_path(QGIS_INCLUDE_DIR
 )
 
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-  set(qgis_debug_prefix "debug/")    # debug lib is in different folder
+  set(qgis_debug_prefix "debug/") # debug lib is in different folder
 endif()
 
 find_library(
@@ -39,6 +39,17 @@ find_library(
  NO_DEFAULT_PATH
 )
 
+# because on the initial build the Qt toolchain file is not yet generated and therefore not included by qgis-js.cmake
+# this will ensure that the Qt toolchain file is included after qtbase is built
+if(EXISTS ${QT_TOOLCHAIN_FILE})
+  set(QT_CHAINLOAD_TOOLCHAIN_FILE ${EMSCRIPTEN_TOOLCHAIN_FILE})
+  include(${QT_TOOLCHAIN_FILE})
+else()
+  message(FATAL_ERROR "Could not find Qt toolchain file: ${QT_TOOLCHAIN_FILE}")
+endif()
+
+# since Qt 6.3 qt_standard_project_setup should be used so set some default values
+qt_standard_project_setup()
 
 set(QGISJS_SOURCES
  src/qgis-js.cpp
@@ -52,8 +63,8 @@ qt_add_executable(qgis-js MANUAL_FINALIZATION ${QGISJS_SOURCES})
 target_compile_options(qgis-js PRIVATE "-fwasm-exceptions")
 set_target_properties(qgis-js PROPERTIES LINK_FLAGS "-fwasm-exceptions")
 
-set_target_properties(qgis-js PROPERTIES LINK_FLAGS "--bind")
-set_target_properties(qgis-js PROPERTIES LINK_FLAGS "--preload-file ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/proj@/proj --preload-file ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/qgis/resources/srs.db@/qgis/resources/srs.db")
+target_compile_options(qgis-js PRIVATE "-msimd128")
+set_target_properties(qgis-js PROPERTIES LINK_FLAGS "-msimd128")
 
 target_include_directories(qgis-js PRIVATE ${QGIS_INCLUDE_DIR})
 target_link_libraries(qgis-js PRIVATE ${QGIS_LIBRARY})
@@ -66,14 +77,13 @@ target_link_libraries(qgis-js PRIVATE
   Qt6::Gui
   Qt6::Core5Compat
   Qt6::PrintSupport
-  Qt6::Widgets    # because QgsApplication -> QApplication
+  Qt6::Widgets # because QgsApplication -> QApplication
   )
 
 set(QGIS_PROVIDERS_LIST
   provider_arcgisfeatureserver
   provider_arcgismapserver
   provider_delimitedtext
-  provider_wcs
   provider_wms
 )
 
@@ -110,10 +120,11 @@ qt_finalize_executable(qgis-js)
 # Flags set by Qt:
 # -s PTHREAD_POOL_SIZE=4
 # -s INITIAL_MEMORY=50MB 
-# -s EXPORTED_RUNTIME_METHODS=UTF16ToString,stringToUTF16,JSEvents,specialHTMLTargets
+# -s EXPORTED_RUNTIME_METHODS=UTF16ToString,stringToUTF16,JSEvents,specialHTMLTargets,FS
 # -s MAX_WEBGL_VERSION=2
 # -s FETCH=1 
 # -s WASM_BIGINT=1
+# -s STACK_SIZE=5MB
 # -s MODULARIZE=1
 # -s EXPORT_NAME=createQtAppInstance
 # -s ALLOW_MEMORY_GROWTH
@@ -122,24 +133,27 @@ qt_finalize_executable(qgis-js)
 
 # Emscripten Runtime
 target_link_options(qgis-js PRIVATE "SHELL: \
--s EXPORT_ES6 \
--s STACK_SIZE=5242880" # 5M 
+-s EXPORT_ES6"
 )
 
 # FS (see https://emscripten.org/docs/api_reference/Filesystem-API.html)
-# NOTE: EXTRA_EXPORTED_RUNTIME_METHODS is deprecated, but we need it for now in order to not overwrite the EXPORTED_RUNTIME_METHODS set by Qt
 target_link_options(qgis-js PRIVATE "SHELL: \
--s EXTRA_EXPORTED_RUNTIME_METHODS=[FS] \
 -s FORCE_FILESYSTEM=1"
 )
 
 # Threading (see https://emscripten.org/docs/porting/pthreads.html)
 set(MINIMAL_THREAD_POOL_SIZE "4")
-set(MAXIMAL_THREAD_POOL_SIZE "8")
+set(MAXIMAL_THREAD_POOL_SIZE "16")
 target_link_options(qgis-js PRIVATE "SHELL: \
 -s PTHREAD_POOL_SIZE=\"Math.min(Math.max(((navigator&&navigator.hardwareConcurrency)||${MINIMAL_THREAD_POOL_SIZE}),${MINIMAL_THREAD_POOL_SIZE}),${MAXIMAL_THREAD_POOL_SIZE})\" \
 -s PTHREAD_POOL_SIZE_STRICT=2 \
--s PTHREAD_POOL_DELAY_LOAD=1"
+-s PTHREAD_POOL_DELAY_LOAD=1 \
+-s MALLOC=mimalloc"
+)
+
+target_link_options(qgis-js PRIVATE "SHELL: \
+--preload-file ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/proj@/proj \
+--preload-file ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/qgis/resources/srs.db@/qgis/resources/srs.db"
 )
 
 # DWARF debug info (see https://developer.chrome.com/blog/faster-wasm-debugging/)
@@ -149,3 +163,8 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
 -gsplit-dwarf \
 -gpubnames")
 endif()
+
+# TODO remove this fix (see https://github.com/emscripten-core/emscripten/issues/21844)
+target_link_options(qgis-js PRIVATE "SHELL: \
+-s EXPORTED_FUNCTIONS=_main,__emscripten_thread_crashed,__embind_initialize_bindings"
+)