Add smoke test and CI yaml

.github/workflows/ci.yml

@@ -0,0 +1,117 @@
+name: Continuous Integration for PR
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  # Build job
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: get emsdk
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y ninja-build
+          git clone https://github.com/emscripten-core/emsdk.git
+          sed -i 's/\r$//' emsdk/emsdk emsdk/emsdk_env.sh
+
+      - name: get slang head commit
+        run: |
+          git clone https://github.com/shader-slang/slang.git slang-repo
+          git -C slang-repo rev-parse HEAD > key.txt
+
+      - name: get spirv-tool head commit
+        run: |
+          git clone https://github.com/KhronosGroup/SPIRV-Tools.git spirv-tools
+          pushd spirv-tools
+          git checkout vulkan-sdk-1.3.290.0
+          popd
+          git -C spirv-tools rev-parse HEAD > key-spirv-tool.txt
+
+      - name: restore slang-wasm
+        id: cache_slang
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            ./slang-wasm.wasm.gz
+            ./slang-wasm.js
+            ./slang-wasm.d.ts
+          key: ${{hashFiles('key.txt')}}
+
+      - name: restore spirv-tools
+        id: cache_spirv_tools
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            ./spirv-tools.wasm
+            ./spirv-tools.js
+            ./spirv-tools.d.ts
+          key: ${{hashFiles('key-spirv-tool.txt')}}
+
+      - name: slang-wasm build
+        if: steps.cache_slang.outputs.cache-hit != 'true'
+        run: |
+          sed -i 's/\r$//' ./slang-wasm-build.sh
+          /bin/bash -x ./slang-wasm-build.sh
+
+      - name: save slang-wasm
+        if: always() && steps.cache_slang.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v4
+        with:
+          path: |
+            ./slang-wasm.wasm.gz
+            ./slang-wasm.js
+            ./slang-wasm.d.ts
+          key: ${{hashFiles('key.txt')}}
+
+      - name: spirv-tools-wasm build
+        if: steps.cache_spirv_tools.outputs.cache-hit != 'true'
+        run: |
+          sed -i 's/\r$//' ./spirv-tool-wasm-build.sh
+          /bin/bash -x ./spirv-tool-wasm-build.sh
+
+      - name: save spirv-tools-wasm
+        if: always() && steps.cache_spirv_tools.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v4
+        with:
+          path: |
+            ./spirv-tools.wasm
+            ./spirv-tools.js
+            ./spirv-tools.d.ts
+          key: ${{hashFiles('key-spirv-tool.txt')}}
+
+      - name: Build
+        run: |
+          cp ./slang-wasm.wasm.gz ./slang-wasm.js ./slang-wasm.d.ts ./src/
+          cp ./spirv-tools.wasm ./spirv-tools.js ./spirv-tools.d.ts ./src/
+          npm install
+          npm run build
+
+      - name: Upload export artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: site-artifact
+          path: ./dist/
+          compression-level: 1
+
+      - name: Smoke test
+        run: |
+          pushd emsdk
+          /bin/sh ./emsdk install latest
+          /bin/sh ./emsdk activate latest
+          source ./emsdk_env.sh
+          popd
+          gzip -d src/slang-wasm.wasm.gz
+          cp src/slang-wasm.wasm ./
+          cp slang-repo/tests/wasm/smoke/smoke-test.js slang-repo/
+          node slang-repo/smoke-test.js src/slang/rand_float.slang computeMain
+
+      - name: Cleanup workspace
+        run: |
+          rm -rf slang-repo emsdk spirv-tools
+          rm ./slang-wasm.wasm.gz ./slang-wasm.js ./slang-wasm.d.ts ./spirv-tools.wasm ./spirv-tools.js ./spirv-tools.d.ts

.github/workflows/jekyll-gh-pages.yml

@@ -33,19 +33,16 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y ninja-build
-          mkdir slang-repo
-          pushd slang-repo
-          git clone https://github.com/shader-slang/slang.git
-          popd
-          echo "$(git -C slang-repo/slang rev-parse HEAD)" >> key.txt
+          git clone https://github.com/shader-slang/slang.git slang-repo
+          git -C slang-repo rev-parse HEAD > key.txt
 
       - name: get spirv-tool head commit
         run: |
           git clone https://github.com/KhronosGroup/SPIRV-Tools.git spirv-tools
           pushd spirv-tools
           git checkout vulkan-sdk-1.3.290.0
           popd
