From 0dbd5811c312880759ebf5cc677179aedc986cbe Mon Sep 17 00:00:00 2001 From: Cassandra Beckley Date: Thu, 27 Mar 2025 10:13:33 -0700 Subject: [PATCH] [SPIR-V] Update submodules spirv-val has added a validation that enforces a minimum version of SPIR-V 1.3 when using VulkanMemoryModel, so I've updated the tests that use it to use the correct target environment. Needed for #7266. --- external/SPIRV-Headers | 2 +- external/SPIRV-Tools | 2 +- tools/clang/test/CodeGenSPIRV/decoration.coherent.hlsl | 2 +- .../test/CodeGenSPIRV/intrinsics.interlocked-methods.ps.hlsl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/external/SPIRV-Headers b/external/SPIRV-Headers index 54a521dd13..0e71067798 160000 --- a/external/SPIRV-Headers +++ b/external/SPIRV-Headers @@ -1 +1 @@ -Subproject commit 54a521dd130ae1b2f38fef79b09515702d135bdd +Subproject commit 0e710677989b4326ac974fd80c5308191ed80965 diff --git a/external/SPIRV-Tools b/external/SPIRV-Tools index ada1771a9f..393d5c7df1 160000 --- a/external/SPIRV-Tools +++ b/external/SPIRV-Tools @@ -1 +1 @@ -Subproject commit ada1771a9f7a125573aa94fe551fdc44b45769bd +Subproject commit 393d5c7df150532045c50affffea2df22e8231b0 diff --git a/tools/clang/test/CodeGenSPIRV/decoration.coherent.hlsl b/tools/clang/test/CodeGenSPIRV/decoration.coherent.hlsl index a8578f7377..5815981057 100644 --- a/tools/clang/test/CodeGenSPIRV/decoration.coherent.hlsl +++ b/tools/clang/test/CodeGenSPIRV/decoration.coherent.hlsl @@ -1,5 +1,5 @@ // RUN: %dxc -T ps_6_0 -E main -fcgl %s -spirv | FileCheck %s -check-prefix=GLSL450 -// RUN: %dxc -T ps_6_0 -E main -fcgl -fspv-use-vulkan-memory-model %s -spirv | FileCheck %s -check-prefix=VULKAN +// RUN: %dxc -T ps_6_0 -E main -fcgl -fspv-use-vulkan-memory-model -fspv-target-env=vulkan1.1 %s -spirv | FileCheck %s -check-prefix=VULKAN // When the GLSL450 memory model is used, there should be no memory operands on the loads and stores. // When the Vulkan memory model is used, there should be no decorations. There should be memory operands on the loads and stores instead. diff --git a/tools/clang/test/CodeGenSPIRV/intrinsics.interlocked-methods.ps.hlsl b/tools/clang/test/CodeGenSPIRV/intrinsics.interlocked-methods.ps.hlsl index e9a1813f31..a0b2ab7207 100644 --- a/tools/clang/test/CodeGenSPIRV/intrinsics.interlocked-methods.ps.hlsl +++ b/tools/clang/test/CodeGenSPIRV/intrinsics.interlocked-methods.ps.hlsl @@ -1,5 +1,5 @@ // RUN: %dxc -T ps_6_0 -E main -fcgl %s -spirv | FileCheck %s -check-prefix=CHECK -check-prefix=GLSL450 -// RUN: %dxc -T ps_6_0 -E main -fcgl -fspv-use-vulkan-memory-model %s -spirv | FileCheck %s -check-prefix=CHECK -check-prefix=VULKAN +// RUN: %dxc -T ps_6_0 -E main -fcgl -fspv-use-vulkan-memory-model -fspv-target-env=vulkan1.1 %s -spirv | FileCheck %s -check-prefix=CHECK -check-prefix=VULKAN RWTexture1D g_tTex1di1; RWTexture1D g_tTex1du1;