From c443bdb883407c5b816c2868bc0c0323e603e459 Mon Sep 17 00:00:00 2001
From: Griffin Berlstein <griffin@berlste.in>
Date: Tue, 23 Jul 2024 14:59:48 -0400
Subject: [PATCH] [Cider 2] Fix a bug in the fud2 path (#2220)

Small patch for an issue with the debugger path
---
 fud2/scripts/cider.rhai                                   | 8 ++++----
 fud2/tests/snapshots/tests__test@calyx_cider-debug.snap   | 2 +-
 fud2/tests/snapshots/tests__test@calyx_cider_dat.snap     | 4 ++--
 fud2/tests/snapshots/tests__test@plan_calyx-to-cider.snap | 2 +-
 fud2/tests/snapshots/tests__test@plan_cider.snap          | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/fud2/scripts/cider.rhai b/fud2/scripts/cider.rhai
index 0aa8a2da42..67bca34d6b 100644
--- a/fud2/scripts/cider.rhai
+++ b/fud2/scripts/cider.rhai
@@ -42,9 +42,9 @@ op(
     [sim::sim_setup, c::calyx_setup],
     c::calyx_state,
     cider_state,
-    |e, input, _output| {
+    |e, input, output| {
         e.build_cmd(
-            ["cider-input.futil"],
+            [output],
             "calyx-with-flags",
             [input],
             [],
@@ -58,12 +58,12 @@ op(
     [sim::sim_setup, c::calyx_setup, cider_setup],
     cider_state,
     sim::dat,
-    |e, _input, output| {
+    |e, input, output| {
         let out_file = "interp_out.dump";
         e.build_cmd(
             [out_file],
             "run-cider",
-            ["cider-input.futil"],
+            [input],
             ["data.dump"],
         );
         e.build_cmd(
diff --git a/fud2/tests/snapshots/tests__test@calyx_cider-debug.snap b/fud2/tests/snapshots/tests__test@calyx_cider-debug.snap
index 9d362b9380..a88b6ace90 100644
--- a/fud2/tests/snapshots/tests__test@calyx_cider-debug.snap
+++ b/fud2/tests/snapshots/tests__test@calyx_cider-debug.snap
@@ -45,7 +45,7 @@ rule interp-to-dump
   command = $cider-converter --to json $in > $out
 build data.dump: dump-to-interp $sim_data | $cider-converter
 
-build cider-input.futil: calyx-with-flags _from_stdin_calyx.futil
+build pseudo_cider: calyx-with-flags _from_stdin_calyx.futil
 build _to_stdout_cider-debug: run-cider-debug pseudo_cider | data.dump
 
 default _to_stdout_cider-debug
diff --git a/fud2/tests/snapshots/tests__test@calyx_cider_dat.snap b/fud2/tests/snapshots/tests__test@calyx_cider_dat.snap
index 8892d93e6c..1f8b731cea 100644
--- a/fud2/tests/snapshots/tests__test@calyx_cider_dat.snap
+++ b/fud2/tests/snapshots/tests__test@calyx_cider_dat.snap
@@ -43,8 +43,8 @@ rule interp-to-dump
   command = $cider-converter --to json $in > $out
 build data.dump: dump-to-interp $sim_data | $cider-converter
 
-build cider-input.futil: calyx-with-flags _from_stdin_calyx.futil
-build interp_out.dump: run-cider cider-input.futil | data.dump
+build pseudo_cider: calyx-with-flags _from_stdin_calyx.futil
+build interp_out.dump: run-cider pseudo_cider | data.dump
 build _to_stdout_dat.json: interp-to-dump interp_out.dump | $sim_data $cider-converter
 
 default _to_stdout_dat.json
diff --git a/fud2/tests/snapshots/tests__test@plan_calyx-to-cider.snap b/fud2/tests/snapshots/tests__test@plan_calyx-to-cider.snap
index b39fb7066f..d4c031b4a6 100644
--- a/fud2/tests/snapshots/tests__test@plan_calyx-to-cider.snap
+++ b/fud2/tests/snapshots/tests__test@plan_calyx-to-cider.snap
@@ -30,6 +30,6 @@ flags = -p none
 rule calyx-with-flags
   command = $calyx-exe -l $calyx-base $flags $args $in > $out
 
-build cider-input.futil: calyx-with-flags /input.ext
+build /output.ext: calyx-with-flags /input.ext
 
 default /output.ext
diff --git a/fud2/tests/snapshots/tests__test@plan_cider.snap b/fud2/tests/snapshots/tests__test@plan_cider.snap
index 1fab96e136..90ae62de2e 100644
--- a/fud2/tests/snapshots/tests__test@plan_cider.snap
+++ b/fud2/tests/snapshots/tests__test@plan_cider.snap
@@ -43,7 +43,7 @@ rule interp-to-dump
   command = $cider-converter --to json $in > $out
 build data.dump: dump-to-interp $sim_data | $cider-converter
 
-build interp_out.dump: run-cider cider-input.futil | data.dump
+build interp_out.dump: run-cider /input.ext | data.dump
 build /output.ext: interp-to-dump interp_out.dump | $sim_data $cider-converter
 
 default /output.ext