Merge branch 'main' into profiling-par-arms

.github/workflows/rust.yml

@@ -123,7 +123,7 @@ jobs:
       working-directory: /home/calyx/interp/tests
       run: |
         # Run the remaining tests
-        runt -x '(numeric types correctness and parsing)|(tcam testing)|(../../tests/correctness/pipelined-mac.futil)|(../../tests/correctness/std-bit-slice.futil)|(polybench)' -d -o fail
+        runt -x '(numeric types correctness and parsing)|(tcam testing)|(../../tests/correctness/pipelined-mac.futil)' -d -o fail
 
     - name: Source code tests
       uses: actions-rs/cargo@v1

Cargo.toml

@@ -129,3 +129,10 @@ calyx-frontend = { path = "calyx-frontend" }
 [[bench]]
 name = "component-sharing"
 harness = false
+
+
+[profile.test.package.proptest]
+opt-level = 3
+
+[profile.test.package.rand_chacha]
+opt-level = 3

Dockerfile

@@ -16,7 +16,8 @@ RUN python3 -m venv /opt/venv
 ENV PATH="/opt/venv/bin:$PATH"
 
 # Install python dependencies cocotb==1.6.2 seems to be for Xilinx cocotb tests
-RUN python3 -m pip install numpy flit prettytable wheel hypothesis pytest simplejson cocotb==1.6.2
+# Need to pin the numpy version since there are TVM issues with versions 2 and above
+RUN python3 -m pip install numpy==1.26.4 flit prettytable wheel hypothesis pytest simplejson cocotb==1.6.2
 # Current cocotb-bus has a bug that is fixed in more up to date repo
 RUN python3 -m pip install git+https://github.com/cocotb/cocotb-bus.git cocotbext-axi
 
@@ -80,7 +81,8 @@ ENV PYTHONPATH=/root/.local/lib/python3.9/site-packages:$PYTHONPATH
 WORKDIR /home/calyx
 run mkdir -p ~/.local/bin
 RUN ln -s /home/calyx/target/debug/fud2 ~/.local/bin/
-RUN printf "[calyx]\nbase = \"/home/calyx\"" >> ~/.config/fud2.toml
+RUN printf "dahlia = \"/home/dahlia/fuse\"\n" >> ~/.config/fud2.toml
+RUN printf "[calyx]\nbase = \"/home/calyx\"\n" >> ~/.config/fud2.toml
 
 # Install calyx-py
 WORKDIR /home/calyx/calyx-py

calyx-frontend/src/attribute.rs

@@ -69,7 +69,11 @@ pub enum BoolAttr {
     #[strum(serialize = "promoted")]
     /// denotes a static component or control promoted from dynamic
     Promoted,
+    #[strum(serialize = "fast")]
+    /// https://github.com/calyxir/calyx/issues/1828
+    Fast,
 }
+
 impl From<BoolAttr> for Attribute {
     fn from(attr: BoolAttr) -> Self {
         Attribute::Bool(attr)

calyx-opt/src/passes/metadata_table_gen.rs

@@ -8,7 +8,7 @@ use std::path::PathBuf;
 /// Metadata stores a Map between each group name and data used in the metadata table (specified in PR #2022)
 #[derive(Default)]
 pub struct Metadata {
-    groups: LinkedHashMap<Id, (usize, PathBuf)>,
+    groups: LinkedHashMap<(Id, Id), ((usize, usize), PathBuf)>,
 }
 
 impl Metadata {
@@ -18,8 +18,14 @@ impl Metadata {
     }
 
     /// Add a new entry to the metadata table
-    fn add_entry(&mut self, name: Id, line: usize, path: PathBuf) {
-        let ins = self.groups.insert(name, (line, path));
+    fn add_entry(
+        &mut self,
+        comp_name: Id,
+        name: Id,
+        span: (usize, usize),
+        path: PathBuf,
+    ) {
+        let ins = self.groups.insert((comp_name, name), (span, path));
         if let Some(_v) = ins {
             panic!("Two of same group name found")
         }
@@ -30,9 +36,10 @@ impl fmt::Display for Metadata {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let grps = &self.groups;
 
-        for (name, (line_num, file)) in grps {
+        for ((comp, name), ((start, end), file)) in grps {
             let file = file.to_str().unwrap();
-            writeln!(f, "    {name}: {file} {line_num}")?;
+
+            writeln!(f, "{comp}.{name}: {file} {start}-{end}")?;
         }
 
         Ok(())
@@ -58,8 +65,13 @@ impl Visitor for Metadata {
                 for rcc_grp in cmpt_iter {
                     let grp = rcc_grp.borrow_mut();
                     let pos_data = grp.attributes.copy_span();
-                    let (file, line_num) = pos_data.get_line_num();
-                    table.add_entry(grp.name(), line_num, PathBuf::from(file));
+                    let (file, span) = pos_data.get_line_num();
+                    table.add_entry(
+                        component.name,
+                        grp.name(),
+                        span,
+                        PathBuf::from(file),
+                    ); //hm may need to actually use the full name of the group
                 }
 
                 ctx.metadata = Some(table.to_string());
@@ -83,9 +95,14 @@ mod tests {
         assert_eq!(empt_string, "");
 
         let path = PathBuf::from("/temp/path/for/testing.futil");
-        data.add_entry(Id::from("group_1"), 12, path.clone());
-        data.add_entry(Id::from("group_2"), 23, path);
+        data.add_entry(
+            Id::from("main"),
+            Id::from("group_1"),
+            (12, 16),
+            path.clone(),
+        );
+        data.add_entry(Id::from("main"), Id::from("group_2"), (23, 28), path);
         let test_string = data.to_string();
-        assert_eq!(test_string, "    group_1: /temp/path/for/testing.futil 12\n    group_2: /temp/path/for/testing.futil 23\n")
+        assert_eq!(test_string, "main.group_1: /temp/path/for/testing.futil 12-16\nmain.group_2: /temp/path/for/testing.futil 23-28\n")
     }
 }