-          echo "$(git -C spirv-tools rev-parse HEAD)" >> key-spirv-tool.txt
+          git -C spirv-tools rev-parse HEAD > key-spirv-tool.txt
 
       - name: restore slang-wasm
         id: cache_slang
@@ -70,9 +67,8 @@ jobs:
       - name: slang-wasm build
         if: steps.cache_slang.outputs.cache-hit != 'true'
         run: |
-          sed -i -e 's/\r$//' ./slang-wasm-build.sh
-          chmod +x ./slang-wasm-build.sh
-          ./slang-wasm-build.sh
+          sed -i 's/\r$//' ./slang-wasm-build.sh
+          /bin/bash -x ./slang-wasm-build.sh
 
       - name: save slang-wasm
         if: always() && steps.cache_slang.outputs.cache-hit != 'true'
@@ -87,9 +83,8 @@ jobs:
       - name: spirv-tools-wasm build
         if: steps.cache_spirv_tools.outputs.cache-hit != 'true'
         run: |
-          sed -i -e 's/\r$//' ./spirv-tool-wasm-build.sh
-          chmod +x ./spirv-tool-wasm-build.sh
-          ./spirv-tool-wasm-build.sh
+          sed -i 's/\r$//' ./spirv-tool-wasm-build.sh
+          /bin/bash -x ./spirv-tool-wasm-build.sh
 
       - name: save spirv-tools-wasm
         if: always() && steps.cache_spirv_tools.outputs.cache-hit != 'true'
@@ -116,7 +111,7 @@ jobs:
         with:
           name: site-artifact
           path: ./dist/
-          compression-level: 1  
+          compression-level: 1
 
   # Deployment job
   deploy:

slang-wasm-build.sh

@@ -1,75 +1,96 @@
 #!/bin/bash
 
-sudo apt-get install -y ninja-build
-
-if [ ! -d emsdk ]; then
-    git clone https://github.com/emscripten-core/emsdk.git
+echo "[$(date)] Version checking ..."
+for requiredUtil in cmake ninja node tsc
+do
+	# When the version of Node is too old, tsc may fail.
+	# We want to stop when it is the case.
+	if ! $requiredUtil --version
+	then
+		echo "Error: a required tool is not found: $requiredUtil"
+		exit 1
+	fi
+done
+
+echo "[$(date)] Sync emsdk repo ..."
+if [ ! -d emsdk ]
+then
+	git clone https://github.com/emscripten-core/emsdk.git
 fi
 
 pushd emsdk
-
-./emsdk install latest
-./emsdk activate latest
-source ./emsdk_env.sh
-
+	sed -i 's/\r$//' emsdk emsdk_env.sh
+	/bin/sh ./emsdk install latest
+	/bin/sh ./emsdk activate latest
+	source ./emsdk_env.sh
 popd
 
-# slang-repo was created in previous step
-pushd ./slang-repo
+echo "[$(date)] Sync slang repo ..."
+if [ ! -d slang-repo ]
+then
+	git clone https://github.com/shader-slang/slang.git slang-repo
+fi
 
-# slang was created in previous step
-pushd slang
+pushd slang-repo
 git submodule update --init --recursive
 
-echo "if(EMSCRIPTEN)
-    slang_add_target(
-        .
-        EXECUTABLE
-        EXCLUDE_FROM_ALL
-        USE_FEWER_WARNINGS
-        LINK_WITH_PRIVATE
-            miniz
-            lz4_static
-            slang
-            core
-            compiler-core
-            slang-capability-defs
-            slang-capability-lookup
-            slang-fiddle-output
-            slang-lookup-tables
-        INCLUDE_DIRECTORIES_PUBLIC ${slang_SOURCE_DIR}/include .
-    )
-    # To generate binding code
-    target_link_options(slang-wasm PUBLIC
-        \"--bind\"
-        --emit-tsd \"$<TARGET_FILE_DIR:slang-wasm>/slang-wasm.d.ts\"
-        -sMODULARIZE=1
-        -sEXPORT_ES6=1
-        -sEXPORTED_RUNTIME_METHODS=['FS']
-    )
-endif()" > "source/slang-wasm/CMakeLists.txt"
-
-cmake --workflow --preset generators --fresh
-mkdir generators
-cmake --install build --prefix generators --component generators
+# The `,` syntax in sed specifies a range from the line that starts
+# with `target_link_options(` to the line that has just a `)` (possibly indented).
+#
+# /start/,/end/c\ ... replaces the block.
+#
+sed -i '/^[[:space:]]*target_link_options(/,/^[[:space:]]*)/c\
+    target_link_options(slang-wasm PUBLIC\
+        \"--bind\"\
+        --emit-tsd \"$<TARGET_FILE_DIR:slang-wasm>/slang-wasm.d.ts\"\
+        -sMODULARIZE=1\
+        -sEXPORT_ES6=1\
+        -sEXPORTED_RUNTIME_METHODS=['FS']\
+    )' "source/slang-wasm/CMakeLists.txt"
+
+if ! grep -q slang-wasm.d.ts "source/slang-wasm/CMakeLists.txt"
+then
+	echo "Error: failed to override CMake option in source/slang-wasm/CMakeLists.txt"
+	exit 1
+fi
 
