Merge pull request #588 from lnis-uofu/tb_port_names

Now port/wire names uses "__" to avoid collision FPGA global ports
lnis-uofu · Mar 16, 2022 · 939f1b8 · 939f1b8
2 parents 8a8e4c6 + 8ab0906
commit 939f1b8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/install_dependencies_build.sh b/.github/workflows/install_dependencies_build.sh
diff --git a/openfpga/src/fpga_verilog/verilog_top_testbench_constants.h b/openfpga/src/fpga_verilog/verilog_top_testbench_constants.h
@@ -18,16 +18,16 @@ constexpr char* TOP_TESTBENCH_SIM_START_PORT_NAME = "sim_start";
 
 constexpr char* TOP_TESTBENCH_ERROR_COUNTER = "nb_error";
 
-constexpr char* TOP_TB_RESET_PORT_NAME = "greset";
-constexpr char* TOP_TB_SET_PORT_NAME = "gset";
-constexpr char* TOP_TB_PROG_RESET_PORT_NAME = "prog_reset";
-constexpr char* TOP_TB_PROG_SET_PORT_NAME = "prog_set";
-constexpr char* TOP_TB_CONFIG_DONE_PORT_NAME = "config_done";
-constexpr char* TOP_TB_OP_CLOCK_PORT_NAME = "op_clock";
-constexpr char* TOP_TB_OP_CLOCK_PORT_PREFIX = "operating_clk_";
-constexpr char* TOP_TB_PROG_CLOCK_PORT_NAME = "prog_clock";
-constexpr char* TOP_TB_INOUT_REG_POSTFIX = "_reg";
-constexpr char* TOP_TB_CLOCK_REG_POSTFIX = "_reg";
+constexpr char* TOP_TB_RESET_PORT_NAME = "__greset__";
+constexpr char* TOP_TB_SET_PORT_NAME = "__gset__";
+constexpr char* TOP_TB_PROG_RESET_PORT_NAME = "__prog_reset__";
+constexpr char* TOP_TB_PROG_SET_PORT_NAME = "__prog_set_";
+constexpr char* TOP_TB_CONFIG_DONE_PORT_NAME = "__config_done__";
+constexpr char* TOP_TB_OP_CLOCK_PORT_NAME = "__op_clock__";
+constexpr char* TOP_TB_OP_CLOCK_PORT_PREFIX = "__operating_clk_";
+constexpr char* TOP_TB_PROG_CLOCK_PORT_NAME = "__prog_clock__";
+constexpr char* TOP_TB_INOUT_REG_POSTFIX = "_reg__";
+constexpr char* TOP_TB_CLOCK_REG_POSTFIX = "_reg__";
 constexpr char* TOP_TB_BITSTREAM_LENGTH_VARIABLE = "BITSTREAM_LENGTH";
 constexpr char* TOP_TB_BITSTREAM_WIDTH_VARIABLE = "BITSTREAM_WIDTH";
 constexpr char* TOP_TB_BITSTREAM_MEM_REG_NAME = "bit_mem";