Merge branch 'main' of https://github.com/calyxir/calyx into benchmar…

…king

.github/workflows/rust.yml

@@ -174,24 +174,24 @@ jobs:
       uses: actions-rs/cargo@v1
       with:
         command: build
-        args: --all-features --manifest-path /home/calyx/Cargo.toml
+        args: --workspace --manifest-path /home/calyx/Cargo.toml
 
 #    - name: Source code doc tests
 #      uses: actions-rs/cargo@v1
 #      with:
 #        command: test
 #        args: --manifest-path /home/calyx/calyx/Cargo.toml --doc lib
 
-    - name: Runt tests
-      working-directory: /home/calyx
-      run: |
-        runt -x 'cocotb' -d -o fail -j 1 --max-futures 5
-
     # Run these sequentially because they might fail intermittently
     - name: Cocotb tests
       working-directory: /home/calyx
       run: |
         runt -i 'cocotb' -d -o fail -j 1 --max-futures 1
+    
+    - name: Runt tests
+      working-directory: /home/calyx
+      run: |
+        runt -x 'cocotb' -d -o fail -j 1 --max-futures 5
 
     - name: Run Python Tests
       working-directory: /home/calyx

.gitignore

@@ -46,6 +46,7 @@ results.xml
 
 # Ignore .fud2 cache
 .fud2/
+.fud2-*/
 
 
 !cider-dap/calyxDebug/package.json
@@ -57,3 +58,5 @@ tools/btor2/btor2i/build/
 # vcd-parsing tmp files ignore
 tools/profiler/tmp/
 tools/profiler/logs
+
+temp/

Cargo.toml

@@ -14,9 +14,12 @@ members = [
     "cider-dap",
     "fud2",
     "fud2/fud-core",
-    "data-conversion",
+    "tools/data-conversion",
     "tools/btor2/btor2i",
     "tools/cider-data-converter",
+    "tools/calyx-pass-explorer",
+    "tools/yxi",
+    "tools/calyx-writer",
 ]
 exclude = ["site"]
 
@@ -92,7 +95,6 @@ path = "src/main.rs"
 [features]
 default = []
 serialize = ["calyx-ir/serialize", "serde/rc", "calyx-backend/sexp"]
-yxi = ["serialize", "calyx-backend/yxi", "calyx-ir/yxi"]
 
 [build-dependencies]
 calyx-stdlib = { path = "calyx-stdlib", version = "0.7.1" }