Replace ingredient cache with faster ingredient map

Cargo.toml

@@ -19,6 +19,7 @@ hashbrown = "0.15"
 hashlink = "0.10"
 indexmap = "2"
 intrusive-collections = "0.9.7"
+papaya = "0.2.1"
 parking_lot = "0.12"
 portable-atomic = "1"
 rustc-hash = "2"
@@ -51,7 +52,7 @@ salsa-macros = { version = "=0.22.0", path = "components/salsa-macros" }
 [dev-dependencies]
 # examples
 crossbeam-channel = "0.5.14"
-dashmap = { version = "6", features = ["raw-api"] }
+dashmap = "6"
 eyre = "0.6.8"
 notify-debouncer-mini = "0.4.1"
 ordered-float = "4.2.1"

components/salsa-macro-rules/src/setup_accumulator_impl.rs

@@ -22,12 +22,8 @@ macro_rules! setup_accumulator_impl {
             use salsa::plumbing::accumulator as $zalsa_struct;
 
             fn $ingredient(zalsa: &$zalsa::Zalsa) -> &$zalsa_struct::IngredientImpl<$Struct> {
-                static $CACHE: $zalsa::IngredientCache<$zalsa_struct::IngredientImpl<$Struct>> =
-                    $zalsa::IngredientCache::new();
-
-                $CACHE.get_or_create(zalsa, || {
-                    zalsa.add_or_lookup_jar_by_type::<$zalsa_struct::JarImpl<$Struct>>()
-                })
+                let index = zalsa.add_or_lookup_jar_by_type::<$zalsa_struct::JarImpl<$Struct>>();
+                zalsa.lookup_ingredient(index).assert_type()
             }
 
             impl $zalsa::Accumulator for $Struct {

components/salsa-macro-rules/src/setup_input_struct.rs

@@ -97,12 +97,8 @@ macro_rules! setup_input_struct {
                 }
 
                 fn ingredient_(zalsa: &$zalsa::Zalsa) -> &$zalsa_struct::IngredientImpl<Self> {
-                    static CACHE: $zalsa::IngredientCache<$zalsa_struct::IngredientImpl<$Configuration>> =
-                        $zalsa::IngredientCache::new();
-
-                    CACHE.get_or_create(zalsa, || {
-                        zalsa.add_or_lookup_jar_by_type::<$zalsa_struct::JarImpl<$Configuration>>()
-                    })
+                    let index = zalsa.add_or_lookup_jar_by_type::<$zalsa_struct::JarImpl<$Configuration>>();
+                    zalsa.lookup_ingredient(index).assert_type()
                 }
 
                 pub fn ingredient_mut(db: &mut dyn $zalsa::Database) -> (&mut $zalsa_struct::IngredientImpl<Self>, &mut $zalsa::Runtime) {

components/salsa-macro-rules/src/setup_interned_struct.rs

@@ -144,13 +144,9 @@ macro_rules! setup_interned_struct {
                 where
                     Db: ?Sized + $zalsa::Database,
                 {
-                    static CACHE: $zalsa::IngredientCache<$zalsa_struct::IngredientImpl<$Configuration>> =
-                        $zalsa::IngredientCache::new();
-
                     let zalsa = db.zalsa();
-                    CACHE.get_or_create(zalsa, || {
-                        zalsa.add_or_lookup_jar_by_type::<$zalsa_struct::JarImpl<$Configuration>>()
-                    })
+                    let index = zalsa.add_or_lookup_jar_by_type::<$zalsa_struct::JarImpl<$Configuration>>();
+                    zalsa.lookup_ingredient(index).assert_type()
                 }
             }
 

components/salsa-macro-rules/src/setup_tracked_fn.rs

@@ -86,9 +86,6 @@ macro_rules! setup_tracked_fn {
 
             struct $Configuration;
 
-            static $FN_CACHE: $zalsa::IngredientCache<$zalsa::function::IngredientImpl<$Configuration>> =
-                $zalsa::IngredientCache::new();
-
             $zalsa::macro_if! {
                 if $needs_interner {
                     #[derive(Copy, Clone)]
@@ -97,9 +94,6 @@ macro_rules! setup_tracked_fn {
                         std::marker::PhantomData<&$db_lt $zalsa::interned::Value<$Configuration>>,
                     );
 
-                    static $INTERN_CACHE: $zalsa::IngredientCache<$zalsa::interned::IngredientImpl<$Configuration>> =
-                        $zalsa::IngredientCache::new();
-
                     impl $zalsa::SalsaStructInDb for $InternedData<'_> {
                         type MemoIngredientMap = $zalsa::MemoIngredientSingletonIndex;
 
@@ -150,10 +144,15 @@ macro_rules! setup_tracked_fn {
             impl $Configuration {
                 fn fn_ingredient(db: &dyn $Db) -> &$zalsa::function::IngredientImpl<$Configuration> {
                     let zalsa = db.zalsa();
-                    $FN_CACHE.get_or_create(zalsa, || {
-                        <dyn $Db as $Db>::zalsa_register_downcaster(db);
-                        zalsa.add_or_lookup_jar_by_type::<$Configuration>()
-                    })
+                    <dyn $Db as $Db>::zalsa_register_downcaster(db);
+                    let index = zalsa.add_or_lookup_jar_by_type::<$Configuration>();
+                    zalsa.lookup_ingredient(index).assert_type()
+                }
+
+                fn fn_ingredient_no_register(db: &dyn $Db) -> &$zalsa::function::IngredientImpl<$Configuration> {
+                    let zalsa = db.zalsa();
+                    let index = zalsa.add_or_lookup_jar_by_type::<$Configuration>();
+                    zalsa.lookup_ingredient(index).assert_type()
                 }
 
                 pub fn fn_ingredient_mut(db: &mut dyn $Db) -> &mut $zalsa::function::IngredientImpl<Self> {
@@ -169,10 +168,9 @@ macro_rules! setup_tracked_fn {
                         db: &dyn $Db,
                     ) -> &$zalsa::interned::IngredientImpl<$Configuration> {
                         let zalsa = db.zalsa();
-                        $INTERN_CACHE.get_or_create(zalsa, || {
-                            <dyn $Db as $Db>::zalsa_register_downcaster(db);
-                            zalsa.add_or_lookup_jar_by_type::<$Configuration>().successor(0)
-                        })
+                        <dyn $Db as $Db>::zalsa_register_downcaster(db);
+                        let index = zalsa.add_or_lookup_jar_by_type::<$Configuration>().successor(0);
+                        zalsa.lookup_ingredient(index).assert_type()
                     }
                 }
             }
@@ -356,7 +354,7 @@ macro_rules! setup_tracked_fn {
                     if $needs_interner {
                         {
                             let key = $Configuration::intern_ingredient($db).intern_id($db.as_dyn_database(), ($($input_id),*), |_, data| data);
-                            $Configuration::fn_ingredient($db).fetch($db, key)
+                            $Configuration::fn_ingredient_no_register($db).fetch($db, key)
                         }
                     } else {
                         $Configuration::fn_ingredient($db).fetch($db, $zalsa::AsId::as_id(&($($input_id),*)))

components/salsa-macro-rules/src/setup_tracked_struct.rs

@@ -184,12 +184,8 @@ macro_rules! setup_tracked_struct {
                 }
 
                 fn ingredient_(zalsa: &$zalsa::Zalsa) -> &$zalsa_struct::IngredientImpl<Self> {
-                    static CACHE: $zalsa::IngredientCache<$zalsa_struct::IngredientImpl<$Configuration>> =
-                        $zalsa::IngredientCache::new();
-
-                    CACHE.get_or_create(zalsa, || {
-                        zalsa.add_or_lookup_jar_by_type::<$zalsa_struct::JarImpl<$Configuration>>()
-                    })
+                    let index = zalsa.add_or_lookup_jar_by_type::<$zalsa_struct::JarImpl<$Configuration>>();
+                    zalsa.lookup_ingredient(index).assert_type()
                 }
             }
 

src/hash.rs

@@ -1,4 +1,4 @@
-use std::hash::{BuildHasher, Hash};
+use std::hash::{BuildHasher, Hash, Hasher};
 
 pub(crate) type FxHasher = std::hash::BuildHasherDefault<rustc_hash::FxHasher>;
 pub(crate) type FxIndexSet<K> = indexmap::IndexSet<K, FxHasher>;
@@ -8,3 +8,24 @@ pub(crate) type FxHashSet<K> = std::collections::HashSet<K, FxHasher>;
 pub(crate) fn hash<T: Hash>(t: &T) -> u64 {
     FxHasher::default().hash_one(t)
 }
+
+// `TypeId` is a 128-bit hash internally, and it's `Hash` implementation
+// writes the lower 64-bits. Hashing it again would be unnecessary.
+#[derive(Default)]
+pub(crate) struct TypeIdHasher(u64);
+
+impl Hasher for TypeIdHasher {
+    fn write(&mut self, _: &[u8]) {
+        unreachable!("`TypeId` calls `write_u64`");
+    }
+
+    #[inline]
+    fn write_u64(&mut self, id: u64) {
+        self.0 = id;
+    }
+
+    #[inline]
+    fn finish(&self) -> u64 {
+        self.0
+    }
+}

src/ingredient.rs

@@ -31,6 +31,7 @@ pub trait Jar: Any {
     }
 
     /// Create the ingredients given the index of the first one.
+    ///
     /// All subsequent ingredients will be assigned contiguous indices.
     fn create_ingredients(
         zalsa: &Zalsa,

src/lib.rs

@@ -18,7 +18,6 @@ mod input;
 mod interned;
 mod key;
 mod memo_ingredient_indices;
-mod nonce;
 #[cfg(feature = "rayon")]
 mod parallel;
 mod return_mode;
@@ -99,9 +98,7 @@ pub mod plumbing {
     pub use crate::tracked_struct::TrackedStructInDb;
     pub use crate::update::helper::{Dispatch as UpdateDispatch, Fallback as UpdateFallback};
     pub use crate::update::{always_update, Update};
-    pub use crate::zalsa::{
-        transmute_data_ptr, views, IngredientCache, IngredientIndex, Zalsa, ZalsaDatabase,
-    };
+    pub use crate::zalsa::{transmute_data_ptr, views, IngredientIndex, Zalsa, ZalsaDatabase};
     pub use crate::zalsa_local::ZalsaLocal;
 
     pub mod accumulator {