From 6529229ae2c955e6417fbdd3887ab97db63d8b4a Mon Sep 17 00:00:00 2001 From: Michal Czyz Date: Tue, 5 Sep 2023 15:42:42 +0200 Subject: [PATCH 1/2] Add configuration of flake, black, isort --- verification/block/.flake8 | 21 +++++++++++++++++++++ verification/{ => block}/__init__.py | 0 verification/block/pyproject.toml | 24 ++++++++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 verification/block/.flake8 rename verification/{ => block}/__init__.py (100%) create mode 100644 verification/block/pyproject.toml diff --git a/verification/block/.flake8 b/verification/block/.flake8 new file mode 100644 index 00000000000..ba96f8f6b59 --- /dev/null +++ b/verification/block/.flake8 @@ -0,0 +1,21 @@ +; Copyright (C) 2023 Antmicro +; SPDX-License-Identifier: Apache-2.0 +[flake8] +ignore = E203, E266, E501, W503, F403, F401, F405 +max-line-length = 100 +max-complexity = 27 +select = B,C,E,F,W,T4,B9 +exclude = + .git, + .gitignore, + .gitmodules, + .github, + .nox, + .pytest_cache, + __pycache__, + docs/source/conf.py, + venv, +count = True +show-source = True +statistics = True + diff --git a/verification/__init__.py b/verification/block/__init__.py similarity index 100% rename from verification/__init__.py rename to verification/block/__init__.py diff --git a/verification/block/pyproject.toml b/verification/block/pyproject.toml new file mode 100644 index 00000000000..109b1e14997 --- /dev/null +++ b/verification/block/pyproject.toml @@ -0,0 +1,24 @@ +# Copyright (C) 2023 Antmicro +# SPDX-License-Identifier: Apache-2.0 + +[tool.black] +line-length = 100 +exclude = ''' +( + /( + | \.git + | \.gitignore + | \.gitmodules + | \.github + | \.nox + | \.pytest_cache + | __pycache__ + | venv + )/ + | docs/source/conf.py +) +''' + +[tool.isort] +profile = "black" +multi_line_output = 3 From 9d05f2c6c8a84b03436b4ce53f37143402f37ed1 Mon Sep 17 00:00:00 2001 From: Michal Czyz Date: Wed, 13 Sep 2023 18:02:38 +0200 Subject: [PATCH 2/2] Implement noxfile and common Makefile --- verification/block/common.mk | 59 ++++++++++++ verification/block/noxfile.py | 144 ++++++++++++++++++++++++++++ verification/block/requirements.txt | 9 ++ 3 files changed, 212 insertions(+) create mode 100644 verification/block/common.mk create mode 100644 verification/block/noxfile.py create mode 100644 verification/block/requirements.txt diff --git a/verification/block/common.mk b/verification/block/common.mk new file mode 100644 index 00000000000..4d68b936694 --- /dev/null +++ b/verification/block/common.mk @@ -0,0 +1,59 @@ +# Copyright (c) 2023 Antmicro +# SPDX-License-Identifier: Apache-2.0 + +TOPLEVEL_LANG = verilog +SIM ?= verilator +WAVES ?= 1 + +# Paths +CURDIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) +CFGDIR := $(abspath $(CURDIR)/snapshots/default) +CONFIG := $(abspath $(CURDIR)/../../configs) + +# Common sources +COMMON_SOURCES = $(CFGDIR)/common_defines.vh +COMMON_SOURCES += $(CFGDIR)/el2_pdef.vh +COMMON_SOURCES += $(SRCDIR)/include/el2_def.sv +COMMON_SOURCES += $(SRCDIR)/lib/beh_lib.sv + +VERILOG_SOURCES := $(COMMON_SOURCES) $(VERILOG_SOURCES) + +# Coverage reporting +COVERAGE_TYPE ?= "" +ifeq ("$(COVERAGE_TYPE)", "all") + VERILATOR_COVERAGE = --coverage +else ifeq ("$(COVERAGE_TYPE)", "branch") + VERILATOR_COVERAGE = --coverage-line +else ifeq ("$(COVERAGE_TYPE)", "toggle") + VERILATOR_COVERAGE = --coverage-toggle +else ifeq ("$(COVERAGE_TYPE)", "functional") + VERILATOR_COVERAGE = --coverage-user +else + VERILATOR_COVERAGE = "" +endif + +# Enable processing of #delay statements +ifeq ($(SIM), verilator) + COMPILE_ARGS += --timing + COMPILE_ARGS += -Wall -Wno-fatal + + EXTRA_ARGS += --trace --trace-structs + EXTRA_ARGS += $(VERILATOR_COVERAGE) +endif + +COCOTB_HDL_TIMEUNIT = 1ns +COCOTB_HDL_TIMEPRECISION = 10ps + +EXTRA_ARGS += -I$(CFGDIR) + +# Build directory +ifneq ($(COVERAGE_TYPE),) + SIM_BUILD := sim-build-$(COVERAGE_TYPE) +endif + +include $(shell cocotb-config --makefiles)/Makefile.sim + +# Rules for generating VeeR config +$(CFGDIR)/common_defines.vh: + cd $(CURDIR) && $(CONFIG)/veer.config -fpga_optimize=0 + diff --git a/verification/block/noxfile.py b/verification/block/noxfile.py new file mode 100644 index 00000000000..11f77f8715d --- /dev/null +++ b/verification/block/noxfile.py @@ -0,0 +1,144 @@ +# Copyright (C) 2023 Antmicro +# SPDX-License-Identifier: Apache-2.0 + +import logging +import os +from xml.etree import ElementTree as ET + +import nox + +# nox quirk: in status.json, return code for failure is 0 +# https://github.com/wntrblm/nox/blob/main/nox/sessions.py#L128C11-L128C11 +nox.options.report = "status.json" +nox.options.reuse_existing_virtualenvs = True + +# Test configuration +blockPath = "." +pipRequirementsPath = "requirements.txt" + +# Coverage types to collect +coverageTypes = [ + "all", + "branch", + "toggle", +] + + +def isSimFailure( + resultsFile="results.xml", testsuites_name="results", verbose=False, suppress_rc=False +): + """ + Extract failure code from cocotb results.xml file + Based on https://github.com/cocotb/cocotb/blob/master/bin/combine_results.py + """ + rc = 0 + + # Logging + logger = logging.getLogger() + logger.setLevel(logging.DEBUG) + logHandler = logging.FileHandler(filename="parseResultsXML.log", mode="w", encoding="utf-8") + logFormatter = logging.Formatter() + logHandler.setFormatter(logFormatter) + logger.addHandler(logHandler) + logHandler.setLevel(logging.INFO) + if verbose: + logHandler.setLevel(logging.DEBUG) + + # Main + result = ET.Element("testsuites", name=testsuites_name) + logging.debug(f"Reading file {resultsFile}") + tree = ET.parse(resultsFile) + + for ts in tree.iter("testsuite"): + ts_name = ts.get("name") + ts_package = ts.get("package") + logging.debug(f"Testsuite name : {ts_name}, package : {ts_package}") + use_element = None + for existing in result: + if existing.get("name") == ts.get("name") and existing.get("package") == ts.get( + "package" + ): + use_element = existing + break + if use_element is None: + result.append(ts) + else: + use_element.extend(list(ts)) + + if verbose: + ET.dump(result) + + for testsuite in result.iter("testsuite"): + for testcase in testsuite.iter("testcase"): + for failure in testcase.iter("failure"): + rc = 1 + logging.info( + "Failure in testsuite: '{}' classname: '{}' testcase: '{}' with parameters '{}'".format( + testsuite.get("name"), + testcase.get("classname"), + testcase.get("name"), + testsuite.get("package"), + ) + ) + + if suppress_rc: + rc = 0 + logging.shutdown() + return rc + + +def verify_block(session, blockName, testName, coverage=""): + session.install("-r", pipRequirementsPath) + testPath = os.path.join(blockPath, blockName) + testNameXML = os.path.join(testName + ".xml") + testNameXMLPath = os.path.join(testPath, testNameXML) + testNameLog = os.path.join(testName + ".log") + testNameLogPath = os.path.join(testPath, testNameLog) + with open(testNameLogPath, "w") as testLog: + session.run( + "make", + "-C", + testPath, + "all", + "COVERAGE_TYPE=" + coverage, + "MODULE=" + testName, + "COCOTB_RESULTS_FILE=" + testNameXML, + stdout=testLog, + stderr=testLog, + ) + # Prevent coverage.dat and test log from being overwritten + if coverage != "": + coveragePath = testPath + coverageName = "coverage.dat" + coverageNamePath = os.path.join(coveragePath, coverageName) + newCoverageName = "coverage_" + testName + "_" + coverage + ".dat" + newCoverageNamePath = os.path.join(coveragePath, newCoverageName) + os.rename(coverageNamePath, newCoverageNamePath) + newTestNameLog = testName + "_" + coverage + ".log" + newTestNameLogPath = os.path.join(testPath, newTestNameLog) + os.rename(testNameLogPath, newTestNameLogPath) + # Add check from results.xml to notify nox that test failed + isTBFailure = isSimFailure(resultsFile=testNameXMLPath) + if isTBFailure: + raise Exception("SimFailure: cocotb failed. See test logs for more information.") + + +@nox.session() +def isort(session: nox.Session) -> None: + """Options are defined in pyproject.toml file""" + session.install("isort") + session.run("isort", ".") + + +@nox.session() +def flake8(session: nox.Session) -> None: + """Options are defined in .flake8 file.""" + session.install("flake8") + session.run("flake8", ".") + + +@nox.session() +def black(session: nox.Session) -> None: + """Options are defined in pyproject.toml file""" + session.install("black") + session.run("black", ".") diff --git a/verification/block/requirements.txt b/verification/block/requirements.txt new file mode 100644 index 00000000000..6a8dd8ec460 --- /dev/null +++ b/verification/block/requirements.txt @@ -0,0 +1,9 @@ +cocotb==1.8.0 +cocotb-bus==0.2.1 +cocotb-coverage==1.1.0 +cocotb-test==0.2.4 +pytest==7.4.1 +pytest-html==3.2.0 +pytest-timeout==2.1.0 +pytest-md==0.2.0 +pyuvm==2.9.1