byuccl · jgoeders · Nov 29, 2023 · Nov 28, 2023 · Nov 28, 2023 · Nov 28, 2023
diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
@@ -13,7 +13,7 @@ concurrency:
 
 
 jobs:
-  # First list all the files in experiments/tests, and generate a JSON string of all the files
+  # First list all the files in tests/ci, and generate a JSON string of all the files
   collect-experiments:
     runs-on: ubuntu-latest
     outputs:
@@ -23,12 +23,12 @@ jobs:
     - uses: actions/checkout@v3
     - id: set-matrix
       run: |
-        echo "matrix=$(ls experiments/tests/*.yaml | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
+        echo "matrix=$(ls tests/ci/*.yaml | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
     # - id: set-matrix-wip
-    #   run: echo "matrix-wip=$(ls experiments/wip/*.yaml | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
+    #   run: echo "matrix-wip=$(ls tests/wip/*.yaml | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
 
   # Build a matrix run of all experiments generated in previous job
-  run-experiments:
+  run-test:
     needs: collect-experiments
     runs-on: [self-hosted, linux]
     strategy:

diff --git a/.github/workflows/weeklytests.yml b/.github/workflows/weeklytests.yml
@@ -23,7 +23,7 @@ jobs:
         submodules: 'recursive'
     - id: set-matrix
       run: |
