Move probing logic to control module

rust-lang · Oct 15, 2024 · 0d28e9b · 0d28e9b
1 parent f7aa64a
commit 0d28e9b
Show file tree

Hide file tree

Showing 9 changed files with 523 additions and 504 deletions.
diff --git a/src/control/group/generic.rs b/src/control/group/generic.rs
@@ -50,20 +50,23 @@ impl Group {
     /// Number of bytes in the group.
     pub(crate) const WIDTH: usize = mem::size_of::<Self>();
 
+    /// Double the group width; size of [`Group::static_empty`].
+    pub(crate) const DOUBLE_WIDTH: usize = Group::WIDTH * 2;
+
     /// Returns a full group of empty tags, suitable for use as the initial
     /// value for an empty hash table.
     ///
     /// This is guaranteed to be aligned to the group size.
     #[inline]
-    pub(crate) const fn static_empty() -> &'static [Tag; Group::WIDTH] {
+    pub(crate) const fn static_empty() -> &'static [Tag; Group::DOUBLE_WIDTH] {
         #[repr(C)]
         struct AlignedTags {
             _align: [Group; 0],
-            tags: [Tag; Group::WIDTH],
+            tags: [Tag; Group::DOUBLE_WIDTH],
         }
         const ALIGNED_TAGS: AlignedTags = AlignedTags {
             _align: [],
-            tags: [Tag::EMPTY; Group::WIDTH],
+            tags: [Tag::EMPTY; Group::DOUBLE_WIDTH],
         };
         &ALIGNED_TAGS.tags
     }

diff --git a/src/control/group/neon.rs b/src/control/group/neon.rs
@@ -21,20 +21,23 @@ impl Group {
     /// Number of bytes in the group.
     pub(crate) const WIDTH: usize = mem::size_of::<Self>();
 
+    /// Double the group width; size of [`Group::static_empty`].
+    pub(crate) const DOUBLE_WIDTH: usize = Group::WIDTH * 2;
+
     /// Returns a full group of empty tags, suitable for use as the initial
     /// value for an empty hash table.
     ///
     /// This is guaranteed to be aligned to the group size.
     #[inline]
-    pub(crate) const fn static_empty() -> &'static [Tag; Group::WIDTH] {
+    pub(crate) const fn static_empty() -> &'static [Tag; Group::DOUBLE_WIDTH] {
         #[repr(C)]
         struct AlignedTags {
             _align: [Group; 0],
-            tags: [Tag; Group::WIDTH],
+            tags: [Tag; Group::DOUBLE_WIDTH],
         }
         const ALIGNED_TAGS: AlignedTags = AlignedTags {
             _align: [],
-            tags: [Tag::EMPTY; Group::WIDTH],
+            tags: [Tag::EMPTY; Group::DOUBLE_WIDTH],
         };
         &ALIGNED_TAGS.tags
     }

diff --git a/src/control/group/sse2.rs b/src/control/group/sse2.rs
@@ -26,21 +26,24 @@ impl Group {
     /// Number of bytes in the group.
     pub(crate) const WIDTH: usize = mem::size_of::<Self>();
 
+    /// Double the group width; size of [`Group::static_empty`].
+    pub(crate) const DOUBLE_WIDTH: usize = Group::WIDTH * 2;
+
     /// Returns a full group of empty tags, suitable for use as the initial
     /// value for an empty hash table.
     ///
     /// This is guaranteed to be aligned to the group size.
     #[inline]
     #[allow(clippy::items_after_statements)]
-    pub(crate) const fn static_empty() -> &'static [Tag; Group::WIDTH] {
+    pub(crate) const fn static_empty() -> &'static [Tag; Group::DOUBLE_WIDTH] {
         #[repr(C)]
         struct AlignedTags {
             _align: [Group; 0],
-            tags: [Tag; Group::WIDTH],
+            tags: [Tag; Group::DOUBLE_WIDTH],
         }
         const ALIGNED_TAGS: AlignedTags = AlignedTags {
             _align: [],
-            tags: [Tag::EMPTY; Group::WIDTH],
+            tags: [Tag::EMPTY; Group::DOUBLE_WIDTH],
         };
         &ALIGNED_TAGS.tags
     }

diff --git a/src/control/mod.rs b/src/control/mod.rs
@@ -1,10 +1,12 @@
 mod bitmask;
 mod group;
+mod probe;
 mod tag;
 
 use self::bitmask::BitMask;
 pub(crate) use self::{
     bitmask::BitMaskIter,
     group::Group,
+    probe::{Probe, ProbeItems},
     tag::{Tag, TagSliceExt},
 };