From 514c217704a7bf25df674ca2128381cdffe13c8f Mon Sep 17 00:00:00 2001 From: Michal Czyz Date: Mon, 4 Sep 2023 14:42:51 +0200 Subject: [PATCH 1/4] Move IRQ test to top dir --- verification/{ => top}/README.md | 0 verification/{ => top}/requirements.txt | 0 verification/{ => top}/test_pyuvm/Makefile | 0 verification/{ => top}/test_pyuvm/__init__.py | 0 verification/{ => top}/test_pyuvm/conftest.py | 0 verification/{ => top}/test_pyuvm/test_irq/irq_utils.py | 0 verification/{ => top}/test_pyuvm/test_irq/irq_uvm.py | 0 verification/{ => top}/test_pyuvm/test_irq/test_irq.py | 0 verification/{ => top}/test_pyuvm/test_pyuvm.py | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename verification/{ => top}/README.md (100%) rename verification/{ => top}/requirements.txt (100%) rename verification/{ => top}/test_pyuvm/Makefile (100%) rename verification/{ => top}/test_pyuvm/__init__.py (100%) rename verification/{ => top}/test_pyuvm/conftest.py (100%) rename verification/{ => top}/test_pyuvm/test_irq/irq_utils.py (100%) rename verification/{ => top}/test_pyuvm/test_irq/irq_uvm.py (100%) rename verification/{ => top}/test_pyuvm/test_irq/test_irq.py (100%) rename verification/{ => top}/test_pyuvm/test_pyuvm.py (100%) diff --git a/verification/README.md b/verification/top/README.md similarity index 100% rename from verification/README.md rename to verification/top/README.md diff --git a/verification/requirements.txt b/verification/top/requirements.txt similarity index 100% rename from verification/requirements.txt rename to verification/top/requirements.txt diff --git a/verification/test_pyuvm/Makefile b/verification/top/test_pyuvm/Makefile similarity index 100% rename from verification/test_pyuvm/Makefile rename to verification/top/test_pyuvm/Makefile diff --git a/verification/test_pyuvm/__init__.py b/verification/top/test_pyuvm/__init__.py similarity index 100% rename from verification/test_pyuvm/__init__.py rename to verification/top/test_pyuvm/__init__.py diff --git a/verification/test_pyuvm/conftest.py b/verification/top/test_pyuvm/conftest.py similarity index 100% rename from verification/test_pyuvm/conftest.py rename to verification/top/test_pyuvm/conftest.py diff --git a/verification/test_pyuvm/test_irq/irq_utils.py b/verification/top/test_pyuvm/test_irq/irq_utils.py similarity index 100% rename from verification/test_pyuvm/test_irq/irq_utils.py rename to verification/top/test_pyuvm/test_irq/irq_utils.py diff --git a/verification/test_pyuvm/test_irq/irq_uvm.py b/verification/top/test_pyuvm/test_irq/irq_uvm.py similarity index 100% rename from verification/test_pyuvm/test_irq/irq_uvm.py rename to verification/top/test_pyuvm/test_irq/irq_uvm.py diff --git a/verification/test_pyuvm/test_irq/test_irq.py b/verification/top/test_pyuvm/test_irq/test_irq.py similarity index 100% rename from verification/test_pyuvm/test_irq/test_irq.py rename to verification/top/test_pyuvm/test_irq/test_irq.py diff --git a/verification/test_pyuvm/test_pyuvm.py b/verification/top/test_pyuvm/test_pyuvm.py similarity index 100% rename from verification/test_pyuvm/test_pyuvm.py rename to verification/top/test_pyuvm/test_pyuvm.py From e092cde3c60795dbbedc4f4021f961a562e64faa Mon Sep 17 00:00:00 2001 From: Michal Czyz Date: Mon, 4 Sep 2023 14:44:59 +0200 Subject: [PATCH 2/4] Adjust CI for new location of verification --- .github/workflows/test-verification.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-verification.yml b/.github/workflows/test-verification.yml index 60a096e2245..2059b41490e 100644 --- a/.github/workflows/test-verification.yml +++ b/.github/workflows/test-verification.yml @@ -85,13 +85,13 @@ jobs: echo "RV_ROOT=$RV_ROOT" >> $GITHUB_ENV PYTHONUNBUFFERED=1 echo "PYTHONUNBUFFERED=$PYTHONUNBUFFERED" >> $GITHUB_ENV - TEST_PATH=$RV_ROOT/verification/${{ matrix.test }} + TEST_PATH=$RV_ROOT/verification/top/${{ matrix.test }} echo "TEST_PATH=$TEST_PATH" >> $GITHUB_ENV - name: Run ${{ matrix.test }} run: | pip3 install meson - pip3 install -r $RV_ROOT/verification/requirements.txt + pip3 install -r $RV_ROOT/verification/top/requirements.txt PYTEST_STYLE_SRC_DIR=${{ github.workspace }}/.github/scripts/pytest/ PYTEST_CSS=${PYTEST_STYLE_SRC_DIR}/css/styles.css HTML_FILE=${{ matrix.test }}_${{ matrix.COVERAGE }}.html From 346b107858851dbf50ee9dde2546c64d547f91a1 Mon Sep 17 00:00:00 2001 From: Michal Czyz Date: Mon, 4 Sep 2023 16:41:32 +0200 Subject: [PATCH 3/4] Freeze pytest tools verisons --- verification/top/requirements.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/verification/top/requirements.txt b/verification/top/requirements.txt index e02d6b69ede..312e26b3b4c 100644 --- a/verification/top/requirements.txt +++ b/verification/top/requirements.txt @@ -6,8 +6,8 @@ ${RV_ROOT}/third_party/cocotb cocotb-bus==0.2.1 cocotb-coverage==1.1.0 cocotb-test==0.2.4 -pytest -pytest-html -pytest-timeout -pytest-md -pyuvm +pytest==7.4.1 +pytest-html==3.2.0 +pytest-timeout==2.1.0 +pytest-md==0.2.0 +pyuvm==2.9.1 From 0115d45c857e781c3f726fda5b36985c150768a3 Mon Sep 17 00:00:00 2001 From: Michal Czyz Date: Tue, 5 Sep 2023 11:30:35 +0200 Subject: [PATCH 4/4] Update paths in README --- verification/top/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/verification/top/README.md b/verification/top/README.md index 6f4320a0d00..28e526ec6e8 100644 --- a/verification/top/README.md +++ b/verification/top/README.md @@ -16,7 +16,7 @@ Remember to set the `RV_ROOT` environment variable, which is required to generat ### Prepare python virtual environment - cd $RV_ROOT/verification + cd $RV_ROOT/verification/top python -m venv venv source venv/bin/activate pip install -r requirements.txt @@ -35,7 +35,7 @@ Each PyUVM test can be either run from a pytest wrapper or directly from a Makef In `test_pyuvm` directory, a `Makefile` and a wrapper `test_pyuvm.py` are placed. - ./verification/ + ./verification/top/ └── test_pyuvm ├── Makefile ├── test_pyuvm.py ⟵ pytest wrapper