Compare commits

...

2 Commits

Author SHA1 Message Date
b2449c5641 Fixed bug in elab script 2025-02-14 13:46:19 +01:00
9d1cce8559 fixed gantry module import 2025-02-14 13:46:19 +01:00
2 changed files with 4 additions and 4 deletions

View File

@ -22,7 +22,7 @@ def runDesign(topDef: str, arch: str, lib: str, std: str):
wavePath = os.path.join(os.getcwd(), "wave")
command = [ ## may add -v for verbose
"ghdl", "-r", f"{topDef}", f"{arch}",
f"--wave={os.path.join(libPath, topDef)}-{arch}.ghw" ##, "--read-wave-opt=<See"
f"--wave=../wave/{topDef}-{arch}.ghw" ##, "--read-wave-opt=<See"
]
subprocess.run(command, cwd=libPath)
command = [

View File

@ -1,5 +1,5 @@
import typer
import elab
import elab as elaborate
import build_env
from typing_extensions import Annotated
@ -28,7 +28,7 @@ def elab(
std: Annotated[str, typer.Option(help="Which VHDL standard to use. 87, 93, 93c, 00, 02 or 08", autocompletion=complete_vhdl_ver)] = "93c"
):
print(f"Elaborating {topdef} with arch {arch} in library {library}. VHDL {std}")
return elab.elabDesign(topdef, arch, library, std)
return elaborate.elabDesign(topdef, arch, library, std)
@software.command(help="Simulates elaborated design in GHDL and views waves in gtkwave. Automatically runs `gantry elab` on the same top def and arch.")
def run(
@ -38,7 +38,7 @@ def run(
std: Annotated[str, typer.Option(help="Which VHDL standard to use. 87, 93, 93c, 00, 02 or 08", autocompletion=complete_vhdl_ver)] = "93c"
):
print(f"Running (and synthesizing if needed) {topdef} with arch {arch} in library {library}. VHDL {std}")
return elab.runDesign(topdef, arch, library, std)
return elaborate.runDesign(topdef, arch, library, std)
@hardware.command()
def build():