From 17ea3c6f6b5f9ac698b856795ab4b82198885b18 Mon Sep 17 00:00:00 2001
From: Firestar99 <4696087-firestar99@users.noreply.gitlab.com>
Date: Wed, 12 Jun 2024 15:41:36 +0200
Subject: [PATCH] subgroup: fixed clippy lints

---
 crates/spirv-std/src/arch/subgroup.rs                        | 5 ++++-
 tests/ui/arch/subgroup/subgroup_non_uniform_ballot.stderr    | 4 ++--
 .../subgroup/subgroup_non_uniform_ballot_bit_count.stderr    | 2 +-
 .../subgroup/subgroup_non_uniform_broadcast_first.stderr     | 2 +-
 tests/ui/arch/subgroup/subgroup_non_uniform_elect.stderr     | 2 +-
 .../subgroup/subgroup_non_uniform_i_add_clustered.stderr     | 2 +-
 .../subgroup_non_uniform_i_add_exclusive_scan.stderr         | 2 +-
 .../subgroup_non_uniform_i_add_inclusive_scan.stderr         | 2 +-
 .../arch/subgroup/subgroup_non_uniform_i_add_reduce.stderr   | 2 +-
 9 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/crates/spirv-std/src/arch/subgroup.rs b/crates/spirv-std/src/arch/subgroup.rs
index c35f734211..78d629657e 100644
--- a/crates/spirv-std/src/arch/subgroup.rs
+++ b/crates/spirv-std/src/arch/subgroup.rs
@@ -1,14 +1,17 @@
+#[cfg(target_arch = "spirv")]
 use crate::arch::barrier;
 use crate::float::Float;
 use crate::integer::{Integer, SignedInteger, UnsignedInteger};
+#[cfg(target_arch = "spirv")]
 use crate::memory::{Scope, Semantics};
 use crate::scalar::VectorOrScalar;
 #[cfg(target_arch = "spirv")]
 use core::arch::asm;
 
+#[cfg(target_arch = "spirv")]
 const SUBGROUP: u32 = Scope::Subgroup as u32;
 
-/// SubgroupMask is a [`glam::UVec4`] representing a bitmask of all invocations within a subgroup.
+/// `SubgroupMask` is a [`glam::UVec4`] representing a bitmask of all invocations within a subgroup.
 /// Mostly used in group ballot operations.
 #[derive(Copy, Clone, Default, Eq, PartialEq)]
 pub struct SubgroupMask(pub glam::UVec4);
diff --git a/tests/ui/arch/subgroup/subgroup_non_uniform_ballot.stderr b/tests/ui/arch/subgroup/subgroup_non_uniform_ballot.stderr
index 559b07c304..13676166e7 100644
--- a/tests/ui/arch/subgroup/subgroup_non_uniform_ballot.stderr
+++ b/tests/ui/arch/subgroup/subgroup_non_uniform_ballot.stderr
@@ -1,9 +1,9 @@
 %1 = OpFunction  %2  None %3
 %4 = OpFunctionParameter  %2
 %5 = OpLabel
-OpLine %6 376 8
+OpLine %6 379 8
 %7 = OpGroupNonUniformBallot  %8  %9 %4
-OpLine %6 412 8
+OpLine %6 415 8
 %10 = OpGroupNonUniformInverseBallot  %2  %9 %7
 OpNoLine
 OpReturnValue %10
diff --git a/tests/ui/arch/subgroup/subgroup_non_uniform_ballot_bit_count.stderr b/tests/ui/arch/subgroup/subgroup_non_uniform_ballot_bit_count.stderr
index 4db8589b64..b3614d4eed 100644
--- a/tests/ui/arch/subgroup/subgroup_non_uniform_ballot_bit_count.stderr
+++ b/tests/ui/arch/subgroup/subgroup_non_uniform_ballot_bit_count.stderr
@@ -1,7 +1,7 @@
 %1 = OpFunction  %2  None %3
 %4 = OpFunctionParameter  %5
 %6 = OpLabel
-OpLine %7 493 8
+OpLine %7 496 8
 %8 = OpGroupNonUniformBallotBitCount  %2  %9 Reduce %4
 OpNoLine
 OpReturnValue %8
