Merge branch 'main' into fud2-remove-duplicate-ops

.github/workflows/rust.yml

@@ -161,14 +161,21 @@ jobs:
         git checkout -f $GITHUB_SHA
         git clean -fd
 
-    - name: Install calyx-py & MrXL
+    - name: Install calyx-py, MrXL, and queues
       working-directory: /home/calyx
       run: |
         cd calyx-py
         FLIT_ROOT_INSTALL=1 flit install --symlink
         cd -
         cd frontends/mrxl
         FLIT_ROOT_INSTALL=1 flit install --symlink
+        cd -
+        cd frontends/queues
+        FLIT_ROOT_INSTALL=1 flit install --symlink
+
+    - name: Generate queue .data and .expect files
+      working-directory: /home/calyx
+      run: ./frontends/queues/test_data_gen/gen_test_data.sh
 
     - name: Build
       uses: actions-rs/cargo@v1
@@ -191,7 +198,7 @@ jobs:
     - name: Runt tests
       working-directory: /home/calyx
       run: |
-        runt -x 'cocotb' -d -o fail -j 1 --max-futures 5
+        runt -x 'cocotb|profiler' -d -o fail -j 1 --max-futures 5
 
     - name: Run Python Tests
       working-directory: /home/calyx

.gitignore

@@ -55,11 +55,17 @@ results.xml
 # btor2i ignore
 tools/btor2/btor2i/build/
 
-# vcd-parsing tmp files ignore
-tools/profiler/tmp/
-tools/profiler/logs
+# profiling ignore
+tools/profiler/data
 
 temp/
 
+# large queue .data and .expect files ignore
+frontends/queues/tests/**/*.data
+frontends/queues/tests/**/*.expect
+
 # for running a venv
-.venv
+.venv
+
+# emacs
+*~

Cargo.toml

@@ -16,8 +16,9 @@ members = [
     "fud2/fud-core",
     "tools/data-conversion",
     "tools/btor2/btor2i",
-    "tools/cider-data-converter",
     "tools/calyx-pass-explorer",
+    "tools/cider-data-converter",
+    "tools/component_cells",
     "tools/yxi",
     "tools/calyx-writer",
 ]

Dockerfile

@@ -20,6 +20,8 @@ ENV PATH="/opt/venv/bin:$PATH"
 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
+# Vcdvcd for profiling
+RUN python3 -m pip install vcdvcd
 
 # Install clang
 RUN apt-get install -y clang

calyx-ir/src/structure.rs

@@ -538,6 +538,15 @@ impl<T> Assignment<T> {
         }
         self.guard.for_each(&mut |port| f(&port).map(Guard::port))
     }
+
+    /// Iterate through all ports contained within the assignment.
+    pub fn iter_ports(&self) -> impl Iterator<Item = RRC<Port>> {
+        self.guard
+            .all_ports()
+            .into_iter()
+            .chain(std::iter::once(Rc::clone(&self.dst)))
+            .chain(std::iter::once(Rc::clone(&self.src)))
+    }
 }
 
 impl From<Assignment<Nothing>> for Assignment<StaticTiming> {