-        echo "matrix=$(ls experiments/weekly_tests/*.yaml | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
+        echo "matrix=$(ls tests/weekly_tests/*.yaml | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
 
   run-tests:
     needs: collect-tests

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -84,7 +84,7 @@
             "python": "${workspaceFolder}/.venv/bin/python",
             "program": "scripts/run_experiment.py",
             "args": [
-                "experiments/phys_netlist.yaml",
+                "tests/phys_netlist.yaml",
                 "-j1"
             ],
             "env": {

diff --git a/bfasst/paths.py b/bfasst/paths.py
@@ -9,7 +9,7 @@
 
 DESIGNS_PATH = ROOT_PATH / "designs"
 BFASST_PATH = ROOT_PATH / "bfasst"
-EXPERIMENTS_PATH = ROOT_PATH / "experiments"
+TESTS_PATH = ROOT_PATH / "tests"
 RESOURCES_PATH = ROOT_PATH / "resources"
 SCRIPTS_PATH = ROOT_PATH / "scripts"
 ERROR_FLOW_PATH = ROOT_PATH / "error_flows"

diff --git a/html_table_README.md b/html_table_README.md
@@ -8,7 +8,7 @@ To run an experiment of flows and update the table, source the following two bas
 
 `run_flows.sh`
 
-* If you want to create a new custom flow for testing, ensure the proper code is located in `scripts/bfasst/flows.py` along with an associated `.yaml` file in the `experiments` directory.
+* If you want to create a new custom flow for testing, ensure the proper code is located in `scripts/bfasst/flows.py` along with an associated `.yaml` file in the `tests` directory.
 * Add your new flow to the `flows_list` variable within the main function of `scripts/run_experiment.py` (this will add a new column to the table).
 * Modify the script to add the commands for running the new experiment in `run_flows.sh` before sourcing.
 

diff --git a/scripts/run_design.py b/scripts/run_design.py
@@ -79,7 +79,7 @@ def main():
 
     error_flows = []
     for dir_item in paths.ERROR_FLOW_PATH.iterdir():
-        if (paths.EXPERIMENTS_PATH / dir_item).is_file() and dir_item.suffix == ".yaml":
+        if (paths.TESTS_PATH / dir_item).is_file() and dir_item.suffix == ".yaml":
             error_flows.append(dir_item.stem)
     parser.add_argument(
         "--error_flow",

diff --git a/test/scripts/test_run.py b/test/scripts/test_run.py
@@ -4,7 +4,7 @@
 import unittest
 import io
 from contextlib import redirect_stderr
-from bfasst.paths import EXPERIMENTS_PATH, ROOT_PATH
+from bfasst.paths import TESTS_PATH, ROOT_PATH
 
 from scripts.run import parse_args
 
@@ -63,7 +63,7 @@ def __try_check_args_for_success(self, args):
 
     def test_check_args_succeeds_on_yaml(self):
         """Test that the check_args function accepts only a yaml or a design/flow"""
-        args = [EXPERIMENTS_PATH / "tests/vivado_bit_analysis.yaml"]
+        args = [TESTS_PATH / "ci/vivado_bit_analysis.yaml"]
         self.__try_check_args_for_success(args)
 
     def test_check_args_succeeds_on_flow_and_design(self):
@@ -82,17 +82,17 @@ def __produce_check_args_failure(self, args):
                 parse_args(args)
 
     def test_check_args_fails_on_yaml_and_design_and_flow(self):
-        args = ["--yaml", "experiments/tests/test.yaml", "--design", "byu/alu", "--flow", "vivado"]
+        args = ["--yaml", "tests/ci/test.yaml", "--design", "byu/alu", "--flow", "vivado"]
         self.__produce_check_args_failure(args)
 
     def test_check_args_fails_on_no_args(self):
         args = []
         self.__produce_check_args_failure(args)
 
     def test_check_args_fails_on_yaml_and_design(self):
-        args = ["--yaml", "experiments/tests/test.yaml", "--design", "byu/alu"]
+        args = ["--yaml", "tests/ci/test.yaml", "--design", "byu/alu"]
         self.__produce_check_args_failure(args)
 
     def test_check_args_fails_on_yaml_and_flow(self):
-        args = ["--yaml", "experiments/tests/test.yaml", "--flow", "vivado"]
+        args = ["--yaml", "tests/ci/test.yaml", "--flow", "vivado"]
         self.__produce_check_args_failure(args)
diff --git a/experiments/.gitignore → tests/.gitignore b/experiments/.gitignore → tests/.gitignore
diff --git a/experiments/Makefile.common → tests/Makefile.common b/experiments/Makefile.common → tests/Makefile.common
@@ -2,7 +2,7 @@
 BFASST_PATH := $(realpath $(LEVEL)/..)
 RESOURCES = $(BFASST_PATH)/resources
 SCRIPTS = $(BFASST_PATH)/scripts
-EXPERIMENTS = $(BFASST_PATH)/experiments
+TESTS = $(BFASST_PATH)/tests
 EXAMPLES = $(BFASST_PATH)/examples
 
 include $(RESOURCES)/Makefile_colors.inc

diff --git a/experiments/Makefile.utils → tests/Makefile.utils b/experiments/Makefile.utils → tests/Makefile.utils
diff --git a/experiments/basic_conformal_compare.yaml → tests/basic_conformal_compare.yaml b/experiments/basic_conformal_compare.yaml → tests/basic_conformal_compare.yaml
diff --git a/experiments/basic_yosys_compare.yaml → tests/basic_yosys_compare.yaml b/experiments/basic_yosys_compare.yaml → tests/basic_yosys_compare.yaml
diff --git a/experiments/tests/rand_soc.yaml → tests/ci/rand_soc.yaml b/experiments/tests/rand_soc.yaml → tests/ci/rand_soc.yaml
diff --git a/experiments/tests/vivado_bit_analysis.yaml → tests/ci/vivado_bit_analysis.yaml b/experiments/tests/vivado_bit_analysis.yaml → tests/ci/vivado_bit_analysis.yaml
diff --git a/experiments/tests/vivado_conformal.yaml → tests/ci/vivado_conformal.yaml b/experiments/tests/vivado_conformal.yaml → tests/ci/vivado_conformal.yaml
diff --git a/experiments/tests/vivado_ooc.yaml → tests/ci/vivado_ooc.yaml b/experiments/tests/vivado_ooc.yaml → tests/ci/vivado_ooc.yaml
diff --git a/experiments/tests/vivado_phys_netlist.yaml → tests/ci/vivado_phys_netlist.yaml b/experiments/tests/vivado_phys_netlist.yaml → tests/ci/vivado_phys_netlist.yaml
diff --git a/...iments/tests/vivado_phys_netlist_cmp.yaml → tests/ci/vivado_phys_netlist_cmp.yaml b/...iments/tests/vivado_phys_netlist_cmp.yaml → tests/ci/vivado_phys_netlist_cmp.yaml
diff --git a/experiments/tests/vivado_yosys_impl.yaml → tests/ci/vivado_yosys_impl.yaml b/experiments/tests/vivado_yosys_impl.yaml → tests/ci/vivado_yosys_impl.yaml
diff --git a/experiments/error_injector.yaml → tests/error_injector.yaml b/experiments/error_injector.yaml → tests/error_injector.yaml
diff --git a/experiments/gather_impl_data.yaml → tests/gather_impl_data.yaml b/experiments/gather_impl_data.yaml → tests/gather_impl_data.yaml
diff --git a/experiments/phys_netlist.yaml → tests/phys_netlist.yaml b/experiments/phys_netlist.yaml → tests/phys_netlist.yaml
diff --git a/experiments/rtl_lse.yaml → tests/rtl_lse.yaml b/experiments/rtl_lse.yaml → tests/rtl_lse.yaml
diff --git a/experiments/rtl_synplify_ic2_conformal.yaml → tests/rtl_synplify_ic2_conformal.yaml b/experiments/rtl_synplify_ic2_conformal.yaml → tests/rtl_synplify_ic2_conformal.yaml
diff --git a/experiments/rtl_synplify_ic2_onespin.yaml → tests/rtl_synplify_ic2_onespin.yaml b/experiments/rtl_synplify_ic2_onespin.yaml → tests/rtl_synplify_ic2_onespin.yaml
diff --git a/experiments/rtl_xilinx_conformal.yaml → tests/rtl_xilinx_conformal.yaml b/experiments/rtl_xilinx_conformal.yaml → tests/rtl_xilinx_conformal.yaml
diff --git a/experiments/rtl_xilinx_conformal_base.yaml → tests/rtl_xilinx_conformal_base.yaml b/experiments/rtl_xilinx_conformal_base.yaml → tests/rtl_xilinx_conformal_base.yaml
diff --git a/...tl_yosys_tech_synplify_ic2_conformal.yaml → ...tl_yosys_tech_synplify_ic2_conformal.yaml b/...tl_yosys_tech_synplify_ic2_conformal.yaml → ...tl_yosys_tech_synplify_ic2_conformal.yaml
diff --git a/...ents/rtl_yosys_tech_synplify_onespin.yaml → tests/rtl_yosys_tech_synplify_onespin.yaml b/...ents/rtl_yosys_tech_synplify_onespin.yaml → tests/rtl_yosys_tech_synplify_onespin.yaml
diff --git a/experiments/verify_fasm_to_bels.yaml → tests/verify_fasm_to_bels.yaml b/experiments/verify_fasm_to_bels.yaml → tests/verify_fasm_to_bels.yaml
diff --git a/experiments/verify_fasm_to_bels_yosys.yaml → tests/verify_fasm_to_bels_yosys.yaml b/experiments/verify_fasm_to_bels_yosys.yaml → tests/verify_fasm_to_bels_yosys.yaml
diff --git a/experiments/vtr_benchmarks.yaml → tests/vtr_benchmarks.yaml b/experiments/vtr_benchmarks.yaml → tests/vtr_benchmarks.yaml
diff --git a/experiments/wafove.yaml → tests/wafove.yaml b/experiments/wafove.yaml → tests/wafove.yaml
diff --git a/...riments/weekly_tests/error_injection.yaml → tests/weekly_tests/error_injection.yaml b/...riments/weekly_tests/error_injection.yaml → tests/weekly_tests/error_injection.yaml
diff --git a/...ents/weekly_tests/phys_netlist_paper.yaml → tests/weekly_tests/phys_netlist_paper.yaml b/...ents/weekly_tests/phys_netlist_paper.yaml → tests/weekly_tests/phys_netlist_paper.yaml
diff --git a/experiments/weekly_tests/vivado.yaml → tests/weekly_tests/vivado.yaml b/experiments/weekly_tests/vivado.yaml → tests/weekly_tests/vivado.yaml
diff --git a/...riments/weekly_tests/vivado_full_ooc.yaml → tests/weekly_tests/vivado_full_ooc.yaml b/...riments/weekly_tests/vivado_full_ooc.yaml → tests/weekly_tests/vivado_full_ooc.yaml
diff --git a/experiments/weekly_tests/vivado_ooc.yaml → tests/weekly_tests/vivado_ooc.yaml b/experiments/weekly_tests/vivado_ooc.yaml → tests/weekly_tests/vivado_ooc.yaml
diff --git a/experiments/xilinx_and_reversed.yaml → tests/xilinx_and_reversed.yaml b/experiments/xilinx_and_reversed.yaml → tests/xilinx_and_reversed.yaml
diff --git a/experiments/xilinx_ooc.yaml → tests/xilinx_ooc.yaml b/experiments/xilinx_ooc.yaml → tests/xilinx_ooc.yaml
diff --git a/experiments/xilinx_phys_netlist_cmp.yaml → tests/xilinx_phys_netlist_cmp.yaml b/experiments/xilinx_phys_netlist_cmp.yaml → tests/xilinx_phys_netlist_cmp.yaml
diff --git a/...riments/yosys_synplify_error_onespin.yaml → tests/yosys_synplify_error_onespin.yaml b/...riments/yosys_synplify_error_onespin.yaml → tests/yosys_synplify_error_onespin.yaml
diff --git a/experiments/yosys_tech_lse.yaml → tests/yosys_tech_lse.yaml b/experiments/yosys_tech_lse.yaml → tests/yosys_tech_lse.yaml