Checkpoint stable lavapipe runtime smoke

Author: AnastaZIuk

CMakeLists.txt

@@ -45,6 +45,7 @@ set(LLVM_PREBUILT_URL "${_WEBVULKAN_DEFAULT_LLVM_PREBUILT_URL}" CACHE STRING "UR
 set(LLVM_PREBUILT_SHA256 "${_WEBVULKAN_DEFAULT_LLVM_PREBUILT_SHA256}" CACHE STRING "SHA256 for LLVM_PREBUILT_URL (optional)")
 set(LLVM_PROVIDER "prebuilt" CACHE STRING "LLVM provider: source, prebuilt, or system")
 set_property(CACHE LLVM_PROVIDER PROPERTY STRINGS source prebuilt system)
+option(WEBVULKAN_LLVM_ORCJIT "Build Mesa with LLVM ORCJIT path" OFF)
 set(LLVM_GIT_REF "afd4df07ab0262482829d4410a6bae9f2809d37b" CACHE STRING "Pinned LLVM git ref")
 if(LLVM_GIT_REF STREQUAL "ee9aeb4e05aa8edd2077b79f6712ea353ef5be77")
   set(LLVM_GIT_REF "afd4df07ab0262482829d4410a6bae9f2809d37b" CACHE STRING "Pinned LLVM git ref" FORCE)
@@ -124,6 +125,7 @@ add_custom_target(llvmpipe_wasm_spike
     -DLLVM_WASM_BUILD_DIR=${LLVM_WASM_BUILD_DIR}
     -DLLVM_WASM_INSTALL_DIR=${LLVM_WASM_INSTALL_DIR}
     -DLLVM_PROVIDER=${LLVM_PROVIDER}
+    -DWEBVULKAN_LLVM_ORCJIT=${WEBVULKAN_LLVM_ORCJIT}
     -DLLVM_GIT_REF=${LLVM_GIT_REF}
     -DLLVM_PREBUILT_URL=${LLVM_PREBUILT_URL}
     -DLLVM_PREBUILT_SHA256=${LLVM_PREBUILT_SHA256}
@@ -138,8 +140,11 @@ add_custom_target(lavapipe_wasm_spike DEPENDS llvmpipe_wasm_spike)
 add_library(webvulkan_llvmpipe_wasm INTERFACE)
 add_library(webvulkan::llvmpipe_wasm ALIAS webvulkan_llvmpipe_wasm)
 add_library(webvulkan::lavapipe_wasm ALIAS webvulkan_llvmpipe_wasm)
+add_library(webvulkan_llvm_jit INTERFACE)
+add_library(webvulkan::llvm_jit ALIAS webvulkan_llvm_jit)
 
 add_dependencies(webvulkan_llvmpipe_wasm llvmpipe_wasm_spike)
+add_dependencies(webvulkan_llvm_jit llvmpipe_wasm_spike)
 
 target_include_directories(webvulkan_llvmpipe_wasm INTERFACE
   "$<BUILD_INTERFACE:${MESA_SRC_DIR}/include>"
@@ -153,6 +158,8 @@ target_include_directories(webvulkan_llvmpipe_wasm INTERFACE
 target_link_libraries(webvulkan_llvmpipe_wasm INTERFACE
   "$<BUILD_INTERFACE:${WEBVULKAN_DRIVER_ARCHIVE}>"
 )
+target_link_libraries(webvulkan_llvm_jit INTERFACE webvulkan::llvmpipe_wasm)
+target_compile_definitions(webvulkan_llvm_jit INTERFACE WEBVULKAN_ENABLE_LLVM_JIT=1)
 
 set(WEBVULKAN_PACKAGE_NAME "WebVulkanLlvmpipeWasm")
 set(WEBVULKAN_CONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${WEBVULKAN_PACKAGE_NAME}")

cmake/BuildMesaLlvmpipeWasm.cmake

@@ -117,6 +117,16 @@ endif()
 if(NOT DEFINED LLVM_PROVIDER)
   set(LLVM_PROVIDER "source")
 endif()
+if(NOT DEFINED WEBVULKAN_LLVM_ORCJIT)
+  set(WEBVULKAN_LLVM_ORCJIT OFF)
+endif()
+if(WEBVULKAN_LLVM_ORCJIT)
+  set(WEBVULKAN_LLVM_ORCJIT_MESON true)
+  set(WEBVULKAN_LLVM_ENABLE_THREADS ON)
+else()
+  set(WEBVULKAN_LLVM_ORCJIT_MESON false)
+  set(WEBVULKAN_LLVM_ENABLE_THREADS OFF)
+endif()
 if(NOT DEFINED LLVM_GIT_REF)
   set(LLVM_GIT_REF "afd4df07ab0262482829d4410a6bae9f2809d37b")
 endif()
@@ -258,7 +268,7 @@ set(MESA_LAVAPIPE_THIN_ARCHIVE "${MESA_BUILD_DIR}/src/gallium/frontends/lavapipe
 set(MESA_LAVAPIPE_FULL_ARCHIVE "${MESA_BUILD_DIR}/src/gallium/frontends/lavapipe/liblavapipe_st.full.a")
 set(MESA_WEBVULKAN_DRIVER_ARCHIVE "${MESA_BUILD_DIR}/libwebvulkan_driver.full.a")
 set(MESA_BUILD_STATE_FILE "${MESA_BUILD_DIR}/.webvulkan_mesa_build_state.txt")
-set(MESA_BUILD_SIGNATURE_VERSION "3")
+set(MESA_BUILD_SIGNATURE_VERSION "4")
 set(MESA_SOURCE_REV "${MESA_GIT_REF}")
 set(MESA_SOURCE_TREE_STATE "unknown")
 if(EXISTS "${MESA_SRC_DIR}/.git")
@@ -276,25 +286,55 @@ if(EXISTS "${MESA_SRC_DIR}/.git")
     endif()
 
     execute_process(
-      COMMAND "${GIT_EXECUTABLE}" -C "${MESA_SRC_DIR}" status --porcelain=v1 --untracked-files=no
-      OUTPUT_VARIABLE MESA_SOURCE_STATUS
+      COMMAND "${GIT_EXECUTABLE}" -C "${MESA_SRC_DIR}" diff --no-ext-diff --binary --no-color HEAD --
+      OUTPUT_VARIABLE MESA_SOURCE_DIFF
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      ERROR_QUIET
+      RESULT_VARIABLE MESA_SOURCE_DIFF_RESULT
+    )
+
+    set(MESA_SOURCE_DIFF_HASH "")
+    if(MESA_SOURCE_DIFF_RESULT EQUAL 0 AND NOT MESA_SOURCE_DIFF STREQUAL "")
+      string(SHA256 MESA_SOURCE_DIFF_HASH "${MESA_SOURCE_DIFF}")
+    endif()
+
+    execute_process(
+      COMMAND "${GIT_EXECUTABLE}" -C "${MESA_SRC_DIR}" ls-files --others --exclude-standard
+      OUTPUT_VARIABLE MESA_SOURCE_UNTRACKED_LIST
       OUTPUT_STRIP_TRAILING_WHITESPACE
       ERROR_QUIET
-      RESULT_VARIABLE MESA_SOURCE_STATUS_RESULT
+      RESULT_VARIABLE MESA_SOURCE_UNTRACKED_RESULT
     )
-    if(MESA_SOURCE_STATUS_RESULT EQUAL 0)
-      if(MESA_SOURCE_STATUS STREQUAL "")
-        set(MESA_SOURCE_TREE_STATE "clean")
-      else()
-        string(SHA256 MESA_SOURCE_STATUS_HASH "${MESA_SOURCE_STATUS}")
-        set(MESA_SOURCE_TREE_STATE "dirty:${MESA_SOURCE_STATUS_HASH}")
+
+    set(MESA_SOURCE_UNTRACKED_HASH "")
+    if(MESA_SOURCE_UNTRACKED_RESULT EQUAL 0 AND NOT MESA_SOURCE_UNTRACKED_LIST STREQUAL "")
+      string(REPLACE "\n" ";" MESA_SOURCE_UNTRACKED_FILES "${MESA_SOURCE_UNTRACKED_LIST}")
+      set(MESA_SOURCE_UNTRACKED_INPUT "")
+      foreach(MESA_SOURCE_UNTRACKED_FILE IN LISTS MESA_SOURCE_UNTRACKED_FILES)
+        if(NOT MESA_SOURCE_UNTRACKED_FILE STREQUAL "")
+          set(MESA_SOURCE_UNTRACKED_PATH "${MESA_SRC_DIR}/${MESA_SOURCE_UNTRACKED_FILE}")
+          if(EXISTS "${MESA_SOURCE_UNTRACKED_PATH}" AND NOT IS_DIRECTORY "${MESA_SOURCE_UNTRACKED_PATH}")
+            file(SHA256 "${MESA_SOURCE_UNTRACKED_PATH}" MESA_SOURCE_UNTRACKED_FILE_HASH)
+            string(APPEND MESA_SOURCE_UNTRACKED_INPUT "${MESA_SOURCE_UNTRACKED_FILE}=${MESA_SOURCE_UNTRACKED_FILE_HASH}\n")
+          endif()
+        endif()
+      endforeach()
+      if(NOT MESA_SOURCE_UNTRACKED_INPUT STREQUAL "")
+        string(SHA256 MESA_SOURCE_UNTRACKED_HASH "${MESA_SOURCE_UNTRACKED_INPUT}")
       endif()
     endif()
+
+    if(MESA_SOURCE_DIFF_HASH STREQUAL "" AND MESA_SOURCE_UNTRACKED_HASH STREQUAL "")
+      set(MESA_SOURCE_TREE_STATE "clean")
+    else()
+      string(SHA256 MESA_SOURCE_TREE_HASH "diff=${MESA_SOURCE_DIFF_HASH}\nuntracked=${MESA_SOURCE_UNTRACKED_HASH}\n")
+      set(MESA_SOURCE_TREE_STATE "dirty:${MESA_SOURCE_TREE_HASH}")
+    endif()
   endif()
 endif()
 
 set(MESA_CONFIG_SIGNATURE_INPUT
-  "llvm_provider=${LLVM_PROVIDER}\nllvm_git_ref=${LLVM_GIT_REF}\nllvm_prebuilt_url=${LLVM_PREBUILT_URL}\nllvm_prebuilt_sha256=${LLVM_PREBUILT_SHA256}\nemsdk_root=${EMSDK_ROOT}\n"
+  "llvm_provider=${LLVM_PROVIDER}\nllvm_git_ref=${LLVM_GIT_REF}\nllvm_prebuilt_url=${LLVM_PREBUILT_URL}\nllvm_prebuilt_sha256=${LLVM_PREBUILT_SHA256}\nemsdk_root=${EMSDK_ROOT}\nllvm_orcjit=${WEBVULKAN_LLVM_ORCJIT_MESON}\n"
 )
 string(SHA256 MESA_CONFIG_SIGNATURE_HASH "${MESA_CONFIG_SIGNATURE_INPUT}")
 
@@ -337,15 +377,22 @@ elseif(NOT MESA_EXISTING_CONFIG_HASH STREQUAL MESA_CONFIG_SIGNATURE_HASH)
 endif()
 
 set(MESA_REQUIRES_COMPILE OFF)
-if(NOT MESA_HAS_REQUIRED_OUTPUTS)
+if(MESA_REQUIRES_CONFIGURE)
+  set(MESA_REQUIRES_COMPILE ON)
+elseif(NOT MESA_HAS_REQUIRED_OUTPUTS)
   set(MESA_REQUIRES_COMPILE ON)
 elseif(NOT MESA_EXISTING_FORMAT STREQUAL MESA_BUILD_SIGNATURE_VERSION)
   set(MESA_REQUIRES_COMPILE ON)
 elseif(NOT MESA_EXISTING_SOURCE_HASH STREQUAL MESA_SOURCE_SIGNATURE_HASH)
   set(MESA_REQUIRES_COMPILE ON)
 endif()
 
-if(NOT MESA_REQUIRES_CONFIGURE AND NOT MESA_REQUIRES_COMPILE)
+set(WEBVULKAN_LLVM_INSTALL_READY OFF)
+if(EXISTS "${LLVM_WASM_INSTALL_DIR}/include/llvm/Config/llvm-config.h")
+  set(WEBVULKAN_LLVM_INSTALL_READY ON)
+endif()
+
+if(NOT MESA_REQUIRES_CONFIGURE AND NOT MESA_REQUIRES_COMPILE AND WEBVULKAN_LLVM_INSTALL_READY)
   message(STATUS "Mesa lavapipe wasm build is up to date")
   return()
 endif()
@@ -403,6 +450,8 @@ if(LLVM_PROVIDER STREQUAL "source")
         -DLLVM_ENABLE_ZLIB=OFF
         -DLLVM_ENABLE_ZSTD=OFF
         -DLLVM_ENABLE_LIBXML2=OFF
+        -DLLVM_FORCE_USE_OLD_TOOLCHAIN=ON
+        -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON
         -DLLVM_BUILD_TOOLS=ON
         -DLLVM_INCLUDE_TOOLS=ON
     )
@@ -447,10 +496,12 @@ if(LLVM_PROVIDER STREQUAL "source")
         -DLLVM_INCLUDE_BENCHMARKS=OFF
         -DLLVM_INCLUDE_DOCS=OFF
         -DLLVM_ENABLE_BINDINGS=OFF
-        -DLLVM_ENABLE_THREADS=OFF
+        -DLLVM_ENABLE_THREADS=${WEBVULKAN_LLVM_ENABLE_THREADS}
         -DLLVM_ENABLE_ZLIB=OFF
         -DLLVM_ENABLE_ZSTD=OFF
         -DLLVM_ENABLE_LIBXML2=OFF
+        -DLLVM_FORCE_USE_OLD_TOOLCHAIN=ON
+        -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON
         -DLLVM_ENABLE_RTTI=ON
         -DLLVM_BUILD_TOOLS=OFF
         -DLLVM_INCLUDE_TOOLS=OFF
@@ -615,6 +666,7 @@ if(MESA_REQUIRES_CONFIGURE)
     -Dllvm=enabled
     -Dshared-llvm=disabled
     -Ddraw-use-llvm=true
+    -Dllvm-orcjit=${WEBVULKAN_LLVM_ORCJIT_MESON}
     -Dopengl=false
     -Dgles1=disabled
     -Dgles2=disabled

cmake/WebVulkanLlvmpipeWasmConfig.cmake.in

@@ -20,6 +20,12 @@ if(NOT TARGET webvulkan::lavapipe_wasm)
   target_link_libraries(webvulkan::lavapipe_wasm INTERFACE webvulkan::llvmpipe_wasm)
 endif()
 
+if(NOT TARGET webvulkan::llvm_jit)
+  add_library(webvulkan::llvm_jit INTERFACE IMPORTED)
+  target_link_libraries(webvulkan::llvm_jit INTERFACE webvulkan::llvmpipe_wasm)
+  target_compile_definitions(webvulkan::llvm_jit INTERFACE WEBVULKAN_ENABLE_LLVM_JIT=1)
+endif()
+
 if(NOT TARGET webvulkan_llvmpipe_wasm)
   add_library(webvulkan_llvmpipe_wasm INTERFACE IMPORTED)
   target_link_libraries(webvulkan_llvmpipe_wasm INTERFACE webvulkan::llvmpipe_wasm)

tests/RunLavapipeRuntimeSmoke.cmake

@@ -71,6 +71,12 @@ append_rsp("-sEXPORT_ES6=1")
 append_rsp("-sENVIRONMENT=web,worker,node")
 append_rsp("-sEXPORTED_FUNCTIONS=['_main','_lavapipe_runtime_smoke']")
 append_rsp("-sEXPORTED_RUNTIME_METHODS=['ccall']")
+append_rsp("-sMAIN_MODULE=2")
+append_rsp("-sALLOW_TABLE_GROWTH=1")
+append_rsp("-Wl,--allow-multiple-definition")
+append_rsp("-sASSERTIONS=2")
+append_rsp("-sSTACK_OVERFLOW_CHECK=2")
+append_rsp("--profiling-funcs")
 append_rsp("${DRIVER_ARCHIVE}")
 
 execute_process(