Move to SystemVerilog HDL (#11)

simple-crypto · Oct 21, 2024 · d3145d9 · d3145d9
1 parent 7ebbe9a
commit d3145d9
Show file tree

Hide file tree

Showing 27 changed files with 6 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -89,14 +89,14 @@ formal-tests: $(FORMAL_VERIF_DONE)
 # VERILATOR
 LINT_VERILATOR=$(DIR_HDL)/.lint-verilator
 $(LINT_VERILATOR): $(HDL_DONE)
-	@set e; (cd $(DIR_HDL) && verilator --lint-only smaesh_hpc.v && touch $(LINT_VERILATOR) || exit 1)  
+	@set e; (cd $(DIR_HDL) && verilator --lint-only smaesh_hpc.sv && touch $(LINT_VERILATOR) || exit 1)  
 
 lint-verilator: $(LINT_VERILATOR)
 # VERIBLE
 VERIBLE?=verible-verilog-lint
 LINT_VERIBLE=$(DIR_HDL)/.lint-verible
 $(LINT_VERIBLE): $(HDL_DONE)
-	@set e; ($(VERIBLE) $(DIR_HDL)/*.v --rules -parameter-name-style,-always-comb && touch $(LINT_VERIBLE) || exit 1)
+	@set e; ($(VERIBLE) $(DIR_HDL)/*.v $(DIR_HDL)/*.sv --rules -parameter-name-style,-always-comb && touch $(LINT_VERIBLE) || exit 1)
 
 lint-verible: $(LINT_VERIBLE)
 # lint all

diff --git a/formal_verif/Makefile b/formal_verif/Makefile
@@ -49,7 +49,7 @@ export TOPLEVEL_LANG ?= verilog
 export SIM_BUILD ?= $(WORK_SYNTH)
 # Sources related
 export VERILOG_INCLUDE_DIRS?= $(HDL_DIR)
-export VERILOG_SOURCES ?= $(SYNTH_NETLIST_VERILOG) $(HDL_DIR)/smaesh_hpc.v 
+export VERILOG_SOURCES ?= $(SYNTH_NETLIST_VERILOG) $(HDL_DIR)/smaesh_hpc.sv 
 # TOPLEVEL is the name of the toplevel module in your Verilog or VHDL file
 export TOPLEVEL ?= smaesh_hpc
 # MODULE is the basename of the Python test file

diff --git a/formal_verif/synth.tcl b/formal_verif/synth.tcl
@@ -3,7 +3,7 @@ set MAIN_MODULE $::env(MAIN_MODULE)
 set OUT_DIR $::env(OUT_DIR)
 set MATCHI_CELLS $::env(MATCHI_CELLS) 
 
-set MAIN_PATH $IMPLEM_DIR/$MAIN_MODULE.v
+set MAIN_PATH $IMPLEM_DIR/$MAIN_MODULE.sv
 set LIB $MATCHI_CELLS
 set LIB_V $LIB.v
 set LIB $LIB.lib

diff --git a/func_tests/Makefile b/func_tests/Makefile
@@ -19,7 +19,7 @@ export TOPLEVEL_LANG ?= verilog
 export SIM_BUILD ?= $(WORK_CASE)
 # Sources related
 export VERILOG_INCLUDE_DIRS?= $(RTL_DIR_HDL)
-export VERILOG_SOURCES ?= $(RTL_DIR_HDL)/*.v
+export VERILOG_SOURCES ?= $(RTL_DIR_HDL)/*.v $(RTL_DIR_HDL)/*.sv
 # TOPLEVEL is the name of the toplevel module in your Verilog or VHDL file
 export TOPLEVEL ?= smaesh_hpc
 # MODULE is the basename of the Python test file

diff --git a/gather_sources.sh b/gather_sources.sh
@@ -16,7 +16,7 @@ mkdir -p $OUT_DIR
 # Iterate over each directory
 for var in "$@"; do
 	dir="$SCRIPT_DIR/$var"
-	files=$(find $dir -name '*.v' -o -name '*.vh')
+	files=$(find $dir -name '*.v' -o -name '*.vh' -o -name '*.sv')
 	for file in $files; do
 		cp $file $OUT_DIR
 		echo "$file copied to $OUT_DIR"

diff --git a/hdl/smaesh_hpc/MSKaes_32bits_core.v → hdl/smaesh_hpc/MSKaes_32bits_core.sv b/hdl/smaesh_hpc/MSKaes_32bits_core.v → hdl/smaesh_hpc/MSKaes_32bits_core.sv
diff --git a/hdl/smaesh_hpc/MSKaes_32bits_fsm.v → hdl/smaesh_hpc/MSKaes_32bits_fsm.sv b/hdl/smaesh_hpc/MSKaes_32bits_fsm.v → hdl/smaesh_hpc/MSKaes_32bits_fsm.sv
diff --git a/hdl/smaesh_hpc/MSKaes_32bits_key_datapath.v → hdl/smaesh_hpc/MSKaes_32bits_key_datapath.sv b/hdl/smaesh_hpc/MSKaes_32bits_key_datapath.v → hdl/smaesh_hpc/MSKaes_32bits_key_datapath.sv
diff --git a/...smaesh_hpc/MSKaes_32bits_state_datapath.v → ...maesh_hpc/MSKaes_32bits_state_datapath.sv b/...smaesh_hpc/MSKaes_32bits_state_datapath.v → ...maesh_hpc/MSKaes_32bits_state_datapath.sv
diff --git a/hdl/smaesh_hpc/MSKaes_rcon.v → hdl/smaesh_hpc/MSKaes_rcon.sv b/hdl/smaesh_hpc/MSKaes_rcon.v → hdl/smaesh_hpc/MSKaes_rcon.sv
diff --git a/hdl/smaesh_hpc/MSKbit0_sharing.v → hdl/smaesh_hpc/MSKbit0_sharing.sv b/hdl/smaesh_hpc/MSKbit0_sharing.v → hdl/smaesh_hpc/MSKbit0_sharing.sv
diff --git a/hdl/smaesh_hpc/MSKdata_holder_low_level.v → hdl/smaesh_hpc/MSKdata_holder_low_level.sv b/hdl/smaesh_hpc/MSKdata_holder_low_level.v → hdl/smaesh_hpc/MSKdata_holder_low_level.sv
diff --git a/hdl/smaesh_hpc/MSKkey_holder.v → hdl/smaesh_hpc/MSKkey_holder.sv b/hdl/smaesh_hpc/MSKkey_holder.v → hdl/smaesh_hpc/MSKkey_holder.sv
diff --git a/hdl/smaesh_hpc/MSKrefresh_tree.v → hdl/smaesh_hpc/MSKrefresh_tree.sv b/hdl/smaesh_hpc/MSKrefresh_tree.v → hdl/smaesh_hpc/MSKrefresh_tree.sv
diff --git a/hdl/smaesh_hpc/mixcolumn/MSKaesMC.v → hdl/smaesh_hpc/mixcolumn/MSKaesMC.sv b/hdl/smaesh_hpc/mixcolumn/MSKaesMC.v → hdl/smaesh_hpc/mixcolumn/MSKaesMC.sv
diff --git a/hdl/smaesh_hpc/mixcolumn/MSKaesMC_inverse.v → hdl/smaesh_hpc/mixcolumn/MSKaesMC_inverse.sv b/hdl/smaesh_hpc/mixcolumn/MSKaesMC_inverse.v → hdl/smaesh_hpc/mixcolumn/MSKaesMC_inverse.sv
diff --git a/...aesh_hpc/mixcolumn/aes_mc_single_column.v → ...esh_hpc/mixcolumn/aes_mc_single_column.sv b/...aesh_hpc/mixcolumn/aes_mc_single_column.v → ...esh_hpc/mixcolumn/aes_mc_single_column.sv
diff --git a/.../mixcolumn/aes_mc_single_column_inverse.v → ...mixcolumn/aes_mc_single_column_inverse.sv b/.../mixcolumn/aes_mc_single_column_inverse.v → ...mixcolumn/aes_mc_single_column_inverse.sv
diff --git a/hdl/smaesh_hpc/mixcolumn/xtime.v → hdl/smaesh_hpc/mixcolumn/xtime.sv b/hdl/smaesh_hpc/mixcolumn/xtime.v → hdl/smaesh_hpc/mixcolumn/xtime.sv
diff --git a/hdl/smaesh_hpc/rnd_gen/prng_top.v → hdl/smaesh_hpc/rnd_gen/prng_top.sv b/hdl/smaesh_hpc/rnd_gen/prng_top.v → hdl/smaesh_hpc/rnd_gen/prng_top.sv
diff --git a/hdl/smaesh_hpc/rnd_gen/trivium_prng.v → hdl/smaesh_hpc/rnd_gen/trivium_prng.sv b/hdl/smaesh_hpc/rnd_gen/trivium_prng.v → hdl/smaesh_hpc/rnd_gen/trivium_prng.sv
diff --git a/hdl/smaesh_hpc/sbox/gen_sbox.v → hdl/smaesh_hpc/sbox/gen_sbox.sv b/hdl/smaesh_hpc/sbox/gen_sbox.v → hdl/smaesh_hpc/sbox/gen_sbox.sv
diff --git a/hdl/smaesh_hpc/serial_shares_words_counter.v → ...smaesh_hpc/serial_shares_words_counter.sv b/hdl/smaesh_hpc/serial_shares_words_counter.v → ...smaesh_hpc/serial_shares_words_counter.sv
diff --git a/hdl/smaesh_hpc/shares2shbus.v → hdl/smaesh_hpc/shares2shbus.sv b/hdl/smaesh_hpc/shares2shbus.v → hdl/smaesh_hpc/shares2shbus.sv
diff --git a/hdl/smaesh_hpc/shbus2shares.v → hdl/smaesh_hpc/shbus2shares.sv b/hdl/smaesh_hpc/shbus2shares.v → hdl/smaesh_hpc/shbus2shares.sv
diff --git a/hdl/smaesh_hpc/smaesh_arbitrer.v → hdl/smaesh_hpc/smaesh_arbitrer.sv b/hdl/smaesh_hpc/smaesh_arbitrer.v → hdl/smaesh_hpc/smaesh_arbitrer.sv
diff --git a/hdl/smaesh_hpc/smaesh_hpc.v → hdl/smaesh_hpc/smaesh_hpc.sv b/hdl/smaesh_hpc/smaesh_hpc.v → hdl/smaesh_hpc/smaesh_hpc.sv