[Cider] rename interp to cider (#2376)

Finally, rename the cider library to be `cider` instead of `interp`.
calyxir · Dec 13, 2024 · 727912a · 727912a
1 parent 426e107
commit 727912a
Show file tree

Hide file tree

Showing 237 changed files with 81 additions and 75 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -111,14 +111,14 @@ jobs:
       uses: actions-rs/cargo@v1
       with:
         command: build
-        args: --all --all-features --manifest-path /home/calyx/interp/Cargo.toml
+        args: --all --all-features --manifest-path /home/calyx/cider/Cargo.toml
 
     - name: Set location of cider binary
       run: |
         fud c stages.interpreter.exec /home/calyx/target/debug/cider
 
     - name: Runt tests
-      working-directory: /home/calyx/interp/tests
+      working-directory: /home/calyx/cider/tests
       run: |
         # Run the remaining tests
         runt -x '(numeric types correctness and parsing)' -d -o fail
@@ -127,13 +127,13 @@ jobs:
       uses: actions-rs/cargo@v1
       with:
         command: test
-        args: --manifest-path /home/calyx/interp/Cargo.toml
+        args: --manifest-path /home/calyx/cider/Cargo.toml
 
     - name: Source code doc tests
       uses: actions-rs/cargo@v1
       with:
         command: test
-        args: --manifest-path /home/calyx/interp/Cargo.toml --doc
+        args: --manifest-path /home/calyx/cider/Cargo.toml --doc
 
   compiler:
     name: Test Compiler

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,7 @@ members = [
     "calyx-stdlib",
     "calyx-backend",
     "calyx-lsp",
-    "interp",
+    "cider",
     "web/rust",
     "tools/data_gen",
     "cider-dap",

diff --git a/cider-dap/Cargo.toml b/cider-dap/Cargo.toml
@@ -9,15 +9,15 @@ edition = "2021"
 dap = { git = "https://github.com/sztomi/dap-rs", tag = "v0.4.1-alpha1" }
 thiserror = "1.*"
 serde_json = "1.0"
-serde.workspace= true
+serde.workspace = true
 owo-colors = "^3.5"
 argh = "0.1"
 slog = "2.7.0"
 slog-term = "2.8.0"
 slog-async = "2.7.0"
 baa = "0.14"
 
-interp = { path = "../interp" }
+cider = { path = "../cider" }
 
 [[bin]]
 name = "cider-dap"

diff --git a/cider-dap/src/adapter.rs b/cider-dap/src/adapter.rs
@@ -1,14 +1,14 @@
 use crate::error::AdapterResult;
 use baa::BitVecOps;
+use cider::debugger::commands::ParsedGroupName;
+use cider::debugger::source::structures::NewSourceMap;
+use cider::debugger::{OwnedDebugger, StoppedReason};
+use cider::flatten::flat_ir::base::{GlobalCellIdx, PortValue};
 use dap::events::{Event, OutputEventBody, StoppedEventBody};
 use dap::types::{
     self, Breakpoint, Scope, Source, SourceBreakpoint, StackFrame, Thread,
     Variable,
 };
-use interp::debugger::commands::ParsedGroupName;
-use interp::debugger::source::structures::NewSourceMap;
-use interp::debugger::{OwnedDebugger, StoppedReason};
-use interp::flatten::flat_ir::base::{GlobalCellIdx, PortValue};
 use std::collections::{HashMap, HashSet};
 use std::path::PathBuf;
 

diff --git a/interp/Cargo.toml → cider/Cargo.toml b/interp/Cargo.toml → cider/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "interp"
+name = "cider"
 version = "0.1.1"
 authors = ["The Calyx authors"]
 edition = "2021"

diff --git a/interp/README.md → cider/README.md b/interp/README.md → cider/README.md
diff --git a/interp/proptest-regressions/tests/values.txt → cider/proptest-regressions/tests/values.txt b/interp/proptest-regressions/tests/values.txt → cider/proptest-regressions/tests/values.txt
diff --git a/interp/src/as_raw.rs → cider/src/as_raw.rs b/interp/src/as_raw.rs → cider/src/as_raw.rs
diff --git a/interp/src/configuration.rs → cider/src/configuration.rs b/interp/src/configuration.rs → cider/src/configuration.rs
diff --git a/...p/src/debugger/commands/command_parser.rs → ...r/src/debugger/commands/command_parser.rs b/...p/src/debugger/commands/command_parser.rs → ...r/src/debugger/commands/command_parser.rs
diff --git a/interp/src/debugger/commands/commands.pest → cider/src/debugger/commands/commands.pest b/interp/src/debugger/commands/commands.pest → cider/src/debugger/commands/commands.pest
diff --git a/interp/src/debugger/commands/core.rs → cider/src/debugger/commands/core.rs b/interp/src/debugger/commands/core.rs → cider/src/debugger/commands/core.rs
diff --git a/interp/src/debugger/commands/mod.rs → cider/src/debugger/commands/mod.rs b/interp/src/debugger/commands/mod.rs → cider/src/debugger/commands/mod.rs
diff --git a/...rp/src/debugger/commands/path_parser.pest → cider/src/debugger/commands/path_parser.pest b/...rp/src/debugger/commands/path_parser.pest → cider/src/debugger/commands/path_parser.pest
diff --git a/interp/src/debugger/commands/path_parser.rs → cider/src/debugger/commands/path_parser.rs b/interp/src/debugger/commands/path_parser.rs → cider/src/debugger/commands/path_parser.rs
diff --git a/interp/src/debugger/debugger_core.rs → cider/src/debugger/debugger_core.rs b/interp/src/debugger/debugger_core.rs → cider/src/debugger/debugger_core.rs
diff --git a/...src/debugger/debugging_context/context.rs → ...src/debugger/debugging_context/context.rs b/...src/debugger/debugging_context/context.rs → ...src/debugger/debugging_context/context.rs
diff --git a/interp/src/debugger/debugging_context/mod.rs → cider/src/debugger/debugging_context/mod.rs b/interp/src/debugger/debugging_context/mod.rs → cider/src/debugger/debugging_context/mod.rs
diff --git a/interp/src/debugger/io_utils.rs → cider/src/debugger/io_utils.rs b/interp/src/debugger/io_utils.rs → cider/src/debugger/io_utils.rs
diff --git a/interp/src/debugger/macros.rs → cider/src/debugger/macros.rs b/interp/src/debugger/macros.rs → cider/src/debugger/macros.rs
diff --git a/interp/src/debugger/mod.rs → cider/src/debugger/mod.rs b/interp/src/debugger/mod.rs → cider/src/debugger/mod.rs
diff --git a/interp/src/debugger/source/metadata.pest → cider/src/debugger/source/metadata.pest b/interp/src/debugger/source/metadata.pest → cider/src/debugger/source/metadata.pest
diff --git a/...rp/src/debugger/source/metadata_parser.rs → cider/src/debugger/source/metadata_parser.rs b/...rp/src/debugger/source/metadata_parser.rs → cider/src/debugger/source/metadata_parser.rs
diff --git a/interp/src/debugger/source/mod.rs → cider/src/debugger/source/mod.rs b/interp/src/debugger/source/mod.rs → cider/src/debugger/source/mod.rs
diff --git a/interp/src/debugger/source/new_metadata.pest → cider/src/debugger/source/new_metadata.pest b/interp/src/debugger/source/new_metadata.pest → cider/src/debugger/source/new_metadata.pest
diff --git a/interp/src/debugger/source/new_parser.rs → cider/src/debugger/source/new_parser.rs b/interp/src/debugger/source/new_parser.rs → cider/src/debugger/source/new_parser.rs
diff --git a/interp/src/debugger/source/structures.rs → cider/src/debugger/source/structures.rs b/interp/src/debugger/source/structures.rs → cider/src/debugger/source/structures.rs
diff --git a/interp/src/errors.rs → cider/src/errors.rs b/interp/src/errors.rs → cider/src/errors.rs
diff --git a/interp/src/flatten/flat_ir/base.rs → cider/src/flatten/flat_ir/base.rs b/interp/src/flatten/flat_ir/base.rs → cider/src/flatten/flat_ir/base.rs
diff --git a/interp/src/flatten/flat_ir/cell_prototype.rs → cider/src/flatten/flat_ir/cell_prototype.rs b/interp/src/flatten/flat_ir/cell_prototype.rs → cider/src/flatten/flat_ir/cell_prototype.rs
diff --git a/interp/src/flatten/flat_ir/component.rs → cider/src/flatten/flat_ir/component.rs b/interp/src/flatten/flat_ir/component.rs → cider/src/flatten/flat_ir/component.rs
diff --git a/interp/src/flatten/flat_ir/control/mod.rs → cider/src/flatten/flat_ir/control/mod.rs b/interp/src/flatten/flat_ir/control/mod.rs → cider/src/flatten/flat_ir/control/mod.rs
diff --git a/...src/flatten/flat_ir/control/structures.rs → ...src/flatten/flat_ir/control/structures.rs b/...src/flatten/flat_ir/control/structures.rs → ...src/flatten/flat_ir/control/structures.rs
diff --git a/...src/flatten/flat_ir/control/translator.rs → ...src/flatten/flat_ir/control/translator.rs b/...src/flatten/flat_ir/control/translator.rs → ...src/flatten/flat_ir/control/translator.rs
diff --git a/interp/src/flatten/flat_ir/control/utils.rs → cider/src/flatten/flat_ir/control/utils.rs b/interp/src/flatten/flat_ir/control/utils.rs → cider/src/flatten/flat_ir/control/utils.rs
diff --git a/interp/src/flatten/flat_ir/flatten_trait.rs → cider/src/flatten/flat_ir/flatten_trait.rs b/interp/src/flatten/flat_ir/flatten_trait.rs → cider/src/flatten/flat_ir/flatten_trait.rs
diff --git a/interp/src/flatten/flat_ir/identifier.rs → cider/src/flatten/flat_ir/identifier.rs b/interp/src/flatten/flat_ir/identifier.rs → cider/src/flatten/flat_ir/identifier.rs
diff --git a/interp/src/flatten/flat_ir/mod.rs → cider/src/flatten/flat_ir/mod.rs b/interp/src/flatten/flat_ir/mod.rs → cider/src/flatten/flat_ir/mod.rs
diff --git a/interp/src/flatten/flat_ir/wires/core.rs → cider/src/flatten/flat_ir/wires/core.rs b/interp/src/flatten/flat_ir/wires/core.rs → cider/src/flatten/flat_ir/wires/core.rs
diff --git a/interp/src/flatten/flat_ir/wires/guards.rs → cider/src/flatten/flat_ir/wires/guards.rs b/interp/src/flatten/flat_ir/wires/guards.rs → cider/src/flatten/flat_ir/wires/guards.rs
diff --git a/interp/src/flatten/flat_ir/wires/mod.rs → cider/src/flatten/flat_ir/wires/mod.rs b/interp/src/flatten/flat_ir/wires/mod.rs → cider/src/flatten/flat_ir/wires/mod.rs
diff --git a/interp/src/flatten/mod.rs → cider/src/flatten/mod.rs b/interp/src/flatten/mod.rs → cider/src/flatten/mod.rs
diff --git a/interp/src/flatten/primitives/builder.rs → cider/src/flatten/primitives/builder.rs b/interp/src/flatten/primitives/builder.rs → cider/src/flatten/primitives/builder.rs
diff --git a/...p/src/flatten/primitives/combinational.rs → ...r/src/flatten/primitives/combinational.rs b/...p/src/flatten/primitives/combinational.rs → ...r/src/flatten/primitives/combinational.rs
diff --git a/interp/src/flatten/primitives/macros.rs → cider/src/flatten/primitives/macros.rs b/interp/src/flatten/primitives/macros.rs → cider/src/flatten/primitives/macros.rs
diff --git a/interp/src/flatten/primitives/mod.rs → cider/src/flatten/primitives/mod.rs b/interp/src/flatten/primitives/mod.rs → cider/src/flatten/primitives/mod.rs
diff --git a/interp/src/flatten/primitives/prim_trait.rs → cider/src/flatten/primitives/prim_trait.rs b/interp/src/flatten/primitives/prim_trait.rs → cider/src/flatten/primitives/prim_trait.rs
diff --git a/...p/src/flatten/primitives/stateful/math.rs → ...r/src/flatten/primitives/stateful/math.rs b/...p/src/flatten/primitives/stateful/math.rs → ...r/src/flatten/primitives/stateful/math.rs
diff --git a/...c/flatten/primitives/stateful/memories.rs → ...c/flatten/primitives/stateful/memories.rs b/...c/flatten/primitives/stateful/memories.rs → ...c/flatten/primitives/stateful/memories.rs
diff --git a/...rp/src/flatten/primitives/stateful/mod.rs → cider/src/flatten/primitives/stateful/mod.rs b/...rp/src/flatten/primitives/stateful/mod.rs → cider/src/flatten/primitives/stateful/mod.rs
diff --git a/interp/src/flatten/primitives/utils.rs → cider/src/flatten/primitives/utils.rs b/interp/src/flatten/primitives/utils.rs → cider/src/flatten/primitives/utils.rs
diff --git a/interp/src/flatten/setup.rs → cider/src/flatten/setup.rs b/interp/src/flatten/setup.rs → cider/src/flatten/setup.rs
diff --git a/interp/src/flatten/structures/context.rs → cider/src/flatten/structures/context.rs b/interp/src/flatten/structures/context.rs → cider/src/flatten/structures/context.rs
diff --git a/...ten/structures/environment/assignments.rs → ...ten/structures/environment/assignments.rs b/...ten/structures/environment/assignments.rs → ...ten/structures/environment/assignments.rs
diff --git a/...c/flatten/structures/environment/clock.rs → ...c/flatten/structures/environment/clock.rs b/...c/flatten/structures/environment/clock.rs → ...c/flatten/structures/environment/clock.rs
diff --git a/...src/flatten/structures/environment/env.rs → ...src/flatten/structures/environment/env.rs b/...src/flatten/structures/environment/env.rs → ...src/flatten/structures/environment/env.rs
diff --git a/...src/flatten/structures/environment/mod.rs → ...src/flatten/structures/environment/mod.rs b/...src/flatten/structures/environment/mod.rs → ...src/flatten/structures/environment/mod.rs
diff --git a/...structures/environment/program_counter.rs → ...structures/environment/program_counter.rs b/...structures/environment/program_counter.rs → ...structures/environment/program_counter.rs
diff --git a/...atten/structures/environment/traverser.rs → ...atten/structures/environment/traverser.rs b/...atten/structures/environment/traverser.rs → ...atten/structures/environment/traverser.rs
diff --git a/...rc/flatten/structures/environment/wave.rs → ...rc/flatten/structures/environment/wave.rs b/...rc/flatten/structures/environment/wave.rs → ...rc/flatten/structures/environment/wave.rs
diff --git a/interp/src/flatten/structures/index_trait.rs → cider/src/flatten/structures/index_trait.rs b/interp/src/flatten/structures/index_trait.rs → cider/src/flatten/structures/index_trait.rs
diff --git a/interp/src/flatten/structures/indexed_map.rs → cider/src/flatten/structures/indexed_map.rs b/interp/src/flatten/structures/indexed_map.rs → cider/src/flatten/structures/indexed_map.rs
diff --git a/interp/src/flatten/structures/mod.rs → cider/src/flatten/structures/mod.rs b/interp/src/flatten/structures/mod.rs → cider/src/flatten/structures/mod.rs
diff --git a/interp/src/flatten/structures/printer.rs → cider/src/flatten/structures/printer.rs b/interp/src/flatten/structures/printer.rs → cider/src/flatten/structures/printer.rs
diff --git a/interp/src/flatten/structures/sparse_map.rs → cider/src/flatten/structures/sparse_map.rs b/interp/src/flatten/structures/sparse_map.rs → cider/src/flatten/structures/sparse_map.rs
diff --git a/interp/src/flatten/structures/thread.rs → cider/src/flatten/structures/thread.rs b/interp/src/flatten/structures/thread.rs → cider/src/flatten/structures/thread.rs
diff --git a/interp/src/flatten/text_utils.rs → cider/src/flatten/text_utils.rs b/interp/src/flatten/text_utils.rs → cider/src/flatten/text_utils.rs
diff --git a/interp/src/lib.rs → cider/src/lib.rs b/interp/src/lib.rs → cider/src/lib.rs
diff --git a/interp/src/logging.rs → cider/src/logging.rs b/interp/src/logging.rs → cider/src/logging.rs
diff --git a/interp/src/macros.rs → cider/src/macros.rs b/interp/src/macros.rs → cider/src/macros.rs
@@ -29,7 +29,7 @@ macro_rules! lit_or_id {
 #[macro_export]
 /// Helper macro to generate port bindings.
 /// ```
-/// # use interp::port_bindings;
+/// # use cider::port_bindings;
 /// port_bindings![ binds;
 ///   r#in -> (16, 32),
 ///   write_en -> (1, 1)
@@ -46,7 +46,7 @@ macro_rules! port_bindings {
 
 /// Helper macro to generate validation checks for the input passed to primitives
 /// ```
-///  # use interp::validate;
+///  # use cider::validate;
 ///  # use baa::BitVecValue;
 ///  # let input = [("left", [4,4,4,4])];
 ///  # let inputs = &input;
@@ -72,7 +72,7 @@ macro_rules! validate {
 /// Helper macro to generate validation checks for the input passed to
 /// primitives, does not error on unknown ports
 /// ```
-///  # use interp::validate_friendly;
+///  # use cider::validate_friendly;
 ///  # use baa::BitVecValue;
 ///  # let input = [("left", [4,4,4,4])];
 ///  # let inputs = &input;

diff --git a/interp/src/main.rs → cider/src/main.rs b/interp/src/main.rs → cider/src/main.rs
@@ -3,7 +3,7 @@
 use argh::FromArgs;
 
 use calyx_utils::OutputFile;
-use interp::{
+use cider::{
     configuration,
     debugger::{Debugger, DebuggerInfo, DebuggerReturnStatus},
     errors::CiderResult,
@@ -120,7 +120,7 @@ fn main() -> CiderResult<()> {
         .build();
 
     let command = opts.mode.unwrap_or(Command::Interpret(CommandInterpret {}));
-    let i_ctx = interp::flatten::setup_simulation(
+    let i_ctx = cider::flatten::setup_simulation(
         &opts.file,
         &opts.lib_path,
         opts.skip_verification,

diff --git a/interp/src/serialization/data_dump.rs → cider/src/serialization/data_dump.rs b/interp/src/serialization/data_dump.rs → cider/src/serialization/data_dump.rs
diff --git a/interp/src/serialization/formatting.rs → cider/src/serialization/formatting.rs b/interp/src/serialization/formatting.rs → cider/src/serialization/formatting.rs
diff --git a/interp/src/serialization/mod.rs → cider/src/serialization/mod.rs b/interp/src/serialization/mod.rs → cider/src/serialization/mod.rs
diff --git a/interp/src/tests/mod.rs → cider/src/tests/mod.rs b/interp/src/tests/mod.rs → cider/src/tests/mod.rs
diff --git a/interp/src/tests/values.rs → cider/src/tests/values.rs b/interp/src/tests/values.rs → cider/src/tests/values.rs
diff --git a/interp/tests/benchmarks/ntt-32.expect → cider/tests/benchmarks/ntt-32.expect b/interp/tests/benchmarks/ntt-32.expect → cider/tests/benchmarks/ntt-32.expect
diff --git a/interp/tests/benchmarks/ntt-32.futil → cider/tests/benchmarks/ntt-32.futil b/interp/tests/benchmarks/ntt-32.futil → cider/tests/benchmarks/ntt-32.futil
diff --git a/interp/tests/benchmarks/ntt-32.futil.data → cider/tests/benchmarks/ntt-32.futil.data b/interp/tests/benchmarks/ntt-32.futil.data → cider/tests/benchmarks/ntt-32.futil.data
diff --git a/interp/tests/benchmarks/ntt-64.expect → cider/tests/benchmarks/ntt-64.expect b/interp/tests/benchmarks/ntt-64.expect → cider/tests/benchmarks/ntt-64.expect
diff --git a/interp/tests/benchmarks/ntt-64.futil → cider/tests/benchmarks/ntt-64.futil b/interp/tests/benchmarks/ntt-64.futil → cider/tests/benchmarks/ntt-64.futil
diff --git a/interp/tests/benchmarks/ntt-64.futil.data → cider/tests/benchmarks/ntt-64.futil.data b/interp/tests/benchmarks/ntt-64.futil.data → cider/tests/benchmarks/ntt-64.futil.data
diff --git a/...marks/polybench/linear-algebra-2mm.expect → ...marks/polybench/linear-algebra-2mm.expect b/...marks/polybench/linear-algebra-2mm.expect → ...marks/polybench/linear-algebra-2mm.expect
diff --git a/...chmarks/polybench/linear-algebra-2mm.fuse → ...chmarks/polybench/linear-algebra-2mm.fuse b/...chmarks/polybench/linear-algebra-2mm.fuse → ...chmarks/polybench/linear-algebra-2mm.fuse
diff --git a/...ks/polybench/linear-algebra-2mm.fuse.data → ...ks/polybench/linear-algebra-2mm.fuse.data b/...ks/polybench/linear-algebra-2mm.fuse.data → ...ks/polybench/linear-algebra-2mm.fuse.data
diff --git a/...marks/polybench/linear-algebra-3mm.expect → ...marks/polybench/linear-algebra-3mm.expect b/...marks/polybench/linear-algebra-3mm.expect → ...marks/polybench/linear-algebra-3mm.expect
diff --git a/...chmarks/polybench/linear-algebra-3mm.fuse → ...chmarks/polybench/linear-algebra-3mm.fuse b/...chmarks/polybench/linear-algebra-3mm.fuse → ...chmarks/polybench/linear-algebra-3mm.fuse
diff --git a/...ks/polybench/linear-algebra-3mm.fuse.data → ...ks/polybench/linear-algebra-3mm.fuse.data b/...ks/polybench/linear-algebra-3mm.fuse.data → ...ks/polybench/linear-algebra-3mm.fuse.data
diff --git a/...arks/polybench/linear-algebra-atax.expect → ...arks/polybench/linear-algebra-atax.expect b/...arks/polybench/linear-algebra-atax.expect → ...arks/polybench/linear-algebra-atax.expect
diff --git a/...hmarks/polybench/linear-algebra-atax.fuse → ...hmarks/polybench/linear-algebra-atax.fuse b/...hmarks/polybench/linear-algebra-atax.fuse → ...hmarks/polybench/linear-algebra-atax.fuse
diff --git a/...s/polybench/linear-algebra-atax.fuse.data → ...s/polybench/linear-algebra-atax.fuse.data b/...s/polybench/linear-algebra-atax.fuse.data → ...s/polybench/linear-algebra-atax.fuse.data
diff --git a/...arks/polybench/linear-algebra-bicg.expect → ...arks/polybench/linear-algebra-bicg.expect b/...arks/polybench/linear-algebra-bicg.expect → ...arks/polybench/linear-algebra-bicg.expect
diff --git a/...hmarks/polybench/linear-algebra-bicg.fuse → ...hmarks/polybench/linear-algebra-bicg.fuse b/...hmarks/polybench/linear-algebra-bicg.fuse → ...hmarks/polybench/linear-algebra-bicg.fuse
diff --git a/...s/polybench/linear-algebra-bicg.fuse.data → ...s/polybench/linear-algebra-bicg.fuse.data b/...s/polybench/linear-algebra-bicg.fuse.data → ...s/polybench/linear-algebra-bicg.fuse.data
diff --git a/.../polybench/linear-algebra-cholesky.expect → .../polybench/linear-algebra-cholesky.expect b/.../polybench/linear-algebra-cholesky.expect → .../polybench/linear-algebra-cholesky.expect
diff --git a/...ks/polybench/linear-algebra-cholesky.fuse → ...ks/polybench/linear-algebra-cholesky.fuse b/...ks/polybench/linear-algebra-cholesky.fuse → ...ks/polybench/linear-algebra-cholesky.fuse
diff --git a/...lybench/linear-algebra-cholesky.fuse.data → ...lybench/linear-algebra-cholesky.fuse.data b/...lybench/linear-algebra-cholesky.fuse.data → ...lybench/linear-algebra-cholesky.fuse.data
diff --git a/...s/polybench/linear-algebra-doitgen.expect → ...s/polybench/linear-algebra-doitgen.expect b/...s/polybench/linear-algebra-doitgen.expect → ...s/polybench/linear-algebra-doitgen.expect
diff --git a/...rks/polybench/linear-algebra-doitgen.fuse → ...rks/polybench/linear-algebra-doitgen.fuse b/...rks/polybench/linear-algebra-doitgen.fuse → ...rks/polybench/linear-algebra-doitgen.fuse
diff --git a/...olybench/linear-algebra-doitgen.fuse.data → ...olybench/linear-algebra-doitgen.fuse.data b/...olybench/linear-algebra-doitgen.fuse.data → ...olybench/linear-algebra-doitgen.fuse.data
diff --git a/...ks/polybench/linear-algebra-durbin.expect → ...ks/polybench/linear-algebra-durbin.expect b/...ks/polybench/linear-algebra-durbin.expect → ...ks/polybench/linear-algebra-durbin.expect
diff --git a/...arks/polybench/linear-algebra-durbin.fuse → ...arks/polybench/linear-algebra-durbin.fuse b/...arks/polybench/linear-algebra-durbin.fuse → ...arks/polybench/linear-algebra-durbin.fuse
diff --git a/...polybench/linear-algebra-durbin.fuse.data → ...polybench/linear-algebra-durbin.fuse.data b/...polybench/linear-algebra-durbin.fuse.data → ...polybench/linear-algebra-durbin.fuse.data
diff --git a/...arks/polybench/linear-algebra-gemm.expect → ...arks/polybench/linear-algebra-gemm.expect b/...arks/polybench/linear-algebra-gemm.expect → ...arks/polybench/linear-algebra-gemm.expect
diff --git a/...hmarks/polybench/linear-algebra-gemm.fuse → ...hmarks/polybench/linear-algebra-gemm.fuse b/...hmarks/polybench/linear-algebra-gemm.fuse → ...hmarks/polybench/linear-algebra-gemm.fuse
diff --git a/...s/polybench/linear-algebra-gemm.fuse.data → ...s/polybench/linear-algebra-gemm.fuse.data b/...s/polybench/linear-algebra-gemm.fuse.data → ...s/polybench/linear-algebra-gemm.fuse.data
diff --git a/...ks/polybench/linear-algebra-gemver.expect → ...ks/polybench/linear-algebra-gemver.expect b/...ks/polybench/linear-algebra-gemver.expect → ...ks/polybench/linear-algebra-gemver.expect
diff --git a/...arks/polybench/linear-algebra-gemver.fuse → ...arks/polybench/linear-algebra-gemver.fuse b/...arks/polybench/linear-algebra-gemver.fuse → ...arks/polybench/linear-algebra-gemver.fuse
diff --git a/...polybench/linear-algebra-gemver.fuse.data → ...polybench/linear-algebra-gemver.fuse.data b/...polybench/linear-algebra-gemver.fuse.data → ...polybench/linear-algebra-gemver.fuse.data
diff --git a/...s/polybench/linear-algebra-gesummv.expect → ...s/polybench/linear-algebra-gesummv.expect b/...s/polybench/linear-algebra-gesummv.expect → ...s/polybench/linear-algebra-gesummv.expect
diff --git a/...rks/polybench/linear-algebra-gesummv.fuse → ...rks/polybench/linear-algebra-gesummv.fuse b/...rks/polybench/linear-algebra-gesummv.fuse → ...rks/polybench/linear-algebra-gesummv.fuse
diff --git a/...olybench/linear-algebra-gesummv.fuse.data → ...olybench/linear-algebra-gesummv.fuse.data b/...olybench/linear-algebra-gesummv.fuse.data → ...olybench/linear-algebra-gesummv.fuse.data
diff --git a/...lybench/linear-algebra-gramschmidt.expect → ...lybench/linear-algebra-gramschmidt.expect b/...lybench/linear-algebra-gramschmidt.expect → ...lybench/linear-algebra-gramschmidt.expect
diff --git a/...polybench/linear-algebra-gramschmidt.fuse → ...polybench/linear-algebra-gramschmidt.fuse b/...polybench/linear-algebra-gramschmidt.fuse → ...polybench/linear-algebra-gramschmidt.fuse
diff --git a/...ench/linear-algebra-gramschmidt.fuse.data → ...ench/linear-algebra-gramschmidt.fuse.data b/...ench/linear-algebra-gramschmidt.fuse.data → ...ench/linear-algebra-gramschmidt.fuse.data
diff --git a/...hmarks/polybench/linear-algebra-lu.expect → ...hmarks/polybench/linear-algebra-lu.expect b/...hmarks/polybench/linear-algebra-lu.expect → ...hmarks/polybench/linear-algebra-lu.expect
diff --git a/...nchmarks/polybench/linear-algebra-lu.fuse → ...nchmarks/polybench/linear-algebra-lu.fuse b/...nchmarks/polybench/linear-algebra-lu.fuse → ...nchmarks/polybench/linear-algebra-lu.fuse
diff --git a/...rks/polybench/linear-algebra-lu.fuse.data → ...rks/polybench/linear-algebra-lu.fuse.data b/...rks/polybench/linear-algebra-lu.fuse.data → ...rks/polybench/linear-algebra-lu.fuse.data
diff --git a/...ks/polybench/linear-algebra-ludcmp.expect → ...ks/polybench/linear-algebra-ludcmp.expect b/...ks/polybench/linear-algebra-ludcmp.expect → ...ks/polybench/linear-algebra-ludcmp.expect
diff --git a/...arks/polybench/linear-algebra-ludcmp.fuse → ...arks/polybench/linear-algebra-ludcmp.fuse b/...arks/polybench/linear-algebra-ludcmp.fuse → ...arks/polybench/linear-algebra-ludcmp.fuse
diff --git a/...polybench/linear-algebra-ludcmp.fuse.data → ...polybench/linear-algebra-ludcmp.fuse.data b/...polybench/linear-algebra-ludcmp.fuse.data → ...polybench/linear-algebra-ludcmp.fuse.data
diff --git a/...marks/polybench/linear-algebra-mvt.expect → ...marks/polybench/linear-algebra-mvt.expect b/...marks/polybench/linear-algebra-mvt.expect → ...marks/polybench/linear-algebra-mvt.expect
diff --git a/...chmarks/polybench/linear-algebra-mvt.fuse → ...chmarks/polybench/linear-algebra-mvt.fuse b/...chmarks/polybench/linear-algebra-mvt.fuse → ...chmarks/polybench/linear-algebra-mvt.fuse
diff --git a/...ks/polybench/linear-algebra-mvt.fuse.data → ...ks/polybench/linear-algebra-mvt.fuse.data b/...ks/polybench/linear-algebra-mvt.fuse.data → ...ks/polybench/linear-algebra-mvt.fuse.data
diff --git a/...arks/polybench/linear-algebra-symm.expect → ...arks/polybench/linear-algebra-symm.expect b/...arks/polybench/linear-algebra-symm.expect → ...arks/polybench/linear-algebra-symm.expect
diff --git a/...hmarks/polybench/linear-algebra-symm.fuse → ...hmarks/polybench/linear-algebra-symm.fuse b/...hmarks/polybench/linear-algebra-symm.fuse → ...hmarks/polybench/linear-algebra-symm.fuse
diff --git a/...s/polybench/linear-algebra-symm.fuse.data → ...s/polybench/linear-algebra-symm.fuse.data b/...s/polybench/linear-algebra-symm.fuse.data → ...s/polybench/linear-algebra-symm.fuse.data
diff --git a/...rks/polybench/linear-algebra-syr2k.expect → ...rks/polybench/linear-algebra-syr2k.expect b/...rks/polybench/linear-algebra-syr2k.expect → ...rks/polybench/linear-algebra-syr2k.expect
diff --git a/...marks/polybench/linear-algebra-syr2k.fuse → ...marks/polybench/linear-algebra-syr2k.fuse b/...marks/polybench/linear-algebra-syr2k.fuse → ...marks/polybench/linear-algebra-syr2k.fuse
diff --git a/.../polybench/linear-algebra-syr2k.fuse.data → .../polybench/linear-algebra-syr2k.fuse.data b/.../polybench/linear-algebra-syr2k.fuse.data → .../polybench/linear-algebra-syr2k.fuse.data
diff --git a/...arks/polybench/linear-algebra-syrk.expect → ...arks/polybench/linear-algebra-syrk.expect b/...arks/polybench/linear-algebra-syrk.expect → ...arks/polybench/linear-algebra-syrk.expect
diff --git a/...hmarks/polybench/linear-algebra-syrk.fuse → ...hmarks/polybench/linear-algebra-syrk.fuse b/...hmarks/polybench/linear-algebra-syrk.fuse → ...hmarks/polybench/linear-algebra-syrk.fuse
diff --git a/...s/polybench/linear-algebra-syrk.fuse.data → ...s/polybench/linear-algebra-syrk.fuse.data b/...s/polybench/linear-algebra-syrk.fuse.data → ...s/polybench/linear-algebra-syrk.fuse.data
diff --git a/...s/polybench/linear-algebra-trisolv.expect → ...s/polybench/linear-algebra-trisolv.expect b/...s/polybench/linear-algebra-trisolv.expect → ...s/polybench/linear-algebra-trisolv.expect
diff --git a/...rks/polybench/linear-algebra-trisolv.fuse → ...rks/polybench/linear-algebra-trisolv.fuse b/...rks/polybench/linear-algebra-trisolv.fuse → ...rks/polybench/linear-algebra-trisolv.fuse
diff --git a/...olybench/linear-algebra-trisolv.fuse.data → ...olybench/linear-algebra-trisolv.fuse.data b/...olybench/linear-algebra-trisolv.fuse.data → ...olybench/linear-algebra-trisolv.fuse.data
diff --git a/...arks/polybench/linear-algebra-trmm.expect → ...arks/polybench/linear-algebra-trmm.expect b/...arks/polybench/linear-algebra-trmm.expect → ...arks/polybench/linear-algebra-trmm.expect
diff --git a/...hmarks/polybench/linear-algebra-trmm.fuse → ...hmarks/polybench/linear-algebra-trmm.fuse b/...hmarks/polybench/linear-algebra-trmm.fuse → ...hmarks/polybench/linear-algebra-trmm.fuse
diff --git a/...s/polybench/linear-algebra-trmm.fuse.data → ...s/polybench/linear-algebra-trmm.fuse.data b/...s/polybench/linear-algebra-trmm.fuse.data → ...s/polybench/linear-algebra-trmm.fuse.data
diff --git a/interp/tests/benchmarks/tcam-32.expect → cider/tests/benchmarks/tcam-32.expect b/interp/tests/benchmarks/tcam-32.expect → cider/tests/benchmarks/tcam-32.expect
diff --git a/interp/tests/benchmarks/tcam-32.futil → cider/tests/benchmarks/tcam-32.futil b/interp/tests/benchmarks/tcam-32.futil → cider/tests/benchmarks/tcam-32.futil
diff --git a/interp/tests/benchmarks/tcam-32.futil.data → cider/tests/benchmarks/tcam-32.futil.data b/interp/tests/benchmarks/tcam-32.futil.data → cider/tests/benchmarks/tcam-32.futil.data
diff --git a/interp/tests/benchmarks/tcam-64.expect → cider/tests/benchmarks/tcam-64.expect b/interp/tests/benchmarks/tcam-64.expect → cider/tests/benchmarks/tcam-64.expect
diff --git a/interp/tests/benchmarks/tcam-64.futil → cider/tests/benchmarks/tcam-64.futil b/interp/tests/benchmarks/tcam-64.futil → cider/tests/benchmarks/tcam-64.futil
diff --git a/interp/tests/benchmarks/tcam-64.futil.data → cider/tests/benchmarks/tcam-64.futil.data b/interp/tests/benchmarks/tcam-64.futil.data → cider/tests/benchmarks/tcam-64.futil.data
diff --git a/interp/tests/complex/unsigned-div.expect → cider/tests/complex/unsigned-div.expect b/interp/tests/complex/unsigned-div.expect → cider/tests/complex/unsigned-div.expect
diff --git a/interp/tests/complex/unsigned-div.futil → cider/tests/complex/unsigned-div.futil b/interp/tests/complex/unsigned-div.futil → cider/tests/complex/unsigned-div.futil
diff --git a/...tests/complex/unsigned-dot-product.expect → ...tests/complex/unsigned-dot-product.expect b/...tests/complex/unsigned-dot-product.expect → ...tests/complex/unsigned-dot-product.expect
diff --git a/.../tests/complex/unsigned-dot-product.futil → .../tests/complex/unsigned-dot-product.futil b/.../tests/complex/unsigned-dot-product.futil → .../tests/complex/unsigned-dot-product.futil
diff --git a/...s/complex/unsigned-dot-product.futil.data → ...s/complex/unsigned-dot-product.futil.data b/...s/complex/unsigned-dot-product.futil.data → ...s/complex/unsigned-dot-product.futil.data
diff --git a/interp/tests/control/if.expect → cider/tests/control/if.expect b/interp/tests/control/if.expect → cider/tests/control/if.expect
diff --git a/interp/tests/control/if.futil → cider/tests/control/if.futil b/interp/tests/control/if.futil → cider/tests/control/if.futil
diff --git a/interp/tests/control/if.futil.data → cider/tests/control/if.futil.data b/interp/tests/control/if.futil.data → cider/tests/control/if.futil.data
diff --git a/interp/tests/control/if_reg.expect → cider/tests/control/if_reg.expect b/interp/tests/control/if_reg.expect → cider/tests/control/if_reg.expect
diff --git a/interp/tests/control/if_reg.futil → cider/tests/control/if_reg.futil b/interp/tests/control/if_reg.futil → cider/tests/control/if_reg.futil
diff --git a/interp/tests/control/invoke/invoke.expect → cider/tests/control/invoke/invoke.expect b/interp/tests/control/invoke/invoke.expect → cider/tests/control/invoke/invoke.expect
diff --git a/interp/tests/control/invoke/invoke.futil → cider/tests/control/invoke/invoke.futil b/interp/tests/control/invoke/invoke.futil → cider/tests/control/invoke/invoke.futil
diff --git a/...rp/tests/control/invoke/invoke.futil.data → cider/tests/control/invoke/invoke.futil.data b/...rp/tests/control/invoke/invoke.futil.data → cider/tests/control/invoke/invoke.futil.data
diff --git a/interp/tests/control/invoke/k3.expect → cider/tests/control/invoke/k3.expect b/interp/tests/control/invoke/k3.expect → cider/tests/control/invoke/k3.expect
diff --git a/interp/tests/control/invoke/k3.futil → cider/tests/control/invoke/k3.futil b/interp/tests/control/invoke/k3.futil → cider/tests/control/invoke/k3.futil
diff --git a/interp/tests/control/invoke/k3.futil.data → cider/tests/control/invoke/k3.futil.data b/interp/tests/control/invoke/k3.futil.data → cider/tests/control/invoke/k3.futil.data
diff --git a/interp/tests/control/iter_mult.expect → cider/tests/control/iter_mult.expect b/interp/tests/control/iter_mult.expect → cider/tests/control/iter_mult.expect
diff --git a/interp/tests/control/iter_mult.futil → cider/tests/control/iter_mult.futil b/interp/tests/control/iter_mult.futil → cider/tests/control/iter_mult.futil
diff --git a/interp/tests/control/par_mem.expect → cider/tests/control/par_mem.expect b/interp/tests/control/par_mem.expect → cider/tests/control/par_mem.expect
diff --git a/interp/tests/control/par_mem.futil → cider/tests/control/par_mem.futil b/interp/tests/control/par_mem.futil → cider/tests/control/par_mem.futil
diff --git a/interp/tests/control/par_reg.expect → cider/tests/control/par_reg.expect b/interp/tests/control/par_reg.expect → cider/tests/control/par_reg.expect
diff --git a/interp/tests/control/par_reg.futil → cider/tests/control/par_reg.futil b/interp/tests/control/par_reg.futil → cider/tests/control/par_reg.futil
diff --git a/interp/tests/control/reg_seq.expect → cider/tests/control/reg_seq.expect b/interp/tests/control/reg_seq.expect → cider/tests/control/reg_seq.expect
diff --git a/interp/tests/control/reg_seq.futil → cider/tests/control/reg_seq.futil b/interp/tests/control/reg_seq.futil → cider/tests/control/reg_seq.futil
diff --git a/.../tests/control/static/while_static.expect → .../tests/control/static/while_static.expect b/.../tests/control/static/while_static.expect → .../tests/control/static/while_static.expect
diff --git a/...p/tests/control/static/while_static.futil → ...r/tests/control/static/while_static.futil b/...p/tests/control/static/while_static.futil → ...r/tests/control/static/while_static.futil
diff --git a/interp/tests/control/while.expect → cider/tests/control/while.expect b/interp/tests/control/while.expect → cider/tests/control/while.expect
diff --git a/interp/tests/control/while.futil → cider/tests/control/while.futil b/interp/tests/control/while.futil → cider/tests/control/while.futil
diff --git a/interp/tests/data-race/conflict.expect → cider/tests/data-race/conflict.expect b/interp/tests/data-race/conflict.expect → cider/tests/data-race/conflict.expect
diff --git a/interp/tests/data-race/conflict.futil → cider/tests/data-race/conflict.futil b/interp/tests/data-race/conflict.futil → cider/tests/data-race/conflict.futil
diff --git a/...rp/tests/data-race/continuous-race.expect → cider/tests/data-race/continuous-race.expect b/...rp/tests/data-race/continuous-race.expect → cider/tests/data-race/continuous-race.expect
diff --git a/interp/tests/data-race/continuous-race.futil → cider/tests/data-race/continuous-race.futil b/interp/tests/data-race/continuous-race.futil → cider/tests/data-race/continuous-race.futil
diff --git a/interp/tests/data-race/guard-conflict.expect → cider/tests/data-race/guard-conflict.expect b/interp/tests/data-race/guard-conflict.expect → cider/tests/data-race/guard-conflict.expect
diff --git a/interp/tests/data-race/guard-conflict.futil → cider/tests/data-race/guard-conflict.futil b/interp/tests/data-race/guard-conflict.futil → cider/tests/data-race/guard-conflict.futil
diff --git a/.../tests/data-race/par-conflict-cmem.expect → .../tests/data-race/par-conflict-cmem.expect b/.../tests/data-race/par-conflict-cmem.expect → .../tests/data-race/par-conflict-cmem.expect
diff --git a/...p/tests/data-race/par-conflict-cmem.futil → ...r/tests/data-race/par-conflict-cmem.futil b/...p/tests/data-race/par-conflict-cmem.futil → ...r/tests/data-race/par-conflict-cmem.futil
diff --git a/interp/tests/data-race/par-conflict.expect → cider/tests/data-race/par-conflict.expect b/interp/tests/data-race/par-conflict.expect → cider/tests/data-race/par-conflict.expect
diff --git a/interp/tests/data-race/par-conflict.futil → cider/tests/data-race/par-conflict.futil b/interp/tests/data-race/par-conflict.futil → cider/tests/data-race/par-conflict.futil
diff --git a/interp/tests/data-race/strange_mult.expect → cider/tests/data-race/strange_mult.expect b/interp/tests/data-race/strange_mult.expect → cider/tests/data-race/strange_mult.expect
diff --git a/interp/tests/data-race/strange_mult.futil → cider/tests/data-race/strange_mult.futil b/interp/tests/data-race/strange_mult.futil → cider/tests/data-race/strange_mult.futil
diff --git a/...tests/errors/multiple_drivers_comb.expect → ...tests/errors/multiple_drivers_comb.expect b/...tests/errors/multiple_drivers_comb.expect → ...tests/errors/multiple_drivers_comb.expect
diff --git a/.../tests/errors/multiple_drivers_comb.futil → .../tests/errors/multiple_drivers_comb.futil b/.../tests/errors/multiple_drivers_comb.futil → .../tests/errors/multiple_drivers_comb.futil
diff --git a/.../tests/errors/multiple_drivers_reg.expect → .../tests/errors/multiple_drivers_reg.expect b/.../tests/errors/multiple_drivers_reg.expect → .../tests/errors/multiple_drivers_reg.expect
diff --git a/...p/tests/errors/multiple_drivers_reg.futil → ...r/tests/errors/multiple_drivers_reg.futil b/...p/tests/errors/multiple_drivers_reg.futil → ...r/tests/errors/multiple_drivers_reg.futil
diff --git a/interp/tests/lowered/if.expect → cider/tests/lowered/if.expect b/interp/tests/lowered/if.expect → cider/tests/lowered/if.expect
diff --git a/interp/tests/lowered/if_reg.expect → cider/tests/lowered/if_reg.expect b/interp/tests/lowered/if_reg.expect → cider/tests/lowered/if_reg.expect
diff --git a/interp/tests/lowered/par_mem.expect → cider/tests/lowered/par_mem.expect b/interp/tests/lowered/par_mem.expect → cider/tests/lowered/par_mem.expect
diff --git a/interp/tests/lowered/par_reg.expect → cider/tests/lowered/par_reg.expect b/interp/tests/lowered/par_reg.expect → cider/tests/lowered/par_reg.expect
diff --git a/interp/tests/lowered/reg_seq.expect → cider/tests/lowered/reg_seq.expect b/interp/tests/lowered/reg_seq.expect → cider/tests/lowered/reg_seq.expect
diff --git a/interp/tests/multi-comp/my_add.expect → cider/tests/multi-comp/my_add.expect b/interp/tests/multi-comp/my_add.expect → cider/tests/multi-comp/my_add.expect
diff --git a/interp/tests/multi-comp/my_add.futil → cider/tests/multi-comp/my_add.futil b/interp/tests/multi-comp/my_add.futil → cider/tests/multi-comp/my_add.futil
diff --git a/interp/tests/multi-comp/my_add_invoke.expect → cider/tests/multi-comp/my_add_invoke.expect b/interp/tests/multi-comp/my_add_invoke.expect → cider/tests/multi-comp/my_add_invoke.expect
diff --git a/interp/tests/multi-comp/my_add_invoke.futil → cider/tests/multi-comp/my_add_invoke.futil b/interp/tests/multi-comp/my_add_invoke.futil → cider/tests/multi-comp/my_add_invoke.futil
diff --git a/...tests/multi-comp/my_add_invoke_ref.expect → ...tests/multi-comp/my_add_invoke_ref.expect b/...tests/multi-comp/my_add_invoke_ref.expect → ...tests/multi-comp/my_add_invoke_ref.expect
diff --git a/.../tests/multi-comp/my_add_invoke_ref.futil → .../tests/multi-comp/my_add_invoke_ref.futil b/.../tests/multi-comp/my_add_invoke_ref.futil → .../tests/multi-comp/my_add_invoke_ref.futil
diff --git a/...tests/ntt-results/ntt-16-reduced-4.expect → ...tests/ntt-results/ntt-16-reduced-4.expect b/...tests/ntt-results/ntt-16-reduced-4.expect → ...tests/ntt-results/ntt-16-reduced-4.expect
diff --git a/interp/tests/ntt-results/ntt-16.expect → cider/tests/ntt-results/ntt-16.expect b/interp/tests/ntt-results/ntt-16.expect → cider/tests/ntt-results/ntt-16.expect
diff --git a/interp/tests/ntt-results/ntt-8.expect → cider/tests/ntt-results/ntt-8.expect b/interp/tests/ntt-results/ntt-8.expect → cider/tests/ntt-results/ntt-8.expect
diff --git a/interp/tests/par-to-seq/par_mem.expect → cider/tests/par-to-seq/par_mem.expect b/interp/tests/par-to-seq/par_mem.expect → cider/tests/par-to-seq/par_mem.expect
diff --git a/interp/tests/par-to-seq/par_reg.expect → cider/tests/par-to-seq/par_reg.expect b/interp/tests/par-to-seq/par_reg.expect → cider/tests/par-to-seq/par_reg.expect
diff --git a/interp/tests/primitives/add-overflow.expect → cider/tests/primitives/add-overflow.expect b/interp/tests/primitives/add-overflow.expect → cider/tests/primitives/add-overflow.expect
diff --git a/interp/tests/primitives/add-overflow.futil → cider/tests/primitives/add-overflow.futil b/interp/tests/primitives/add-overflow.futil → cider/tests/primitives/add-overflow.futil
diff --git a/interp/tests/primitives/binary.expect → cider/tests/primitives/binary.expect b/interp/tests/primitives/binary.expect → cider/tests/primitives/binary.expect
diff --git a/interp/tests/primitives/binary.futil → cider/tests/primitives/binary.futil b/interp/tests/primitives/binary.futil → cider/tests/primitives/binary.futil
diff --git a/interp/tests/primitives/flickering_go.expect → cider/tests/primitives/flickering_go.expect b/interp/tests/primitives/flickering_go.expect → cider/tests/primitives/flickering_go.expect
diff --git a/interp/tests/primitives/flickering_go.futil → cider/tests/primitives/flickering_go.futil b/interp/tests/primitives/flickering_go.futil → cider/tests/primitives/flickering_go.futil
diff --git a/interp/tests/primitives/mem.expect → cider/tests/primitives/mem.expect b/interp/tests/primitives/mem.expect → cider/tests/primitives/mem.expect
diff --git a/interp/tests/primitives/mem.futil → cider/tests/primitives/mem.futil b/interp/tests/primitives/mem.futil → cider/tests/primitives/mem.futil
diff --git a/interp/tests/primitives/mem2.expect → cider/tests/primitives/mem2.expect b/interp/tests/primitives/mem2.expect → cider/tests/primitives/mem2.expect
diff --git a/interp/tests/primitives/mem2.futil → cider/tests/primitives/mem2.futil b/interp/tests/primitives/mem2.futil → cider/tests/primitives/mem2.futil
diff --git a/interp/tests/primitives/reg.expect → cider/tests/primitives/reg.expect b/interp/tests/primitives/reg.expect → cider/tests/primitives/reg.expect
diff --git a/interp/tests/primitives/reg.futil → cider/tests/primitives/reg.futil b/interp/tests/primitives/reg.futil → cider/tests/primitives/reg.futil
diff --git a/interp/tests/primitives/slice.expect → cider/tests/primitives/slice.expect b/interp/tests/primitives/slice.expect → cider/tests/primitives/slice.expect
diff --git a/interp/tests/primitives/slice.futil → cider/tests/primitives/slice.futil b/interp/tests/primitives/slice.futil → cider/tests/primitives/slice.futil
diff --git a/interp/tests/primitives/sqrt.expect → cider/tests/primitives/sqrt.expect b/interp/tests/primitives/sqrt.expect → cider/tests/primitives/sqrt.expect
diff --git a/interp/tests/primitives/sqrt.futil → cider/tests/primitives/sqrt.futil b/interp/tests/primitives/sqrt.futil → cider/tests/primitives/sqrt.futil
diff --git a/interp/tests/runt.toml → cider/tests/runt.toml b/interp/tests/runt.toml → cider/tests/runt.toml
@@ -18,7 +18,7 @@ paths = ["multi-comp/*.futil"]
 cmd = """
 fud2 --from calyx --to dat \
          --through cider \
-         -s cider.flags="--dump-registers" \
+         -s cider.flags="--dump-registers --check-data-race" \
          {}
 """
 timeout = 10
@@ -39,7 +39,7 @@ paths = ["complex/*.futil"]
 cmd = """
 fud2 --from calyx --to dat \
          --through cider \
-         -s cider.flags="--dump-registers" \
+         -s cider.flags="--dump-registers --check-data-race" \
          {}
 """
 timeout = 10
@@ -83,7 +83,7 @@ expect_dir = "control"
 name = "invoke"
 paths = ["control/invoke/*.futil"]
 cmd = """
-fud2 {} --from calyx --to dat --through cider -s sim.data={}.data -s calyx.args="--log off"
+fud2 {} --from calyx --to dat --through cider -s sim.data={}.data -s calyx.args="--log off" -s cider.flags="--check-data-race"
 """
 timeout = 10
 
@@ -93,7 +93,8 @@ paths = ["control/invoke/*.futil"]
 cmd = """
 fud2 {} --from calyx --to dat --through cider \
  -s cider.calyx-passes=" -p compile-invoke" \
- -s sim.data={}.data -s calyx.args="--log off"
+ -s sim.data={}.data -s calyx.args="--log off" \
+ -s cider.flags="--check-data-race"
 """
 
 [[tests]]
@@ -165,6 +166,7 @@ fud2 --from calyx --to dat \
          --through cider \
          -s sim.data={}.data \
          -s calyx.args="--log off" \
+         -s cider.flags="--check-data-race" \
          {}
 """
 
@@ -177,6 +179,7 @@ fud2 --from calyx --to dat \
          -s sim.data={}.data \
          -s calyx.args="--log off" \
          -s cider.calyx-passes=" -p compile-invoke" \
+         -s cider.flags="--check-data-race" \
          {}
 """
 
@@ -204,6 +207,7 @@ fud2 --from calyx --to dat \
       --through cider \
       -s calyx.args="--log off" \
       -s sim.data={}.data \
+      -s cider.flags="--check-data-race" \
       {}
 """
 
@@ -215,6 +219,7 @@ fud2 --from calyx --to dat \
          --through cider \
          -s sim.data={}.data \
          -s calyx.args="--log off" \
+         -s cider.flags="--check-data-race" \
          {}
 """
 
@@ -226,6 +231,7 @@ fud2 --from dahlia --to dat \
          --through cider \
          -s sim.data={}.data \
          -s calyx.args="--log off" \
+         -s cider.flags="--check-data-race" \
          {}
 """
 timeout = 180

diff --git a/.../unit/assign-order-does-not-matter.expect → .../unit/assign-order-does-not-matter.expect b/.../unit/assign-order-does-not-matter.expect → .../unit/assign-order-does-not-matter.expect
diff --git a/...s/unit/assign-order-does-not-matter.futil → ...s/unit/assign-order-does-not-matter.futil b/...s/unit/assign-order-does-not-matter.futil → ...s/unit/assign-order-does-not-matter.futil
diff --git a/interp/tests/unit/comb-comp-incr.expect → cider/tests/unit/comb-comp-incr.expect b/interp/tests/unit/comb-comp-incr.expect → cider/tests/unit/comb-comp-incr.expect
diff --git a/interp/tests/unit/comb-comp-incr.futil → cider/tests/unit/comb-comp-incr.futil b/interp/tests/unit/comb-comp-incr.futil → cider/tests/unit/comb-comp-incr.futil
diff --git a/interp/tests/unit/combinational-chain.expect → cider/tests/unit/combinational-chain.expect b/interp/tests/unit/combinational-chain.expect → cider/tests/unit/combinational-chain.expect
diff --git a/interp/tests/unit/combinational-chain.futil → cider/tests/unit/combinational-chain.futil b/interp/tests/unit/combinational-chain.futil → cider/tests/unit/combinational-chain.futil
diff --git a/...gister-writes-visible-inside-group.expect → ...gister-writes-visible-inside-group.expect b/...gister-writes-visible-inside-group.expect → ...gister-writes-visible-inside-group.expect
diff --git a/...egister-writes-visible-inside-group.futil → ...egister-writes-visible-inside-group.futil b/...egister-writes-visible-inside-group.futil → ...egister-writes-visible-inside-group.futil
diff --git a/...it/uninitialized-port-returns-zero.expect → ...it/uninitialized-port-returns-zero.expect b/...it/uninitialized-port-returns-zero.expect → ...it/uninitialized-port-returns-zero.expect
diff --git a/...nit/uninitialized-port-returns-zero.futil → ...nit/uninitialized-port-returns-zero.futil b/...nit/uninitialized-port-returns-zero.futil → ...nit/uninitialized-port-returns-zero.futil
diff --git a/tools/cider-data-converter/Cargo.toml b/tools/cider-data-converter/Cargo.toml
@@ -8,7 +8,7 @@ version = "0.1.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-interp = { path = "../../interp" }
+cider = { path = "../../cider" }
 serde = { workspace = true }
 serde_json = { workspace = true, features = ["arbitrary_precision"] }
 itertools = { workspace = true }

diff --git a/tools/cider-data-converter/src/converter.rs b/tools/cider-data-converter/src/converter.rs
@@ -1,5 +1,5 @@
 use super::json_data::*;
-use interp::serialization::*;
+use cider::serialization::*;
 use itertools::Itertools;
 use num_bigint::{BigInt, BigUint, ToBigInt};
 use num_rational::BigRational;
@@ -162,11 +162,11 @@ fn float_to_rational(float: f64) -> BigRational {
 
 fn unroll_float(
     val: f64,
-    format: &interp::serialization::FormatInfo,
+    format: &cider::serialization::FormatInfo,
     round_float: bool,
 ) -> Vec<u8> {
     match *format {
-        interp::serialization::FormatInfo::Fixed {
+        cider::serialization::FormatInfo::Fixed {
             signed,
             int_width,
             frac_width,
@@ -225,7 +225,7 @@ fn unroll_float(
                     .take((frac_width + int_width).div_ceil(8) as usize)
                     .collect::<Vec<_>>()
             }
-        interp::serialization::FormatInfo::IEEFloat { width, .. } => {
+        cider::serialization::FormatInfo::IEEFloat { width, .. } => {
             match width {
                 32 => Vec::from((val as f32).to_le_bytes().as_slice()),
                 64 => Vec::from(val.to_le_bytes().as_slice()),
@@ -272,13 +272,13 @@ fn format_data(declaration: &MemoryDeclaration, data: &[u8]) -> ParseVec {
     let chunk_stream =
         data.chunks_exact(width.div_ceil(8) as usize).map(|chunk| {
             match declaration.format {
-                interp::serialization::FormatInfo::Bitnum {
+                cider::serialization::FormatInfo::Bitnum {
                     signed, ..
                 } => {
                     let int = parse_bytes(chunk, width, signed);
                     Number::from_str(&int.to_str_radix(10)).unwrap()
                 }
-                interp::serialization::FormatInfo::Fixed {
+                cider::serialization::FormatInfo::Fixed {
                     signed,
                     int_width,
                     frac_width,
@@ -289,7 +289,7 @@ fn format_data(declaration: &MemoryDeclaration, data: &[u8]) -> ParseVec {
 
                     Number::from_f64(float).unwrap()
                 }
-                interp::serialization::FormatInfo::IEEFloat {
+                cider::serialization::FormatInfo::IEEFloat {
                     width,
                     ..
                 } => {
@@ -411,7 +411,7 @@ mod tests {
         let int_width = 16;
         let frac_width = 16;
 
-        let format = interp::serialization::FormatInfo::Fixed {
+        let format = cider::serialization::FormatInfo::Fixed {
             signed,
             int_width,
             frac_width,