upgrade from rspirv 0.12 to 0.13

39ali · 39ali · commit 15e705a0dcdb · 2026-05-04T14:17:22.000+03:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/rustc_codegen_spirv/Cargo.toml b/crates/rustc_codegen_spirv/Cargo.toml
@@ -49,7 +49,7 @@ thorin-dwp = "0.9.0"
 ar = "0.9.0"
 either = "1.8.0"
 indexmap = "2.6.0"
-rspirv = "0.12"
+rspirv = "0.13"
 rustc_codegen_spirv-types.workspace = true
 spirv-std-types = { workspace = true, features = ["std"] }
 rustc-demangle = "0.1.21"
diff --git a/crates/rustc_codegen_spirv/src/builder/builder_methods.rs b/crates/rustc_codegen_spirv/src/builder/builder_methods.rs
@@ -341,7 +341,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
     fn ordering_to_semantics_def(&mut self, ordering: AtomicOrdering) -> SpirvValue {
         let mut invalid_seq_cst = false;
         let semantics = match ordering {
-            AtomicOrdering::Relaxed => MemorySemantics::NONE,
+            AtomicOrdering::Relaxed => MemorySemantics::RELAXED,
             AtomicOrdering::Acquire => MemorySemantics::MAKE_VISIBLE | MemorySemantics::ACQUIRE,
             AtomicOrdering::Release => MemorySemantics::MAKE_AVAILABLE | MemorySemantics::RELEASE,
             AtomicOrdering::AcqRel => {
diff --git a/crates/rustc_codegen_spirv/src/builder/byte_addressable_buffer.rs b/crates/rustc_codegen_spirv/src/builder/byte_addressable_buffer.rs
@@ -6,7 +6,7 @@ use crate::builder_spirv::{SpirvValue, SpirvValueExt, SpirvValueKind};
 use crate::spirv_type::SpirvType;
 use rspirv::spirv::{Decoration, Word};
 use rustc_abi::{Align, Size};
-use rustc_codegen_spirv_types::Capability;
+use rspirv::spirv::Capability;
 use rustc_codegen_ssa::traits::BuilderMethods;
 use rustc_errors::ErrorGuaranteed;
 use rustc_middle::ty::Ty;
diff --git a/crates/rustc_codegen_spirv/src/builder/ext_inst.rs b/crates/rustc_codegen_spirv/src/builder/ext_inst.rs
@@ -2,7 +2,7 @@ use super::Builder;
 use crate::builder_spirv::{SpirvValue, SpirvValueExt};
 use crate::custom_insts;
 use rspirv::dr::Operand;
-use rspirv::spirv::{GLOp, Word};
+use rspirv::spirv::{GlslStd450Op as GLOp, Word};
 
 const GLSL_STD_450: &str = "GLSL.std.450";
 
diff --git a/crates/rustc_codegen_spirv/src/builder/intrinsics.rs b/crates/rustc_codegen_spirv/src/builder/intrinsics.rs
@@ -8,7 +8,7 @@ use crate::codegen_cx::CodegenCx;
 use crate::custom_insts::CustomInst;
 use crate::spirv_type::SpirvType;
 use rspirv::dr::Operand;
-use rspirv::spirv::GLOp;
+use rspirv::spirv::GlslStd450Op as GLOp;
 use rustc_codegen_ssa::mir::operand::{OperandRef, OperandValue};
 use rustc_codegen_ssa::mir::place::PlaceRef;
 use rustc_codegen_ssa::traits::{BuilderMethods, IntrinsicCallBuilderMethods};
diff --git a/crates/rustc_codegen_spirv/src/builder/libm_intrinsics.rs b/crates/rustc_codegen_spirv/src/builder/libm_intrinsics.rs
@@ -3,7 +3,7 @@ use crate::maybe_pqp_cg_ssa as rustc_codegen_ssa;
 
 use super::Builder;
 use crate::builder_spirv::{SpirvValue, SpirvValueExt};
-use rspirv::spirv::{GLOp, Word};
+use rspirv::spirv::{GlslStd450Op as GLOp, Word};
 use rustc_codegen_ssa::traits::BuilderMethods;
 
 #[derive(Copy, Clone, Debug)]
diff --git a/crates/rustc_codegen_spirv/src/builder/spirv_asm.rs b/crates/rustc_codegen_spirv/src/builder/spirv_asm.rs
@@ -32,7 +32,7 @@ pub struct InstructionTable {
 
 impl InstructionTable {
     pub fn new() -> Self {
-        let table = rspirv::grammar::CoreInstructionTable::iter()
+        let table = rspirv::grammar::INSTRUCTION_TABLE.iter()
             .map(|inst| (inst.opname, inst))
             .collect();
         Self { table }
@@ -1537,6 +1537,9 @@ impl<'cx, 'tcx> Builder<'cx, 'tcx> {
                 Ok(x) => inst.operands.push(dr::Operand::StoreCacheControl(x)),
                 Err(()) => self.err(format!("unknown StoreCacheControl {word}")),
             },
+            (kind, Some(_)) => {
+                self.err(format!("unsupported operand kind {kind:?}"));
+            }
             (kind, None) => match token {
                 Token::Word(_) => bug!(),
                 Token::String(_) => {
@@ -1573,14 +1576,14 @@ pub const IMAGE_OPERANDS: &[(&str, ImageOperands)] = &[
     ("MakeTexelAvailable", ImageOperands::MAKE_TEXEL_AVAILABLE),
     (
         "MakeTexelAvailableKHR",
-        ImageOperands::MAKE_TEXEL_AVAILABLE_KHR,
+        ImageOperands::MAKE_TEXEL_AVAILABLE,
     ),
     ("MakeTexelVisible", ImageOperands::MAKE_TEXEL_VISIBLE),
-    ("MakeTexelVisibleKHR", ImageOperands::MAKE_TEXEL_VISIBLE_KHR),
+    ("MakeTexelVisibleKHR", ImageOperands::MAKE_TEXEL_VISIBLE),
     ("NonPrivateTexel", ImageOperands::NON_PRIVATE_TEXEL),
-    ("NonPrivateTexelKHR", ImageOperands::NON_PRIVATE_TEXEL_KHR),
+    ("NonPrivateTexelKHR", ImageOperands::NON_PRIVATE_TEXEL),
     ("VolatileTexel", ImageOperands::VOLATILE_TEXEL),
-    ("VolatileTexelKHR", ImageOperands::VOLATILE_TEXEL_KHR),
+    ("VolatileTexelKHR", ImageOperands::VOLATILE_TEXEL),
     ("SignExtend", ImageOperands::SIGN_EXTEND),
     ("ZeroExtend", ImageOperands::ZERO_EXTEND),
 ];
@@ -1618,7 +1621,7 @@ pub const FUNCTION_CONTROL: &[(&str, FunctionControl)] = &[
 ];
 pub const MEMORY_SEMANTICS: &[(&str, MemorySemantics)] = &[
     ("Relaxed", MemorySemantics::RELAXED),
-    ("None", MemorySemantics::NONE),
+    ("None", MemorySemantics::RELAXED),
     ("Acquire", MemorySemantics::ACQUIRE),
     ("Release", MemorySemantics::RELEASE),
     ("AcquireRelease", MemorySemantics::ACQUIRE_RELEASE),
@@ -1639,11 +1642,11 @@ pub const MEMORY_SEMANTICS: &[(&str, MemorySemantics)] = &[
     ),
     ("ImageMemory", MemorySemantics::IMAGE_MEMORY),
     ("OutputMemory", MemorySemantics::OUTPUT_MEMORY),
-    ("OutputMemoryKHR", MemorySemantics::OUTPUT_MEMORY_KHR),
+    ("OutputMemoryKHR", MemorySemantics::OUTPUT_MEMORY),
     ("MakeAvailable", MemorySemantics::MAKE_AVAILABLE),
-    ("MakeAvailableKHR", MemorySemantics::MAKE_AVAILABLE_KHR),
+    ("MakeAvailableKHR", MemorySemantics::MAKE_AVAILABLE),
     ("MakeVisible", MemorySemantics::MAKE_VISIBLE),
-    ("MakeVisibleKHR", MemorySemantics::MAKE_VISIBLE_KHR),
+    ("MakeVisibleKHR", MemorySemantics::MAKE_VISIBLE),
     ("Volatile", MemorySemantics::VOLATILE),
 ];
 pub const MEMORY_ACCESS: &[(&str, MemoryAccess)] = &[
@@ -1654,17 +1657,17 @@ pub const MEMORY_ACCESS: &[(&str, MemoryAccess)] = &[
     ("MakePointerAvailable", MemoryAccess::MAKE_POINTER_AVAILABLE),
     (
         "MakePointerAvailableKHR",
-        MemoryAccess::MAKE_POINTER_AVAILABLE_KHR,
+        MemoryAccess::MAKE_POINTER_AVAILABLE,
     ),
     ("MakePointerVisible", MemoryAccess::MAKE_POINTER_VISIBLE),
     (
         "MakePointerVisibleKHR",
-        MemoryAccess::MAKE_POINTER_VISIBLE_KHR,
+        MemoryAccess::MAKE_POINTER_VISIBLE,
     ),
     ("NonPrivatePointer", MemoryAccess::NON_PRIVATE_POINTER),
     (
         "NonPrivatePointerKHR",
-        MemoryAccess::NON_PRIVATE_POINTER_KHR,
+        MemoryAccess::NON_PRIVATE_POINTER,
     ),
 ];
 pub const KERNEL_PROFILING_INFO: &[(&str, KernelProfilingInfo)] = &[
diff --git a/crates/rustc_codegen_spirv/src/linker/inline.rs b/crates/rustc_codegen_spirv/src/linker/inline.rs
@@ -343,8 +343,8 @@ impl LegalGlobal {
             let global = match inst.class.opcode {
                 Op::TypePointer => Self::TypePointer(inst.operands[0].unwrap_storage_class()),
                 Op::Variable => Self::Variable,
-                op if rspirv::grammar::reflect::is_type(op) => Self::TypeNonPointer,
-                op if rspirv::grammar::reflect::is_constant(op) => Self::Const,
+                op if op.is_type() => Self::TypeNonPointer,
+                op if op.is_constant() => Self::Const,
 
                 // FIXME(eddyb) should this be `unreachable!()`?
                 _ => continue,
diff --git a/crates/rustc_codegen_spirv/src/linker/simple_passes.rs b/crates/rustc_codegen_spirv/src/linker/simple_passes.rs
@@ -1,7 +1,6 @@
 use super::{get_name, get_names};
 use rspirv::dr::{Block, Function, Module};
 use rspirv::spirv::{Decoration, ExecutionModel, Op, Word};
-use rustc_codegen_spirv_types::Capability;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_session::Session;
 use std::iter::once;
@@ -355,7 +354,7 @@ pub fn remove_unused_type_capabilities(module: &mut Module) {
 pub fn remove_non_uniform_decorations(_sess: &Session, module: &mut Module) -> super::Result<()> {
     let has_shader_non_uniform_capability = module.capabilities.iter().any(|inst| {
         inst.class.opcode == Op::Capability
-            && inst.operands[0].unwrap_capability() == Capability::ShaderNonUniform
+            && inst.operands[0].unwrap_capability() == rspirv::spirv::Capability::ShaderNonUniform
     });
     if !has_shader_non_uniform_capability {
         module.annotations.retain(|inst| {
diff --git a/crates/rustc_codegen_spirv/src/linker/spirt_passes/validate.rs b/crates/rustc_codegen_spirv/src/linker/spirt_passes/validate.rs
@@ -280,7 +280,7 @@ impl Validator<'_> {
         // FIXME(eddyb) make this information available through `spirt::spv::spec`.
         let (exts_providing_inst, caps_enabling_insts) = {
             let inst_def =
-                rspirv::grammar::CoreInstructionTable::lookup_opcode(spv_inst.opcode.as_u16())
+                rspirv::grammar::INSTRUCTION_TABLE.lookup_opcode(spv_inst.opcode.as_u16().into())
                     .unwrap();
             (
                 inst_def.extensions.iter().copied(),
diff --git a/crates/rustc_codegen_spirv/src/spirv_type.rs b/crates/rustc_codegen_spirv/src/spirv_type.rs
@@ -104,7 +104,7 @@ impl SpirvType<'_> {
             Self::Void => cx.emit_global().type_void_id(id),
             Self::Bool => cx.emit_global().type_bool_id(id),
             Self::Integer(width, signed) => cx.emit_global().type_int_id(id, width, signed as u32),
-            Self::Float(width) => cx.emit_global().type_float_id(id, width),
+            Self::Float(width) => cx.emit_global().type_float_id(id, width, None),
             Self::Adt {
                 def_id: _,
                 align: _,
diff --git a/crates/rustc_codegen_spirv/src/spirv_type_constraints.rs b/crates/rustc_codegen_spirv/src/spirv_type_constraints.rs
@@ -1096,9 +1096,9 @@ pub fn instruction_signatures(op: Op) -> Option<&'static [InstSig<'static>]> {
         | Op::ImageBlockMatchSSDQCOM
         | Op::ImageBlockMatchSADQCOM => reserved!(SPV_QCOM_image_processing),
         // SPV_AMDX_shader_enqueue
-        Op::FinalizeNodePayloadsAMDX
-        | Op::FinishWritingNodePayloadAMDX
-        | Op::InitializeNodePayloadsAMDX => reserved!(SPV_AMDX_shader_enqueue),
+        Op::AllocateNodePayloadsAMDX
+        | Op::EnqueueNodePayloadsAMDX
+        | Op::FinishWritingNodePayloadAMDX => reserved!(SPV_AMDX_shader_enqueue),
         // SPV_NV_displacement_micromap
         Op::FetchMicroTriangleVertexPositionNV | Op::FetchMicroTriangleVertexBarycentricNV => {
             reserved!(SPV_NV_displacement_micromap)
@@ -1124,6 +1124,21 @@ pub fn instruction_signatures(op: Op) -> Option<&'static [InstSig<'static>]> {
         | Op::SpecConstantCompositeContinuedINTEL
         | Op::ControlBarrierArriveINTEL
         | Op::ControlBarrierWaitINTEL => reserved!(unknown_extension_INTEL),
+
+        // TODO unknown_extension_ARM
+        Op::TypeTensorARM
+        | Op::TensorReadARM
+        | Op::TensorWriteARM
+        | Op::TensorQuerySizeARM
+        | Op::GraphConstantARM
+        | Op::GraphEntryPointARM
+        | Op::GraphARM
+        | Op::GraphInputARM
+        | Op::GraphSetOutputARM
+        | Op::GraphEndARM
+        | Op::TypeGraphARM => reserved!(unknown_extension_ARM),
+
+        _ => reserved!(unknown_extension_),
     }
 
     None
diff --git a/crates/rustc_codegen_spirv/src/symbols.rs b/crates/rustc_codegen_spirv/src/symbols.rs
@@ -273,10 +273,10 @@ const EXECUTION_MODES: &[(&str, ExecutionMode, ExecutionModeExtraDim)] = {
         ("rounding_mode_rte", RoundingModeRTE, Value),
         ("rounding_mode_rtz", RoundingModeRTZ, Value),
         ("stencil_ref_replacing_ext", StencilRefReplacingEXT, None),
-        ("output_lines_nv", OutputLinesNV, None),
-        ("output_primitives_nv", OutputPrimitivesNV, Value),
-        ("derivative_group_quads_nv", DerivativeGroupQuadsNV, None),
-        ("output_triangles_nv", OutputTrianglesNV, None),
+        ("output_lines_nv", OutputLinesEXT, None),
+        ("output_primitives_nv", OutputPrimitivesEXT, Value),
+        ("derivative_group_quads_nv", DerivativeGroupQuadsKHR, None),
+        ("output_triangles_nv", OutputTrianglesEXT, None),
         ("output_lines_ext", ExecutionMode::OutputLinesEXT, None),
         (
             "output_triangles_ext",
diff --git a/crates/spirv-std/src/arch/demote_to_helper_invocation_ext.rs b/crates/spirv-std/src/arch/demote_to_helper_invocation_ext.rs
@@ -18,10 +18,10 @@ use core::arch::asm;
 /// invocations are helper invocations in the presence
 /// of [demote_to_helper_invocation].
 #[spirv_std_macros::gpu_only]
-#[doc(alias = "OpDemoteToHelperInvocationEXT", alias = "discard")]
+#[doc(alias = "OpDemoteToHelperInvocation", alias = "discard")]
 pub fn demote_to_helper_invocation() {
     unsafe {
-        asm!("OpDemoteToHelperInvocationEXT");
+        asm!("OpDemoteToHelperInvocation");
     }
 }
 
diff --git a/tests/compiletests/ui/dis/panic_builtin_bounds_check.stderr b/tests/compiletests/ui/dis/panic_builtin_bounds_check.stderr
@@ -43,7 +43,7 @@ OpBranchConditional %27 %29 %30
 OpBranch %28
 %30 = OpLabel
 OpLine %4 27 4
-%31 = OpExtInst  %6  %1 1 %3 %9 %17
+%31 = OpExtInst  %6  %1 DebugPrintf %3 %9 %17
 OpNoLine
 OpReturn
 %28 = OpLabel
diff --git a/tests/compiletests/ui/dis/panic_sequential_many.stderr b/tests/compiletests/ui/dis/panic_sequential_many.stderr
diff --git a/tests/compiletests/ui/spirv-attr/location_assignment/mesh_shader.stderr b/tests/compiletests/ui/spirv-attr/location_assignment/mesh_shader.stderr
