saji/niar
1
0
Fork 0
mirror of https://git.sr.ht/~kivikakk/niar synced 2024-12-22 23:22:24 +00:00
Code Activity

cxxrtl: put each CXXRTL platform in its own build directory.

Browse source
This commit is contained in:
Asherah Connor 2024-06-27 19:37:29 +03:00
parent b4eef36627
commit 0ab73b31a6
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
niar/cxxrtl.py
View file

@ -98,20 +98,22 @@ def add_arguments(np: Project, parser):
def main(np: Project, args): def main(np: Project, args):
yosys = find_yosys(lambda ver: ver >= (0, 10)) yosys = find_yosys(lambda ver: ver >= (0, 10))
os.makedirs(np.path.build(), exist_ok=True)
platform = np.cxxrtl_target_by_name(args.target) platform = np.cxxrtl_target_by_name(args.target)
design = construct_top(np, platform) design = construct_top(np, platform)
subdir = type(platform).__name__
os.makedirs(np.path.build(subdir), exist_ok=True)
cr = CommandRunner(force=args.force) cr = CommandRunner(force=args.force)
with logtime(logging.DEBUG, "elaboration"): with logtime(logging.DEBUG, "elaboration"):
il_path = np.path.build(f"{np.name}.cc.il") il_path = np.path.build(subdir, f"{np.name}.il")
rtlil_text = rtlil.convert(design, name=np.name, platform=platform) rtlil_text = rtlil.convert(design, name=np.name, platform=platform)
with open(il_path, "w") as f: with open(il_path, "w") as f:
f.write(rtlil_text) f.write(rtlil_text)
cxxrtl_cc_path = np.path.build(f"{np.name}.cc") cxxrtl_cc_path = np.path.build(subdir, f"{np.name}.cc")
yosys_script_path = _make_absolute(np.path.build(f"{np.name}.cc.ys")) yosys_script_path = _make_absolute(np.path.build(subdir, f"{np.name}.ys"))
black_boxes = {} black_boxes = {}
with open(yosys_script_path, "w") as f: with open(yosys_script_path, "w") as f:
@ -151,11 +153,11 @@ def main(np: Project, args):
cr.run() cr.run()
with logtime(logging.DEBUG, "compilation"): with logtime(logging.DEBUG, "compilation"):
cc_odep_paths = {cxxrtl_cc_path: (np.path.build(f"{np.name}.o"), [])} cc_odep_paths = {cxxrtl_cc_path: (np.path.build(subdir, f"{np.name}.o"), [])}
depfs = list(np.path("cxxrtl").glob("**/*.h")) depfs = list(np.path("cxxrtl").glob("**/*.h"))
for path in np.path("cxxrtl").glob("**/*.cc"): for path in np.path("cxxrtl").glob("**/*.cc"):
# XXX: we make no effort to distinguish cxxrtl/a.cc and cxxrtl/dir/a.cc. # XXX: we make no effort to distinguish cxxrtl/a.cc and cxxrtl/dir/a.cc.
cc_odep_paths[path] = (np.path.build(f"{path.stem}.o"), depfs) cc_odep_paths[path] = (np.path.build(subdir, f"{path.stem}.o"), depfs)
cxxflags = CXXFLAGS + [ cxxflags = CXXFLAGS + [
f"-DCLOCK_HZ={int(platform.default_clk_frequency)}", f"-DCLOCK_HZ={int(platform.default_clk_frequency)}",
@ -172,7 +174,7 @@ def main(np: Project, args):
cmd = [ cmd = [
"c++", "c++",
*cxxflags, *cxxflags,
f"-I{np.path("build")}", f"-I{np.path.build(subdir)}",
f"-I{yosys.data_dir() / "include" / "backends" / "cxxrtl" / "runtime"}", f"-I{yosys.data_dir() / "include" / "backends" / "cxxrtl" / "runtime"}",
"-c", "-c",
cc_path, cc_path,
@ -183,6 +185,9 @@ def main(np: Project, args):
cmd = ["zig"] + cmd cmd = ["zig"] + cmd
cr.add_process(cmd, infs=[cc_path] + dep_paths, outf=o_path) cr.add_process(cmd, infs=[cc_path] + dep_paths, outf=o_path)
# Not feasible to do these per-CXXRTL platform, as clangd won't find
# them (and how could it know which to choose?). Worth noting it checks
# inside a directory named "build" specifically.
with open(np.path.build("compile_commands.json"), "w") as f: with open(np.path.build("compile_commands.json"), "w") as f:
json.dump( json.dump(
[{ [{
@ -195,7 +200,7 @@ def main(np: Project, args):
cr.run() cr.run()
exe_o_path = np.path.build("cxxrtl") exe_o_path = np.path.build(subdir, np.name)
cc_o_paths = [o_path for (o_path, _) in cc_odep_paths.values()] cc_o_paths = [o_path for (o_path, _) in cc_odep_paths.values()]
if platform.uses_zig: if platform.uses_zig:
cmd = [ cmd = [