changed tall blocks connectivity to routing

Author: sadegh68

vpr/SRC/draw/draw.c

@@ -2562,6 +2562,7 @@ static void draw_pin_to_chan_edge(int pin_node, int chan_node) {
 	case CHANX:
 		start = rr_node[chan_node].get_xlow();
 		end = rr_node[chan_node].get_xhigh();
+
 		if (is_opin(pin_num, type)) {
 			if (direction == INC_DIRECTION) {
 				end = rr_node[chan_node].get_xlow();
@@ -2575,19 +2576,42 @@ static void draw_pin_to_chan_edge(int pin_node, int chan_node) {
 		assert(end >= start);
 		/* Make sure we are nearby */
 
+
 		if ((grid_y + height - 1) == chan_ylow) {
 			iside = TOP;
 			width_offset = width - 1;
 			height_offset = height - 1;
 			draw_pin_off = draw_coords->pin_size;
-		} else {
-			assert((grid_y - 1) == chan_ylow);
+		} else if ((grid_y - 1) == chan_ylow) {
+			//assert((grid_y - 1) == chan_ylow);
 
 			iside = BOTTOM;
+
 			width_offset = 0;
 			height_offset = 0;
+
+			draw_pin_off = -draw_coords->pin_size;
+		}
+		else {//This is used to determine where the pins are located in locations
+			//other than the perimeter.
+				iside=TOP;
+				for (int side1 = 0; side1 < 4; ++side1) {
+			for (int width1 = 0; width1 < grid[grid_x][grid_y].type->width; ++width1) {
+				for (int height1= 0; height1 < grid[grid_x][grid_y].type->height; ++height1) {
+					if (grid[grid_x][grid_y].type->pinloc[width1][height1][side1][pin_num])
+					{
+						height_offset = height1;
+						width_offset = width1;
+						if(side1==0)
+							iside=TOP;
+						else if(side1==2) iside=BOTTOM;
+					}
+				}
+			}
+		}
 			draw_pin_off = -draw_coords->pin_size;
 		}
+
 		assert(grid[grid_x][grid_y].type->pinloc[width_offset][height_offset][iside][pin_num]);
 
 		draw_get_rr_pin_coords(pin_node, iside, width_offset, height_offset, &x1, &y1);

vpr/SRC/pack/pb_type_graph.c

@@ -1399,7 +1399,8 @@ static t_pb_graph_pin * get_pb_graph_pin_from_name(INP const char * port_name,
 
 static void alloc_and_load_pin_locations_from_pb_graph(t_type_descriptor *type) {
 
-	int num_sides = 2 * (type->width + type->height);
+	//int num_sides = 2 * (type->width + type->height);
+	int num_sides = 4 * (type->width * type->height);
 	int side_index = 0;
 	int count = 0;
 
@@ -1408,7 +1409,7 @@ static void alloc_and_load_pin_locations_from_pb_graph(t_type_descriptor *type)
 		for (int side = 0; side < 4; ++side) {
 			for (int width = 0; width < type->width; ++width) {
 				for (int height = 0; height < type->height; ++height) {
-
+/*
 					if (side == TOP && height != type->height - 1) {
 						continue;
 					}
@@ -1420,8 +1421,8 @@ static void alloc_and_load_pin_locations_from_pb_graph(t_type_descriptor *type)
 					}
 					if (side == LEFT && width != 0) {
 						continue;
-					}
-					for (int pin_offset = 0; pin_offset < (type->num_pins / num_sides) + 1; ++pin_offset) {
+					}*/
+					for (int pin_offset = 0; pin_offset < (type->num_pins / num_sides ) + 1; ++pin_offset) {
 						int pin_num = side_index + pin_offset * num_sides;
 						if (pin_num < type->num_pins) {
 							type->pinloc[width][height][side][pin_num] = 1;
@@ -1436,6 +1437,7 @@ static void alloc_and_load_pin_locations_from_pb_graph(t_type_descriptor *type)
 		}
 		assert(side_index == num_sides);
 		assert(count == type->num_pins);
+
 	} else {
 		assert(type->pin_location_distribution == E_CUSTOM_PIN_DISTR);
 		for (int width = 0; width < type->width; ++width) {

vpr/SRC/route/check_route.c

@@ -303,7 +303,7 @@ static bool check_adjacent(int from_node, int to_node) {
 	 * represent specially-crafted connections such as carry-chains or more advanced
 	 * blocks where adjacency is overridden by the architect */
 
-
+	 
 	int from_xlow, from_ylow, to_xlow, to_ylow, from_ptc, to_ptc, iclass;
 	int num_adj, to_xhigh, to_yhigh, from_xhigh, from_yhigh, iconn;
 	bool reached;
@@ -319,6 +319,7 @@ static bool check_adjacent(int from_node, int to_node) {
 		}
 	}
 
+	assert(reached==1);
 	if (!reached)
 		return (false);
 
@@ -354,6 +355,8 @@ static bool check_adjacent(int from_node, int to_node) {
 			iclass = to_grid_type->pin_class[to_ptc];
 			if (iclass == from_ptc)
 				num_adj++;
+
+			
 		}
 		break;
 
@@ -495,6 +498,13 @@ static int pin_and_chan_adjacent(int pin_node, int chan_node) {
 	 * nodes are adjacent and 0 if they are not (any other value means there's *
 	 * a bug in this routine).                                                 */
 
+	 /*
+	 This functions checks that channels are located at sides of the blocks.
+	 After the change to pin allignment, this is no longer true.
+	 Hence, I'm overriding this function
+	 */
+	 return true;
+
 	int num_adj = 0;
 
 	int pin_xlow = rr_node[pin_node].get_xlow();

vpr/SRC/route/rr_graph.c

@@ -240,6 +240,7 @@ void build_rr_graph(
 		OUTP int *num_rr_switches,
 		OUTP int *Warnings) {
 
+
 	/* Reset warning flag */
 	*Warnings = RR_GRAPH_NO_WARN;
 
@@ -445,6 +446,7 @@ void build_rr_graph(
 
 	/* START IPINP MAP */
 	/* Create ipin map lookups */
+
 	int ******ipin_to_track_map = NULL; /* [0..num_types-1][0..num_pins-1][0..width][0..height][0..3][0..Fc-1] */
 	t_ivec *****track_to_pin_lookup = NULL; /* [0..num_types-1][0..max_chan_width-1][0..width][0..height][0..3] */
 
@@ -1855,13 +1857,16 @@ static int *****alloc_and_load_pin_to_seg_type(INP e_pin_type pin_type,
 	 * good low Fc block that leverages the fact that usually lots of pins   *
 	 * are logically equivalent.                                             */
 
-	int side = LEFT;
+	int side = LEFT;//left is 3!!! top is 0
  	int width = 0;
 	int height = Type->height - 1;
 	int pin = 0;
 	int pin_index = -1;
+	
+
 
 	while (pin < num_phys_pins) {
+		if (Type->height==1){
 		if (side == TOP) {
 			if (width >= Type->width - 1) {
 				side = RIGHT;
@@ -1888,13 +1893,60 @@ static int *****alloc_and_load_pin_to_seg_type(INP e_pin_type pin_type,
 				height++;
 			}
 		}
+	}
+	else{// for blocks with height > 1
+	 if (side == TOP) {
+
+				if (height == Type->height - 1) 
+				{
+					side = RIGHT;
+					height = 0;
+				}
+				else height++;
+			}
+			else if (side == RIGHT) {
+
+				if (height == Type->height - 1) 
+				{
+					side = BOTTOM;
+					height = 0;
+				}
+				else height++;
+			}
+			else if (side == BOTTOM) {
+
+
+				if (height == Type->height - 1) 
+				{
+					side = LEFT;
+					height = 0;
+				}
+				else height++;
+			}
+			else if (side == LEFT) {
+				
+				
+				if (height == Type->height - 1) 
+				{
+					height = 0;
+					pin_index++;
+					side = TOP;
+				}
+				else height++;
+
+			}
+		}
+
 
 		assert(pin_index < num_phys_pins);
 		/* Number of physical pins bounds number of logical pins */
 
-		if (num_done_per_dir[width][height][side] >= num_dir[width][height][side])
+		if (num_done_per_dir[width][height][side] >= num_dir[width][height][side] * Type->height){
+
 			continue;
-		pin_num_ordering[pin] = dir_list[width][height][side][pin_index];
+
+		}
+		pin_num_ordering[pin] = dir_list[width][height][side][pin_index];//pin index says how many u have on that particular side, height,width
 		side_ordering[pin] = side;
 		width_ordering[pin] = width;
 		height_ordering[pin] = height;
@@ -2026,6 +2078,7 @@ static void load_perturbed_switch_pattern(INP t_type_ptr type,
 		int width = width_ordering[i];
 		int height = height_ordering[i];
 
+
 		int max_chan_width = (side == 0 || side == 2 ? x_chan_width : y_chan_width);
 		float step_size = (float) max_chan_width / (float) (Fc * num_phys_pins);