Convert Snapshot Configuration to TOML (#7160)

* Prepare for Toml

* Convert Configurations Entirely To TOML

naga/Cargo.toml

@@ -118,4 +118,5 @@ ron = "0.8.0"
 rspirv = { version = "0.11", git = "https://github.com/gfx-rs/rspirv", rev = "b969f175d5663258b4891e44b76c1544da9661ab" }
 serde = { workspace = true, features = ["default", "derive"] }
 spirv = { version = "0.3", features = ["deserialize"] }
+toml = "0.8"
 walkdir.workspace = true

naga/src/back/glsl/mod.rs

@@ -79,6 +79,28 @@ pub(crate) const FREXP_FUNCTION: &str = "naga_frexp";
 // Must match code in glsl_built_in
 pub const FIRST_INSTANCE_BINDING: &str = "naga_vs_first_instance";
 
+#[cfg_attr(feature = "serialize", derive(serde::Serialize))]
+#[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
+struct BindingMapSerialization {
+    resource_binding: crate::ResourceBinding,
+    bind_target: u8,
+}
+
+#[cfg(feature = "deserialize")]
+fn deserialize_binding_map<'de, D>(deserializer: D) -> Result<BindingMap, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    use serde::Deserialize;
+
+    let vec = Vec::<BindingMapSerialization>::deserialize(deserializer)?;
+    let mut map = BindingMap::default();
+    for item in vec {
+        map.insert(item.resource_binding, item.bind_target);
+    }
+    Ok(map)
+}
+
 /// Mapping between resources and bindings.
 pub type BindingMap = std::collections::BTreeMap<crate::ResourceBinding, u8>;
 
@@ -266,6 +288,10 @@ pub struct Options {
     /// Configuration flags for the [`Writer`].
     pub writer_flags: WriterFlags,
     /// Map of resources association to binding locations.
+    #[cfg_attr(
+        feature = "deserialize",
+        serde(deserialize_with = "deserialize_binding_map")
+    )]
     pub binding_map: BindingMap,
     /// Should workgroup variables be zero initialized (by polyfilling)?
     pub zero_initialize_workgroup_memory: bool,

naga/src/back/hlsl/mod.rs

@@ -149,6 +149,28 @@ pub struct OffsetsBindTarget {
     pub size: u32,
 }
 
+#[cfg_attr(feature = "serialize", derive(serde::Serialize))]
+#[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
+struct BindingMapSerialization {
+    resource_binding: crate::ResourceBinding,
+    bind_target: BindTarget,
+}
+
+#[cfg(feature = "deserialize")]
+fn deserialize_binding_map<'de, D>(deserializer: D) -> Result<BindingMap, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    use serde::Deserialize;
+
+    let vec = Vec::<BindingMapSerialization>::deserialize(deserializer)?;
+    let mut map = BindingMap::default();
+    for item in vec {
+        map.insert(item.resource_binding, item.bind_target);
+    }
+    Ok(map)
+}
+
 // Using `BTreeMap` instead of `HashMap` so that we can hash itself.
 pub type BindingMap = std::collections::BTreeMap<crate::ResourceBinding, BindTarget>;
 
@@ -245,10 +267,63 @@ impl Default for SamplerHeapBindTargets {
     }
 }
 
+#[cfg_attr(feature = "serialize", derive(serde::Serialize))]
+#[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
+struct SamplerIndexBufferBindingSerialization {
+    group: u32,
+    bind_target: BindTarget,
+}
+
+#[cfg(feature = "deserialize")]
+fn deserialize_sampler_index_buffer_bindings<'de, D>(
+    deserializer: D,
+) -> Result<SamplerIndexBufferBindingMap, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    use serde::Deserialize;
+
+    let vec = Vec::<SamplerIndexBufferBindingSerialization>::deserialize(deserializer)?;
+    let mut map = SamplerIndexBufferBindingMap::default();
+    for item in vec {
+        map.insert(
+            SamplerIndexBufferKey { group: item.group },
+            item.bind_target,
+        );
+    }
+    Ok(map)
+}
+
 // We use a BTreeMap here so that we can hash it.
 pub type SamplerIndexBufferBindingMap =
     std::collections::BTreeMap<SamplerIndexBufferKey, BindTarget>;
 
