Merge branch 'main' into scheduling

Author: UnsignedByte

.github/workflows/format.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Install stable
       uses: actions-rs/toolchain@v1
       with:
-          toolchain: 1.72.0
+          toolchain: 1.85.0
           override: true
           components: rustfmt, clippy
     - name: Check formatting

.github/workflows/test.yml

@@ -67,9 +67,6 @@ jobs:
     needs: [hash, build]
     if: always() && !failure() && !cancelled()
     container: ghcr.io/cucapra/filament:${{ needs.hash.outputs.hash }}
-    defaults:
-      run:
-        working-directory: /home/filament
     steps:
       - name: Copy fud configuration
         run: |
@@ -80,10 +77,14 @@ jobs:
         with:
           repository: cucapra/filament
           ref: ${{ github.sha }}
+      - name: Reconfigure fud
+        run: |
+          fud register -p $GITHUB_WORKSPACE/fud/filament.py filament
+          fud config stages.filament.exec $GITHUB_WORKSPACE/target/debug/filament
+          fud config stages.filament.library $GITHUB_WORKSPACE
       - name: Build Filament
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
+        run: |
+          cargo build --all
       - name: Check versions
         run: |
           rustc --version

Cargo.toml

@@ -11,9 +11,9 @@ readme = "README.md"
 description = "A language for Fearless Hardware Design"
 categories = ["compilers"]
 homepage = "https://filamenthdl.com"
-edition = "2021"
+edition = "2024"
 version = "0.1.0"
-rust-version = "1.67"
+rust-version = "1.85"
 
 [workspace.dependencies]
 toml = "0.8"
@@ -37,6 +37,7 @@ tempfile = "3.13.0"
 strum = "0.26.3"
 strum_macros = "0.26.3"
 ordered-float = "5.0.0"
+boxcar = "0.2.10"
 
 fil-utils = { version = "0.1.0", path = "crates/utils" }
 fil-ast = { version = "0.1.0", path = "crates/ast" }
@@ -59,10 +60,6 @@ default-features = false
 version = "0.11"
 features = ["ascii-only"]
 
-[workspace.dependencies.string-interner]
-version = "0.14"
-features = ["backends", "std", "inline-more"]
-
 [workspace.dependencies.bitvec]
 version = "1.0.1"
 features = ["alloc"]

Dockerfile

@@ -66,9 +66,9 @@ RUN wget https://github.com/chipsalliance/verible/releases/download/v0.0-3428-gc
   rm verible.tar.gz
 ENV PATH=$PATH:/home/verible/bin
 
-# Set rust to 1.76 and runt to 0.4.1
-RUN rustup toolchain install 1.76.0 &&\
-    rustup default 1.76.0 &&\
+# Set rust to 1.82 and runt to 0.4.1
+RUN rustup toolchain install 1.85.0 &&\
+    rustup default 1.85.0 &&\
     cargo install runt --version 0.4.1
 
 # ----------------------------------------
@@ -80,7 +80,6 @@ ADD . filament
 WORKDIR /home/filament
 # Make rust use sparse registries (https://doc.rust-lang.org/nightly/cargo/reference/registries.html#registry-protocols)
 ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
-RUN cargo build --all
 # Set up fud
 RUN python3 -m pip install cocotb find_libpython pytest && \
   fud register -p fud/filament.py filament && \

apps/blas/rot/test.fil apps/blas/rot/test.fil.skipapps/blas/rot/test.fil renamed to apps/blas/rot/test.fil.skip

@@ -1,7 +1,7 @@
 use super::{Command, Id, Signature};
-use fil_gen as gen;
+use fgen::GenConfig;
+use fil_gen as fgen;
 use fil_utils::{self as utils, AttrCtx};
-use gen::GenConfig;
 use std::path::PathBuf;
 
 #[derive(Default)]