-emcmake cmake -DSLANG_GENERATORS_PATH=generators/bin --preset emscripten -DSLANG_SLANG_LLVM_FLAVOR=DISABLE -DSLANG_ENABLE_SPLIT_DEBUG_INFO=FALSE
-cmake --build --preset emscripten --target slang-wasm
+echo "[$(date)] Setup generator configuration ..."
+if ! cmake --workflow --preset generators --fresh
+then
+	echo "Error: CMake configuration failed."
+	exit 1
+fi
 
-cmakeRet=$?
-popd
+echo "[$(date)] Build generators ..."
+mkdir generators
+if ! cmake --install build --prefix generators --component generators
+then
+	echo "Error: CMake build for generators failed."
+	exit 1
+fi
 
-popd
+echo "[$(date)] Setup slang-wasm configuration ..."
+if ! emcmake cmake -DSLANG_GENERATORS_PATH=generators/bin --preset emscripten -DSLANG_ENABLE_RELEASE_LTO=OFF
+then
+	echo "Error: emcmake failed."
+	exit 1
+fi
+
+cp build/CMakeCache.txt ../../CMakeCache.txt
+cp build.em/CMakeCache.txt ../../CMakeCache.em.txt
 
-if [ $cmakeRet -ne 0 ]; then
-    exit -1;
+echo "[$(date)] Build slang as wasm ..."
+if ! cmake --build --preset emscripten --target slang-wasm
+then
+	echo "Build with CMake failed."
+	exit 1
 fi
 
-cp slang-repo/slang/build.em/Release/bin/* ./
-cp slang-repo/slang/build.em/Release/bin/* ./
-gzip -c slang-wasm.wasm > slang-wasm.wasm.gz
+popd
 
-rm key.txt
-echo "$(git -C ./slang-repo/slang rev-parse HEAD)" >> key.txt
+cp slang-repo/build.em/Release/bin/* ./
+gzip -c slang-wasm.wasm > slang-wasm.wasm.gz
 
+git -C ./slang-repo rev-parse HEAD > key.txt
 echo "key: $(cat key.txt)"
+

spirv-tool-wasm-build.sh

@@ -1,25 +1,32 @@
 #!/bin/bash
 
-if [ ! -d emsdk ]; then
+if [ ! -d emsdk ]
+then
     git clone https://github.com/emscripten-core/emsdk.git emsdk
 fi
 
 pushd emsdk
-
-./emsdk install latest
-./emsdk activate latest
-source ./emsdk_env.sh
-
+	sed -i 's/\r$//' emsdk emsdk_env.sh
+	/bin/sh ./emsdk install latest
+	/bin/sh ./emsdk activate latest
+	source ./emsdk_env.sh
 popd
 
+if [ ! -d spirv-tools ]
+then
+	git clone https://github.com/KhronosGroup/SPIRV-Tools.git spirv-tools
+fi
+
 pushd spirv-tools
 git checkout vulkan-sdk-1.3.290.0
 
 python3 utils/git-sync-deps
 
-sed -i '52i        -s EXPORT_ES6 \\' ./source/wasm/build.sh
-echo $(cat ./source/wasm/build.sh)
-./source/wasm/build.sh
+# add an additional option to emcc command
+sed -i 's/\r$//' source/wasm/build.sh
+sed -i 's/-s MODULARIZE \\/-s MODULARIZE -s EXPORT_ES6 \\/' source/wasm/build.sh
+
+bash -x source/wasm/build.sh
 
 cp out/web/spirv-tools.wasm ../
 cp out/web/spirv-tools.js ../