diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c0ff75b..f2d81ff 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ jobs: - name: Install dependencies run: | - python -m pip install -U -r test/requirements.txt + python -m pip install -U -r tests/requirements.txt - name: Install run: | @@ -40,7 +40,7 @@ jobs: - name: Test run: | - cd test + cd tests export SKIP_SYNTH_TESTS=1 export STUB_SIMULATOR=1 pytest @@ -59,13 +59,9 @@ jobs: run: | python -m pip install -U pylint - - name: Install - run: | - python -m pip install . - - name: Run Lint run: | - pylint --rcfile test/pylint.rc peakrdl + pylint --rcfile tests/pylint.rc src/peakrdl #------------------------------------------------------------------------------- mypy: @@ -83,7 +79,7 @@ jobs: - name: Type Check run: | - mypy --config-file test/mypy.ini peakrdl + mypy --config-file tests/mypy.ini src/peakrdl #------------------------------------------------------------------------------- build_sdist: diff --git a/MANIFEST.in b/MANIFEST.in index d627dcd..ef7aadf 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,2 @@ -recursive-include peakrdl/regblock *.sv -prune test +recursive-include src/peakrdl/regblock *.sv +prune tests diff --git a/setup.py b/setup.py index 1770447..028931c 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ with open("README.md", "r", encoding='utf-8') as fh: long_description = fh.read() -with open(os.path.join("peakrdl/regblock", "__about__.py"), encoding='utf-8') as f: +with open(os.path.join("src/peakrdl/regblock", "__about__.py"), encoding='utf-8') as f: v_dict = {} exec(f.read(), v_dict) version = v_dict['__version__'] @@ -19,7 +19,8 @@ setuptools.setup( long_description=long_description, long_description_content_type="text/markdown", url="https://github.com/SystemRDL/PeakRDL-regblock", - packages=['peakrdl.regblock'], + package_dir={'': 'src'}, + packages=setuptools.find_namespace_packages("src", include=['peakrdl.*']), include_package_data=True, python_requires='>=3.6', install_requires=[ diff --git a/peakrdl/regblock/__about__.py b/src/peakrdl/regblock/__about__.py similarity index 100% rename from peakrdl/regblock/__about__.py rename to src/peakrdl/regblock/__about__.py diff --git a/peakrdl/regblock/__init__.py b/src/peakrdl/regblock/__init__.py similarity index 100% rename from peakrdl/regblock/__init__.py rename to src/peakrdl/regblock/__init__.py diff --git a/peakrdl/regblock/addr_decode.py b/src/peakrdl/regblock/addr_decode.py similarity index 100% rename from peakrdl/regblock/addr_decode.py rename to src/peakrdl/regblock/addr_decode.py diff --git a/peakrdl/regblock/cpuif/__init__.py b/src/peakrdl/regblock/cpuif/__init__.py similarity index 100% rename from peakrdl/regblock/cpuif/__init__.py rename to src/peakrdl/regblock/cpuif/__init__.py diff --git a/peakrdl/regblock/cpuif/apb3/__init__.py b/src/peakrdl/regblock/cpuif/apb3/__init__.py similarity index 100% rename from peakrdl/regblock/cpuif/apb3/__init__.py rename to src/peakrdl/regblock/cpuif/apb3/__init__.py diff --git a/peakrdl/regblock/cpuif/apb3/apb3_tmpl.sv b/src/peakrdl/regblock/cpuif/apb3/apb3_tmpl.sv similarity index 100% rename from peakrdl/regblock/cpuif/apb3/apb3_tmpl.sv rename to src/peakrdl/regblock/cpuif/apb3/apb3_tmpl.sv diff --git a/peakrdl/regblock/cpuif/axi4lite/__init__.py b/src/peakrdl/regblock/cpuif/axi4lite/__init__.py similarity index 100% rename from peakrdl/regblock/cpuif/axi4lite/__init__.py rename to src/peakrdl/regblock/cpuif/axi4lite/__init__.py diff --git a/peakrdl/regblock/cpuif/axi4lite/axi4lite_tmpl.sv b/src/peakrdl/regblock/cpuif/axi4lite/axi4lite_tmpl.sv similarity index 100% rename from peakrdl/regblock/cpuif/axi4lite/axi4lite_tmpl.sv rename to src/peakrdl/regblock/cpuif/axi4lite/axi4lite_tmpl.sv diff --git a/peakrdl/regblock/cpuif/base.py b/src/peakrdl/regblock/cpuif/base.py similarity index 100% rename from peakrdl/regblock/cpuif/base.py rename to src/peakrdl/regblock/cpuif/base.py diff --git a/peakrdl/regblock/cpuif/passthrough/__init__.py b/src/peakrdl/regblock/cpuif/passthrough/__init__.py similarity index 100% rename from peakrdl/regblock/cpuif/passthrough/__init__.py rename to src/peakrdl/regblock/cpuif/passthrough/__init__.py diff --git a/peakrdl/regblock/cpuif/passthrough/passthrough_tmpl.sv b/src/peakrdl/regblock/cpuif/passthrough/passthrough_tmpl.sv similarity index 100% rename from peakrdl/regblock/cpuif/passthrough/passthrough_tmpl.sv rename to src/peakrdl/regblock/cpuif/passthrough/passthrough_tmpl.sv diff --git a/peakrdl/regblock/dereferencer.py b/src/peakrdl/regblock/dereferencer.py similarity index 100% rename from peakrdl/regblock/dereferencer.py rename to src/peakrdl/regblock/dereferencer.py diff --git a/peakrdl/regblock/exporter.py b/src/peakrdl/regblock/exporter.py similarity index 100% rename from peakrdl/regblock/exporter.py rename to src/peakrdl/regblock/exporter.py diff --git a/peakrdl/regblock/field_logic/__init__.py b/src/peakrdl/regblock/field_logic/__init__.py similarity index 100% rename from peakrdl/regblock/field_logic/__init__.py rename to src/peakrdl/regblock/field_logic/__init__.py diff --git a/peakrdl/regblock/field_logic/bases.py b/src/peakrdl/regblock/field_logic/bases.py similarity index 100% rename from peakrdl/regblock/field_logic/bases.py rename to src/peakrdl/regblock/field_logic/bases.py diff --git a/peakrdl/regblock/field_logic/generators.py b/src/peakrdl/regblock/field_logic/generators.py similarity index 100% rename from peakrdl/regblock/field_logic/generators.py rename to src/peakrdl/regblock/field_logic/generators.py diff --git a/peakrdl/regblock/field_logic/hw_interrupts.py b/src/peakrdl/regblock/field_logic/hw_interrupts.py similarity index 100% rename from peakrdl/regblock/field_logic/hw_interrupts.py rename to src/peakrdl/regblock/field_logic/hw_interrupts.py diff --git a/peakrdl/regblock/field_logic/hw_set_clr.py b/src/peakrdl/regblock/field_logic/hw_set_clr.py similarity index 100% rename from peakrdl/regblock/field_logic/hw_set_clr.py rename to src/peakrdl/regblock/field_logic/hw_set_clr.py diff --git a/peakrdl/regblock/field_logic/hw_write.py b/src/peakrdl/regblock/field_logic/hw_write.py similarity index 100% rename from peakrdl/regblock/field_logic/hw_write.py rename to src/peakrdl/regblock/field_logic/hw_write.py diff --git a/peakrdl/regblock/field_logic/sw_onread.py b/src/peakrdl/regblock/field_logic/sw_onread.py similarity index 100% rename from peakrdl/regblock/field_logic/sw_onread.py rename to src/peakrdl/regblock/field_logic/sw_onread.py diff --git a/peakrdl/regblock/field_logic/sw_onwrite.py b/src/peakrdl/regblock/field_logic/sw_onwrite.py similarity index 100% rename from peakrdl/regblock/field_logic/sw_onwrite.py rename to src/peakrdl/regblock/field_logic/sw_onwrite.py diff --git a/peakrdl/regblock/field_logic/sw_singlepulse.py b/src/peakrdl/regblock/field_logic/sw_singlepulse.py similarity index 100% rename from peakrdl/regblock/field_logic/sw_singlepulse.py rename to src/peakrdl/regblock/field_logic/sw_singlepulse.py diff --git a/peakrdl/regblock/field_logic/templates/counter_macros.sv b/src/peakrdl/regblock/field_logic/templates/counter_macros.sv similarity index 100% rename from peakrdl/regblock/field_logic/templates/counter_macros.sv rename to src/peakrdl/regblock/field_logic/templates/counter_macros.sv diff --git a/peakrdl/regblock/field_logic/templates/field_storage.sv b/src/peakrdl/regblock/field_logic/templates/field_storage.sv similarity index 100% rename from peakrdl/regblock/field_logic/templates/field_storage.sv rename to src/peakrdl/regblock/field_logic/templates/field_storage.sv diff --git a/peakrdl/regblock/forloop_generator.py b/src/peakrdl/regblock/forloop_generator.py similarity index 100% rename from peakrdl/regblock/forloop_generator.py rename to src/peakrdl/regblock/forloop_generator.py diff --git a/peakrdl/regblock/hwif/__init__.py b/src/peakrdl/regblock/hwif/__init__.py similarity index 100% rename from peakrdl/regblock/hwif/__init__.py rename to src/peakrdl/regblock/hwif/__init__.py diff --git a/peakrdl/regblock/hwif/generators.py b/src/peakrdl/regblock/hwif/generators.py similarity index 100% rename from peakrdl/regblock/hwif/generators.py rename to src/peakrdl/regblock/hwif/generators.py diff --git a/peakrdl/regblock/module_tmpl.sv b/src/peakrdl/regblock/module_tmpl.sv similarity index 100% rename from peakrdl/regblock/module_tmpl.sv rename to src/peakrdl/regblock/module_tmpl.sv diff --git a/peakrdl/regblock/package_tmpl.sv b/src/peakrdl/regblock/package_tmpl.sv similarity index 100% rename from peakrdl/regblock/package_tmpl.sv rename to src/peakrdl/regblock/package_tmpl.sv diff --git a/peakrdl/regblock/readback/__init__.py b/src/peakrdl/regblock/readback/__init__.py similarity index 100% rename from peakrdl/regblock/readback/__init__.py rename to src/peakrdl/regblock/readback/__init__.py diff --git a/peakrdl/regblock/readback/generators.py b/src/peakrdl/regblock/readback/generators.py similarity index 100% rename from peakrdl/regblock/readback/generators.py rename to src/peakrdl/regblock/readback/generators.py diff --git a/peakrdl/regblock/readback/templates/readback.sv b/src/peakrdl/regblock/readback/templates/readback.sv similarity index 100% rename from peakrdl/regblock/readback/templates/readback.sv rename to src/peakrdl/regblock/readback/templates/readback.sv diff --git a/peakrdl/regblock/scan_design.py b/src/peakrdl/regblock/scan_design.py similarity index 100% rename from peakrdl/regblock/scan_design.py rename to src/peakrdl/regblock/scan_design.py diff --git a/peakrdl/regblock/struct_generator.py b/src/peakrdl/regblock/struct_generator.py similarity index 100% rename from peakrdl/regblock/struct_generator.py rename to src/peakrdl/regblock/struct_generator.py diff --git a/peakrdl/regblock/utils.py b/src/peakrdl/regblock/utils.py similarity index 100% rename from peakrdl/regblock/utils.py rename to src/peakrdl/regblock/utils.py diff --git a/test/README.md b/tests/README.md similarity index 97% rename from test/README.md rename to tests/README.md index 6e1b8d8..bcbf3a0 100644 --- a/test/README.md +++ b/tests/README.md @@ -47,14 +47,13 @@ Use `pytest --workers auto` to run tests in parallel. To run all tests: ```bash -cd test/ -pytest +python3 setup.py install +pytest tests ``` You can also run a specific testcase. For example: ```bash -cd test/test_hw_access -pytest +pytest tests/test_hw_access ``` diff --git a/test/__init__.py b/tests/__init__.py similarity index 100% rename from test/__init__.py rename to tests/__init__.py diff --git a/test/lib/__init__.py b/tests/lib/__init__.py similarity index 100% rename from test/lib/__init__.py rename to tests/lib/__init__.py diff --git a/test/lib/base_testcase.py b/tests/lib/base_testcase.py similarity index 100% rename from test/lib/base_testcase.py rename to tests/lib/base_testcase.py diff --git a/test/lib/cpuifs/__init__.py b/tests/lib/cpuifs/__init__.py similarity index 100% rename from test/lib/cpuifs/__init__.py rename to tests/lib/cpuifs/__init__.py diff --git a/test/lib/cpuifs/apb3/__init__.py b/tests/lib/cpuifs/apb3/__init__.py similarity index 100% rename from test/lib/cpuifs/apb3/__init__.py rename to tests/lib/cpuifs/apb3/__init__.py diff --git a/test/lib/cpuifs/apb3/apb3_intf.sv b/tests/lib/cpuifs/apb3/apb3_intf.sv similarity index 100% rename from test/lib/cpuifs/apb3/apb3_intf.sv rename to tests/lib/cpuifs/apb3/apb3_intf.sv diff --git a/test/lib/cpuifs/apb3/apb3_intf_driver.sv b/tests/lib/cpuifs/apb3/apb3_intf_driver.sv similarity index 100% rename from test/lib/cpuifs/apb3/apb3_intf_driver.sv rename to tests/lib/cpuifs/apb3/apb3_intf_driver.sv diff --git a/test/lib/cpuifs/apb3/tb_inst.sv b/tests/lib/cpuifs/apb3/tb_inst.sv similarity index 100% rename from test/lib/cpuifs/apb3/tb_inst.sv rename to tests/lib/cpuifs/apb3/tb_inst.sv diff --git a/test/lib/cpuifs/axi4lite/__init__.py b/tests/lib/cpuifs/axi4lite/__init__.py similarity index 100% rename from test/lib/cpuifs/axi4lite/__init__.py rename to tests/lib/cpuifs/axi4lite/__init__.py diff --git a/test/lib/cpuifs/axi4lite/axi4lite_intf.sv b/tests/lib/cpuifs/axi4lite/axi4lite_intf.sv similarity index 100% rename from test/lib/cpuifs/axi4lite/axi4lite_intf.sv rename to tests/lib/cpuifs/axi4lite/axi4lite_intf.sv diff --git a/test/lib/cpuifs/axi4lite/axi4lite_intf_driver.sv b/tests/lib/cpuifs/axi4lite/axi4lite_intf_driver.sv similarity index 100% rename from test/lib/cpuifs/axi4lite/axi4lite_intf_driver.sv rename to tests/lib/cpuifs/axi4lite/axi4lite_intf_driver.sv diff --git a/test/lib/cpuifs/axi4lite/tb_inst.sv b/tests/lib/cpuifs/axi4lite/tb_inst.sv similarity index 100% rename from test/lib/cpuifs/axi4lite/tb_inst.sv rename to tests/lib/cpuifs/axi4lite/tb_inst.sv diff --git a/test/lib/cpuifs/base.py b/tests/lib/cpuifs/base.py similarity index 100% rename from test/lib/cpuifs/base.py rename to tests/lib/cpuifs/base.py diff --git a/test/lib/cpuifs/passthrough/__init__.py b/tests/lib/cpuifs/passthrough/__init__.py similarity index 100% rename from test/lib/cpuifs/passthrough/__init__.py rename to tests/lib/cpuifs/passthrough/__init__.py diff --git a/test/lib/cpuifs/passthrough/passthrough_driver.sv b/tests/lib/cpuifs/passthrough/passthrough_driver.sv similarity index 100% rename from test/lib/cpuifs/passthrough/passthrough_driver.sv rename to tests/lib/cpuifs/passthrough/passthrough_driver.sv diff --git a/test/lib/cpuifs/passthrough/tb_inst.sv b/tests/lib/cpuifs/passthrough/tb_inst.sv similarity index 100% rename from test/lib/cpuifs/passthrough/tb_inst.sv rename to tests/lib/cpuifs/passthrough/tb_inst.sv diff --git a/test/lib/sim_testcase.py b/tests/lib/sim_testcase.py similarity index 100% rename from test/lib/sim_testcase.py rename to tests/lib/sim_testcase.py diff --git a/test/lib/simulators/__init__.py b/tests/lib/simulators/__init__.py similarity index 100% rename from test/lib/simulators/__init__.py rename to tests/lib/simulators/__init__.py diff --git a/test/lib/simulators/questa.py b/tests/lib/simulators/questa.py similarity index 100% rename from test/lib/simulators/questa.py rename to tests/lib/simulators/questa.py diff --git a/test/lib/simulators/xilinx.py b/tests/lib/simulators/xilinx.py similarity index 100% rename from test/lib/simulators/xilinx.py rename to tests/lib/simulators/xilinx.py diff --git a/test/lib/sv_line_anchor.py b/tests/lib/sv_line_anchor.py similarity index 100% rename from test/lib/sv_line_anchor.py rename to tests/lib/sv_line_anchor.py diff --git a/test/lib/synth_testcase.py b/tests/lib/synth_testcase.py similarity index 100% rename from test/lib/synth_testcase.py rename to tests/lib/synth_testcase.py diff --git a/test/lib/synthesis/vivado/constr.xdc b/tests/lib/synthesis/vivado/constr.xdc similarity index 100% rename from test/lib/synthesis/vivado/constr.xdc rename to tests/lib/synthesis/vivado/constr.xdc diff --git a/test/lib/synthesis/vivado/run.tcl b/tests/lib/synthesis/vivado/run.tcl similarity index 100% rename from test/lib/synthesis/vivado/run.tcl rename to tests/lib/synthesis/vivado/run.tcl diff --git a/test/lib/tb_base.sv b/tests/lib/tb_base.sv similarity index 100% rename from test/lib/tb_base.sv rename to tests/lib/tb_base.sv diff --git a/test/lib/test_params.py b/tests/lib/test_params.py similarity index 100% rename from test/lib/test_params.py rename to tests/lib/test_params.py diff --git a/test/mypy.ini b/tests/mypy.ini similarity index 100% rename from test/mypy.ini rename to tests/mypy.ini diff --git a/test/pylint.rc b/tests/pylint.rc similarity index 100% rename from test/pylint.rc rename to tests/pylint.rc diff --git a/test/pytest.ini b/tests/pytest.ini similarity index 100% rename from test/pytest.ini rename to tests/pytest.ini diff --git a/test/requirements.txt b/tests/requirements.txt similarity index 100% rename from test/requirements.txt rename to tests/requirements.txt diff --git a/test/run.sh b/tests/run.sh similarity index 80% rename from test/run.sh rename to tests/run.sh index 43d9eab..8f26280 100755 --- a/test/run.sh +++ b/tests/run.sh @@ -15,7 +15,7 @@ pip install -r $this_dir/requirements.txt # Install dut cd $this_dir/../ -python $this_dir/../setup.py install +pip install . cd $this_dir # Run unit tests @@ -23,7 +23,7 @@ export SKIP_SYNTH_TESTS=1 pytest --workers auto # Run lint -pylint --rcfile $this_dir/pylint.rc ../peakrdl +pylint --rcfile $this_dir/pylint.rc ../src/peakrdl # Run static type checking -mypy $this_dir/../peakrdl +mypy $this_dir/../src/peakrdl diff --git a/test/test_bitwise_reduce/__init__.py b/tests/test_bitwise_reduce/__init__.py similarity index 100% rename from test/test_bitwise_reduce/__init__.py rename to tests/test_bitwise_reduce/__init__.py diff --git a/test/test_bitwise_reduce/regblock.rdl b/tests/test_bitwise_reduce/regblock.rdl similarity index 100% rename from test/test_bitwise_reduce/regblock.rdl rename to tests/test_bitwise_reduce/regblock.rdl diff --git a/test/test_bitwise_reduce/tb_template.sv b/tests/test_bitwise_reduce/tb_template.sv similarity index 100% rename from test/test_bitwise_reduce/tb_template.sv rename to tests/test_bitwise_reduce/tb_template.sv diff --git a/test/test_bitwise_reduce/testcase.py b/tests/test_bitwise_reduce/testcase.py similarity index 100% rename from test/test_bitwise_reduce/testcase.py rename to tests/test_bitwise_reduce/testcase.py diff --git a/test/test_counter_basics/__init__.py b/tests/test_counter_basics/__init__.py similarity index 100% rename from test/test_counter_basics/__init__.py rename to tests/test_counter_basics/__init__.py diff --git a/test/test_counter_basics/regblock.rdl b/tests/test_counter_basics/regblock.rdl similarity index 100% rename from test/test_counter_basics/regblock.rdl rename to tests/test_counter_basics/regblock.rdl diff --git a/test/test_counter_basics/tb_template.sv b/tests/test_counter_basics/tb_template.sv similarity index 100% rename from test/test_counter_basics/tb_template.sv rename to tests/test_counter_basics/tb_template.sv diff --git a/test/test_counter_basics/testcase.py b/tests/test_counter_basics/testcase.py similarity index 100% rename from test/test_counter_basics/testcase.py rename to tests/test_counter_basics/testcase.py diff --git a/test/test_counter_saturate/__init__.py b/tests/test_counter_saturate/__init__.py similarity index 100% rename from test/test_counter_saturate/__init__.py rename to tests/test_counter_saturate/__init__.py diff --git a/test/test_counter_saturate/regblock.rdl b/tests/test_counter_saturate/regblock.rdl similarity index 100% rename from test/test_counter_saturate/regblock.rdl rename to tests/test_counter_saturate/regblock.rdl diff --git a/test/test_counter_saturate/tb_template.sv b/tests/test_counter_saturate/tb_template.sv similarity index 100% rename from test/test_counter_saturate/tb_template.sv rename to tests/test_counter_saturate/tb_template.sv diff --git a/test/test_counter_saturate/testcase.py b/tests/test_counter_saturate/testcase.py similarity index 100% rename from test/test_counter_saturate/testcase.py rename to tests/test_counter_saturate/testcase.py diff --git a/test/test_counter_threshold/__init__.py b/tests/test_counter_threshold/__init__.py similarity index 100% rename from test/test_counter_threshold/__init__.py rename to tests/test_counter_threshold/__init__.py diff --git a/test/test_counter_threshold/regblock.rdl b/tests/test_counter_threshold/regblock.rdl similarity index 100% rename from test/test_counter_threshold/regblock.rdl rename to tests/test_counter_threshold/regblock.rdl diff --git a/test/test_counter_threshold/tb_template.sv b/tests/test_counter_threshold/tb_template.sv similarity index 100% rename from test/test_counter_threshold/tb_template.sv rename to tests/test_counter_threshold/tb_template.sv diff --git a/test/test_counter_threshold/testcase.py b/tests/test_counter_threshold/testcase.py similarity index 100% rename from test/test_counter_threshold/testcase.py rename to tests/test_counter_threshold/testcase.py diff --git a/test/test_field_types/__init__.py b/tests/test_field_types/__init__.py similarity index 100% rename from test/test_field_types/__init__.py rename to tests/test_field_types/__init__.py diff --git a/test/test_field_types/regblock.rdl b/tests/test_field_types/regblock.rdl similarity index 100% rename from test/test_field_types/regblock.rdl rename to tests/test_field_types/regblock.rdl diff --git a/test/test_field_types/tb_template.sv b/tests/test_field_types/tb_template.sv similarity index 100% rename from test/test_field_types/tb_template.sv rename to tests/test_field_types/tb_template.sv diff --git a/test/test_field_types/testcase.py b/tests/test_field_types/testcase.py similarity index 100% rename from test/test_field_types/testcase.py rename to tests/test_field_types/testcase.py diff --git a/test/test_hw_access/__init__.py b/tests/test_hw_access/__init__.py similarity index 100% rename from test/test_hw_access/__init__.py rename to tests/test_hw_access/__init__.py diff --git a/test/test_hw_access/regblock.rdl b/tests/test_hw_access/regblock.rdl similarity index 100% rename from test/test_hw_access/regblock.rdl rename to tests/test_hw_access/regblock.rdl diff --git a/test/test_hw_access/tb_template.sv b/tests/test_hw_access/tb_template.sv similarity index 100% rename from test/test_hw_access/tb_template.sv rename to tests/test_hw_access/tb_template.sv diff --git a/test/test_hw_access/testcase.py b/tests/test_hw_access/testcase.py similarity index 100% rename from test/test_hw_access/testcase.py rename to tests/test_hw_access/testcase.py diff --git a/test/test_interrupts/__init__.py b/tests/test_interrupts/__init__.py similarity index 100% rename from test/test_interrupts/__init__.py rename to tests/test_interrupts/__init__.py diff --git a/test/test_interrupts/regblock.rdl b/tests/test_interrupts/regblock.rdl similarity index 100% rename from test/test_interrupts/regblock.rdl rename to tests/test_interrupts/regblock.rdl diff --git a/test/test_interrupts/tb_template.sv b/tests/test_interrupts/tb_template.sv similarity index 100% rename from test/test_interrupts/tb_template.sv rename to tests/test_interrupts/tb_template.sv diff --git a/test/test_interrupts/testcase.py b/tests/test_interrupts/testcase.py similarity index 100% rename from test/test_interrupts/testcase.py rename to tests/test_interrupts/testcase.py diff --git a/test/test_onread_onwrite/__init__.py b/tests/test_onread_onwrite/__init__.py similarity index 100% rename from test/test_onread_onwrite/__init__.py rename to tests/test_onread_onwrite/__init__.py diff --git a/test/test_onread_onwrite/regblock.rdl b/tests/test_onread_onwrite/regblock.rdl similarity index 100% rename from test/test_onread_onwrite/regblock.rdl rename to tests/test_onread_onwrite/regblock.rdl diff --git a/test/test_onread_onwrite/tb_template.sv b/tests/test_onread_onwrite/tb_template.sv similarity index 100% rename from test/test_onread_onwrite/tb_template.sv rename to tests/test_onread_onwrite/tb_template.sv diff --git a/test/test_onread_onwrite/testcase.py b/tests/test_onread_onwrite/testcase.py similarity index 100% rename from test/test_onread_onwrite/testcase.py rename to tests/test_onread_onwrite/testcase.py diff --git a/test/test_pipelined_cpuif/__init__.py b/tests/test_pipelined_cpuif/__init__.py similarity index 100% rename from test/test_pipelined_cpuif/__init__.py rename to tests/test_pipelined_cpuif/__init__.py diff --git a/test/test_pipelined_cpuif/regblock.rdl b/tests/test_pipelined_cpuif/regblock.rdl similarity index 100% rename from test/test_pipelined_cpuif/regblock.rdl rename to tests/test_pipelined_cpuif/regblock.rdl diff --git a/test/test_pipelined_cpuif/tb_template.sv b/tests/test_pipelined_cpuif/tb_template.sv similarity index 100% rename from test/test_pipelined_cpuif/tb_template.sv rename to tests/test_pipelined_cpuif/tb_template.sv diff --git a/test/test_pipelined_cpuif/testcase.py b/tests/test_pipelined_cpuif/testcase.py similarity index 100% rename from test/test_pipelined_cpuif/testcase.py rename to tests/test_pipelined_cpuif/testcase.py diff --git a/test/test_precedence/__init__.py b/tests/test_precedence/__init__.py similarity index 100% rename from test/test_precedence/__init__.py rename to tests/test_precedence/__init__.py diff --git a/test/test_precedence/regblock.rdl b/tests/test_precedence/regblock.rdl similarity index 100% rename from test/test_precedence/regblock.rdl rename to tests/test_precedence/regblock.rdl diff --git a/test/test_precedence/tb_template.sv b/tests/test_precedence/tb_template.sv similarity index 100% rename from test/test_precedence/tb_template.sv rename to tests/test_precedence/tb_template.sv diff --git a/test/test_precedence/testcase.py b/tests/test_precedence/testcase.py similarity index 100% rename from test/test_precedence/testcase.py rename to tests/test_precedence/testcase.py diff --git a/test/test_read_fanin/__init__.py b/tests/test_read_fanin/__init__.py similarity index 100% rename from test/test_read_fanin/__init__.py rename to tests/test_read_fanin/__init__.py diff --git a/test/test_read_fanin/regblock.rdl b/tests/test_read_fanin/regblock.rdl similarity index 100% rename from test/test_read_fanin/regblock.rdl rename to tests/test_read_fanin/regblock.rdl diff --git a/test/test_read_fanin/tb_template.sv b/tests/test_read_fanin/tb_template.sv similarity index 100% rename from test/test_read_fanin/tb_template.sv rename to tests/test_read_fanin/tb_template.sv diff --git a/test/test_read_fanin/testcase.py b/tests/test_read_fanin/testcase.py similarity index 100% rename from test/test_read_fanin/testcase.py rename to tests/test_read_fanin/testcase.py diff --git a/test/test_reset_signals/__init__.py b/tests/test_reset_signals/__init__.py similarity index 100% rename from test/test_reset_signals/__init__.py rename to tests/test_reset_signals/__init__.py diff --git a/test/test_reset_signals/regblock.rdl b/tests/test_reset_signals/regblock.rdl similarity index 100% rename from test/test_reset_signals/regblock.rdl rename to tests/test_reset_signals/regblock.rdl diff --git a/test/test_reset_signals/tb_template.sv b/tests/test_reset_signals/tb_template.sv similarity index 100% rename from test/test_reset_signals/tb_template.sv rename to tests/test_reset_signals/tb_template.sv diff --git a/test/test_reset_signals/testcase.py b/tests/test_reset_signals/testcase.py similarity index 100% rename from test/test_reset_signals/testcase.py rename to tests/test_reset_signals/testcase.py diff --git a/test/test_singlepulse/__init__.py b/tests/test_singlepulse/__init__.py similarity index 100% rename from test/test_singlepulse/__init__.py rename to tests/test_singlepulse/__init__.py diff --git a/test/test_singlepulse/regblock.rdl b/tests/test_singlepulse/regblock.rdl similarity index 100% rename from test/test_singlepulse/regblock.rdl rename to tests/test_singlepulse/regblock.rdl diff --git a/test/test_singlepulse/tb_template.sv b/tests/test_singlepulse/tb_template.sv similarity index 100% rename from test/test_singlepulse/tb_template.sv rename to tests/test_singlepulse/tb_template.sv diff --git a/test/test_singlepulse/testcase.py b/tests/test_singlepulse/testcase.py similarity index 100% rename from test/test_singlepulse/testcase.py rename to tests/test_singlepulse/testcase.py diff --git a/test/test_structural_sw_rw/__init__.py b/tests/test_structural_sw_rw/__init__.py similarity index 100% rename from test/test_structural_sw_rw/__init__.py rename to tests/test_structural_sw_rw/__init__.py diff --git a/test/test_structural_sw_rw/regblock.rdl b/tests/test_structural_sw_rw/regblock.rdl similarity index 100% rename from test/test_structural_sw_rw/regblock.rdl rename to tests/test_structural_sw_rw/regblock.rdl diff --git a/test/test_structural_sw_rw/tb_template.sv b/tests/test_structural_sw_rw/tb_template.sv similarity index 100% rename from test/test_structural_sw_rw/tb_template.sv rename to tests/test_structural_sw_rw/tb_template.sv diff --git a/test/test_structural_sw_rw/testcase.py b/tests/test_structural_sw_rw/testcase.py similarity index 100% rename from test/test_structural_sw_rw/testcase.py rename to tests/test_structural_sw_rw/testcase.py diff --git a/test/test_swacc_swmod/__init__.py b/tests/test_swacc_swmod/__init__.py similarity index 100% rename from test/test_swacc_swmod/__init__.py rename to tests/test_swacc_swmod/__init__.py diff --git a/test/test_swacc_swmod/regblock.rdl b/tests/test_swacc_swmod/regblock.rdl similarity index 100% rename from test/test_swacc_swmod/regblock.rdl rename to tests/test_swacc_swmod/regblock.rdl diff --git a/test/test_swacc_swmod/tb_template.sv b/tests/test_swacc_swmod/tb_template.sv similarity index 100% rename from test/test_swacc_swmod/tb_template.sv rename to tests/test_swacc_swmod/tb_template.sv diff --git a/test/test_swacc_swmod/testcase.py b/tests/test_swacc_swmod/testcase.py similarity index 100% rename from test/test_swacc_swmod/testcase.py rename to tests/test_swacc_swmod/testcase.py diff --git a/test/test_swwe/__init__.py b/tests/test_swwe/__init__.py similarity index 100% rename from test/test_swwe/__init__.py rename to tests/test_swwe/__init__.py diff --git a/test/test_swwe/regblock.rdl b/tests/test_swwe/regblock.rdl similarity index 100% rename from test/test_swwe/regblock.rdl rename to tests/test_swwe/regblock.rdl diff --git a/test/test_swwe/tb_template.sv b/tests/test_swwe/tb_template.sv similarity index 100% rename from test/test_swwe/tb_template.sv rename to tests/test_swwe/tb_template.sv diff --git a/test/test_swwe/testcase.py b/tests/test_swwe/testcase.py similarity index 100% rename from test/test_swwe/testcase.py rename to tests/test_swwe/testcase.py diff --git a/test/test_user_cpuif/__init__.py b/tests/test_user_cpuif/__init__.py similarity index 100% rename from test/test_user_cpuif/__init__.py rename to tests/test_user_cpuif/__init__.py diff --git a/test/test_user_cpuif/regblock.rdl b/tests/test_user_cpuif/regblock.rdl similarity index 100% rename from test/test_user_cpuif/regblock.rdl rename to tests/test_user_cpuif/regblock.rdl diff --git a/test/test_user_cpuif/testcase.py b/tests/test_user_cpuif/testcase.py similarity index 100% rename from test/test_user_cpuif/testcase.py rename to tests/test_user_cpuif/testcase.py diff --git a/test/test_user_cpuif/user_apb3_tmpl.sv b/tests/test_user_cpuif/user_apb3_tmpl.sv similarity index 100% rename from test/test_user_cpuif/user_apb3_tmpl.sv rename to tests/test_user_cpuif/user_apb3_tmpl.sv