Replace std HashMap with im HashMap.

Summary: Replace the std HashMap to im::HashMap for HashSet lattice domain, abstract partition and abstract environment. This should give much better performance as it reduces the deep clone.

Reviewed By: yuxuanchen1997

Differential Revision: D40204693

fbshipit-source-id: 3b4aca2b3ead1449b2453236bbcabd5224b055ab

Author: @

rust/Cargo.toml

@@ -10,6 +10,7 @@ edition = "2021"
 [dependencies]
 smallvec = { version = "1.9.0", features = ["const_generics"] }
 disjoint-sets = "0.4.2"
+im = "14.2.0"
 petgraph = "0.6.2"
 sparta-proc-macros = { path = "../rust-proc-macros", version = "0.1.0" }
 

rust/src/datatype/abstract_environment.rs

@@ -6,9 +6,10 @@
  */
 
 use std::borrow::Cow;
-use std::collections::HashMap;
 use std::hash::Hash;
 
+use im::HashMap;
+
 use crate::datatype::bitvec::BitVec;
 use crate::datatype::AbstractDomain;
 use crate::datatype::PatriciaTreeMap;
@@ -222,8 +223,11 @@ where
             (Value(l_map), Value(ref mut r_map)) => {
                 l_map.retain(|l_k, _| r_map.contains_key(l_k));
 
-                for (l_k, l_v) in l_map.iter_mut() {
-                    let r_v = r_map.remove(l_k).unwrap();
+                // NOTE: implcit prerequisite: key() and iter_mut() get the same order for the same map.
+                // When `im` crate upgrades to 15.1, we could simply use iter_mut() as it will get both
+                // keys and values.
+                let r_vs: Vec<_> = l_map.keys().map(|l_k| r_map.remove(l_k).unwrap()).collect();
+                for (l_v, r_v) in l_map.iter_mut().zip(r_vs) {
                     operation(l_v, r_v);
                 }
                 l_map.retain(|_, l_v| !l_v.is_top());

rust/src/datatype/abstract_partition.rs

@@ -6,9 +6,10 @@
  */
 
 use std::borrow::Cow;
-use std::collections::HashMap;
 use std::hash::Hash;
 
+use im::HashMap;
+
 use crate::datatype::bitvec::BitVec;
 use crate::datatype::AbstractDomain;
 use crate::datatype::PatriciaTreeMap;
@@ -238,8 +239,8 @@ where
             (Value(l_map), Value(mut r_map)) => {
                 l_map.retain(|l_k, _| r_map.contains_key(l_k));
 
-                for (l_k, l_v) in l_map.iter_mut() {
-                    let r_v = r_map.remove(l_k).unwrap();
+                let r_vs: Vec<_> = l_map.keys().map(|l_k| r_map.remove(l_k).unwrap()).collect();
+                for (l_v, r_v) in l_map.iter_mut().zip(r_vs) {
                     operation(l_v, r_v);
                 }
 

rust/src/datatype/hash_set_impl.rs

@@ -5,9 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-use std::collections::HashSet;
 use std::hash::Hash;
 
+use im::HashSet;
+
 use super::powerset::SetAbstractDomainOps;
 use super::powerset::SetElementOps;
 

rust/src/datatype/powerset.rs

@@ -5,9 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-use std::collections::HashSet;
 use std::iter::FromIterator;
 
+use im::HashSet;
+
 use super::abstract_domain::AbstractDomain;
 use crate::datatype::PatriciaTreeSet;
 

rust/tests/abstract_partition_test.rs

@@ -6,8 +6,7 @@
  */
 
 mod abstract_partition_test {
-    use std::collections::HashSet;
-
+    use im::HashSet;
     use sparta::datatype::AbstractDomain;
     use sparta::datatype::AbstractPartition;
     use sparta::datatype::HashMapAbstractPartition;
@@ -65,11 +64,11 @@ mod abstract_partition_test {
 
         assert!(
             join.get(&("v2".to_string())).set()
-                == &HashSet::from(["c".to_string(), "d".to_string()])
+                == &HashSet::from(vec!["c".to_string(), "d".to_string()])
         );
         assert!(
             join.get(&("v3".to_string())).set()
-                == &HashSet::from([
+                == &HashSet::from(vec![
                     "d".to_string(),
                     "e".to_string(),
                     "f".to_string(),
@@ -88,10 +87,10 @@ mod abstract_partition_test {
         assert!(meet.leq(&p2));
         assert_eq!(meet.len(), 2);
 
-        assert!(meet.get(&("v2".to_string())).set() == &HashSet::from(["c".to_string()]));
+        assert!(meet.get(&("v2".to_string())).set() == &HashSet::from(vec!["c".to_string()]));
         assert!(
             meet.get(&("v3".to_string())).set()
-                == &HashSet::from(["d".to_string(), "e".to_string()])
+                == &HashSet::from(vec!["d".to_string(), "e".to_string()])
         );
 
         assert!(p1.clone().meet(Partition::bottom()).is_bottom());
@@ -141,10 +140,10 @@ mod abstract_partition_test {
         assert!(join.get(&0) == p2.get(&0));
         assert!(join.get(&1) == p1.get(&1));
 
-        assert!(join.get(&2).set() == &HashSet::from(["c".to_string(), "d".to_string()]));
+        assert!(join.get(&2).set() == &HashSet::from(vec!["c".to_string(), "d".to_string()]));
         assert!(
             join.get(&3).set()
-                == &HashSet::from([
+                == &HashSet::from(vec![
                     "d".to_string(),
                     "e".to_string(),
                     "f".to_string(),
@@ -163,8 +162,8 @@ mod abstract_partition_test {
         assert!(meet.leq(&p2));
         assert_eq!(meet.len(), 2);
 
-        assert!(meet.get(&2).set() == &HashSet::from(["c".to_string()]));
-        assert!(meet.get(&3).set() == &HashSet::from(["d".to_string(), "e".to_string()]));
+        assert!(meet.get(&2).set() == &HashSet::from(vec!["c".to_string()]));
+        assert!(meet.get(&3).set() == &HashSet::from(vec!["d".to_string(), "e".to_string()]));
 
         assert!(p1.clone().meet(Partition::bottom()).is_bottom());
         assert!(p1.clone().meet(Partition::top()) == p1);

rust/tests/fixpoint_iter_test.rs

@@ -9,8 +9,8 @@
 
 mod liveness {
     use std::collections::HashMap;
-    use std::collections::HashSet;
 
+    use im::HashSet;
     use smallvec::SmallVec;
     use sparta::datatype::HashSetAbstractDomain;
     use sparta::fixpoint_iter::FixpointIteratorTransformer;