From f30de1085ce23e920031d56540fd69791aa48ead Mon Sep 17 00:00:00 2001
From: tangxifan <tangxifan@gmail.com>
Date: Sat, 19 Feb 2022 23:33:16 -0800
Subject: [PATCH] [Test] Cover all the related testcase about bus group

---
 .../config/mac4_bus_group.xml                 | 26 +++++++++++++++++++
 .../config/pin_constraints_dummy.xml          |  5 ++++
 .../config/task.conf                          |  7 ++++-
 .../config/mac4_bus_group.xml                 | 26 +++++++++++++++++++
 .../config/pin_constraints_dummy.xml          |  5 ++++
 .../config/task.conf                          |  7 ++++-
 .../config/mac4_bus_group.xml                 | 26 +++++++++++++++++++
 .../config/pin_constraints_dummy.xml          |  5 ++++
 .../config/task.conf                          |  7 ++++-
 9 files changed, 111 insertions(+), 3 deletions(-)
 create mode 100644 openfpga_flow/tasks/basic_tests/bus_group/full_testbench_explicit_mapping/config/mac4_bus_group.xml
 create mode 100644 openfpga_flow/tasks/basic_tests/bus_group/full_testbench_explicit_mapping/config/pin_constraints_dummy.xml
 create mode 100644 openfpga_flow/tasks/basic_tests/bus_group/full_testbench_implicit_mapping/config/mac4_bus_group.xml
 create mode 100644 openfpga_flow/tasks/basic_tests/bus_group/full_testbench_implicit_mapping/config/pin_constraints_dummy.xml
 create mode 100644 openfpga_flow/tasks/basic_tests/bus_group/preconfig_testbench_implicit_mapping/config/mac4_bus_group.xml
 create mode 100644 openfpga_flow/tasks/basic_tests/bus_group/preconfig_testbench_implicit_mapping/config/pin_constraints_dummy.xml

diff --git a/openfpga_flow/tasks/basic_tests/bus_group/full_testbench_explicit_mapping/config/mac4_bus_group.xml b/openfpga_flow/tasks/basic_tests/bus_group/full_testbench_explicit_mapping/config/mac4_bus_group.xml
new file mode 100644
index 000000000..50a42a566
--- /dev/null
+++ b/openfpga_flow/tasks/basic_tests/bus_group/full_testbench_explicit_mapping/config/mac4_bus_group.xml
@@ -0,0 +1,26 @@
+<bus_group>
+  <bus name="a[3:0]" big_endian="false">
+    <pin id="0" name="a_0_"/>
+    <pin id="1" name="a_1_"/>
+    <pin id="2" name="a_2_"/>
+    <pin id="3" name="a_3_"/>
+  </bus>
+  <bus name="b[3:0]" big_endian="false">
+    <pin id="0" name="b_0_"/>
+    <pin id="1" name="b_1_"/>
+    <pin id="2" name="b_2_"/>
+    <pin id="3" name="b_3_"/>
+  </bus>
+  <bus name="c[3:0]" big_endian="false">
+    <pin id="0" name="c_0_"/>
+    <pin id="1" name="c_1_"/>
+    <pin id="2" name="c_2_"/>
+    <pin id="3" name="c_3_"/>
+  </bus>
+  <bus name="out[3:0]" big_endian="false">
+    <pin id="0" name="out_0_"/>
+    <pin id="1" name="out_1_"/>
+    <pin id="2" name="out_2_"/>
+    <pin id="3" name="out_3_"/>
+  </bus>
+</bus_group>
diff --git a/openfpga_flow/tasks/basic_tests/bus_group/full_testbench_explicit_mapping/config/pin_constraints_dummy.xml b/openfpga_flow/tasks/basic_tests/bus_group/full_testbench_explicit_mapping/config/pin_constraints_dummy.xml
new file mode 100644
index 000000000..9d692672b
--- /dev/null
+++ b/openfpga_flow/tasks/basic_tests/bus_group/full_testbench_explicit_mapping/config/pin_constraints_dummy.xml
@@ -0,0 +1,5 @@
+<pin_constraints>
+  <!-- A dummy pin constraints file
+    -->
+</pin_constraints>
+
diff --git a/openfpga_flow/tasks/basic_tests/bus_group/full_testbench_explicit_mapping/config/task.conf b/openfpga_flow/tasks/basic_tests/bus_group/full_testbench_explicit_mapping/config/task.conf
index adfb12dc1..cdd9b8f94 100644
--- a/openfpga_flow/tasks/basic_tests/bus_group/full_testbench_explicit_mapping/config/task.conf
+++ b/openfpga_flow/tasks/basic_tests/bus_group/full_testbench_explicit_mapping/config/task.conf
@@ -20,13 +20,13 @@ openfpga_shell_template=${PATH:OPENFPGA_PATH}/openfpga_flow/openfpga_shell_scrip
 openfpga_arch_file=${PATH:OPENFPGA_PATH}/openfpga_flow/openfpga_arch/k6_frac_N10_adder_chain_dpram8K_dsp36_fracff_40nm_openfpga.xml
 openfpga_sim_setting_file=${PATH:OPENFPGA_PATH}/openfpga_flow/openfpga_simulation_settings/fixed_sim_openfpga.xml
 openfpga_verilog_port_mapping=--explicit_port_mapping
