added xy attribute to custom switchblock

Author: saaramahmoudi

libs/libarchfpga/src/parse_switchblocks.cpp

@@ -372,6 +372,11 @@ void check_switchblock(const t_switchblock_inf* sb, const t_arch* arch) {
         check_bidir_switchblock(&(sb->permutation_map));
     }
 
+    /*check if type is XY_SPECIFIED, at least one of x and y is described in the architecture file*/
+    if(sb->location == e_sb_location::E_XY_SPECIFIED){
+        VTR_ASSERT(sb->x != -1 || sb->y != -1);
+    }
+
     /* check that specified wires exist */
     for (const auto& wireconn : sb->wireconns) {
         check_wireconn(arch, wireconn);

libs/libarchfpga/src/physical_types.h

@@ -253,7 +253,8 @@ enum e_sb_location {
     E_CORNER,
     E_FRINGE, /* perimeter minus corners */
     E_CORE,
-    E_EVERYWHERE
+    E_EVERYWHERE,
+    E_XY_SPECIFIED
 };
 
 /*************************************************************************************************/
@@ -1878,6 +1879,9 @@ struct t_switchblock_inf {
     e_sb_location location;          /* where on the FPGA this switchblock should be built (i.e. perimeter, core, everywhere) */
     e_directionality directionality; /* the directionality of this switchblock (unidir/bidir) */
 
+    int x = -1; /* The exact x-axis location that this SB is used, meaningful when location is set to E_XY_specified */
+    int y = -1; /* The exact y-axis location that this SB is used, meanignful when location is set to E_XY_specified */
+    
     t_permutation_map permutation_map; /* map holding the permutation functions attributed to this switchblock */
 
     std::vector<t_wireconn_inf> wireconns; /* list of wire types/groups this SB will connect */

libs/libarchfpga/src/read_xml_arch_file.cpp

@@ -4081,11 +4081,19 @@ static void ProcessSwitchblocks(pugi::xml_node Parent, t_arch* arch, const pugiu
                 sb.location = E_CORNER;
             } else if (strcmp(tmp, "FRINGE") == 0) {
                 sb.location = E_FRINGE;
+            } else if (strcmp(tmp,"XY_SPECIFIED") == 0){
+                sb.location = E_XY_SPECIFIED;
             } else {
                 archfpga_throw(loc_data.filename_c_str(), loc_data.line(SubElem), "unrecognized switchblock location: %s\n", tmp);
             }
         }
 
+        /* get the switchblock coordinate only if sb.location is set to E_XY_SPECIFIED*/
+        if(sb.location == e_sb_location::E_XY_SPECIFIED){
+            sb.x = get_attribute(SubElem, "x", loc_data, ReqOpt::OPTIONAL).as_int(-1);
+            sb.y = get_attribute(SubElem, "y", loc_data, ReqOpt::OPTIONAL).as_int(-1);
+        }
+
         /* get switchblock permutation functions */
         SubElem = get_first_child(Node, "switchfuncs", loc_data);
         read_sb_switchfuncs(SubElem, &sb, loc_data);

vpr/src/route/build_switchblocks.cpp

@@ -268,7 +268,7 @@ int get_wire_segment_length(const DeviceGrid& grid, e_rr_type chan_type, const t
 static int get_switchpoint_of_wire(const DeviceGrid& grid, e_rr_type chan_type, const t_chan_seg_details& wire_details, int seg_coord, e_side sb_side);
 
 /* returns true if the coordinates x/y do not correspond to the location specified by 'location' */
-static bool sb_not_here(const DeviceGrid& grid, int x, int y, e_sb_location location);
+static bool sb_not_here(const DeviceGrid& grid, int x, int y, e_sb_location location, int sb_x, int sb_y);
 
 /* checks if the specified coordinates represent a corner of the FPGA */
 static bool is_corner(const DeviceGrid& grid, int x, int y);
@@ -324,10 +324,11 @@ t_sb_connection_map* alloc_and_load_switchblock_permutations(const t_chan_detail
         if (directionality != sb.directionality) {
             VPR_FATAL_ERROR(VPR_ERROR_ARCH, "alloc_and_load_switchblock_connections: Switchblock %s does not match directionality of architecture\n", sb.name.c_str());
         }
+        
         /* Iterate over the x,y coordinates spanning the FPGA. */
         for (size_t x_coord = 0; x_coord < grid.width(); x_coord++) {
             for (size_t y_coord = 0; y_coord <= grid.height(); y_coord++) {
-                if (sb_not_here(grid, x_coord, y_coord, sb.location)) {
+                if (sb_not_here(grid, x_coord, y_coord, sb.location, sb.x, sb.y)) {
                     continue;
                 }
                 /* now we iterate over all the potential side1->side2 connections */
@@ -362,7 +363,7 @@ void free_switchblock_permutations(t_sb_connection_map* sb_conns) {
 }
 
 /* returns true if the coordinates x/y do not correspond to the location specified by 'location' */
-static bool sb_not_here(const DeviceGrid& grid, int x, int y, e_sb_location location) {
+static bool sb_not_here(const DeviceGrid& grid, int x, int y, e_sb_location location, int sb_x, int sb_y) {
     bool sb_not_here = true;
 
     switch (location) {
@@ -388,6 +389,20 @@ static bool sb_not_here(const DeviceGrid& grid, int x, int y, e_sb_location loca
             if (is_perimeter(grid, x, y) && !is_corner(grid, x, y)) {
                 sb_not_here = false;
             }
+            break;
+        case E_XY_SPECIFIED:
+            if(x == sb_x && y == sb_y){
+                sb_not_here = false;
+            } 
+            
+            if(x == sb_x && sb_y == -1){
+                sb_not_here = false;
+            }
+            
+            if(sb_x == -1 && y == sb_y){
+                sb_not_here = false;
+            }
+            
             break;
         default:
             VPR_FATAL_ERROR(VPR_ERROR_ARCH, "sb_not_here: unrecognized location enum: %d\n", location);