SymbiFlow · acomodi · Jan 20, 2020 · Jul 8, 2019 · Aug 16, 2019 · Sep 27, 2019
diff --git a/libs/libarchfpga/src/physical_types.h b/libs/libarchfpga/src/physical_types.h
@@ -1457,6 +1457,7 @@ struct t_arch_switch_inf {
     float Cin = 0.;
     float Cout = 0.;
     float Cinternal = 0.;
+    float penalty_cost = 0.;
     float mux_trans_size = 1.;
     BufferSize buf_size_type = BufferSize::AUTO;
     float buf_size = 0.;
@@ -1521,6 +1522,7 @@ struct t_rr_switch_inf {
     float Cout = 0.;
     float Cinternal = 0.;
     float Tdel = 0.;
+    float penalty_cost = 0.;
     float mux_trans_size = 0.;
     float buf_size = 0.;
     const char* name = nullptr;

diff --git a/libs/libarchfpga/src/read_xml_arch_file.cpp b/libs/libarchfpga/src/read_xml_arch_file.cpp
@@ -3987,23 +3987,23 @@ static void ProcessSwitches(pugi::xml_node Parent,
         SwitchType type = SwitchType::MUX;
         if (0 == strcmp(type_name, "mux")) {
             type = SwitchType::MUX;
-            expect_only_attributes(Node, {"type", "name", "R", "Cin", "Cout", "Cinternal", "Tdel", "buf_size", "power_buf_size", "mux_trans_size"}, " with type '"s + type_name + "'"s, loc_data);
+            expect_only_attributes(Node, {"type", "name", "R", "Cin", "Cout", "Cinternal", "Tdel", "penalty_cost", "buf_size", "power_buf_size", "mux_trans_size"}, " with type '"s + type_name + "'"s, loc_data);
 
         } else if (0 == strcmp(type_name, "tristate")) {
             type = SwitchType::TRISTATE;
-            expect_only_attributes(Node, {"type", "name", "R", "Cin", "Cout", "Cinternal", "Tdel", "buf_size", "power_buf_size"}, " with type '"s + type_name + "'"s, loc_data);
+            expect_only_attributes(Node, {"type", "name", "R", "Cin", "Cout", "Cinternal", "Tdel", "penalty_cost", "buf_size", "power_buf_size"}, " with type '"s + type_name + "'"s, loc_data);
 
         } else if (0 == strcmp(type_name, "buffer")) {
             type = SwitchType::BUFFER;
-            expect_only_attributes(Node, {"type", "name", "R", "Cin", "Cout", "Tdel", "buf_size", "power_buf_size"}, " with type '"s + type_name + "'"s, loc_data);
+            expect_only_attributes(Node, {"type", "name", "R", "Cin", "Cout", "Tdel", "penalty_cost", "buf_size", "power_buf_size"}, " with type '"s + type_name + "'"s, loc_data);
 
         } else if (0 == strcmp(type_name, "pass_gate")) {
             type = SwitchType::PASS_GATE;
-            expect_only_attributes(Node, {"type", "name", "R", "Cin", "Cout", "Tdel"}, " with type '"s + type_name + "'"s, loc_data);
+            expect_only_attributes(Node, {"type", "name", "R", "Cin", "Cout", "Tdel", "penalty_cost"}, " with type '"s + type_name + "'"s, loc_data);
 
         } else if (0 == strcmp(type_name, "short")) {
             type = SwitchType::SHORT;
-            expect_only_attributes(Node, {"type", "name", "R", "Cin", "Cout", "Tdel"}, " with type "s + type_name + "'"s, loc_data);
+            expect_only_attributes(Node, {"type", "name", "R", "Cin", "Cout", "Tdel", "penalty_cost"}, " with type "s + type_name + "'"s, loc_data);
         } else {
             archfpga_throw(loc_data.filename_c_str(), loc_data.line(Node),
                            "Invalid switch type '%s'.\n", type_name);
@@ -4026,6 +4026,7 @@ static void ProcessSwitches(pugi::xml_node Parent,
         arch_switch.Cin = get_attribute(Node, "Cin", loc_data, CIN_REQD).as_float(0);
         arch_switch.Cout = get_attribute(Node, "Cout", loc_data, COUT_REQD).as_float(0);
         arch_switch.Cinternal = get_attribute(Node, "Cinternal", loc_data, CINTERNAL_REQD).as_float(0);
+        arch_switch.penalty_cost = get_attribute(Node, "penalty_cost", loc_data, ReqOpt::OPTIONAL).as_float(0);
 
         if (arch_switch.type() == SwitchType::MUX) {
             //Only muxes have mux transistors

diff --git a/libs/libvtrcapnproto/CMakeLists.txt b/libs/libvtrcapnproto/CMakeLists.txt
@@ -19,6 +19,7 @@ endif()
 # Each schema used should appear here.
 set(CAPNP_DEFS
     place_delay_model.capnp
+    connection_map.capnp
     matrix.capnp
     gen/rr_graph_uxsdcxx.capnp
     map_lookahead.capnp

diff --git a/libs/libvtrcapnproto/connection_map.capnp b/libs/libvtrcapnproto/connection_map.capnp
@@ -0,0 +1,25 @@
+@0x876ec83c2fea5a18;
+
+using Matrix = import "matrix.capnp";
+
+struct VprCostEntry {
+    delay @0 :Float32;
+    congestion @1 :Float32;
+    fill @2 :Bool;
+}
+
+struct VprVector2D {
+    x @0 :Int64;
+    y @1 :Int64;
+}
+
+struct VprFloatEntry {
+    value @0 :Float32;
+}
+
+struct VprCostMap {
+    costMap @0 :Matrix.Matrix((Matrix.Matrix(VprCostEntry)));
+    offset @1 :Matrix.Matrix(VprVector2D);
+    depField @2 :List(Int64);
+    penalty @3 :Matrix.Matrix(VprFloatEntry);
+}
diff --git a/libs/libvtrcapnproto/gen/rr_graph_uxsdcxx.capnp b/libs/libvtrcapnproto/gen/rr_graph_uxsdcxx.capnp
@@ -2,11 +2,11 @@
 # https://github.com/duck2/uxsdcxx
 # Modify only if your build process doesn't involve regenerating this file.
 #
-# Cmdline: uxsdcxx/uxsdcap.py /home/kmurray/trees/vtr/vpr/src/route/rr_graph.xsd
-# Input file: /home/kmurray/trees/vtr/vpr/src/route/rr_graph.xsd
-# md5sum of input file: 40e83d2ea6556761d4e29f21324b1871
+# Cmdline: uxsdcxx/uxsdcap.py rr_graph.xsd
+# Input file: rr_graph.xsd
+# md5sum of input file: bea3923ac9822e94db96d5d9d15e18c6
 
-@0xb803100e76d3342d;
+@0xf281a101eeb2a247;
 using Cxx = import "/capnp/c++.capnp";
 $Cxx.namespace("ucap");
 
@@ -81,6 +81,7 @@ struct Timing {
 	cout @2 :Float32;
 	r @3 :Float32;
 	tdel @4 :Float32;
+	penaltyCost @5 :Float32;
 }
 
 struct Sizing {
@@ -176,6 +177,18 @@ struct Metadata {
 	metas @0 :List(Meta);
 }
 
+struct CanonicalLoc {
+	x @0 :UInt32;
+	y @1 :UInt32;
+}
+
+struct ConnectionBoxAnnotation {
+	id @0 :UInt32;
+	sitePinDelay @1 :Float32;
+	x @2 :UInt32;
+	y @3 :UInt32;
+}
+
 struct Node {
 	capacity @0 :UInt32;
 	direction @1 :NodeDirection;
@@ -185,6 +198,8 @@ struct Node {
 	timing @5 :NodeTiming;
 	segment @6 :NodeSegment;
 	metadata @7 :Metadata;
+	canonicalLoc @8 :CanonicalLoc;
+	connectionBox @9 :ConnectionBoxAnnotation;
 }
 
 struct RrNodes {
@@ -202,6 +217,18 @@ struct RrEdges {
 	edges @0 :List(Edge);
 }
 
+struct ConnectionBoxDeclaration {
+	id @0 :UInt32;
+	name @1 :Text;
+}
+
+struct ConnectionBoxes {
+	numBoxes @0 :UInt32;
+	xDim @1 :UInt32;
+	yDim @2 :UInt32;
+	connectionBoxes @3 :List(ConnectionBoxDeclaration);
+}
+
 struct RrGraph {
 	toolComment @0 :Text;
 	toolName @1 :Text;
@@ -213,4 +240,5 @@ struct RrGraph {
 	grid @7 :GridLocs;
 	rrNodes @8 :RrNodes;
 	rrEdges @9 :RrEdges;
+	connectionBoxes @10 :ConnectionBoxes;
 }
diff --git a/vpr/src/base/SetupVPR.cpp b/vpr/src/base/SetupVPR.cpp
@@ -287,6 +287,7 @@ static void SetupSwitches(const t_arch& Arch,
     device_ctx.arch_switch_inf[RoutingArch->delayless_switch].R = 0.;
     device_ctx.arch_switch_inf[RoutingArch->delayless_switch].Cin = 0.;
     device_ctx.arch_switch_inf[RoutingArch->delayless_switch].Cout = 0.;
+    device_ctx.arch_switch_inf[RoutingArch->delayless_switch].penalty_cost = 0.;
     device_ctx.arch_switch_inf[RoutingArch->delayless_switch].set_Tdel(t_arch_switch_inf::UNDEFINED_FANIN, 0.);
     device_ctx.arch_switch_inf[RoutingArch->delayless_switch].power_buffer_type = POWER_BUFFER_TYPE_NONE;
     device_ctx.arch_switch_inf[RoutingArch->delayless_switch].mux_trans_size = 0.;

diff --git a/vpr/src/base/ShowSetup.cpp b/vpr/src/base/ShowSetup.cpp
@@ -313,6 +313,9 @@ static void ShowRouterOpts(const t_router_opts& RouterOpts) {
                 case e_router_lookahead::NO_OP:
                     VTR_LOG("NO_OP\n");
                     break;
+                case e_router_lookahead::CONNECTION_BOX_MAP:
+                    VTR_LOG("CONNECTION_BOX_MAP\n");
+                    break;
                 default:
                     VPR_FATAL_ERROR(VPR_ERROR_UNKNOWN, "Unknown lookahead_type\n");
             }

diff --git a/vpr/src/base/read_options.cpp b/vpr/src/base/read_options.cpp
@@ -775,6 +775,8 @@ struct ParseRouterLookahead {
             conv_value.set_value(e_router_lookahead::MAP);
         else if (str == "extended_map")
             conv_value.set_value(e_router_lookahead::EXTENDED_MAP);
+        else if (str == "connection_box_map")
+            conv_value.set_value(e_router_lookahead::CONNECTION_BOX_MAP);
         else {
             std::stringstream msg;
             msg << "Invalid conversion from '"
@@ -788,10 +790,12 @@ struct ParseRouterLookahead {
 
     ConvertedValue<std::string> to_str(e_router_lookahead val) {
         ConvertedValue<std::string> conv_value;
-        if (val == e_router_lookahead::CLASSIC)
+        if (val == e_router_lookahead::CLASSIC) {
             conv_value.set_value("classic");
-        else if (val == e_router_lookahead::MAP) {
+        } else if (val == e_router_lookahead::MAP) {
             conv_value.set_value("map");
+        } else if (val == e_router_lookahead::CONNECTION_BOX_MAP) {
+            conv_value.set_value("connection_box_map");
         } else {
             VTR_ASSERT(val == e_router_lookahead::EXTENDED_MAP);
             conv_value.set_value("extended_map");
@@ -800,7 +804,7 @@ struct ParseRouterLookahead {
     }
 
     std::vector<std::string> default_choices() {
-        return {"classic", "map", "extended_map"};
+        return {"classic", "map", "extended_map", "connection_box_map"};
     }
 };
 

diff --git a/vpr/src/base/vpr_context.h b/vpr/src/base/vpr_context.h
@@ -24,6 +24,7 @@
 #include "place_macro.h"
 #include "compressed_grid.h"
 #include "metadata_storage.h"
+#include "connection_box.h"
 
 /**
  * @brief A Context is collection of state relating to a particular part of VPR
@@ -231,6 +232,8 @@ struct DeviceContext : public Context {
      * Used to determine when reading rrgraph if file is already loaded.
      */
     std::string read_rr_graph_filename;
+
+    ConnectionBoxes connection_boxes;
 };
 
 /**

diff --git a/vpr/src/base/vpr_types.h b/vpr/src/base/vpr_types.h
@@ -110,10 +110,11 @@ constexpr const char* EMPTY_BLOCK_NAME = "EMPTY";
 #endif
 
 enum class e_router_lookahead {
-    CLASSIC,      ///<VPR's classic lookahead (assumes uniform wire types)
-    MAP,          ///<Lookahead considering different wire types (see Oleg Petelin's MASc Thesis)
-    EXTENDED_MAP, ///<Lookahead with a more extensive node sampling method
-    NO_OP         ///<A no-operation lookahead which always returns zero
+    CLASSIC,           ///<VPR's classic lookahead (assumes uniform wire types)
+    MAP,               ///<Lookahead considering different wire types (see Oleg Petelin's MASc Thesis)
+    EXTENDED_MAP,      ///<Lookahead with a more extensive node sampling method
+    NO_OP,             ///<A no-operation lookahead which always returns zero
+    CONNECTION_BOX_MAP ///<Lookahead considering different wire types and IPIN connection box.
 };
 
 enum class e_route_bb_update {