-openfpga_bus_group_file=${PATH:TASK_DIR}/config/counter8_bus_group.xml
 
 [ARCHITECTURES]
 arch0=${PATH:OPENFPGA_PATH}/openfpga_flow/vpr_arch/k6_frac_N10_tileable_adder_chain_dpram8K_dsp36_fracff_40nm.xml
 
 [BENCHMARKS]
 bench0=${PATH:OPENFPGA_PATH}/openfpga_flow/benchmarks/micro_benchmark/counters/counter_8bit_async_reset/counter.v
+bench1=${PATH:OPENFPGA_PATH}/openfpga_flow/benchmarks/micro_benchmark/mac/mac_4/mac_4.v
 
 [SYNTHESIS_PARAM]
 # Yosys script parameters
@@ -42,6 +42,11 @@ bench_yosys_rewrite_common=${PATH:OPENFPGA_PATH}/openfpga_flow/misc/ys_tmpl_yosy
 
 bench0_top = counter
 bench0_openfpga_pin_constraints_file=${PATH:TASK_DIR}/config/pin_constraints_reset.xml
+bench0_openfpga_bus_group_file=${PATH:TASK_DIR}/config/counter8_bus_group.xml
+
+bench1_top = mac_4
+bench1_openfpga_pin_constraints_file=${PATH:TASK_DIR}/config/pin_constraints_dummy.xml
+bench1_openfpga_bus_group_file=${PATH:TASK_DIR}/config/mac4_bus_group.xml
 
 [SCRIPT_PARAM_MIN_ROUTE_CHAN_WIDTH]
 end_flow_with_test=
