[spv-out] Use IndexSet instead of HashSet for iterated sets (capabilities/extensions).

@jimblandy: Adapt v0.10 to modern Clippy, cargo doc.
This commit is contained in:
Eduard-Mihai Burtescu authored and Jim Blandy committed 2023-06-21 18:18:16 -07:00
1 parent c52d91023d
commit 6ef09afb35
9 files changed
+38 -18

No files matched your search

+3
View File
@@ -156,7 +156,10 @@ pub struct InlineSampler {
impl Eq for InlineSampler {}
#[allow(unknown_lints)]
#[allow(renamed_and_removed_lints)]
#[allow(clippy::derive_hash_xor_eq)]
#[allow(clippy::derived_hash_with_manual_eq)]
impl std::hash::Hash for InlineSampler {
fn hash<H: std::hash::Hasher>(&self, hasher: &mut H) {
self.coord.hash(hasher);
+2 -2
View File
@@ -573,10 +573,10 @@ pub struct Writer {
///
/// If `capabilities_available` is `Some`, then this is always a subset of
/// that.
capabilities_used: crate::FastHashSet<Capability>,
capabilities_used: crate::FastIndexSet<Capability>,
/// The set of spirv extensions used.
extensions_used: crate::FastHashSet<&'static str>,
extensions_used: crate::FastIndexSet<&'static str>,
debugs: Vec<Instruction>,
annotations: Vec<Instruction>,
+7
View File
@@ -52,6 +52,13 @@ impl<K, S: Clone> Recyclable for std::collections::HashSet<K, S> {
}
}
impl<K, S: Clone> Recyclable for indexmap::IndexSet<K, S> {
fn recycle(mut self) -> Self {
self.clear();
self
}
}
impl<K: Ord, V> Recyclable for std::collections::BTreeMap<K, V> {
fn recycle(mut self) -> Self {
self.clear();
+3 -3
View File
@@ -47,7 +47,7 @@ impl Writer {
}
let raw_version = ((major as u32) << 16) | ((minor as u32) << 8);
let mut capabilities_used = crate::FastHashSet::default();
let mut capabilities_used = crate::FastIndexSet::default();
capabilities_used.insert(spirv::Capability::Shader);
let mut id_gen = IdGenerator::default();
@@ -60,7 +60,7 @@ impl Writer {
id_gen,
capabilities_available: options.capabilities.clone(),
capabilities_used,
extensions_used: crate::FastHashSet::default(),
extensions_used: crate::FastIndexSet::default(),
debugs: vec![],
annotations: vec![],
flags: options.flags,
@@ -1681,7 +1681,7 @@ impl Writer {
}
/// Return the set of capabilities the last module written used.
pub const fn get_capabilities_used(&self) -> &crate::FastHashSet<spirv::Capability> {
pub const fn get_capabilities_used(&self) -> &crate::FastIndexSet<spirv::Capability> {
&self.capabilities_used
}
}
+13 -3
View File
@@ -192,7 +192,12 @@ tree.
clippy::unneeded_field_pattern,
clippy::match_like_matches_macro,
clippy::if_same_then_else,
clippy::derive_partial_eq_without_eq
clippy::derive_partial_eq_without_eq,
clippy::only_used_in_recursion,
clippy::needless_borrowed_reference,
clippy::useless_conversion,
clippy::needless_lifetimes,
clippy::bool_to_int_with_if
)]
#![warn(
trivial_casts,
@@ -231,6 +236,11 @@ pub type FastHashMap<K, T> = rustc_hash::FxHashMap<K, T>;
/// Hash set that is faster but not resilient to DoS attacks.
pub type FastHashSet<K> = rustc_hash::FxHashSet<K>;
/// Insertion-order-preserving hash set (`IndexSet<K>`), but with the same
/// hasher as `FastHashSet<K>` (faster but not resilient to DoS attacks).
pub type FastIndexSet<K> =
indexmap::IndexSet<K, std::hash::BuildHasherDefault<rustc_hash::FxHasher>>;
/// Map of expressions that have associated variable names
pub(crate) type NamedExpressions = FastHashMap<Handle<Expression>, String>;
@@ -1259,7 +1269,7 @@ pub enum Expression {
/// Load a value indirectly.
///
/// For [`TypeInner::Atomic`] the result is a corresponding scalar.
/// For other types behind the pointer<T>, the result is T.
/// For other types behind the `pointer<T>`, the result is T.
Load { pointer: Handle<Expression> },
/// Sample a point from a sampled or a depth image.
ImageSample {
@@ -1547,7 +1557,7 @@ pub enum Statement {
///
/// For [`TypeInner::Atomic`] type behind the pointer, the value
/// has to be a corresponding scalar.
/// For other types behind the pointer<T>, the value is T.
/// For other types behind the `pointer<T>`, the value is T.
///
/// This statement is a barrier for any operations on the
/// `Expression::LocalVariable` or `Expression::GlobalVariable`
@@ -2,10 +2,10 @@
; Version: 1.1
; Generator: rspirv
; Bound: 244
OpCapability ImageQuery
OpCapability Image1D
OpCapability Shader
OpCapability Sampled1D
OpCapability Image1D
OpCapability ImageQuery
%1 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %222 "fragment_shader" %220
+2 -2
View File
@@ -2,10 +2,10 @@
; Version: 1.1
; Generator: rspirv
; Bound: 274
OpCapability ImageQuery
OpCapability Image1D
OpCapability Shader
OpCapability Sampled1D
OpCapability Image1D
OpCapability ImageQuery
%1 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %252 "fragment_shader" %250
+3 -3
View File
@@ -2,11 +2,11 @@
; Version: 1.1
; Generator: rspirv
; Bound: 306
OpCapability Shader
OpCapability Image1D
OpCapability Sampled1D
OpCapability SampledCubeArray
OpCapability ImageQuery
OpCapability Image1D
OpCapability Shader
OpCapability Sampled1D
%1 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450
OpEntryPoint GLCompute %76 "main" %73
+3 -3
View File
@@ -6,7 +6,7 @@ Test SPIR-V backend capability checks.
use spirv::Capability as Ca;
fn capabilities_used(source: &str) -> naga::FastHashSet<Ca> {
fn capabilities_used(source: &str) -> naga::FastIndexSet<Ca> {
use naga::back::spv;
use naga::valid;
@@ -36,7 +36,7 @@ fn require_and_forbid(required: &[Ca], forbidden: &[Ca], source: &str) {
let missing_caps: Vec<_> = required
.iter()
.filter(|cap| !caps_used.contains(cap))
.filter(|&cap| !caps_used.contains(cap))
.cloned()
.collect();
if !missing_caps.is_empty() {
@@ -48,7 +48,7 @@ fn require_and_forbid(required: &[Ca], forbidden: &[Ca], source: &str) {
let forbidden_caps: Vec<_> = forbidden
.iter()
.filter(|cap| caps_used.contains(cap))
.filter(|&cap| caps_used.contains(cap))
.cloned()
.collect();
if !forbidden_caps.is_empty() {