test: use spirv-as instead of pre-assembled SPIR-V (gfx-rs#7157)

sagudev · Feb 17, 2025 · e590555 · e590555
1 parent 7240c18
commit e590555
Show file tree

Hide file tree

Showing 46 changed files with 473 additions and 389 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,9 +18,8 @@ env:
   #
 
   # Sourced from https://vulkan.lunarg.com/sdk/home#linux
-  #
-  # We don't include the 4th version number, as it's not used in any URL.
   VULKAN_SDK_VERSION: "1.4.304"
+  VULKAN_FULL_SDK_VERSION: "1.4.304.1"
   # Sourced from https://www.nuget.org/packages/Microsoft.Direct3D.WARP
   WARP_VERSION: "1.0.13"
 
@@ -56,7 +55,7 @@ env:
   RUSTDOCFLAGS: -D warnings
   WASM_BINDGEN_TEST_TIMEOUT: 300 # 5 minutes
   CACHE_SUFFIX: d # cache busting
-  WGPU_TESTING: true
+  WGPU_CI: true
 
 # We distinguish the following kinds of builds:
 # - native: build for the same target as we compile on
@@ -567,6 +566,32 @@ jobs:
           echo "VK_DRIVER_FILES=`cygpath --windows $PWD/mesa/lvp_icd.x86_64.json`" >> "$GITHUB_ENV"
           echo "GALLIUM_DRIVER=llvmpipe" >> "$GITHUB_ENV"
 
+      - name: (windows) install vulkan sdk
+        if: matrix.os == 'windows-2022'
+        shell: bash
+        run: |
+          set -e
+
+          curl.exe -L --retry 5 https://sdk.lunarg.com/sdk/download/${{ env.VULKAN_FULL_SDK_VERSION }}/windows/VulkanSDK-${{ env.VULKAN_FULL_SDK_VERSION }}-Installer.exe -o vulkan-sdk-installer.exe
+
+          ./vulkan-sdk-installer.exe --accept-licenses --default-answer --confirm-command install
+
+          echo "C:/VulkanSDK/${{ env.VULKAN_FULL_SDK_VERSION }}/Bin" >> "$GITHUB_PATH"
+
+      - name: (mac) install vulkan sdk
+        if: matrix.os == 'macos-14'
+        shell: bash
+        run: |
+          set -e
+
+          curl -L --retry 5 https://sdk.lunarg.com/sdk/download/${{ env.VULKAN_FULL_SDK_VERSION }}/mac/vulkansdk-macos-${{ env.VULKAN_FULL_SDK_VERSION }}.zip -o vulkan-sdk.zip
+          unzip vulkan-sdk.zip -d vulkan-sdk
+
+          ls -l vulkan-sdk
+          sudo ./vulkan-sdk/InstallVulkan-${{ env.VULKAN_FULL_SDK_VERSION }}.app/Contents/MacOS/InstallVulkan-${{ env.VULKAN_FULL_SDK_VERSION }} --root "$HOME/VulkanSDK" --accept-licenses --default-answer --confirm-command install
+
+          echo "$HOME/VulkanSDK/macOS/bin" >> "$GITHUB_PATH"
+
       - name: (linux) install vulkan sdk
         if: matrix.os == 'ubuntu-24.04'
         shell: bash
@@ -577,7 +602,7 @@ jobs:
 
           # vulkan sdk
           wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add -
-          sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-$VULKAN_SDK_VERSION-noble.list https://packages.lunarg.com/vulkan/$VULKAN_SDK_VERSION/lunarg-vulkan-$VULKAN_SDK_VERSION-noble.list
+          sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-${{ env.VULKAN_SDK_VERSION }}-noble.list https://packages.lunarg.com/vulkan/${{ env.VULKAN_SDK_VERSION }}/lunarg-vulkan-$VULKAN_SDK_VERSION-noble.list
 
           sudo apt-get update
           sudo apt install -y vulkan-sdk

diff --git a/naga/tests/in/spv/atomic_compare_exchange.spv b/naga/tests/in/spv/atomic_compare_exchange.spv
diff --git a/naga/tests/in/spv/atomic_exchange.spv b/naga/tests/in/spv/atomic_exchange.spv
diff --git a/naga/tests/in/spv/atomic_global_struct_field_vertex.spv b/naga/tests/in/spv/atomic_global_struct_field_vertex.spv
diff --git a/naga/tests/in/spv/atomic_i_add_sub.spv b/naga/tests/in/spv/atomic_i_add_sub.spv
diff --git a/naga/tests/in/spv/atomic_i_decrement.spv b/naga/tests/in/spv/atomic_i_decrement.spv
diff --git a/naga/tests/in/spv/atomic_i_increment.spv b/naga/tests/in/spv/atomic_i_increment.spv
diff --git a/naga/tests/in/spv/atomic_load_and_store.spv b/naga/tests/in/spv/atomic_load_and_store.spv
diff --git a/naga/tests/in/spv/binding-arrays.dynamic.spv b/naga/tests/in/spv/binding-arrays.dynamic.spv
diff --git a/naga/tests/in/spv/binding-arrays.dynamic.spvasm b/naga/tests/in/spv/binding-arrays.dynamic.spvasm
@@ -1,3 +1,6 @@
+; SPIR-V
+; Version: 1.0
+
 ;; Make sure that we promote `OpTypeRuntimeArray` of textures and samplers into
 ;; `TypeInner::BindingArray` and support indexing it through `OpAccessChain`
 ;; and `OpInBoundsAccessChain`.

diff --git a/naga/tests/in/spv/binding-arrays.static.spv b/naga/tests/in/spv/binding-arrays.static.spv
diff --git a/naga/tests/in/spv/binding-arrays.static.spvasm b/naga/tests/in/spv/binding-arrays.static.spvasm
@@ -1,3 +1,6 @@
+; SPIR-V
+; Version: 1.0
+
 ;; Make sure that we promote `OpTypeArray` of textures and samplers into
 ;; `TypeInner::BindingArray` and support indexing it through `OpAccessChain`
 ;; and `OpInBoundsAccessChain`.

diff --git a/naga/tests/in/spv/builtin-accessed-outside-entrypoint.spv b/naga/tests/in/spv/builtin-accessed-outside-entrypoint.spv
diff --git a/naga/tests/in/spv/builtin-accessed-outside-entrypoint.spvasm b/naga/tests/in/spv/builtin-accessed-outside-entrypoint.spvasm
@@ -1,3 +1,6 @@
+; SPIR-V
+; Version: 1.0
+
 ;; Ensure builtin binding isn't removed by unused gl_PerVertex builtin culling when
 ;; the builtin is used in a function defined after (in the SPIRV) the entry point.
 ;;

diff --git a/naga/tests/in/spv/degrees.spv b/naga/tests/in/spv/degrees.spv
diff --git a/naga/tests/in/spv/do-while.spv b/naga/tests/in/spv/do-while.spv
diff --git a/naga/tests/in/spv/do-while.spvasm b/naga/tests/in/spv/do-while.spvasm
@@ -1,3 +1,6 @@
+; SPIR-V
+; Version: 1.0
+
 ;; Ensure that `do`-`while`-style loops, with conditional backedges, are properly
 ;; supported, via `break if` (as `continuing { ... if c { break; } }` is illegal).
 ;;

diff --git a/naga/tests/in/spv/empty-global-name.spv b/naga/tests/in/spv/empty-global-name.spv
diff --git a/naga/tests/in/spv/empty-global-name.spvasm b/naga/tests/in/spv/empty-global-name.spvasm
@@ -1,3 +1,6 @@
+; SPIR-V
+; Version: 1.0
+
 ;; Make sure we handle globals whose assigned name is "".
 ;;
 ;; In MSL, the anonymous global sometimes ends up looking like

diff --git a/naga/tests/in/spv/fetch_depth.spv b/naga/tests/in/spv/fetch_depth.spv
diff --git a/naga/tests/in/spv/inv-hyperbolic-trig-functions.spv b/naga/tests/in/spv/inv-hyperbolic-trig-functions.spv
diff --git a/naga/tests/in/spv/quad-vert.spv b/naga/tests/in/spv/quad-vert.spv
diff --git a/naga/tests/in/spv/shadow.spv b/naga/tests/in/spv/shadow.spv
diff --git a/naga/tests/in/spv/spec-constants-issue-5598.spv b/naga/tests/in/spv/spec-constants-issue-5598.spv
diff --git a/naga/tests/in/spv/spec-constants.spv b/naga/tests/in/spv/spec-constants.spv
diff --git a/naga/tests/in/spv/subgroup-operations-s.spv b/naga/tests/in/spv/subgroup-operations-s.spv
diff --git a/naga/tests/in/spv/unnamed-gl-per-vertex.spv b/naga/tests/in/spv/unnamed-gl-per-vertex.spv
diff --git a/naga/tests/in/spv/unnamed-gl-per-vertex.spvasm b/naga/tests/in/spv/unnamed-gl-per-vertex.spvasm
@@ -1,3 +1,9 @@
+; SPIR-V
+; Version: 1.0
+; Generator: Google Shaderc over Glslang; 11
+; Bound: 34
+; Schema: 0
+
 ;; Make sure that we don't have a validation error due to lacking capabilities
 ;; for bulltins such as ClipDistance when those builtin are not actually used.
 ;;
@@ -22,11 +28,6 @@
 ;; } 
 ;; ```
 ;;
-; SPIR-V
-; Version: 1.0
-; Generator: Google Shaderc over Glslang; 11
-; Bound: 34
-; Schema: 0
                OpCapability Shader
           %1 = OpExtInstImport "GLSL.std.450"
                OpMemoryModel Logical GLSL450