Skip to content

Commit 672d7f3

Browse files
GHDL doesn't strip asserts for synth
1 parent f37138c commit 672d7f3

File tree

4 files changed

+2
-5
lines changed

4 files changed

+2
-5
lines changed

hdl/ip/vhd/spi/axi_controller/spi_axi_pkg.vhd

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ package body spi_axi_pkg is
7070
when spi_opcode_bit_clr =>
7171
return rdata and (not wdata);
7272
when others =>
73-
assert false report "not a bit operation opcode" severity failure;
73+
return rdata;
7474
end case;
7575

7676
end function;

hdl/ip/vhd/spi/axi_controller/spi_axi_sms.vhd

-2
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,6 @@ begin
215215
v.state := OPCODE;
216216
v.opcode := (others => '0');
217217
v.req_addr := (others => '0');
218-
219-
-- TODO: any more clearing needed?
220218
end if;
221219

222220
spi_rin <= v;

tools/yosys.bzl

-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ def yosys_vhdl_synth(ctx):
6565
# depends on them. Buck2 is too smart such that since nothing depends
6666
# on them, it doesn't even build them
6767
# This is a bit of a hack but it works for now.
68-
6968
yosys_py = ctx.actions.declare_output("synth.py")
7069

7170
yosys_gen = ctx.attrs._yosys_gen[RunInfo]

tools/yosys_gen/templates/synth_py.jinja2

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ cmd = [
2222
"-m",
2323
"ghdl",
2424
"-p",
25-
f'ghdl --std=08 {files_str} -e {{project.top_entity_name}}; {{project.synth_family}} -json {args.output}',
25+
f'ghdl --std=08 --no-formal {files_str} -e {{project.top_entity_name}}; {{project.synth_family}} -json {args.output}',
2626
]
2727

2828
a = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=False)

0 commit comments

Comments
 (0)