Remove PoC smoke path and keep real runtime flow

Author: AnastaZIuk

.gitignore

@@ -3,4 +3,5 @@
 /package*/
 /.3rdparty/
 /out/
+/tmp/
 .DS_Store

README.md

@@ -56,7 +56,7 @@ Why not LLVM JIT-in-Wasm right now:
 
 Why not full NIR->Wasm backend today:
 - Mesa does not ship a complete NIR->Wasm backend for this use case.
-- We built a simple proof-of-concept for a minimal pattern, but a full backend from scratch is a large compiler project and not realistic for a single maintainer effort.
+- A full backend from scratch is a large compiler project and not realistic for a single maintainer effort.
 
 Current strategy:
 - Keep `clang_wasm_runtime_smoke` as a clang-in-wasm toolchain proof path.
@@ -154,13 +154,10 @@ It validates:
 
 This gives a realistic loader flow for consumers that use Volk, while keeping dispatch pinned to the wasm ICD path.
 
-`smoke_poc_nir_to_wasm` is kept as an experimental proof-of-concept path and is not the main production direction.
-
 Current shader-path split:
 - `lavapipe_runtime_smoke` injects runtime-generated SPIR-V (from Wasmer `clspv` by default) into the smoke module and validates Vulkan compute dispatch in the Mesa wasm driver.
 - `clang_wasm_runtime_smoke` validates the clang-in-wasm toolchain path and runs an SPIR-V probe through a Wasmer runtime command (`clspv` package entrypoint by default).
 - If that command is unavailable, smoke falls back to a direct `--target=spirv32` probe and reports the provider and failure reason.
-- `smoke_poc_nir_to_wasm` is a separate experimental check and is not part of `runtime_smoke`.
 
 ## Release channels
 

tests/CMakeLists.txt

@@ -297,9 +297,11 @@ add_custom_target(wasm_runtime_smoke DEPENDS "${WEBVULKAN_WASM_SMOKE_OK}")
 
 set(WEBVULKAN_LAVAPIPE_SMOKE_OK "${CMAKE_BINARY_DIR}/lavapipe_runtime_smoke.ok")
 set(WEBVULKAN_LAVAPIPE_SMOKE_JS "${CMAKE_BINARY_DIR}/lavapipe-smoke/lavapipe_runtime_smoke.js")
