Revert "Integrate upstream uxsdcxx parser with connection box lookahead"

This reverts commit 8c4519c8723b7adf2c4571700202f06690d04278.

Author: acomodi

libs/libvtrcapnproto/gen/rr_graph_uxsdcxx.capnp

@@ -137,18 +137,6 @@ struct BlockTypes {
 	blockTypes @0 :List(BlockType);
 }
 
-struct ConnectionBoxDeclaration {
-	id @0 :UInt32;
-	name @1 :Text;
-}
-
-struct ConnectionBoxes {
-	numBoxes @0 :UInt32;
-	xDim @1 :UInt32;
-	yDim @2 :UInt32;
-	connectionBoxes @3 :List(ConnectionBoxDeclaration);
-}
-
 struct GridLoc {
 	blockTypeId @0 :Int32;
 	heightOffset @1 :Int32;
@@ -188,18 +176,6 @@ 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;
@@ -209,8 +185,6 @@ struct Node {
 	timing @5 :NodeTiming;
 	segment @6 :NodeSegment;
 	metadata @7 :Metadata;
-	canonicalLoc @8 :CanonicalLoc;
-	connectionBox @9 :ConnectionBoxAnnotation;
 }
 
 struct RrNodes {
@@ -236,8 +210,7 @@ struct RrGraph {
 	switches @4 :Switches;
 	segments @5 :Segments;
 	blockTypes @6 :BlockTypes;
-	connectionBoxes @7 :ConnectionBoxes;
-	grid @8 :GridLocs;
-	rrNodes @9 :RrNodes;
-	rrEdges @10 :RrEdges;
+	grid @7 :GridLocs;
+	rrNodes @8 :RrNodes;
+	rrEdges @9 :RrEdges;
 }

vpr/src/base/read_options.cpp

@@ -692,8 +692,6 @@ struct ParseRouterLookahead {
             conv_value.set_value(e_router_lookahead::CLASSIC);
         else if (str == "map")
             conv_value.set_value(e_router_lookahead::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 '"
@@ -707,22 +705,17 @@ 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 {
+            VTR_ASSERT(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 {
-            std::stringstream msg;
-            msg << "Unrecognized e_router_lookahead";
-            conv_value.set_error(msg.str());
         }
         return conv_value;
     }
 
     std::vector<std::string> default_choices() {
-        return {"classic", "map", "connection_box_map"};
+        return {"classic", "map"};
     }
 };
 

vpr/src/base/vpr_types.h

@@ -108,10 +108,7 @@ constexpr const char* EMPTY_BLOCK_NAME = "EMPTY";
 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)
-    NO_OP,   //A no-operation lookahead which always returns zero
-    CONNECTION_BOX_MAP,
-    // Lookahead considering different wire types and IPIN
-    // connection box.
+    NO_OP    //A no-operation lookahead which always returns zero
 };
 
 enum class e_route_bb_update {