diff --git a/tests/ui/arch/subgroup/subgroup_non_uniform_broadcast_first.stderr b/tests/ui/arch/subgroup/subgroup_non_uniform_broadcast_first.stderr
index 829d283178..84f784d58e 100644
--- a/tests/ui/arch/subgroup/subgroup_non_uniform_broadcast_first.stderr
+++ b/tests/ui/arch/subgroup/subgroup_non_uniform_broadcast_first.stderr
@@ -1,7 +1,7 @@
 %1 = OpFunction  %2  None %3
 %4 = OpFunctionParameter  %2
 %5 = OpLabel
-OpLine %6 343 8
+OpLine %6 346 8
 %7 = OpGroupNonUniformBroadcastFirst  %2  %8 %4
 OpNoLine
 OpReturnValue %7
diff --git a/tests/ui/arch/subgroup/subgroup_non_uniform_elect.stderr b/tests/ui/arch/subgroup/subgroup_non_uniform_elect.stderr
index 09efa455b0..73bf0b2778 100644
--- a/tests/ui/arch/subgroup/subgroup_non_uniform_elect.stderr
+++ b/tests/ui/arch/subgroup/subgroup_non_uniform_elect.stderr
@@ -1,6 +1,6 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 178 8
+OpLine %5 181 8
 %6 = OpGroupNonUniformElect  %2  %7
 OpNoLine
 OpReturnValue %6
diff --git a/tests/ui/arch/subgroup/subgroup_non_uniform_i_add_clustered.stderr b/tests/ui/arch/subgroup/subgroup_non_uniform_i_add_clustered.stderr
index e154835797..6a1216d607 100644
--- a/tests/ui/arch/subgroup/subgroup_non_uniform_i_add_clustered.stderr
+++ b/tests/ui/arch/subgroup/subgroup_non_uniform_i_add_clustered.stderr
@@ -1,7 +1,7 @@
 %1 = OpFunction  %2  None %3
 %4 = OpFunctionParameter  %2
 %5 = OpLabel
-OpLine %6 787 8
+OpLine %6 790 8
 %7 = OpGroupNonUniformIAdd  %2  %8 ClusteredReduce %4 %9
 OpNoLine
 OpReturnValue %7
diff --git a/tests/ui/arch/subgroup/subgroup_non_uniform_i_add_exclusive_scan.stderr b/tests/ui/arch/subgroup/subgroup_non_uniform_i_add_exclusive_scan.stderr
index 27b0aeab5e..7efe91dbb5 100644
--- a/tests/ui/arch/subgroup/subgroup_non_uniform_i_add_exclusive_scan.stderr
+++ b/tests/ui/arch/subgroup/subgroup_non_uniform_i_add_exclusive_scan.stderr
@@ -1,7 +1,7 @@
 %1 = OpFunction  %2  None %3
 %4 = OpFunctionParameter  %2
 %5 = OpLabel
-OpLine %6 746 8
+OpLine %6 749 8
 %7 = OpGroupNonUniformIAdd  %2  %8 ExclusiveScan %4
 OpNoLine
 OpReturnValue %7
diff --git a/tests/ui/arch/subgroup/subgroup_non_uniform_i_add_inclusive_scan.stderr b/tests/ui/arch/subgroup/subgroup_non_uniform_i_add_inclusive_scan.stderr
index fe0b5ea63d..8c771f386e 100644
--- a/tests/ui/arch/subgroup/subgroup_non_uniform_i_add_inclusive_scan.stderr
+++ b/tests/ui/arch/subgroup/subgroup_non_uniform_i_add_inclusive_scan.stderr
@@ -1,7 +1,7 @@
 %1 = OpFunction  %2  None %3
 %4 = OpFunctionParameter  %2
 %5 = OpLabel
-OpLine %6 746 8
+OpLine %6 749 8
 %7 = OpGroupNonUniformIAdd  %2  %8 InclusiveScan %4
 OpNoLine
 OpReturnValue %7
diff --git a/tests/ui/arch/subgroup/subgroup_non_uniform_i_add_reduce.stderr b/tests/ui/arch/subgroup/subgroup_non_uniform_i_add_reduce.stderr
index 45f7e660b5..40942f30fc 100644
--- a/tests/ui/arch/subgroup/subgroup_non_uniform_i_add_reduce.stderr
+++ b/tests/ui/arch/subgroup/subgroup_non_uniform_i_add_reduce.stderr
@@ -1,7 +1,7 @@
 %1 = OpFunction  %2  None %3
 %4 = OpFunctionParameter  %2
 %5 = OpLabel
-OpLine %6 746 8
+OpLine %6 749 8
 %7 = OpGroupNonUniformIAdd  %2  %8 Reduce %4
 OpNoLine
 OpReturnValue %7