Skip to content

Commit 3d53b0c

Browse files
committed
Implement NIR to WASM runtime smoke path
1 parent 44e26ee commit 3d53b0c

4 files changed

Lines changed: 477 additions & 47 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ set(WASM_BUILD_DIR "${WEBVULKAN_BUILD_DIR}/wasm" CACHE PATH "WASM sub-build dire
2525
set(WEBVULKAN_EMSCRIPTEN_TOOLCHAIN_FILE "${PROJECT_SOURCE_DIR}/cmake/toolchains/WebVulkanEmscripten.cmake" CACHE FILEPATH "Custom Emscripten toolchain file")
2626
set(MESA_SRC_DIR "${WEBVULKAN_THIRDPARTY_DIR}/mesa" CACHE PATH "Path where Mesa is cloned")
2727
set(MESA_GIT_URL "https://github.com/Devsh-Graphics-Programming/mesa.git" CACHE STRING "Mesa git repository URL")
28-
set(MESA_GIT_REF "029fc5ee759c44470a52ecd09f77132581f3a1c7" CACHE STRING "Pinned Mesa git ref")
28+
set(MESA_GIT_REF "ca61cf8e8fcf6b2e57ca714ecc3fdb7d5699cf64" CACHE STRING "Pinned Mesa git ref")
2929
set(MESA_WASM_BUILD_DIR "${WEBVULKAN_BUILD_DIR}/mesa-wasm" CACHE PATH "Mesa WASM build directory")
3030
set(LLVM_SRC_DIR "${WEBVULKAN_THIRDPARTY_DIR}/llvm-project" CACHE PATH "Path where llvm-project is cloned")
3131
set(LLVM_HOST_BUILD_DIR "${WEBVULKAN_BUILD_DIR}/llvm-host-tools" CACHE PATH "LLVM host tools build directory")

tests/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,14 +171,15 @@ set(_webvulkan_lavapipe_depends
171171
if(_webvulkan_test_mode STREQUAL "in-tree")
172172
list(APPEND _webvulkan_lavapipe_depends llvmpipe_wasm_spike)
173173
endif()
174+
list(JOIN _webvulkan_smoke_include_dirs "|" _webvulkan_smoke_include_dirs_serialized)
174175

175176
add_custom_command(
176177
OUTPUT "${WEBVULKAN_LAVAPIPE_SMOKE_OK}"
177178
COMMAND
178179
"${CMAKE_COMMAND}"
179180
-DEMSDK_ROOT=${EMSDK_ROOT}
180181
-DDRIVER_ARCHIVE=${_webvulkan_driver_archive}
181-
-DSMOKE_INCLUDE_DIRS=${_webvulkan_smoke_include_dirs}
182+
-DSMOKE_INCLUDE_DIRS_SERIALIZED=${_webvulkan_smoke_include_dirs_serialized}
182183
-DSMOKE_SOURCE=${CMAKE_CURRENT_LIST_DIR}/wasm/src/lavapipe_runtime_smoke.c
183184
-DSMOKE_JS_OUT=${WEBVULKAN_LAVAPIPE_SMOKE_JS}
184185
-DSMOKE_SCRIPT=${CMAKE_CURRENT_LIST_DIR}/wasm/tools/smoke_runtime.mjs

tests/RunLavapipeRuntimeSmoke.cmake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,17 @@ endfunction()
88

99
require_var(EMSDK_ROOT)
1010
require_var(DRIVER_ARCHIVE)
11-
require_var(SMOKE_INCLUDE_DIRS)
1211
require_var(SMOKE_SOURCE)
1312
require_var(SMOKE_JS_OUT)
1413
require_var(SMOKE_SCRIPT)
1514
require_var(VOLK_INCLUDE_DIR)
1615
require_var(VOLK_SOURCE)
1716

17+
if(DEFINED SMOKE_INCLUDE_DIRS_SERIALIZED AND NOT "${SMOKE_INCLUDE_DIRS_SERIALIZED}" STREQUAL "")
18+
string(REPLACE "|" ";" SMOKE_INCLUDE_DIRS "${SMOKE_INCLUDE_DIRS_SERIALIZED}")
19+
endif()
20+
require_var(SMOKE_INCLUDE_DIRS)
21+
1822
if(CMAKE_HOST_WIN32)
1923
set(EMCC_BIN "${EMSDK_ROOT}/upstream/emscripten/emcc.bat")
2024
file(GLOB NODE_CANDIDATES "${EMSDK_ROOT}/node/*/bin/node.exe")

0 commit comments

Comments
 (0)