+#[cfg_attr(feature = "serialize", derive(serde::Serialize))]
+#[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
+struct DynamicStorageBufferOffsetTargetSerialization {
+    index: u32,
+    bind_target: OffsetsBindTarget,
+}
+
+#[cfg(feature = "deserialize")]
+fn deserialize_storage_buffer_offsets<'de, D>(
+    deserializer: D,
+) -> Result<DynamicStorageBufferOffsetsTargets, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    use serde::Deserialize;
+
+    let vec = Vec::<DynamicStorageBufferOffsetTargetSerialization>::deserialize(deserializer)?;
+    let mut map = DynamicStorageBufferOffsetsTargets::default();
+    for item in vec {
+        map.insert(item.index, item.bind_target);
+    }
+    Ok(map)
+}
+
+pub type DynamicStorageBufferOffsetsTargets = std::collections::BTreeMap<u32, OffsetsBindTarget>;
+
 /// Shorthand result used internally by the backend
 type BackendResult = Result<(), Error>;
 
@@ -269,6 +344,10 @@ pub struct Options {
     /// The hlsl shader model to be used
     pub shader_model: ShaderModel,
     /// Map of resources association to binding locations.
+    #[cfg_attr(
+        feature = "deserialize",
+        serde(deserialize_with = "deserialize_binding_map")
+    )]
     pub binding_map: BindingMap,
     /// Don't panic on missing bindings, instead generate any HLSL.
     pub fake_missing_bindings: bool,
@@ -280,9 +359,17 @@ pub struct Options {
     /// Bind target of the sampler heap and comparison sampler heap.
     pub sampler_heap_target: SamplerHeapBindTargets,
     /// Mapping of each bind group's sampler index buffer to a bind target.
+    #[cfg_attr(
+        feature = "deserialize",
+        serde(deserialize_with = "deserialize_sampler_index_buffer_bindings")
+    )]
     pub sampler_buffer_binding_map: SamplerIndexBufferBindingMap,
     /// Bind target for dynamic storage buffer offsets
-    pub dynamic_storage_buffer_offsets_targets: std::collections::BTreeMap<u32, OffsetsBindTarget>,
+    #[cfg_attr(
+        feature = "deserialize",
+        serde(deserialize_with = "deserialize_storage_buffer_offsets")
+    )]
+    pub dynamic_storage_buffer_offsets_targets: DynamicStorageBufferOffsetsTargets,
     /// Should workgroup variables be zero initialized (by polyfilling)?
     pub zero_initialize_workgroup_memory: bool,
     /// Should we restrict indexing of vectors, matrices and arrays?

naga/src/back/msl/mod.rs

@@ -62,6 +62,28 @@ pub struct BindTarget {
     pub mutable: bool,
 }
 
+#[cfg_attr(feature = "serialize", derive(serde::Serialize))]
+#[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
+struct BindingMapSerialization {
+    resource_binding: crate::ResourceBinding,
+    bind_target: BindTarget,
+}
+
+#[cfg(feature = "deserialize")]
+fn deserialize_binding_map<'de, D>(deserializer: D) -> Result<BindingMap, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    use serde::Deserialize;
+
+    let vec = Vec::<BindingMapSerialization>::deserialize(deserializer)?;
+    let mut map = BindingMap::default();
+    for item in vec {
+        map.insert(item.resource_binding, item.bind_target);
+    }
+    Ok(map)
+}
+
 // Using `BTreeMap` instead of `HashMap` so that we can hash itself.
 pub type BindingMap = std::collections::BTreeMap<crate::ResourceBinding, BindTarget>;
 