+set(WEBVULKAN_RUNTIME_REGISTRY_SOURCE "${CMAKE_CURRENT_LIST_DIR}/wasm/src/webvulkan_shader_runtime_registry.c")
 set(_webvulkan_lavapipe_depends
   "${CMAKE_CURRENT_LIST_DIR}/RunLavapipeRuntimeSmoke.cmake"
   "${CMAKE_CURRENT_LIST_DIR}/wasm/src/lavapipe_runtime_smoke.c"
+  "${WEBVULKAN_RUNTIME_REGISTRY_SOURCE}"
   "${CMAKE_CURRENT_LIST_DIR}/wasm/tools/smoke_runtime.mjs"
   "${WEBVULKAN_DXC_WASM_JS}"
   "${_webvulkan_volk_source}"
@@ -310,6 +312,10 @@ if(_webvulkan_test_mode STREQUAL "in-tree")
   list(APPEND _webvulkan_lavapipe_depends llvmpipe_wasm_spike)
 endif()
 list(JOIN _webvulkan_smoke_include_dirs "|" _webvulkan_smoke_include_dirs_serialized)
+set(_webvulkan_lavapipe_extra_sources
+  "${WEBVULKAN_RUNTIME_REGISTRY_SOURCE}"
+)
+list(JOIN _webvulkan_lavapipe_extra_sources "|" _webvulkan_lavapipe_extra_sources_serialized)
 
 add_custom_command(
   OUTPUT "${WEBVULKAN_LAVAPIPE_SMOKE_OK}"
@@ -318,6 +324,7 @@ add_custom_command(
     -DEMSDK_ROOT=${EMSDK_ROOT}
     -DDRIVER_ARCHIVE=${_webvulkan_driver_archive}
     -DSMOKE_INCLUDE_DIRS_SERIALIZED=${_webvulkan_smoke_include_dirs_serialized}
+    -DSMOKE_EXTRA_SOURCES_SERIALIZED=${_webvulkan_lavapipe_extra_sources_serialized}
     -DSMOKE_SOURCE=${CMAKE_CURRENT_LIST_DIR}/wasm/src/lavapipe_runtime_smoke.c
     -DSMOKE_JS_OUT=${WEBVULKAN_LAVAPIPE_SMOKE_JS}
     -DSMOKE_EXPORT=_lavapipe_runtime_smoke
@@ -338,41 +345,6 @@ add_custom_command(
 )
 add_custom_target(lavapipe_runtime_smoke DEPENDS "${WEBVULKAN_LAVAPIPE_SMOKE_OK}")
 
-set(WEBVULKAN_POC_NIR_TO_WASM_SMOKE_OK "${CMAKE_BINARY_DIR}/poc_nir_to_wasm_smoke.ok")
-set(WEBVULKAN_POC_NIR_TO_WASM_SMOKE_JS "${CMAKE_BINARY_DIR}/lavapipe-smoke/poc_nir_to_wasm_smoke.js")
-set(_webvulkan_poc_nir_to_wasm_depends
-  "${CMAKE_CURRENT_LIST_DIR}/RunLavapipeRuntimeSmoke.cmake"
-  "${CMAKE_CURRENT_LIST_DIR}/wasm/src/poc_nir_to_wasm_smoke.c"
-  "${CMAKE_CURRENT_LIST_DIR}/wasm/tools/smoke_runtime.mjs"
-  "${_webvulkan_volk_source}"
-  "${_webvulkan_volk_header}"
-  "${_webvulkan_driver_archive}"
-)
-if(_webvulkan_test_mode STREQUAL "in-tree")
-  list(APPEND _webvulkan_poc_nir_to_wasm_depends llvmpipe_wasm_spike)
-endif()
-add_custom_command(
-  OUTPUT "${WEBVULKAN_POC_NIR_TO_WASM_SMOKE_OK}"
-  COMMAND
-    "${CMAKE_COMMAND}"
-    -DEMSDK_ROOT=${EMSDK_ROOT}
-    -DDRIVER_ARCHIVE=${_webvulkan_driver_archive}
-    -DSMOKE_INCLUDE_DIRS_SERIALIZED=${_webvulkan_smoke_include_dirs_serialized}
-    -DSMOKE_SOURCE=${CMAKE_CURRENT_LIST_DIR}/wasm/src/poc_nir_to_wasm_smoke.c
-    -DSMOKE_JS_OUT=${WEBVULKAN_POC_NIR_TO_WASM_SMOKE_JS}
-    -DSMOKE_EXPORT=_poc_nir_to_wasm_smoke
-    -DSMOKE_SCRIPT=${CMAKE_CURRENT_LIST_DIR}/wasm/tools/smoke_runtime.mjs
-    -DSMOKE_REQUIRE_RUNTIME_SPIRV=0
-    -DVOLK_INCLUDE_DIR=${_webvulkan_volk_include_dir}
-    -DVOLK_SOURCE=${_webvulkan_volk_source}
-    -P "${CMAKE_CURRENT_LIST_DIR}/RunLavapipeRuntimeSmoke.cmake"
-  COMMAND "${CMAKE_COMMAND}" -E touch "${WEBVULKAN_POC_NIR_TO_WASM_SMOKE_OK}"
-  DEPENDS ${_webvulkan_poc_nir_to_wasm_depends}
-  USES_TERMINAL
-  VERBATIM
-)
-add_custom_target(smoke_poc_nir_to_wasm DEPENDS "${WEBVULKAN_POC_NIR_TO_WASM_SMOKE_OK}")
-
 set(WEBVULKAN_CLANG_WASM_SMOKE_OK "${CMAKE_BINARY_DIR}/clang_wasm_runtime_smoke.ok")
 add_custom_command(
   OUTPUT "${WEBVULKAN_CLANG_WASM_SMOKE_OK}"

tests/RunLavapipeRuntimeSmoke.cmake

@@ -37,6 +37,9 @@ if(DEFINED SMOKE_INCLUDE_DIRS_SERIALIZED AND NOT "${SMOKE_INCLUDE_DIRS_SERIALIZE
   string(REPLACE "|" ";" SMOKE_INCLUDE_DIRS "${SMOKE_INCLUDE_DIRS_SERIALIZED}")
 endif()
 require_var(SMOKE_INCLUDE_DIRS)
+if(DEFINED SMOKE_EXTRA_SOURCES_SERIALIZED AND NOT "${SMOKE_EXTRA_SOURCES_SERIALIZED}" STREQUAL "")
+  string(REPLACE "|" ";" SMOKE_EXTRA_SOURCES "${SMOKE_EXTRA_SOURCES_SERIALIZED}")
+endif()
 
 if(CMAKE_HOST_WIN32)
   set(EMCC_BIN "${EMSDK_ROOT}/upstream/emscripten/emcc.bat")
@@ -59,6 +62,11 @@ list(GET NODE_CANDIDATES 0 NODE_EXE)
 if(NOT EXISTS "${DRIVER_ARCHIVE}")
   message(FATAL_ERROR "Missing driver archive ${DRIVER_ARCHIVE}")
 endif()
+foreach(SMOKE_EXTRA_SOURCE IN LISTS SMOKE_EXTRA_SOURCES)
+  if(NOT EXISTS "${SMOKE_EXTRA_SOURCE}")
+    message(FATAL_ERROR "Missing smoke extra source ${SMOKE_EXTRA_SOURCE}")
+  endif()
+endforeach()
 if(NOT EXISTS "${VOLK_SOURCE}")
   message(FATAL_ERROR "Missing volk source ${VOLK_SOURCE}")
 endif()
@@ -82,6 +90,9 @@ function(append_rsp ARG_VALUE)
 endfunction()
 
 append_rsp("${SMOKE_SOURCE}")
+foreach(SMOKE_EXTRA_SOURCE IN LISTS SMOKE_EXTRA_SOURCES)
+  append_rsp("${SMOKE_EXTRA_SOURCE}")
+endforeach()
 append_rsp("${VOLK_SOURCE}")
 append_rsp("-o")
 append_rsp("${SMOKE_JS_OUT}")
@@ -98,7 +109,7 @@ append_rsp("-sMODULARIZE=1")
 append_rsp("-sEXPORT_ES6=1")
 append_rsp("-sENVIRONMENT=web,worker,node")
 if(SMOKE_REQUIRE_RUNTIME_SPIRV STREQUAL "1")
-  append_rsp("-sEXPORTED_FUNCTIONS=['_main','${SMOKE_EXPORT}','_webvulkan_set_runtime_shader_spirv','_malloc','_free']")
+  append_rsp("-sEXPORTED_FUNCTIONS=['_main','${SMOKE_EXPORT}','_webvulkan_reset_runtime_shader_registry','_webvulkan_set_runtime_active_shader_key','_webvulkan_set_runtime_expected_dispatch_value','_webvulkan_runtime_reset_captured_shader_key','_webvulkan_runtime_has_captured_shader_key','_webvulkan_runtime_get_captured_shader_key_lo','_webvulkan_runtime_get_captured_shader_key_hi','_webvulkan_set_runtime_shader_spirv','_webvulkan_register_runtime_shader_spirv','_webvulkan_register_runtime_wasm_module','_webvulkan_register_runtime_shader_bundle','_webvulkan_get_runtime_wasm_used','_webvulkan_get_runtime_wasm_provider','_malloc','_free']")
 else()
   append_rsp("-sEXPORTED_FUNCTIONS=['_main','${SMOKE_EXPORT}']")
 endif()

tests/wasm/src/lavapipe_runtime_smoke.c

@@ -1,10 +1,13 @@
 #include <emscripten/emscripten.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <volk.h>
 
+#include "webvulkan_shader_runtime_registry.h"
+
 VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetInstanceProcAddr(VkInstance instance, const char* pName);
 
 static const uint32_t kSmokeComputeSpirv[] = {
@@ -27,30 +30,7 @@ static const uint32_t kSmokeComputeSpirv[] = {
   0x0000000bu, 0x0003003eu, 0x0000000eu, 0x0000000cu, 0x000100fdu, 0x00010038u
 };
 
-static uint8_t* g_runtime_shader_spirv = 0;
-static uint32_t g_runtime_shader_spirv_size = 0u;
-
-EMSCRIPTEN_KEEPALIVE int webvulkan_set_runtime_shader_spirv(const uint8_t* bytes, uint32_t byteCount) {
-  if (!bytes || byteCount < 4u || (byteCount % 4u) != 0u) {
-    return -1;
-  }
-  if (bytes[0] != 0x03u || bytes[1] != 0x02u || bytes[2] != 0x23u || bytes[3] != 0x07u) {
-    return -2;
-  }
-
-  uint8_t* copy = (uint8_t*)malloc(byteCount);
-  if (!copy) {
-    return -3;
-  }
-  memcpy(copy, bytes, byteCount);
-
-  if (g_runtime_shader_spirv) {
-    free(g_runtime_shader_spirv);
-  }
-  g_runtime_shader_spirv = copy;
-  g_runtime_shader_spirv_size = byteCount;
-  return 0;
-}
+static const uint32_t kEmbeddedExpectedDispatchValue = 0x12345678u;
 
 static int string_contains(const char* haystack, const char* needle) {
   return haystack && needle && strstr(haystack, needle) != 0;
@@ -139,6 +119,9 @@ EMSCRIPTEN_KEEPALIVE int lavapipe_runtime_smoke(void) {
   VkFence submitFence = VK_NULL_HANDLE;
   VkQueue queue = VK_NULL_HANDLE;
   uint32_t dispatchObservedValue = 0u;
+  uint32_t expectedDispatchValue = kEmbeddedExpectedDispatchValue;
+  uint32_t shaderKeyLo = webvulkan_get_runtime_active_shader_key_lo();
+  uint32_t shaderKeyHi = webvulkan_get_runtime_active_shader_key_hi();
   const uint32_t* shaderCodeWords = kSmokeComputeSpirv;
   size_t shaderCodeSizeBytes = sizeof(kSmokeComputeSpirv);
   const char* shaderSource = "embedded_static_spirv";
@@ -181,6 +164,7 @@ EMSCRIPTEN_KEEPALIVE int lavapipe_runtime_smoke(void) {
 
 
   volkInitializeCustom((PFN_vkGetInstanceProcAddr)vk_icdGetInstanceProcAddr);
+  webvulkan_runtime_mark_wasm_usage(0, "none");
   if (!vkCreateInstance || !vkEnumerateInstanceVersion) {
     smokeRc = 21;
     goto cleanup;
@@ -427,11 +411,32 @@ EMSCRIPTEN_KEEPALIVE int lavapipe_runtime_smoke(void) {
     goto cleanup;
   }
 
-  if (g_runtime_shader_spirv && g_runtime_shader_spirv_size >= 4u && (g_runtime_shader_spirv_size % 4u) == 0u) {
-    shaderCodeWords = (const uint32_t*)g_runtime_shader_spirv;
-    shaderCodeSizeBytes = (size_t)g_runtime_shader_spirv_size;
-    shaderSource = "runtime_injected_spirv";
-    shaderEntryPoint = "write_const";
+  const uint8_t* runtimeSpirvBytes = 0;
+  uint32_t runtimeSpirvSize = 0u;
+  const char* runtimeSpirvEntrypoint = 0;
+  if (webvulkan_runtime_lookup_spirv_module(
+        shaderKeyLo,
+        shaderKeyHi,
+        &runtimeSpirvBytes,
+        &runtimeSpirvSize,
+        &runtimeSpirvEntrypoint
+      ) &&
+      runtimeSpirvBytes &&
+      runtimeSpirvSize >= 4u &&
+      (runtimeSpirvSize % 4u) == 0u) {
+    shaderCodeWords = (const uint32_t*)runtimeSpirvBytes;
+    shaderCodeSizeBytes = (size_t)runtimeSpirvSize;
+    shaderSource = "runtime_registry_spirv";
+    if (runtimeSpirvEntrypoint && runtimeSpirvEntrypoint[0]) {
+      shaderEntryPoint = runtimeSpirvEntrypoint;
+    }
+    if (!webvulkan_runtime_lookup_expected_dispatch_value(
+          shaderKeyLo,
+          shaderKeyHi,
+          &expectedDispatchValue
+        )) {
+      expectedDispatchValue = shaderKeyLo;
+    }
   }
 
   VkShaderModuleCreateInfo shaderCreateInfo;
@@ -696,9 +701,9 @@ EMSCRIPTEN_KEEPALIVE int lavapipe_runtime_smoke(void) {
   }
 
   dispatchObservedValue = mappedStorageWord[0];
-  if (dispatchObservedValue != 0x12345678u) {
+  if (dispatchObservedValue != expectedDispatchValue) {
     printf("lavapipe runtime smoke dispatch mismatch\n");
-    printf("  shader.dispatch.expected=0x%08x\n", 0x12345678u);
+    printf("  shader.dispatch.expected=0x%08x\n", expectedDispatchValue);
     printf("  shader.dispatch.observed=0x%08x\n", dispatchObservedValue);
     smokeRc = 73;
     goto cleanup;
@@ -725,13 +730,14 @@ EMSCRIPTEN_KEEPALIVE int lavapipe_runtime_smoke(void) {
   printf("  proof.device_name_contains_llvmpipe=%s\n", proofDeviceName ? "yes" : "no");
   printf("  proof.driver_name_contains_llvmpipe=%s\n", proofDriverName ? "yes" : "no");
   printf("  vulkan_loader=volk (custom vk_icdGetInstanceProcAddr)\n");
+  printf("  shader.key=0x%08x%08x\n", shaderKeyHi, shaderKeyLo);
   printf("  shader.source=%s\n", shaderSource);
   printf("  shader.entrypoint=%s\n", shaderEntryPoint);
   printf("  shader.code_bytes=%u\n", (unsigned)shaderCodeSizeBytes);
   printf("  shader.create_module=ok\n");
   printf("  shader.create_compute_pipeline=ok\n");
   printf("  shader.dispatch=ok\n");
-  printf("  shader.dispatch.expected=0x%08x\n", 0x12345678u);
+  printf("  shader.dispatch.expected=0x%08x\n", expectedDispatchValue);
   printf("  shader.dispatch.observed=0x%08x\n", dispatchObservedValue);
 
 cleanup: