aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichalis Pardalos <m.pardalos@gmail.com>2021-09-02 21:19:57 +0100
committerMichalis Pardalos <m.pardalos@gmail.com>2021-09-03 13:13:49 +0100
commitc897f10b61700fce4977ea5a3726c0f497732781 (patch)
tree6b0d40fe0d72aec1b6dc7a6d119c1df38304803b
parent1be25f8fb37d44b22472d2ae7ca73dc38b04b147 (diff)
downloadvericert-c897f10b61700fce4977ea5a3726c0f497732781.tar.gz
vericert-c897f10b61700fce4977ea5a3726c0f497732781.zip
Remove double clock
-rw-r--r--src/hls/Veriloggen.v12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/hls/Veriloggen.v b/src/hls/Veriloggen.v
index 1e7bb8e..6d57bd5 100644
--- a/src/hls/Veriloggen.v
+++ b/src/hls/Veriloggen.v
@@ -98,12 +98,6 @@ Section TRANSLATE.
let externctrl := HTL.mod_externctrl m in
- (* Only declare the clock if this is the top-level module, i.e. there is no inherited clock *)
- let maybe_clk_decl := match externclk with
- | None => scl_to_Vdecls [(clk, (Some Vinput, VScalar 1))]
- | Some _ => []
- end in
-
let local_arrdecls := PTree.filter (fun r _ => negb (PTree.contains r externctrl)) (HTL.mod_arrdecls m) in
let arr_decls := arr_to_Vdeclarrs (AssocMap.elements local_arrdecls) in
@@ -119,10 +113,9 @@ Section TRANSLATE.
(Vnonblock (Vvar (HTL.mod_finish m)) (Vlit (ZToValue 0))))
(Vcase (Vvar (HTL.mod_st m)) case_el_ctrl (Some Vskip)))
:: Valways (Vposedge clk) (Vcase (Vvar (HTL.mod_st m)) case_el_data (Some Vskip))
- :: inst_ram m.(HTL.mod_clk) ram
+ :: inst_ram clk ram
:: arr_decls
++ scl_decls
- ++ maybe_clk_decl
++ List.flat_map Verilog.mod_body (List.map snd (PTree.elements cleaned_modules))
| Nothing =>
Valways (Vposedge clk) (Vcond (Vbinop Veq (Vvar (HTL.mod_reset m)) (Vlit (ZToValue 1)))
@@ -133,7 +126,6 @@ Section TRANSLATE.
:: Valways (Vposedge clk) (Vcase (Vvar (HTL.mod_st m)) case_el_data (Some Vskip))
:: arr_decls
++ scl_decls
- ++ maybe_clk_decl
++ List.flat_map Verilog.mod_body (List.map snd (PTree.elements cleaned_modules))
end
in
@@ -141,7 +133,7 @@ Section TRANSLATE.
OK (Verilog.mkmodule
(HTL.mod_start m)
(HTL.mod_reset m)
- (HTL.mod_clk m)
+ clk
(HTL.mod_finish m)
(HTL.mod_return m)
(HTL.mod_st m)