Additional build improvements by HelloKayT · Pull Request #13 · oxidecomputer/vw

HelloKayT · 2026-03-11T21:25:57Z

Bringing in quartz and working with sophisticated external library dependencies required additional infrastructure.

Allow multiple src patterns for one library. Code from other repos can rely on files in other folders, but expects to be in the same library
Exclude patterns: we need to be able to exclude testbenches/other test code
Bring in submodules: quartz has XPM as a submodule and we need that for top-level testbenches

https://github.com/oxidecomputer/redhawk/pull/42/ relies on this version of vw

these deps are skipped when generating vivado tcl import files

- Allow multiple src patterns for one library. Code from other repos can rely on files in other folders, but expects to be in the same library - Exclude patterns: we need to be able to exclude testbenches/other test code - Bring in submodules: quartz has XPM as a submodule and we need that for top-level testbenches

- Quartz relies on XPM, so XPM needs to be built first...

rcgoodfellow

Thanks @HelloKayT. Just a few small comments here. Also noticing some things that I had Claude generate that I'm not super thrilled with haha. Created a follow up issue for leveraging vhdl_ls for dependency modeling if we can.

rcgoodfellow · 2026-03-17T18:27:09Z

vw-lib/src/lib.rs

    #[serde(default)]
    pub commit: Option<String>,
-    pub src: String,
+    #[serde(deserialize_with = "string_or_vec")]


Is maintaining this parser really necessary or should we just say that this field is always vector-valued and the string case becomes a single element vector? I realize this makes existing vw.toml files backwards compatible, but given i'm the only other user of vw at this point I think, i'm fine with updating my toml files.

Yeah I think if we're okay with "vector of patterns" as a way to control which source directories to bring into a library, a single element vector works. I'll update to just do a vector

rcgoodfellow · 2026-03-17T18:27:56Z

vw-lib/src/lib.rs

    pub repo: String,
    pub commit: String,
-    pub src: String,
+    #[serde(deserialize_with = "string_or_vec")]


Same as above, I think we can probably avoid the manual parsing here and just make this vector valued all the time.

rcgoodfellow · 2026-03-17T18:56:56Z

vw-lib/src/lib.rs

+
+    /// Get cached file dependencies, reading and parsing file if not cached.
+    pub fn get_dependencies(&mut self, path: &Path) -> Result<&Vec<VwSymbol>> {
+        if !self.dependencies.contains_key(path) {


You can avoid the get then unwrap pattern by using the Entry API here.

use std::collections::hash_map::Entry; // ... pub fn get_dependencies(&mut self, path: &Path) -> Result<&Vec<VwSymbol>> { let entry = self.dependencies.entry(path.to_path_buf()); Ok(match entry { Entry::Occupied(e) => e.into_mut(), Entry::Vacant(e) => { let content = fs::read_to_string(path).map_err(|e| { VwError::FileSystem { message: format!("Failed to read file {path:?}: {e}"), } })?; let deps = parse_file_dependencies(&content)?; e.insert(deps) } }) }

rcgoodfellow · 2026-03-17T18:58:27Z

vw-lib/src/lib.rs

+        &mut self,
+        path: &Path,
+    ) -> Result<&Vec<VwSymbol>> {
+        if !self.provided_symbols.contains_key(path) {


Same use of Entry API also applies here.

rcgoodfellow · 2026-03-17T19:00:25Z

vw-lib/src/lib.rs

+    }
+
+    // Find direct entity instantiations (instance_name: entity work.entity_name)
+    let entity_inst_pattern = r"(?i)\w+\s*:\s*entity\s+work\.(\w+)";


Not something that needs to be addressed here, but I seem to recall that we can get a dependency-tree-like-thing from vhdl_ls? I realize this is code that is mostly moved and is not new. So just going to create a tracking issue.

Use vhdl_ls to track dependencies #14

rcgoodfellow · 2026-03-17T19:06:39Z

vw-lib/src/lib.rs

+        lib_deps.insert(lib_name.clone(), deps);
+    }
+
+    // Topological sort of library names (Kahn's algorithm)


I've used the topological sort in the petgraph crate for stuff like this and it's worked out nicely.

rcgoodfellow · 2026-03-17T19:12:31Z

vw-lib/src/lib.rs

+
+    /// Get cached entities in file, reading and parsing if not cached.
+    pub fn get_entities(&mut self, path: &Path) -> Result<&Vec<String>> {
+        if !self.entities.contains_key(path) {


Same use of Entry API also applies here.

rcgoodfellow · 2026-03-17T21:33:55Z

vw-lib/src/lib.rs

+    })??;
+
+    // Find the .so file in the workspace target directory (parent of testbench dir)
+    let lib_name = format!("lib{}.so", package_name.replace('-', "_"));


The following seems to allow things to compile on macos

Suggested change

let lib_name = format!("lib{}.so", package_name.replace('-', "_"));

let ext = if cfg!(target_os = "macos") { "dylib" } else { "so" };

let lib_name = format!("lib{}.{ext}", package_name.replace('-', "_"));

HelloKayT and others added 18 commits December 12, 2025 09:52

Add recursive search, add in cosim library building

2218cef

test commit, please ignore

f47894d

Break out nvc commands further to help build resolution TB

0008b8a

Integrated VHDL->Rust struct generation

7a52def

Make sure to capture all package dependencies

6e2e1f5

Fix destination of Rust library

c71f206

Support enums

37c092f

add sim_only option to deps (#9)

76ff984

these deps are skipped when generating vivado tcl import files

Make generated code use BitSet

5805824

Formatting

6aa1db8

Allow anodize to specify the output directory

8373a0d

Paying my dues to clippy

ef4d357

Refactor for codegen repo

75522db

Sort external libraries by dependency

9737e47

- Quartz relies on XPM, so XPM needs to be built first...

Merge branch 'main' into katie/build_improvements

2dffa46

Add timeouts

dac17f5

F o r m a t t i n g

630b36f

HelloKayT requested a review from rcgoodfellow March 13, 2026 17:16

rcgoodfellow reviewed Mar 17, 2026

View reviewed changes

HelloKayT added 4 commits March 18, 2026 12:30

Use only vectors for src patterns

2449a78

Use entry to get HashMap values

25930ba

Also add package instantiations

f75d39a

Use petgraph topological sort

06476f0

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Additional build improvements #13

Additional build improvements #13
HelloKayT wants to merge 22 commits intomainfrom
katie/build_improvements

HelloKayT commented Mar 11, 2026 •

edited

Loading

Uh oh!

rcgoodfellow left a comment

Uh oh!

rcgoodfellow Mar 17, 2026

Uh oh!

HelloKayT Mar 18, 2026 •

edited

Loading

Uh oh!

rcgoodfellow Mar 17, 2026

Uh oh!

rcgoodfellow Mar 17, 2026

Uh oh!

rcgoodfellow Mar 17, 2026

Uh oh!

rcgoodfellow Mar 17, 2026

Uh oh!

rcgoodfellow Mar 17, 2026

Uh oh!

rcgoodfellow Mar 17, 2026

Uh oh!

rcgoodfellow Mar 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	let lib_name = format!("lib{}.so", package_name.replace('-', "_"));
	let ext = if cfg!(target_os = "macos") { "dylib" } else { "so" };
	let lib_name = format!("lib{}.{ext}", package_name.replace('-', "_"));

Conversation

HelloKayT commented Mar 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rcgoodfellow left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

HelloKayT Mar 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

HelloKayT commented Mar 11, 2026 •

edited

Loading

HelloKayT Mar 18, 2026 •

edited

Loading