Remove workspace structure, creusot code, merge back vecmap into main…

… crate
lf-lang · Mar 12, 2024 · ad06b93 · ad06b93
1 parent 4ac6459
commit ad06b93
Show file tree

Hide file tree

Showing 47 changed files with 65 additions and 26,285 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,10 +1,64 @@
-[workspace]
+[package]
+name = "reactor_rt"
+version = "0.1.0"
+authors = ["Clément Fournier <clement.fournier76@gmail.com>"]
+edition = "2021"
 
-members = [
-    "runtime",
-    "vecmap",
-]
-exclude = [ "vecmap/creusot" ]
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[profile.bench]
-debug = true
+[dependencies]
+log = "0.4"
+index_vec = "0.1"
+#itertools = "0.10.1"
+#bit-set = "0.5"
+smallvec = { version = "1.10", features = ["const_generics"] }
+petgraph = "0.6"
+array-macro = "2.1"
+atomic_refcell = "0.1"
+crossbeam-utils = "0.8"
+crossbeam-channel = { git = "https://github.com/oowekyala/crossbeam.git", rev = "9eed66904f969156dedad4eef61ce91d23b9cccb" }
+static_assertions = "1.1.0"
+rayon = { version = "1.5", optional = true }
+cfg-if = "1.0.0"
+
+[dev-dependencies]
+criterion = "0.3"
+env_logger = "0.9"
+assert_matches = "1.5"
+dmsort = "1.0.1"
+
+[features]
+default=["vec-id-sets"]
+# Enable the parallel runtime implementation todo make default
+parallel-runtime=["rayon"]
+# Enables 64-bit wide reaction ids on 64 bit architectures.
+# This may reduce performance, but allows for 2^32 reactor
+# instances compared to the default of 2^16, which may feel
+# a bit tight for some applications.
+wide-ids=[]
+vec-id-sets=[]
+no-unsafe=[]
+# used internally for benchmarking, to access private APIs
+public-internals=[]
+
+[[bench]]
+name = "savina_pong"
+harness = false
+
+[[bench]]
+name = "global_id"
+path = "benches/micro/global_id.rs"
+required-features = ["public-internals"]
+harness = false
+
+[[bench]]
+name = "dmsort"
+path = "benches/micro/dmsort.rs"
+required-features = ["public-internals"]
+harness = false
+
+[[bench]]
+name = "exec_reactions"
+path = "benches/micro/exec_reactions.rs"
+required-features = ["public-internals"]
+harness = false
diff --git a/runtime/benches/README.md → benches/README.md b/runtime/benches/README.md → benches/README.md
diff --git a/runtime/benches/SavinaPong.lf → benches/SavinaPong.lf b/runtime/benches/SavinaPong.lf → benches/SavinaPong.lf
diff --git a/runtime/benches/micro/dmsort.rs → benches/micro/dmsort.rs b/runtime/benches/micro/dmsort.rs → benches/micro/dmsort.rs
diff --git a/runtime/benches/micro/exec_reactions.rs → benches/micro/exec_reactions.rs b/runtime/benches/micro/exec_reactions.rs → benches/micro/exec_reactions.rs
diff --git a/runtime/benches/micro/global_id.rs → benches/micro/global_id.rs b/runtime/benches/micro/global_id.rs → benches/micro/global_id.rs
diff --git a/runtime/benches/savina_pong.rs → benches/savina_pong.rs b/runtime/benches/savina_pong.rs → benches/savina_pong.rs
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
diff --git a/runtime/src/actions.rs → src/actions.rs b/runtime/src/actions.rs → src/actions.rs
diff --git a/runtime/src/assembly.rs → src/assembly.rs b/runtime/src/assembly.rs → src/assembly.rs
diff --git a/runtime/src/ids.rs → src/ids.rs b/runtime/src/ids.rs → src/ids.rs
diff --git a/runtime/src/lib.rs → src/lib.rs b/runtime/src/lib.rs → src/lib.rs
diff --git a/runtime/src/ports.rs → src/ports.rs b/runtime/src/ports.rs → src/ports.rs
diff --git a/runtime/src/scheduler/assembly_impl.rs → src/scheduler/assembly_impl.rs b/runtime/src/scheduler/assembly_impl.rs → src/scheduler/assembly_impl.rs
diff --git a/runtime/src/scheduler/context.rs → src/scheduler/context.rs b/runtime/src/scheduler/context.rs → src/scheduler/context.rs
diff --git a/runtime/src/scheduler/debug.rs → src/scheduler/debug.rs b/runtime/src/scheduler/debug.rs → src/scheduler/debug.rs
@@ -29,7 +29,7 @@ use std::fmt::{Display, Formatter, Result};
 use std::ops::Range;
 
 use index_vec::{Idx, IndexVec};
-use vecmap::VecMap;
+use crate::vecmap::VecMap;
 
 use crate::assembly::{ReactorInitializer, TriggerId};
 use crate::{GlobalReactionId, ReactorId};

diff --git a/runtime/src/scheduler/dependencies.rs → src/scheduler/dependencies.rs b/runtime/src/scheduler/dependencies.rs → src/scheduler/dependencies.rs
diff --git a/runtime/src/scheduler/events.rs → src/scheduler/events.rs b/runtime/src/scheduler/events.rs → src/scheduler/events.rs
diff --git a/runtime/src/scheduler/mod.rs → src/scheduler/mod.rs b/runtime/src/scheduler/mod.rs → src/scheduler/mod.rs
diff --git a/runtime/src/scheduler/scheduler_impl.rs → src/scheduler/scheduler_impl.rs b/runtime/src/scheduler/scheduler_impl.rs → src/scheduler/scheduler_impl.rs
diff --git a/runtime/src/test/mod.rs → src/test/mod.rs b/runtime/src/test/mod.rs → src/test/mod.rs
diff --git a/runtime/src/test/stuff_that_must_compile.rs → src/test/stuff_that_must_compile.rs b/runtime/src/test/stuff_that_must_compile.rs → src/test/stuff_that_must_compile.rs
diff --git a/runtime/src/test/test_ports.rs → src/test/test_ports.rs b/runtime/src/test/test_ports.rs → src/test/test_ports.rs
diff --git a/runtime/src/test/testutil.rs → src/test/testutil.rs b/runtime/src/test/testutil.rs → src/test/testutil.rs
diff --git a/runtime/src/time.rs → src/time.rs b/runtime/src/time.rs → src/time.rs
diff --git a/runtime/src/timers.rs → src/timers.rs b/runtime/src/timers.rs → src/timers.rs
diff --git a/runtime/src/triggers.rs → src/triggers.rs b/runtime/src/triggers.rs → src/triggers.rs
diff --git a/runtime/src/util/mod.rs → src/util/mod.rs b/runtime/src/util/mod.rs → src/util/mod.rs
@@ -25,6 +25,8 @@
 use std::convert::TryFrom;
 use std::time::Duration;
 
+pub(crate) mod vecmap;
+
 #[macro_export]
 #[doc(hidden)]
 macro_rules! join_to {

diff --git a/vecmap/src/lib.rs → src/util/vecmap.rs b/vecmap/src/lib.rs → src/util/vecmap.rs
diff --git a/vecmap/.gitignore b/vecmap/.gitignore
diff --git a/vecmap/Cargo.toml b/vecmap/Cargo.toml