diff --git a/openfpga_flow/tasks/basic_tests/bus_group/full_testbench_implicit_mapping/config/mac4_bus_group.xml b/openfpga_flow/tasks/basic_tests/bus_group/full_testbench_implicit_mapping/config/mac4_bus_group.xml
new file mode 100644
index 000000000..50a42a566
--- /dev/null
+++ b/openfpga_flow/tasks/basic_tests/bus_group/full_testbench_implicit_mapping/config/mac4_bus_group.xml
@@ -0,0 +1,26 @@
+<bus_group>
+  <bus name="a[3:0]" big_endian="false">
+    <pin id="0" name="a_0_"/>
+    <pin id="1" name="a_1_"/>
+    <pin id="2" name="a_2_"/>
+    <pin id="3" name="a_3_"/>
+  </bus>
+  <bus name="b[3:0]" big_endian="false">
+    <pin id="0" name="b_0_"/>
+    <pin id="1" name="b_1_"/>
+    <pin id="2" name="b_2_"/>
+    <pin id="3" name="b_3_"/>
+  </bus>
+  <bus name="c[3:0]" big_endian="false">
+    <pin id="0" name="c_0_"/>
+    <pin id="1" name="c_1_"/>
+    <pin id="2" name="c_2_"/>
+    <pin id="3" name="c_3_"/>
+  </bus>
+  <bus name="out[3:0]" big_endian="false">
+    <pin id="0" name="out_0_"/>
+    <pin id="1" name="out_1_"/>
+    <pin id="2" name="out_2_"/>
+    <pin id="3" name="out_3_"/>
+  </bus>
+</bus_group>
diff --git a/openfpga_flow/tasks/basic_tests/bus_group/full_testbench_implicit_mapping/config/pin_constraints_dummy.xml b/openfpga_flow/tasks/basic_tests/bus_group/full_testbench_implicit_mapping/config/pin_constraints_dummy.xml
new file mode 100644
index 000000000..9d692672b
--- /dev/null
+++ b/openfpga_flow/tasks/basic_tests/bus_group/full_testbench_implicit_mapping/config/pin_constraints_dummy.xml
@@ -0,0 +1,5 @@
+<pin_constraints>
+  <!-- A dummy pin constraints file
+    -->
+</pin_constraints>
+
diff --git a/openfpga_flow/tasks/basic_tests/bus_group/full_testbench_implicit_mapping/config/task.conf b/openfpga_flow/tasks/basic_tests/bus_group/full_testbench_implicit_mapping/config/task.conf
index 2ecda7275..49b12c169 100644
--- a/openfpga_flow/tasks/basic_tests/bus_group/full_testbench_implicit_mapping/config/task.conf
+++ b/openfpga_flow/tasks/basic_tests/bus_group/full_testbench_implicit_mapping/config/task.conf
@@ -20,13 +20,13 @@ openfpga_shell_template=${PATH:OPENFPGA_PATH}/openfpga_flow/openfpga_shell_scrip
 openfpga_arch_file=${PATH:OPENFPGA_PATH}/openfpga_flow/openfpga_arch/k6_frac_N10_adder_chain_dpram8K_dsp36_fracff_40nm_openfpga.xml
 openfpga_sim_setting_file=${PATH:OPENFPGA_PATH}/openfpga_flow/openfpga_simulation_settings/fixed_sim_openfpga.xml
 openfpga_verilog_port_mapping=
-openfpga_bus_group_file=${PATH:TASK_DIR}/config/counter8_bus_group.xml
 
 [ARCHITECTURES]
 arch0=${PATH:OPENFPGA_PATH}/openfpga_flow/vpr_arch/k6_frac_N10_tileable_adder_chain_dpram8K_dsp36_fracff_40nm.xml
 
 [BENCHMARKS]
 bench0=${PATH:OPENFPGA_PATH}/openfpga_flow/benchmarks/micro_benchmark/counters/counter_8bit_async_reset/counter.v
+bench1=${PATH:OPENFPGA_PATH}/openfpga_flow/benchmarks/micro_benchmark/mac/mac_4/mac_4.v
 
 [SYNTHESIS_PARAM]
 # Yosys script parameters
@@ -42,6 +42,11 @@ bench_yosys_rewrite_common=${PATH:OPENFPGA_PATH}/openfpga_flow/misc/ys_tmpl_yosy
 
 bench0_top = counter
 bench0_openfpga_pin_constraints_file=${PATH:TASK_DIR}/config/pin_constraints_reset.xml
+bench0_openfpga_bus_group_file=${PATH:TASK_DIR}/config/counter8_bus_group.xml
+
+bench1_top = mac_4
+bench1_openfpga_pin_constraints_file=${PATH:TASK_DIR}/config/pin_constraints_dummy.xml
+bench1_openfpga_bus_group_file=${PATH:TASK_DIR}/config/mac4_bus_group.xml
 
 [SCRIPT_PARAM_MIN_ROUTE_CHAN_WIDTH]
 end_flow_with_test=
