Merge pull request #301 from umarcor/vunit-cleanup

VUnit cleanup

.github/workflows/test.yml

@@ -5,6 +5,7 @@ on:
   pull_request:
   schedule:
     - cron: '0 0 * * 5'
+  workflow_dispatch:
 
 jobs:
 
@@ -54,10 +55,11 @@ jobs:
   VUnit:
     needs: [build]
     runs-on: ubuntu-latest
-    container: ghdl/vunit:llvm
     steps:
     - uses: actions/checkout@v2
-    - run: python3 ./run.py -p10
+    - uses: docker://ghdl/vunit:llvm
+      with:
+        args: python3 ./run.py -p10
 
   symbiflow:
     strategy:

run.py

@@ -1,29 +1,23 @@
 from pathlib import Path
 from vunit import VUnit
-from glob import glob
 
-prj = VUnit.from_argv()
+ROOT = Path(__file__).parent
-prj.add_osvvm()
-root = Path(__file__).parent
 
-lib = prj.add_library("lib")
+PRJ = VUnit.from_argv()
-lib.add_source_files(root / "litedram" / "extras" / "*.vhdl")
+PRJ.add_osvvm()
-lib.add_source_files(root / "litedram" / "generated" / "sim" / "*.vhdl")
 
-# Use multiply.vhd and not xilinx-mult.vhd. Use VHDL-based random.
+PRJ.add_library("lib").add_source_files([
-vhdl_files = glob(str(root / "*.vhdl"))
+    ROOT / "litedram" / "extras" / "*.vhdl",
-vhdl_files = [
+    ROOT / "litedram" / "generated" / "sim" / "*.vhdl"
+] + [
     src_file
-    for src_file in vhdl_files
+    for src_file in ROOT.glob("*.vhdl")
-    if ("xilinx-mult" not in src_file)
+    # Use multiply.vhd and not xilinx-mult.vhd. Use VHDL-based random.
-    and ("foreign_random" not in src_file)
+    if not any(exclude in str(src_file) for exclude in ["xilinx-mult", "foreign_random", "nonrandom"])
-    and ("nonrandom" not in src_file)
+])
-]
-lib.add_source_files(vhdl_files)
 
-unisim = prj.add_library("unisim")
+PRJ.add_library("unisim").add_source_files(ROOT / "sim-unisim" / "*.vhdl")
-unisim.add_source_files(root / "sim-unisim" / "*.vhdl")
 
-prj.set_sim_option("disable_ieee_warnings", True)
+PRJ.set_sim_option("disable_ieee_warnings", True)
 
-prj.main()
+PRJ.main()