@@ -70,6 +92,10 @@ pub type BindingMap = std::collections::BTreeMap<crate::ResourceBinding, BindTar
 #[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
 #[cfg_attr(any(feature = "serialize", feature = "deserialize"), serde(default))]
 pub struct EntryPointResources {
+    #[cfg_attr(
+        feature = "deserialize",
+        serde(deserialize_with = "deserialize_binding_map")
+    )]
     pub resources: BindingMap,
 
     pub push_constant_buffer: Option<Slot>,

naga/tests/in/6220-break-from-loop.toml

@@ -0,0 +1 @@
+targets = "SPIRV"

naga/tests/in/6438-conflicting-idents.toml

@@ -0,0 +1 @@
+targets = "SPIRV | METAL | GLSL | HLSL | WGSL"

naga/tests/in/6772-unpack-expr-accesses.toml

@@ -0,0 +1 @@
+targets = "SPIRV | METAL | GLSL | HLSL | WGSL"

naga/tests/in/abstract-types-const.toml

@@ -0,0 +1 @@
+targets = "SPIRV | METAL | GLSL | WGSL"

naga/tests/in/abstract-types-function-calls.toml

@@ -0,0 +1 @@
+targets = "SPIRV | METAL | GLSL | WGSL"

naga/tests/in/abstract-types-operators.toml

@@ -0,0 +1 @@
+targets = "SPIRV | METAL | GLSL | WGSL"

naga/tests/in/abstract-types-return.toml

@@ -0,0 +1 @@
+targets = "SPIRV | METAL | GLSL | HLSL | WGSL"

naga/tests/in/abstract-types-var.toml

@@ -0,0 +1 @@
+targets = "SPIRV | METAL | GLSL | WGSL"

naga/tests/in/access.toml

@@ -0,0 +1,34 @@
+targets = "SPIRV | METAL | GLSL | HLSL | WGSL | IR | ANALYSIS"
+
+[msl]
+fake_missing_bindings = false
+lang_version = [1, 2]
+spirv_cross_compatibility = false
+zero_initialize_workgroup_memory = true
+
+[msl.per_entry_point_map.atomics]
+resources = [
+    { bind_target = { buffer = 0, mutable = true }, resource_binding = { group = 0, binding = 0 } },
+]
+sizes_buffer = 24
+
+[msl.per_entry_point_map.foo_frag]
+resources = [
+    { bind_target = { buffer = 0, mutable = true }, resource_binding = { group = 0, binding = 0 } },
+    { bind_target = { buffer = 2, mutable = true }, resource_binding = { group = 0, binding = 2 } },
+]
+sizes_buffer = 24
+
+[msl.per_entry_point_map.foo_vert]
+resources = [
+    { bind_target = { buffer = 0, mutable = false }, resource_binding = { group = 0, binding = 0 } },
+    { bind_target = { buffer = 1, mutable = false }, resource_binding = { group = 0, binding = 1 } },
+    { bind_target = { buffer = 2, mutable = false }, resource_binding = { group = 0, binding = 2 } },
+    { bind_target = { buffer = 3, mutable = false }, resource_binding = { group = 0, binding = 3 } },
+]
+sizes_buffer = 24
+
+[spv]
+adjust_coordinate_space = false
+debug = true
+version = [1, 1]

naga/tests/in/array-in-ctor.toml

@@ -0,0 +1 @@
+targets = "SPIRV | METAL | GLSL | HLSL | WGSL"

naga/tests/in/array-in-function-return-type.toml

@@ -0,0 +1 @@
+targets = "SPIRV | METAL | GLSL | HLSL | WGSL"

naga/tests/in/atomicCompareExchange-int64.toml

@@ -0,0 +1,12 @@
+god_mode = true
+targets = "SPIRV | WGSL"
+
+[hlsl]
+fake_missing_bindings = true
+push_constants_target = { register = 0, space = 0 }
+restrict_indexing = true
+special_constants_binding = { register = 0, space = 1 }
+zero_initialize_workgroup_memory = true
+
+[spv]
+version = [1, 0]

naga/tests/in/atomicCompareExchange.toml

@@ -0,0 +1 @@
+targets = "SPIRV | METAL | WGSL"