diff --git a/openfpga_flow/tasks/basic_tests/bus_group/preconfig_testbench_implicit_mapping/config/mac4_bus_group.xml b/openfpga_flow/tasks/basic_tests/bus_group/preconfig_testbench_implicit_mapping/config/mac4_bus_group.xml
new file mode 100644
index 000000000..50a42a566
--- /dev/null
+++ b/openfpga_flow/tasks/basic_tests/bus_group/preconfig_testbench_implicit_mapping/config/mac4_bus_group.xml
@@ -0,0 +1,26 @@
+<bus_group>
+  <bus name="a[3:0]" big_endian="false">
+    <pin id="0" name="a_0_"/>
+    <pin id="1" name="a_1_"/>
+    <pin id="2" name="a_2_"/>
+    <pin id="3" name="a_3_"/>
+  </bus>
+  <bus name="b[3:0]" big_endian="false">
+    <pin id="0" name="b_0_"/>
+    <pin id="1" name="b_1_"/>
+    <pin id="2" name="b_2_"/>
+    <pin id="3" name="b_3_"/>
+  </bus>
+  <bus name="c[3:0]" big_endian="false">
+    <pin id="0" name="c_0_"/>
+    <pin id="1" name="c_1_"/>
+    <pin id="2" name="c_2_"/>
+    <pin id="3" name="c_3_"/>
+  </bus>
+  <bus name="out[3:0]" big_endian="false">
+    <pin id="0" name="out_0_"/>
+    <pin id="1" name="out_1_"/>
+    <pin id="2" name="out_2_"/>
+    <pin id="3" name="out_3_"/>
+  </bus>
+</bus_group>
diff --git a/openfpga_flow/tasks/basic_tests/bus_group/preconfig_testbench_implicit_mapping/config/pin_constraints_dummy.xml b/openfpga_flow/tasks/basic_tests/bus_group/preconfig_testbench_implicit_mapping/config/pin_constraints_dummy.xml
new file mode 100644
index 000000000..9d692672b
--- /dev/null
+++ b/openfpga_flow/tasks/basic_tests/bus_group/preconfig_testbench_implicit_mapping/config/pin_constraints_dummy.xml
@@ -0,0 +1,5 @@
+<pin_constraints>
+  <!-- A dummy pin constraints file
+    -->
+</pin_constraints>
+
diff --git a/openfpga_flow/tasks/basic_tests/bus_group/preconfig_testbench_implicit_mapping/config/task.conf b/openfpga_flow/tasks/basic_tests/bus_group/preconfig_testbench_implicit_mapping/config/task.conf
index 23af1199a..3dafcf21d 100644
--- a/openfpga_flow/tasks/basic_tests/bus_group/preconfig_testbench_implicit_mapping/config/task.conf
+++ b/openfpga_flow/tasks/basic_tests/bus_group/preconfig_testbench_implicit_mapping/config/task.conf
@@ -20,13 +20,13 @@ openfpga_shell_template=${PATH:OPENFPGA_PATH}/openfpga_flow/openfpga_shell_scrip
 openfpga_arch_file=${PATH:OPENFPGA_PATH}/openfpga_flow/openfpga_arch/k6_frac_N10_adder_chain_dpram8K_dsp36_fracff_40nm_openfpga.xml
 openfpga_sim_setting_file=${PATH:OPENFPGA_PATH}/openfpga_flow/openfpga_simulation_settings/fixed_sim_openfpga.xml
 openfpga_verilog_port_mapping=
-openfpga_bus_group_file=${PATH:TASK_DIR}/config/counter8_bus_group.xml
 
 [ARCHITECTURES]
 arch0=${PATH:OPENFPGA_PATH}/openfpga_flow/vpr_arch/k6_frac_N10_tileable_adder_chain_dpram8K_dsp36_fracff_40nm.xml
 
 [BENCHMARKS]
 bench0=${PATH:OPENFPGA_PATH}/openfpga_flow/benchmarks/micro_benchmark/counters/counter_8bit_async_reset/counter.v
+bench1=${PATH:OPENFPGA_PATH}/openfpga_flow/benchmarks/micro_benchmark/mac/mac_4/mac_4.v
 
 [SYNTHESIS_PARAM]
 # Yosys script parameters
@@ -42,6 +42,11 @@ bench_yosys_rewrite_common=${PATH:OPENFPGA_PATH}/openfpga_flow/misc/ys_tmpl_yosy
 
 bench0_top = counter
 bench0_openfpga_pin_constraints_file=${PATH:TASK_DIR}/config/pin_constraints_reset.xml
+bench0_openfpga_bus_group_file=${PATH:TASK_DIR}/config/counter8_bus_group.xml
+
+bench1_top = mac_4
+bench1_openfpga_pin_constraints_file=${PATH:TASK_DIR}/config/pin_constraints_dummy.xml
+bench1_openfpga_bus_group_file=${PATH:TASK_DIR}/config/mac4_bus_group.xml
 
 [SCRIPT_PARAM_MIN_ROUTE_CHAN_WIDTH]
 end_flow_with_test=