Quality of life improvements for static web sample. (iree-org#8240)

* Move web server script to scripts/ so it can be used more naturally for other samples * Fetch easeljs library and use the local server script, to be ready for CORS / SharedArrayBuffer / Emscripten pthreads experiments * Set `-g -gseparate-dwarf` per https://developer.chrome.com/blog/wasm-debugging-2020/, enabling DWARF debugging instead of source map debugging, then remove the serving directory hack * serving the entire source tree with a nested build tree may have also been OOM-ing my tabs... not sure - just serving a 600KB `.wasm` and a 2MB `.debug.wasm` is much better anyways
vermish6 · Feb 4, 2022 · de1935a · de1935a
2 parents b55cefd + 4957d8b
commit de1935a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 18 deletions.
diff --git a/experimental/sample_web_static/CMakeLists.txt b/experimental/sample_web_static/CMakeLists.txt
@@ -49,8 +49,9 @@ target_link_options(${_NAME} PRIVATE
   #
   "-sASSERTIONS=1"
   #
-  "-gsource-map"
-  "-source-map-base="
+  # https://developer.chrome.com/blog/wasm-debugging-2020/
+  "-g"
+  "-gseparate-dwarf"
 )
 
 #-------------------------------------------------------------------------------
@@ -91,8 +92,9 @@ target_link_options(${_NAME} PRIVATE
   #
   "-sASSERTIONS=1"
   #
-  "-gsource-map"
-  "-source-map-base="
+  # https://developer.chrome.com/blog/wasm-debugging-2020/
+  "-g"
+  "-gseparate-dwarf"
   #
   # https://emscripten.org/docs/porting/pthreads.html#compiling-with-pthreads-enabled
   "-pthread"

diff --git a/experimental/sample_web_static/build_static_emscripten_demo.sh b/experimental/sample_web_static/build_static_emscripten_demo.sh
@@ -67,6 +67,7 @@ pushd ${ROOT_DIR?}/build-emscripten
 # Note: The sample creates a task device directly, so no drivers are required,
 #       but some targets are gated on specific CMake options.
 emcmake "${CMAKE_BIN?}" -G Ninja .. \
+  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
   -DIREE_HOST_BINARY_ROOT=$PWD/../build-host/install \
   -DIREE_BUILD_EXPERIMENTAL_WEB_SAMPLES=ON \
   -DIREE_HAL_DRIVER_DEFAULTS=OFF \
@@ -83,20 +84,14 @@ popd
 # Serve the demo using a local webserver                                      #
 ###############################################################################
 
-echo "=== Copying static files (index.html) to the build directory ==="
+echo "=== Copying static files to the build directory ==="
 
 cp ${ROOT_DIR?}/experimental/sample_web_static/index.html ${BINARY_DIR}
 
-echo "=== Running local webserver ==="
-echo "    open at http://localhost:8000/build-emscripten/experimental/sample_web_static/"
+EASELJS_LIBRARY=${BINARY_DIR}/easeljs.min.js
+test -f ${EASELJS_LIBRARY} || \
+    wget https://code.createjs.com/1.0.0/easeljs.min.js -O ${EASELJS_LIBRARY}
 
-# **Note**: this serves from the root so source maps can reference code in the
-# source tree. A real deployment would bundle the output artifacts and serve
-# them from a build/release directory.
+echo "=== Running local webserver, open at http://localhost:8000/ ==="
 
-# local_server.py is needed when using SharedArrayBuffer, with multithreading
-# python3 local_server.py --directory ${ROOT_DIR?}
-
-# http.server on its own is fine for single threaded use, and this doesn't
-# break CORS for external resources like easeljs from a CDN
-python3 -m http.server --directory ${ROOT_DIR?}
+python3 ${ROOT_DIR?}/scripts/local_web_server.py --directory ${BINARY_DIR}
diff --git a/experimental/sample_web_static/index.html b/experimental/sample_web_static/index.html
@@ -14,8 +14,7 @@
   <title>IREE Static Web Sample</title>
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
-  <!-- TODO(scotttodd): use local copy for CORS webserver / SharedArrayBuffer workarounds? -->
-  <script src="https://code.createjs.com/1.0.0/easeljs.min.js"></script>
+  <script src="./easeljs.min.js"></script>
 </head>
 
 <body style="background-color: #2b2c30; color: #ABB2BF">

diff --git a/...imental/sample_web_static/local_server.py → scripts/local_web_server.py b/...imental/sample_web_static/local_server.py → scripts/local_web_server.py