riscv
/
OpenFPGA
mirror of https://github.com/lnis-uofu/OpenFPGA.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'multimode_clb' of https://github.com/LNIS-Projects/OpenFPGA into multimode_clb

This commit is contained in:
Baudouin Chauviere 2019-06-26 10:51:55 -06:00
parent 8f21a3b177 ec504049ef
commit b7c2954b91
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vpr7_x2p/vpr/SRC/fpga_x2p/verilog/verilog_formal_random_top_testbench.c
View File

@ -222,12 +222,17 @@ void dump_verilog_top_random_testbench_check(FILE* fp){
assert((VPACK_INPAD == logical_block[iblock].type) assert((VPACK_INPAD == logical_block[iblock].type)
||(VPACK_OUTPAD == logical_block[iblock].type)); ||(VPACK_OUTPAD == logical_block[iblock].type));
if(VPACK_OUTPAD == logical_block[iblock].type){ if(VPACK_OUTPAD == logical_block[iblock].type){
fprintf(fp, " %s%s <= %s%s ^ %s%s ;\n", logical_block[iblock].name, fprintf(fp, " if(!(%s%s === %s%s) && !(%s%s === 1'bx)) begin\n",
flag_postfix, logical_block[iblock].name,
logical_block[iblock].name, gfpga_postfix,
gfpga_postfix, logical_block[iblock].name,
logical_block[iblock].name, bench_postfix,
bench_postfix); logical_block[iblock].name,
bench_postfix);
fprintf(fp, " %s%s <= 1'b1;\n", logical_block[iblock].name,
flag_postfix);
fprintf(fp, " end else begin\n %s%s <= 1'b0;\n end\n", logical_block[iblock].name,
flag_postfix);
} }
} }
} }

18
vpr7_x2p/vpr/SRC/fpga_x2p/verilog/verilog_submodules.c
View File

@ -104,10 +104,17 @@ void dump_verilog_submodule_signal_init(FILE* fp,
fprintf(fp, "initial begin\n"); fprintf(fp, "initial begin\n");
// fprintf(fp, "`ifdef %s\n #0.001\n`endif\n", // Commented, looks no longer needed // fprintf(fp, "`ifdef %s\n #0.001\n`endif\n", // Commented, looks no longer needed
// icarus_simulator_flag); // icarus_simulator_flag);
fprintf(fp, " `ifdef %s\n", verilog_formal_verification_preproc_flag);
for (iport = 0; iport < num_input_port; iport++) {
fprintf(fp, " $deposit(%s, 1'b0);\n",
input_port[iport]->lib_name);
}
fprintf(fp, " `else\n");
for (iport = 0; iport < num_input_port; iport++) { for (iport = 0; iport < num_input_port; iport++) {
fprintf(fp, " $deposit(%s, $random);\n", fprintf(fp, " $deposit(%s, $random);\n",
input_port[iport]->lib_name); input_port[iport]->lib_name);
} }
fprintf(fp, " `endif\n");
fprintf(fp, "end\n"); fprintf(fp, "end\n");
fprintf(fp, " //------ END driver initialization -----\n"); fprintf(fp, " //------ END driver initialization -----\n");
fprintf(fp, "`endif\n"); fprintf(fp, "`endif\n");
@ -233,8 +240,9 @@ void dump_verilog_invbuf_module(FILE* fp,
output_port[0]->lib_name, output_port[0]->lib_name,
output_port[0]->lib_name); output_port[0]->lib_name);
} else { } else {
fprintf(fp, "assign %s = ~%s;\n", fprintf(fp, "assign %s = (%s === 1'bz)? $random : ~%s;\n",
output_port[0]->lib_name, output_port[0]->lib_name,
input_port[0]->lib_name,
input_port[0]->lib_name); input_port[0]->lib_name);
} }
break; break;
@ -296,13 +304,15 @@ void dump_verilog_invbuf_module(FILE* fp,
output_port[0]->lib_name); output_port[0]->lib_name);
} else if (FALSE == invbuf_spice_model->design_tech_info.buffer_info->tapered_buf) { } else if (FALSE == invbuf_spice_model->design_tech_info.buffer_info->tapered_buf) {
fprintf(fp, "assign %s = %s;\n", fprintf(fp, "assign %s = (%s === 1'bz)? $random : %s;\n",
output_port[0]->lib_name, output_port[0]->lib_name,
input_port[0]->lib_name,
input_port[0]->lib_name); input_port[0]->lib_name);
} else { } else {
assert (TRUE == invbuf_spice_model->design_tech_info.buffer_info->tapered_buf); assert (TRUE == invbuf_spice_model->design_tech_info.buffer_info->tapered_buf);
fprintf(fp, "assign %s = ", fprintf(fp, "assign %s = (%s === 1'bz)? $random : ",
output_port[0]->lib_name); output_port[0]->lib_name,
input_port[0]->lib_name);
/* depend on the stage, we may invert the output */ /* depend on the stage, we may invert the output */
if (1 == invbuf_spice_model->design_tech_info.buffer_info->tap_buf_level % 2) { if (1 == invbuf_spice_model->design_tech_info.buffer_info->tap_buf_level % 2) {
fprintf(fp, "~"); fprintf(fp, "~");

2
vpr7_x2p/vpr/regression_verilog.sh
View File

@ -33,7 +33,7 @@ perl rewrite_path_in_file.pl -i $arch_xml_file -k $arch_ff_keyword $new_ff_path
cd - cd -
# Run VPR # Run VPR
./vpr $arch_xml_file $blif_file --full_stats --nodisp --activity_file $act_file --fpga_verilog --fpga_verilog_dir $verilog_output_dirpath/$verilog_output_dirname --fpga_x2p_rename_illegal_port --fpga_bitstream_generator --fpga_verilog_print_top_testbench --fpga_verilog_print_input_blif_testbench --fpga_verilog_include_timing --fpga_verilog_include_signal_init --fpga_verilog_print_formal_verification_top_netlist --fpga_verilog_print_autocheck_top_testbench $verilog_reference --fpga_verilog_print_user_defined_template --route_chan_width $vpr_route_chan_width --fpga_verilog_include_icarus_simulator --fpga_verilog_print_report_timing_tcl --power --tech_properties $tech_file --fpga_verilog_print_sdc_pnr --fpga_verilog_print_sdc_analysis --fpga_x2p_compact_routing_hierarchy ./vpr $arch_xml_file $blif_file --full_stats --nodisp --activity_file $act_file --fpga_verilog --fpga_verilog_dir $verilog_output_dirpath/$verilog_output_dirname --fpga_x2p_rename_illegal_port --fpga_bitstream_generator --fpga_verilog_print_top_testbench --fpga_verilog_print_input_blif_testbench --fpga_verilog_include_timing --fpga_verilog_include_signal_init --fpga_verilog_print_formal_verification_top_netlist --fpga_verilog_print_autocheck_top_testbench $verilog_reference --fpga_verilog_print_user_defined_template --route_chan_width $vpr_route_chan_width --fpga_verilog_include_icarus_simulator --fpga_verilog_print_report_timing_tcl --power --tech_properties $tech_file --fpga_verilog_print_sdc_pnr --fpga_verilog_print_sdc_analysis #--fpga_x2p_compact_routing_hierarchy
cd $fpga_flow_scripts cd $fpga_flow_scripts
perl rewrite_path_in_file.pl -i $ff_path -o $new_ff_path -k $ff_keyword $ff_include_path perl rewrite_path_in_file.pl -i $ff_path -o $new_ff_path -k $ff_keyword $ff_include_path