@@ -10,15 +10,19 @@ pub struct Extern {
     pub path: String,
     pub comps: Vec<Signature>,
     /// name of the tool that generates this module
-    pub gen: Option<String>,
+    pub gen_tool: Option<String>,
 }
 impl Extern {
     pub fn new(
         path: String,
         comps: Vec<Signature>,
-        gen: Option<String>,
+        gen_tool: Option<String>,
     ) -> Self {
-        Self { path, comps, gen }
+        Self {
+            path,
+            comps,
+            gen_tool,
+        }
     }
 
     pub fn map_path<F>(mut self, func: F) -> Self
@@ -60,7 +64,9 @@ pub struct Namespace {
 impl Namespace {
     /// Returns true if the namespace declares at least one generative module
     pub fn requires_gen(&self) -> bool {
-        self.externs.iter().any(|Extern { gen, .. }| gen.is_some())
+        self.externs
+            .iter()
+            .any(|Extern { gen_tool, .. }| gen_tool.is_some())
     }
 
     /// Initialize the generator executor using the given generate definitions.
@@ -71,14 +77,19 @@ impl Namespace {
         &self,
         out_dir: Option<PathBuf>,
         config: GenConfig,
-    ) -> gen::GenExec {
-        let mut gen_exec = gen::GenExec::new(false, out_dir, config);
-        for Extern { path, gen, .. } in &self.externs {
-            let Some(tool_name) = gen else {
+    ) -> fgen::GenExec {
+        let mut gen_exec = fgen::GenExec::new(false, out_dir, config);
+        for Extern { path, gen_tool, .. } in &self.externs {
+            let Some(tool_name) = gen_tool else {
                 continue;
             };
             let tool = gen_exec.register_tool_from_file(path.into());
-            assert!(&tool.name == tool_name, "Generate definition for tool `{}` does not match the tool name `{}`", tool_name, tool.name);
+            assert!(
+                &tool.name == tool_name,
+                "Generate definition for tool `{}` does not match the tool name `{}`",
+                tool_name,
+                tool.name
+            );
         }
         gen_exec
     }

crates/ast/src/component.rs

@@ -9,7 +9,7 @@ use fil_utils::{
 };
 use itertools::Itertools;
 use pest::pratt_parser::{Assoc, Op, PrattParser};
-use pest_consume::{match_nodes, Error, Parser};
+use pest_consume::{Error, Parser, match_nodes};
 use std::fs;
 use std::hash::Hash;
 use std::path::Path;
@@ -42,8 +42,8 @@ lazy_static::lazy_static! {
 }
 
 pub enum BodyEl {
-    Ext(ast::Extern),
-    Comp(ast::Component),
+    Ext(Box<ast::Extern>),
+    Comp(Box<ast::Component>),
 }
 
 #[derive(Clone)]
@@ -73,10 +73,10 @@ impl FilamentParser {
         })?;
         // Add a new file to the position table
         let string_content = std::str::from_utf8(content)?.to_string();
-        let file = GlobalPositionTable::as_mut()
+        let file = GlobalPositionTable::get()
             .add_file(path.to_string_lossy().to_string(), string_content);
         let user_data = UserData { file };
-        let (_, content) = GlobalPositionTable::as_ref().get_file_data(file);
+        let (_, content) = GlobalPositionTable::get().get_file_data(file);
         // Parse the file
         let inputs =
             FilamentParser::parse_with_userdata(Rule::file, content, user_data)
@@ -111,11 +111,8 @@ impl FilamentParser {
     fn get_span(node: &Node) -> GPosIdx {
         let ud = node.user_data();
         let sp = node.as_span();
-        let pos = GlobalPositionTable::as_mut().add_pos(
-            ud.file,
-            sp.start(),
-            sp.end(),
-        );
+        let pos =
+            GlobalPositionTable::get().add_pos(ud.file, sp.start(), sp.end());
         GPosIdx(pos)
     }
 
@@ -901,9 +898,9 @@ impl FilamentParser {
     fn comp_or_ext(input: Node) -> ParseResult<BodyEl> {
         Ok(match_nodes!(
             input.into_children();
-            [external(sig)] => BodyEl::Ext(sig),
-            [generate(sig)] => BodyEl::Ext(sig),
-            [component(comp)] => BodyEl::Comp(comp),
+            [external(sig)] => BodyEl::Ext(Box::new(sig)),
+            [generate(sig)] => BodyEl::Ext(Box::new(sig)),
+            [component(comp)] => BodyEl::Comp(Box::new(comp)),
         ))
     }
 
@@ -925,8 +922,8 @@ impl FilamentParser {
 
                 for m in mixed {
                     match m {
-                        BodyEl::Ext(sig) => namespace.externs.push(sig),
-                        BodyEl::Comp(comp) => namespace.components.push(comp),
+                        BodyEl::Ext(sig) => namespace.externs.push(*sig),
+                        BodyEl::Comp(comp) => namespace.components.push(*comp),
                     }
                 }
                 namespace

crates/ast/src/parser.rs

@@ -34,7 +34,6 @@ struct-variant.workspace = true
 env_logger.workspace = true
 codespan-reporting.workspace = true
 bitvec.workspace = true
-string-interner.workspace = true
 fil-ast.workspace = true
 fil-ir.workspace = true
 fil-utils.workspace = true

crates/filament/Cargo.toml

@@ -19,9 +19,9 @@ impl FromStr for Solver {
             "cvc5" => Ok(Solver::CVC5),
             "boolector" => Ok(Solver::Boolector),
             "bitwuzla" => Ok(Solver::Bitwuzla),
-            _ => {
-                Err(format!("unknown solver: {s}. Known solvers are: z3, cvc5, boolector, bitwuzla"))
-            }
+            _ => Err(format!(
+                "unknown solver: {s}. Known solvers are: z3, cvc5, boolector, bitwuzla"
+            )),
         }
     }
 }

crates/filament/src/cmdline.rs

@@ -78,15 +78,17 @@ impl Assume {
                         assert!(
                             args.len() == 1,
                             "Currently Unimplemented: {} requires {} arguments, automatic assumptions only implemented for single argument functions.",
-                            op, args.len()
+                            op,
+                            args.len()
                         );
                         Some((*op, *rhs, args[0]))
                     }
                     (_, ir::Expr::Fn { op, args }) => {
                         assert!(
                             args.len() == 1,
                             "Currently Unimplemented: {} requires {} arguments, automatic assumptions only implemented for single argument functions.",
-                            op, args.len()
+                            op,
+                            args.len()
                         );
                         Some((*op, *lhs, args[0]))
                     }