diff --git a/.github/workflows/Implementation.yml b/.github/workflows/Implementation.yml index a47e756..7f88992 100644 --- a/.github/workflows/Implementation.yml +++ b/.github/workflows/Implementation.yml @@ -17,6 +17,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - uses: docker://ghcr.io/unike267/containers/impl-arty:latest with: @@ -37,6 +40,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - uses: docker://ghcr.io/unike267/containers/impl-arty:latest with: @@ -57,6 +63,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - uses: docker://ghcr.io/unike267/containers/impl-arty:latest with: @@ -77,6 +86,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - uses: docker://ghcr.io/unike267/containers/impl-arty:latest with: @@ -97,6 +109,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - uses: docker://ghcr.io/unike267/containers/impl-arty:latest with: @@ -117,6 +132,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - uses: docker://ghcr.io/unike267/containers/impl-arty:latest with: @@ -137,6 +155,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - uses: docker://ghcr.io/unike267/containers/impl-arty:latest with: @@ -157,6 +178,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - uses: docker://ghcr.io/unike267/containers/impl-arty:latest with: @@ -177,6 +201,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - uses: docker://ghcr.io/unike267/containers/impl-arty:latest with: @@ -197,6 +224,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - uses: docker://ghcr.io/unike267/containers/impl-arty:latest with: @@ -217,6 +247,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - uses: docker://ghcr.io/unike267/containers/impl-arty:latest with: @@ -237,6 +270,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - uses: docker://ghcr.io/unike267/containers/impl-arty:latest with: @@ -257,6 +293,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - uses: docker://ghcr.io/unike267/containers/impl-arty:latest with: @@ -277,6 +316,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - uses: docker://ghcr.io/unike267/containers/impl-arty:latest with: @@ -297,6 +339,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - uses: docker://ghcr.io/unike267/containers/impl-arty:latest with: @@ -317,6 +362,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - uses: docker://ghcr.io/unike267/containers/impl-arty:latest with: @@ -337,6 +385,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - uses: docker://ghcr.io/unike267/containers/impl-arty:latest with: @@ -357,6 +408,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - uses: docker://ghcr.io/unike267/containers/impl-arty:latest with: diff --git a/.github/workflows/Simulation.yml b/.github/workflows/Simulation.yml index 2172835..fe3962e 100644 --- a/.github/workflows/Simulation.yml +++ b/.github/workflows/Simulation.yml @@ -41,6 +41,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - name: 'Run slink Complex Latency test' uses: docker://docker.io/ghdl/vunit:mcode-master @@ -63,6 +66,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - name: 'Run slink Complex Throughput test' uses: docker://docker.io/ghdl/vunit:mcode-master @@ -98,6 +104,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - name: 'Run wishbone Complex Latency test' uses: docker://docker.io/ghdl/vunit:mcode-master @@ -120,6 +129,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - name: 'Run wishbone Complex Throughput test' uses: docker://docker.io/ghdl/vunit:mcode-master @@ -143,6 +155,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - name: 'Run CFU Complex Latency test for mult_wfifos' uses: docker://docker.io/ghdl/vunit:mcode-master @@ -164,6 +179,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - name: 'Run CFU Complex Latency test for multp_wfifos' uses: docker://docker.io/ghdl/vunit:mcode-master @@ -185,6 +203,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - name: 'Run CFU Complex Latency test for multp' uses: docker://docker.io/ghdl/vunit:mcode-master @@ -206,6 +227,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - name: 'Run CFS Complex Latency test for buffering multipliers' uses: docker://docker.io/ghdl/vunit:mcode-master @@ -229,6 +253,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - name: 'Run CFS Complex Latency test for not buffering multipliers' uses: docker://docker.io/ghdl/vunit:mcode-master @@ -248,6 +275,9 @@ jobs: - name: '🧰 Checkout' uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 - name: 'Run CFS Complex Throughput test for buffering multipliers' uses: docker://docker.io/ghdl/vunit:mcode-master diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..2f78da5 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "neorv32-setups"] + path = neorv32-setups + url = git@github.com:stnolting/neorv32-setups diff --git a/impl/nextpnr/impl_mult_wfifos_cfs.sh b/impl/nextpnr/impl_mult_wfifos_cfs.sh index a88f5a5..e256a1e 100755 --- a/impl/nextpnr/impl_mult_wfifos_cfs.sh +++ b/impl/nextpnr/impl_mult_wfifos_cfs.sh @@ -16,14 +16,8 @@ else fi echo "Selected board is" $Arty -apt update -qq - -apt install -y git - cd ../.. -git clone --recursive https://github.com/stnolting/neorv32-setups - mv rtl/mult/CFS/neorv32_application_image.vhd neorv32-setups/neorv32/rtl/core mv rtl/mult/CFS/neorv32_cfs.vhd neorv32-setups/neorv32/rtl/core diff --git a/impl/nextpnr/impl_mult_wfifos_slink.sh b/impl/nextpnr/impl_mult_wfifos_slink.sh index ab5c1de..762bd6b 100755 --- a/impl/nextpnr/impl_mult_wfifos_slink.sh +++ b/impl/nextpnr/impl_mult_wfifos_slink.sh @@ -16,14 +16,8 @@ else fi echo "Selected board is" $Arty -apt update -qq - -apt install -y git - cd ../.. -git clone --recursive https://github.com/stnolting/neorv32-setups - mv rtl/mult/slink/neorv32_application_image.vhd neorv32-setups/neorv32/rtl/core mkdir -p build diff --git a/impl/nextpnr/impl_mult_wfifos_wishbone.sh b/impl/nextpnr/impl_mult_wfifos_wishbone.sh index 7f46b05..51d3cb2 100755 --- a/impl/nextpnr/impl_mult_wfifos_wishbone.sh +++ b/impl/nextpnr/impl_mult_wfifos_wishbone.sh @@ -16,14 +16,8 @@ else fi echo "Selected board is" $Arty -apt update -qq - -apt install -y git - cd ../.. -git clone --recursive https://github.com/stnolting/neorv32-setups - mv rtl/mult/EMEM/neorv32_application_image.vhd neorv32-setups/neorv32/rtl/core mkdir -p build diff --git a/impl/nextpnr/impl_multp_cfs.sh b/impl/nextpnr/impl_multp_cfs.sh index 451ee51..01c8461 100755 --- a/impl/nextpnr/impl_multp_cfs.sh +++ b/impl/nextpnr/impl_multp_cfs.sh @@ -16,14 +16,8 @@ else fi echo "Selected board is" $Arty -apt update -qq - -apt install -y git - cd ../.. -git clone --recursive https://github.com/stnolting/neorv32-setups - mv rtl/multp/CFS/neorv32_application_image.vhd neorv32-setups/neorv32/rtl/core mv rtl/multp/CFS/neorv32_cfs.vhd neorv32-setups/neorv32/rtl/core diff --git a/impl/nextpnr/impl_multp_slink.sh b/impl/nextpnr/impl_multp_slink.sh index c085711..ac8ba32 100755 --- a/impl/nextpnr/impl_multp_slink.sh +++ b/impl/nextpnr/impl_multp_slink.sh @@ -16,14 +16,8 @@ else fi echo "Selected board is" $Arty -apt update -qq - -apt install -y git - cd ../.. -git clone --recursive https://github.com/stnolting/neorv32-setups - mv rtl/mult/slink/neorv32_application_image.vhd neorv32-setups/neorv32/rtl/core mkdir -p build diff --git a/impl/nextpnr/impl_multp_wfifos_cfs.sh b/impl/nextpnr/impl_multp_wfifos_cfs.sh index ffba044..540523b 100755 --- a/impl/nextpnr/impl_multp_wfifos_cfs.sh +++ b/impl/nextpnr/impl_multp_wfifos_cfs.sh @@ -16,14 +16,8 @@ else fi echo "Selected board is" $Arty -apt update -qq - -apt install -y git - cd ../.. -git clone --recursive https://github.com/stnolting/neorv32-setups - mv rtl/mult/CFS/neorv32_application_image.vhd neorv32-setups/neorv32/rtl/core mv rtl/mult/CFS/neorv32_cfs.vhd neorv32-setups/neorv32/rtl/core diff --git a/impl/nextpnr/impl_multp_wfifos_slink.sh b/impl/nextpnr/impl_multp_wfifos_slink.sh index 9e1e345..cb1350a 100755 --- a/impl/nextpnr/impl_multp_wfifos_slink.sh +++ b/impl/nextpnr/impl_multp_wfifos_slink.sh @@ -16,14 +16,8 @@ else fi echo "Selected board is" $Arty -apt update -qq - -apt install -y git - cd ../.. -git clone --recursive https://github.com/stnolting/neorv32-setups - mv rtl/mult/slink/neorv32_application_image.vhd neorv32-setups/neorv32/rtl/core mkdir -p build diff --git a/impl/nextpnr/impl_multp_wfifos_wishbone.sh b/impl/nextpnr/impl_multp_wfifos_wishbone.sh index cc7d6f4..f843efe 100755 --- a/impl/nextpnr/impl_multp_wfifos_wishbone.sh +++ b/impl/nextpnr/impl_multp_wfifos_wishbone.sh @@ -16,14 +16,8 @@ else fi echo "Selected board is" $Arty -apt update -qq - -apt install -y git - cd ../.. -git clone --recursive https://github.com/stnolting/neorv32-setups - mv rtl/mult/EMEM/neorv32_application_image.vhd neorv32-setups/neorv32/rtl/core mkdir -p build diff --git a/impl/nextpnr/impl_mults_cfu.sh b/impl/nextpnr/impl_mults_cfu.sh index a35a188..2720434 100755 --- a/impl/nextpnr/impl_mults_cfu.sh +++ b/impl/nextpnr/impl_mults_cfu.sh @@ -16,14 +16,8 @@ else fi echo "Selected board is" $Arty -apt update -qq - -apt install -y git - cd ../.. -git clone --recursive https://github.com/stnolting/neorv32-setups - mv rtl/mult/CFU/neorv32_application_image.vhd neorv32-setups/neorv32/rtl/core mv rtl/mult/CFU/neorv32_cpu_cp_cfu.vhd neorv32-setups/neorv32/rtl/core diff --git a/neorv32-setups b/neorv32-setups new file mode 160000 index 0000000..a9b61de --- /dev/null +++ b/neorv32-setups @@ -0,0 +1 @@ +Subproject commit a9b61ded34987af30e4a7b9e15d4feb71151b004 diff --git a/sim/test/test_CFS_Complex_Latency.sh b/sim/test/test_CFS_Complex_Latency.sh index e08fd0c..d29d80e 100755 --- a/sim/test/test_CFS_Complex_Latency.sh +++ b/sim/test/test_CFS_Complex_Latency.sh @@ -4,14 +4,8 @@ set -ex cd $(dirname "$0") -apt update -qq - -apt install -y git - cd ../.. -git clone --recursive https://github.com/stnolting/neorv32-setups - if [[ -z "${Fifos}" ]]; then echo "Start test" mv rtl/mult/CFS/sim/LATENCY/neorv32_application_image.vhd neorv32-setups/neorv32/rtl/core diff --git a/sim/test/test_CFS_Complex_Throughput.sh b/sim/test/test_CFS_Complex_Throughput.sh index 1f35fde..2be2a52 100755 --- a/sim/test/test_CFS_Complex_Throughput.sh +++ b/sim/test/test_CFS_Complex_Throughput.sh @@ -4,14 +4,8 @@ set -ex cd $(dirname "$0") -apt update -qq - -apt install -y git - cd ../.. -git clone --recursive https://github.com/stnolting/neorv32-setups - mv rtl/mult/CFS/sim/THROUGHPUT/neorv32_application_image.vhd neorv32-setups/neorv32/rtl/core mv rtl/mult/CFS/neorv32_cfs.vhd neorv32-setups/neorv32/rtl/core diff --git a/sim/test/test_CFU_Complex_Latency.sh b/sim/test/test_CFU_Complex_Latency.sh index 314c412..1615781 100755 --- a/sim/test/test_CFU_Complex_Latency.sh +++ b/sim/test/test_CFU_Complex_Latency.sh @@ -4,14 +4,8 @@ set -ex cd $(dirname "$0") -apt update -qq - -apt install -y git - cd ../.. -git clone --recursive https://github.com/stnolting/neorv32-setups - if [[ -z "${Design}" ]]; then mv rtl/mult/CFU/SIM/LATENCY/neorv32_application_image.vhd neorv32-setups/neorv32/rtl/core elif [[ $Design == 'mult' ]]; then diff --git a/sim/test/test_slink_Complex_Latency.sh b/sim/test/test_slink_Complex_Latency.sh index 9a6185e..ef99d76 100755 --- a/sim/test/test_slink_Complex_Latency.sh +++ b/sim/test/test_slink_Complex_Latency.sh @@ -4,14 +4,8 @@ set -ex cd $(dirname "$0") -apt update -qq - -apt install -y git - cd ../.. -git clone --recursive https://github.com/stnolting/neorv32-setups - mv rtl/mult/slink/sim/LATENCY/neorv32_application_image.vhd neorv32-setups/neorv32/rtl/core cd sim/slink/complex-lat diff --git a/sim/test/test_slink_Complex_Throughput.sh b/sim/test/test_slink_Complex_Throughput.sh index bb49a2c..6eaf227 100755 --- a/sim/test/test_slink_Complex_Throughput.sh +++ b/sim/test/test_slink_Complex_Throughput.sh @@ -4,14 +4,8 @@ set -ex cd $(dirname "$0") -apt update -qq - -apt install -y git - cd ../.. -git clone --recursive https://github.com/stnolting/neorv32-setups - mv rtl/mult/slink/sim/THROUGHPUT/neorv32_application_image.vhd neorv32-setups/neorv32/rtl/core cd sim/slink/complex-thr diff --git a/sim/test/test_wishbone_Complex_Latency.sh b/sim/test/test_wishbone_Complex_Latency.sh index 7013118..401322c 100755 --- a/sim/test/test_wishbone_Complex_Latency.sh +++ b/sim/test/test_wishbone_Complex_Latency.sh @@ -4,14 +4,8 @@ set -ex cd $(dirname "$0") -apt update -qq - -apt install -y git - cd ../.. -git clone --recursive https://github.com/stnolting/neorv32-setups - mv rtl/mult/EMEM/sim/LATENCY/neorv32_application_image.vhd neorv32-setups/neorv32/rtl/core cd sim/EMEM/complex-lat diff --git a/sim/test/test_wishbone_Complex_Throughput.sh b/sim/test/test_wishbone_Complex_Throughput.sh index f3a73b9..2ea0eb4 100755 --- a/sim/test/test_wishbone_Complex_Throughput.sh +++ b/sim/test/test_wishbone_Complex_Throughput.sh @@ -4,14 +4,8 @@ set -ex cd $(dirname "$0") -apt update -qq - -apt install -y git - cd ../.. -git clone --recursive https://github.com/stnolting/neorv32-setups - mv rtl/mult/EMEM/sim/THROUGHPUT/neorv32_application_image.vhd neorv32-setups/neorv32/rtl/core cd sim/EMEM/complex-thr