Separate flag for specifying lib path in fud2 (#2325)

Add a `calyx.lib_path` argument for the `fud2` stage.

fud2/fud-core/src/script/plugin.rs

@@ -495,10 +495,16 @@ impl ScriptRunner {
         static_files: impl Iterator<Item = (&'static str, &'static [u8])>,
     ) -> &mut Self {
         for (name, data) in static_files {
-            let ast = self
-                .engine
-                .compile(String::from_utf8(data.to_vec()).unwrap())
-                .unwrap();
+            let file = String::from_utf8(data.to_vec()).unwrap();
+            let compile_res = self.engine.compile(file);
+
+            let ast = match compile_res {
+                Ok(ast) => ast,
+                Err(e) => {
+                    let msg = format!("Failed to parse `{name}': {e}",);
+                    panic!("{msg}");
+                }
+            };
             let functions =
                 self.resolver.as_mut().unwrap().register_data(name, ast);
             self.rhai_functions = self.rhai_functions.merge(&functions);

fud2/scripts/calyx.rhai

@@ -6,14 +6,16 @@ export let calyx_setup = calyx_setup;
 fn calyx_setup(e) {
    e.config_var("calyx-base", "calyx.base");
    e.config_var_or("calyx-exe", "calyx.exe", "$calyx-base/target/debug/calyx");
+   e.config_var_or("calyx-lib-path", "calyx.lib_path", "$calyx-base");
    e.config_var_or("args", "calyx.args", "");
-   e.rule("calyx", "$calyx-exe -l $calyx-base -b $backend $args $in > $out");
-   e.rule("calyx-pass", "$calyx-exe -l $calyx-base -p $pass $args $in > $out");
+
+   e.rule("calyx", "$calyx-exe -l $calyx-lib-path -b $backend $args $in > $out");
+   e.rule("calyx-pass", "$calyx-exe -l $calyx-lib-path -p $pass $args $in > $out");
 
    e.config_var_or("flags", "calyx.flags", "-p none");
    e.rule(
        "calyx-with-flags",
-       "$calyx-exe -l $calyx-base $flags $args $in > $out",
+       "$calyx-exe -l $calyx-lib-path $flags $args $in > $out",
    );
 }
 

fud2/tests/snapshots/tests__test@calyx_through_cider_to_dat.snap

@@ -8,14 +8,15 @@ rule get-rsrc
 
 calyx-base = /test/calyx
 calyx-exe = $calyx-base/target/debug/calyx
+calyx-lib-path = $calyx-base
 args = 
 rule calyx
-  command = $calyx-exe -l $calyx-base -b $backend $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -b $backend $args $in > $out
 rule calyx-pass
-  command = $calyx-exe -l $calyx-base -p $pass $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -p $pass $args $in > $out
 flags = -p none
 rule calyx-with-flags
-  command = $calyx-exe -l $calyx-base $flags $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path $flags $args $in > $out
 
 cider-exe = $calyx-base/target/debug/cider
 cider-converter = $calyx-base/target/debug/cider-data-converter

fud2/tests/snapshots/tests__test@calyx_through_firrtl_to_verilog-refmem.snap

@@ -8,14 +8,15 @@ rule get-rsrc
 
 calyx-base = /test/calyx
 calyx-exe = $calyx-base/target/debug/calyx
+calyx-lib-path = $calyx-base
 args = 
 rule calyx
-  command = $calyx-exe -l $calyx-base -b $backend $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -b $backend $args $in > $out
 rule calyx-pass
-  command = $calyx-exe -l $calyx-base -p $pass $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -p $pass $args $in > $out
 flags = -p none
 rule calyx-with-flags
-  command = $calyx-exe -l $calyx-base $flags $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path $flags $args $in > $out
 
 yxi = $calyx-base/target/debug/yxi
 rule yxi

fud2/tests/snapshots/tests__test@calyx_through_icarus_to_dat.snap

@@ -8,14 +8,15 @@ rule get-rsrc
 
 calyx-base = /test/calyx
 calyx-exe = $calyx-base/target/debug/calyx
+calyx-lib-path = $calyx-base
 args = 
 rule calyx
-  command = $calyx-exe -l $calyx-base -b $backend $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -b $backend $args $in > $out
 rule calyx-pass
-  command = $calyx-exe -l $calyx-base -p $pass $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -p $pass $args $in > $out
 flags = -p none
 rule calyx-with-flags
-  command = $calyx-exe -l $calyx-base $flags $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path $flags $args $in > $out
 
 python = python3
 build json-dat.py: get-rsrc

fud2/tests/snapshots/tests__test@calyx_through_icarus_to_vcd.snap

@@ -8,14 +8,15 @@ rule get-rsrc
 
 calyx-base = /test/calyx
 calyx-exe = $calyx-base/target/debug/calyx
+calyx-lib-path = $calyx-base
 args = 
 rule calyx
-  command = $calyx-exe -l $calyx-base -b $backend $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -b $backend $args $in > $out
 rule calyx-pass
-  command = $calyx-exe -l $calyx-base -p $pass $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -p $pass $args $in > $out
 flags = -p none
 rule calyx-with-flags
-  command = $calyx-exe -l $calyx-base $flags $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path $flags $args $in > $out
 
 python = python3
 build json-dat.py: get-rsrc

fud2/tests/snapshots/tests__test@calyx_through_verilator_to_dat.snap

@@ -8,14 +8,15 @@ rule get-rsrc
 
 calyx-base = /test/calyx
 calyx-exe = $calyx-base/target/debug/calyx
+calyx-lib-path = $calyx-base
 args = 
 rule calyx
-  command = $calyx-exe -l $calyx-base -b $backend $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -b $backend $args $in > $out
 rule calyx-pass
-  command = $calyx-exe -l $calyx-base -p $pass $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -p $pass $args $in > $out
 flags = -p none
 rule calyx-with-flags
-  command = $calyx-exe -l $calyx-base $flags $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path $flags $args $in > $out
 
 python = python3
 build json-dat.py: get-rsrc

fud2/tests/snapshots/tests__test@calyx_through_verilator_to_vcd.snap

@@ -8,14 +8,15 @@ rule get-rsrc
 
 calyx-base = /test/calyx
 calyx-exe = $calyx-base/target/debug/calyx
+calyx-lib-path = $calyx-base
 args = 
 rule calyx
-  command = $calyx-exe -l $calyx-base -b $backend $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -b $backend $args $in > $out
 rule calyx-pass
-  command = $calyx-exe -l $calyx-base -p $pass $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -p $pass $args $in > $out
 flags = -p none
 rule calyx-with-flags
-  command = $calyx-exe -l $calyx-base $flags $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path $flags $args $in > $out
 
 python = python3
 build json-dat.py: get-rsrc

fud2/tests/snapshots/tests__test@calyx_through_xrt-trace_to_vcd.snap

@@ -8,14 +8,15 @@ rule get-rsrc
 
 calyx-base = /test/calyx
 calyx-exe = $calyx-base/target/debug/calyx
+calyx-lib-path = $calyx-base
 args = 
 rule calyx
-  command = $calyx-exe -l $calyx-base -b $backend $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -b $backend $args $in > $out
 rule calyx-pass
-  command = $calyx-exe -l $calyx-base -p $pass $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -p $pass $args $in > $out
 flags = -p none
 rule calyx-with-flags
-  command = $calyx-exe -l $calyx-base $flags $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path $flags $args $in > $out
 
 vivado-dir = /test/xilinx/vivado
 vitis-dir = /test/xilinx/vitis

fud2/tests/snapshots/tests__test@calyx_through_xrt_to_dat.snap

@@ -8,14 +8,15 @@ rule get-rsrc
 
 calyx-base = /test/calyx
 calyx-exe = $calyx-base/target/debug/calyx
+calyx-lib-path = $calyx-base
 args = 
 rule calyx
-  command = $calyx-exe -l $calyx-base -b $backend $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -b $backend $args $in > $out
 rule calyx-pass
-  command = $calyx-exe -l $calyx-base -p $pass $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -p $pass $args $in > $out
 flags = -p none
 rule calyx-with-flags
-  command = $calyx-exe -l $calyx-base $flags $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path $flags $args $in > $out
 
 vivado-dir = /test/xilinx/vivado
 vitis-dir = /test/xilinx/vitis

fud2/tests/snapshots/tests__test@calyx_to_cider-debug.snap

@@ -8,14 +8,15 @@ rule get-rsrc
 
 calyx-base = /test/calyx
 calyx-exe = $calyx-base/target/debug/calyx
+calyx-lib-path = $calyx-base
 args = 
 rule calyx
-  command = $calyx-exe -l $calyx-base -b $backend $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -b $backend $args $in > $out
 rule calyx-pass
-  command = $calyx-exe -l $calyx-base -p $pass $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -p $pass $args $in > $out
 flags = -p none
 rule calyx-with-flags
-  command = $calyx-exe -l $calyx-base $flags $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path $flags $args $in > $out
 
 build tb.sv: get-rsrc
 

fud2/tests/snapshots/tests__test@calyx_to_verilog.snap

@@ -8,14 +8,15 @@ rule get-rsrc
 
 calyx-base = /test/calyx
 calyx-exe = $calyx-base/target/debug/calyx
+calyx-lib-path = $calyx-base
 args = 
 rule calyx
-  command = $calyx-exe -l $calyx-base -b $backend $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -b $backend $args $in > $out
 rule calyx-pass
-  command = $calyx-exe -l $calyx-base -p $pass $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -p $pass $args $in > $out
 flags = -p none
 rule calyx-with-flags
-  command = $calyx-exe -l $calyx-base $flags $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path $flags $args $in > $out
 
 build _to_stdout_verilog.sv: calyx _from_stdin_calyx.futil
   backend = verilog

fud2/tests/snapshots/tests__test@plan_axi-wrapped.snap

@@ -8,14 +8,15 @@ rule get-rsrc
 
 calyx-base = /test/calyx
 calyx-exe = $calyx-base/target/debug/calyx
+calyx-lib-path = $calyx-base
 args = 
 rule calyx
-  command = $calyx-exe -l $calyx-base -b $backend $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -b $backend $args $in > $out
 rule calyx-pass
-  command = $calyx-exe -l $calyx-base -p $pass $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -p $pass $args $in > $out
 flags = -p none
 rule calyx-with-flags
-  command = $calyx-exe -l $calyx-base $flags $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path $flags $args $in > $out
 
 yxi = $calyx-base/target/debug/yxi
 rule yxi

fud2/tests/snapshots/tests__test@plan_calyx-noverify.snap

@@ -8,14 +8,15 @@ rule get-rsrc
 
 calyx-base = /test/calyx
 calyx-exe = $calyx-base/target/debug/calyx
+calyx-lib-path = $calyx-base
 args = 
 rule calyx
-  command = $calyx-exe -l $calyx-base -b $backend $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -b $backend $args $in > $out
 rule calyx-pass
-  command = $calyx-exe -l $calyx-base -p $pass $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -p $pass $args $in > $out
 flags = -p none
 rule calyx-with-flags
-  command = $calyx-exe -l $calyx-base $flags $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path $flags $args $in > $out
 
 build /output.ext: calyx /input.ext
   backend = verilog

fud2/tests/snapshots/tests__test@plan_calyx-to-cider.snap

@@ -8,14 +8,15 @@ rule get-rsrc
 
 calyx-base = /test/calyx
 calyx-exe = $calyx-base/target/debug/calyx
+calyx-lib-path = $calyx-base
 args = 
 rule calyx
-  command = $calyx-exe -l $calyx-base -b $backend $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -b $backend $args $in > $out
 rule calyx-pass
-  command = $calyx-exe -l $calyx-base -p $pass $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -p $pass $args $in > $out
 flags = -p none
 rule calyx-with-flags
-  command = $calyx-exe -l $calyx-base $flags $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path $flags $args $in > $out
 
 build /output.ext: calyx-with-flags /input.ext
 

fud2/tests/snapshots/tests__test@plan_calyx-to-cocotb-axi.snap

@@ -8,14 +8,15 @@ rule get-rsrc
 
 calyx-base = /test/calyx
 calyx-exe = $calyx-base/target/debug/calyx
+calyx-lib-path = $calyx-base
 args = 
 rule calyx
-  command = $calyx-exe -l $calyx-base -b $backend $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -b $backend $args $in > $out
 rule calyx-pass
-  command = $calyx-exe -l $calyx-base -p $pass $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -p $pass $args $in > $out
 flags = -p none
 rule calyx-with-flags
-  command = $calyx-exe -l $calyx-base $flags $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path $flags $args $in > $out
 
 cocotb-makefile-dir = $calyx-base/yxi/axi-calyx/cocotb
 sim_data = /test/data.json

fud2/tests/snapshots/tests__test@plan_calyx-to-firrtl.snap

@@ -8,14 +8,15 @@ rule get-rsrc
 
 calyx-base = /test/calyx
 calyx-exe = $calyx-base/target/debug/calyx
+calyx-lib-path = $calyx-base
 args = 
 rule calyx
-  command = $calyx-exe -l $calyx-base -b $backend $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -b $backend $args $in > $out
 rule calyx-pass
-  command = $calyx-exe -l $calyx-base -p $pass $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -p $pass $args $in > $out
 flags = -p none
 rule calyx-with-flags
-  command = $calyx-exe -l $calyx-base $flags $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path $flags $args $in > $out
 
 yxi = $calyx-base/target/debug/yxi
 rule yxi

fud2/tests/snapshots/tests__test@plan_calyx-to-verilog.snap

@@ -8,14 +8,15 @@ rule get-rsrc
 
 calyx-base = /test/calyx
 calyx-exe = $calyx-base/target/debug/calyx
+calyx-lib-path = $calyx-base
 args = 
 rule calyx
-  command = $calyx-exe -l $calyx-base -b $backend $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -b $backend $args $in > $out
 rule calyx-pass
-  command = $calyx-exe -l $calyx-base -p $pass $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -p $pass $args $in > $out
 flags = -p none
 rule calyx-with-flags
-  command = $calyx-exe -l $calyx-base $flags $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path $flags $args $in > $out
 
 build /output.ext: calyx /input.ext
   backend = verilog

fud2/tests/snapshots/tests__test@plan_calyx-to-yxi.snap

@@ -8,14 +8,15 @@ rule get-rsrc
 
 calyx-base = /test/calyx
 calyx-exe = $calyx-base/target/debug/calyx
+calyx-lib-path = $calyx-base
 args = 
 rule calyx
-  command = $calyx-exe -l $calyx-base -b $backend $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -b $backend $args $in > $out
 rule calyx-pass
-  command = $calyx-exe -l $calyx-base -p $pass $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -p $pass $args $in > $out
 flags = -p none
 rule calyx-with-flags
-  command = $calyx-exe -l $calyx-base $flags $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path $flags $args $in > $out
 
 yxi = $calyx-base/target/debug/yxi
 rule yxi

fud2/tests/snapshots/tests__test@plan_cider.snap

@@ -8,14 +8,15 @@ rule get-rsrc
 
 calyx-base = /test/calyx
 calyx-exe = $calyx-base/target/debug/calyx
+calyx-lib-path = $calyx-base
 args = 
 rule calyx
-  command = $calyx-exe -l $calyx-base -b $backend $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -b $backend $args $in > $out
 rule calyx-pass
-  command = $calyx-exe -l $calyx-base -p $pass $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path -p $pass $args $in > $out
 flags = -p none
 rule calyx-with-flags
-  command = $calyx-exe -l $calyx-base $flags $args $in > $out
+  command = $calyx-exe -l $calyx-lib-path $flags $args $in > $out
 
 cider-exe = $calyx-base/target/debug/cider
 cider-converter = $calyx-base/target/debug/cider-data-converter