Skip to content

Commit 37426cb

Browse files
soheilshahrouzsoheilshahrouz
committed
parse new noc metrics
1 parent 4b9d804 commit 37426cb

File tree

2 files changed

+39
-24
lines changed

2 files changed

+39
-24
lines changed

‎vpr/src/place/place.cpp

Lines changed: 32 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -828,17 +828,19 @@ void try_place(const Netlist<>& net_list,
828828
costs.bb_cost, costs.timing_cost);
829829
if (noc_opts.noc) {
830830
VTR_LOG("NoC Placement Costs. "
831-
"noc cost: %g, "
832-
"noc_aggregate_bandwidth_cost: %g, "
833-
"noc_latency_cost: %g, "
834-
"noc_latency_constraints_cost: %d, "
835-
"noc_congestion_cost: %g, "
831+
"cost: %g, "
832+
"aggregate_bandwidth_cost: %g, "
833+
"latency_cost: %g, "
834+
"n_met_latency_constraints: %d, "
835+
"latency_overrun_cost: %g, "
836+
"congestion_cost: %g, "
836837
"accum_congested_ratio: %g, "
837838
"n_congested_links: %d \n",
838839
calculate_noc_cost(costs.noc_cost_terms, costs.noc_cost_norm_factors, noc_opts),
839840
costs.noc_cost_terms.aggregate_bandwidth,
840841
costs.noc_cost_terms.latency,
841842
get_number_of_traffic_flows_with_latency_cons_met(),
843+
costs.noc_cost_terms.latency_overrun,
842844
costs.noc_cost_terms.congestion,
843845
get_total_congestion_bandwidth_ratio(),
844846
get_number_of_congested_noc_links());
@@ -876,20 +878,25 @@ void try_place(const Netlist<>& net_list,
876878
if (noc_opts.noc) {
877879
sprintf(msg,
878880
"\nInitial NoC Placement Costs. "
879-
"noc cost: %g, "
880-
"noc_aggregate_bandwidth_cost: %g "
881-
"noc_latency_cost: %g "
882-
"noc_latency_constraints_cost: %d "
883-
"noc_congestion_cost: %g "
881+
"cost: %g, "
882+
"aggregate_bandwidth_cost: %g, "
883+
"latency_cost: %g, "
884+
"n_met_latency_constraints: %d, "
885+
"latency_overrun_cost: %g, "
886+
"congestion_cost: %g, "
884887
"accum_congested_ratio: %g, "
885-
"n_congested_links: %d",
888+
"n_congested_links: %d \n",
886889
calculate_noc_cost(costs.noc_cost_terms, costs.noc_cost_norm_factors, noc_opts),
887890
costs.noc_cost_terms.aggregate_bandwidth,
888891
costs.noc_cost_terms.latency,
889892
get_number_of_traffic_flows_with_latency_cons_met(),
893+
costs.noc_cost_terms.latency_overrun,
890894
costs.noc_cost_terms.congestion,
891895
get_total_congestion_bandwidth_ratio(),
892896
get_number_of_congested_noc_links());
897+
898+
899+
893900
}
894901
//Draw the initial placement
895902
update_screen(ScreenUpdatePriority::MAJOR, msg, PLACEMENT, timing_info);
@@ -1201,33 +1208,37 @@ void try_place(const Netlist<>& net_list,
12011208
if (noc_opts.noc) {
12021209
sprintf(msg,
12031210
"\nNoC Placement Costs. "
1204-
"noc cost: %g, "
1205-
"noc_aggregate_bandwidth_cost: %g, "
1206-
"noc_latency_cost: %g, "
1207-
"noc_latency_constraints_cost: %d, "
1208-
"noc_congestion_cost: %g, "
1211+
"cost: %g, "
1212+
"aggregate_bandwidth_cost: %g, "
1213+
"latency_cost: %g, "
1214+
"n_met_latency_constraints: %d, "
1215+
"latency_overrun_cost: %g, "
1216+
"congestion_cost: %g, "
12091217
"accum_congested_ratio: %g, "
12101218
"n_congested_links: %d \n",
12111219
calculate_noc_cost(costs.noc_cost_terms, costs.noc_cost_norm_factors, noc_opts),
12121220
costs.noc_cost_terms.aggregate_bandwidth,
12131221
costs.noc_cost_terms.latency,
12141222
get_number_of_traffic_flows_with_latency_cons_met(),
1223+
costs.noc_cost_terms.latency_overrun,
12151224
costs.noc_cost_terms.congestion,
12161225
get_total_congestion_bandwidth_ratio(),
12171226
get_number_of_congested_noc_links());
12181227

12191228
VTR_LOG("\nNoC Placement Costs. "
1220-
"noc cost: %g, "
1221-
"noc_aggregate_bandwidth_cost: %g, "
1222-
"noc_latency_cost: %g, "
1223-
"noc_latency_constraints_cost: %d, "
1224-
"noc_congestion_cost: %g, "
1229+
"cost: %g, "
1230+
"aggregate_bandwidth_cost: %g, "
1231+
"latency_cost: %g, "
1232+
"n_met_latency_constraints: %d, "
1233+
"latency_overrun_cost: %g, "
1234+
"congestion_cost: %g, "
12251235
"accum_congested_ratio: %g, "
12261236
"n_congested_links: %d \n",
12271237
calculate_noc_cost(costs.noc_cost_terms, costs.noc_cost_norm_factors, noc_opts),
12281238
costs.noc_cost_terms.aggregate_bandwidth,
12291239
costs.noc_cost_terms.latency,
12301240
get_number_of_traffic_flows_with_latency_cons_met(),
1241+
costs.noc_cost_terms.latency_overrun,
12311242
costs.noc_cost_terms.congestion,
12321243
get_total_congestion_bandwidth_ratio(),
12331244
get_number_of_congested_noc_links());

‎vtr_flow/parse/parse_config/vpr_noc.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
%include "timing/vpr.route_min_chan_width.txt"
1212
%include "timing/vpr.route_relaxed_chan_width.txt"
1313

14-
NoC_agg_bandwidth;vpr.out;NoC Placement Costs. noc_aggregate_bandwidth_cost: (.*), noc_latency_cost: .*, noc_latency_constraints_cost: .*,
15-
NoC_latency;vpr.out;NoC Placement Costs. noc_aggregate_bandwidth_cost: .*, noc_latency_cost: (.*), noc_latency_constraints_cost: .*,
16-
NoC_latency_constraints_cost;vpr.out;NoC Placement Costs. noc_aggregate_bandwidth_cost: .*, noc_latency_cost: .*, noc_latency_constraints_cost: (.*),
14+
NoC_agg_bandwidth;vpr.out;NoC Placement Costs. cost: .*, aggregate_bandwidth_cost: (.*), latency_cost: .*, n_met_latency_constraints: .*, latency_overrun_cost: .*, congestion_cost: .*, accum_congested_ratio: .*, n_congested_links: .*
15+
NoC_latency;vpr.out;NoC Placement Costs. cost: .*, aggregate_bandwidth_cost: .*, latency_cost: (.*), n_met_latency_constraints: .*, latency_overrun_cost: .*, congestion_cost: .*, accum_congested_ratio: .*, n_congested_links: .*
16+
NoC_n_met_latency_constraints;vpr.out;NoC Placement Costs. cost: .*, aggregate_bandwidth_cost: .*, latency_cost: .*, n_met_latency_constraints: (.*), latency_overrun_cost: .*, congestion_cost: .*, accum_congested_ratio: .*, n_congested_links: .*
17+
NoC_latency_overrun;vpr.out;NoC Placement Costs. cost: .*, aggregate_bandwidth_cost: .*, latency_cost: .*, n_met_latency_constraints: .*, latency_overrun_cost: (.*), congestion_cost: .*, accum_congested_ratio: .*, n_congested_links: .*
18+
NoC_congested_bw;vpr.out;NoC Placement Costs. cost: .*, aggregate_bandwidth_cost: .*, latency_cost: .*, n_met_latency_constraints: .*, latency_overrun_cost: .*, congestion_cost: (.*), accum_congested_ratio: .*, n_congested_links: .*
19+
NoC_congestion_ratio;vpr.out;NoC Placement Costs. cost: .*, aggregate_bandwidth_cost: .*, latency_cost: .*, n_met_latency_constraints: .*, latency_overrun_cost: .*, congestion_cost: .*, accum_congested_ratio: (.*), n_congested_links: .*
20+
NoC_n_congested_links;vpr.out;NoC Placement Costs. cost: .*, aggregate_bandwidth_cost: .*, latency_cost: .*, n_met_latency_constraints: .*, latency_overrun_cost: .*, congestion_cost: .*, accum_congested_ratio: .*, n_congested_links: (.*)

0 commit comments

Comments
 (0)