Add ID to .route file and simplify placement ID

Author: kmurray

vpr/SRC/base/globals.cpp

@@ -45,6 +45,8 @@ t_type_ptr IO_TYPE = NULL;
 t_type_ptr EMPTY_TYPE = NULL;
 t_type_ptr FILL_TYPE = NULL;
 
+std::string g_placement_id; //SHA256 digest of .place file
+
 /******** Physical architecture ********/
 
 int nx = 0;
@@ -67,6 +69,8 @@ struct s_grid_tile **grid = NULL; /* [0..(nx+1)][0..(ny+1)] Physical block list
 struct s_trace **trace_head = NULL; /* [0..(num_nets-1)] */
 struct s_trace **trace_tail = NULL; /* [0..(num_nets-1)] */
 
+std::string g_routing_id; //SHA256 digest of .route file
+
 /******** Structures defining the FPGA routing architecture ********/
 
 int num_rr_nodes = 0;

vpr/SRC/base/globals.h

@@ -71,6 +71,8 @@ extern struct s_block *block;
 /* New external-to-complex block, post-packed netlist*/
 extern t_netlist g_clbs_nlist;
 
+extern std::string g_placement_id; //SHA256 digest of .place file
+
 /********************************************************************
  Physical FPGA architecture globals 
  *********************************************************************/
@@ -107,6 +109,8 @@ extern t_chan_width chan_width;
 /* [0..num_nets-1] of linked list start pointers.  Defines the routing.  */
 extern struct s_trace **trace_head, **trace_tail;
 
+extern std::string g_routing_id; //SHA256 digest of .route file
+
 /* Structures to define the routing architecture of the FPGA.           */
 extern int num_rr_nodes;
 extern t_rr_node *rr_node; /* [0..num_rr_nodes-1]          */

vpr/SRC/base/netlist.h

@@ -77,6 +77,7 @@ struct t_vnet{
 struct t_netlist{
 	//vector<t_blocks> blocks; To-do: Need to implement later
 	vector<t_vnet>  net;
+
     std::string netlist_id;
 };
 

vpr/SRC/base/place_and_route.cpp

@@ -78,11 +78,7 @@ bool place_and_route(struct s_placer_opts placer_opts,
 
 	if (!placer_opts.doPlacement || placer_opts.place_freq == PLACE_NEVER) {
 		/* Read the placement from a file */
-<<<<<<< HEAD
-		read_place(place_file, arch_file, net_file, nx, ny, num_blocks, block);
-=======
-		read_place(filename_opts.ArchFile, filename_opts.NetFile, filename_opts.PlaceFile, arch, nx, ny, num_blocks, block);
->>>>>>> Add netlist and architecture SHA256 ID consistency checks when reading placement file
+		read_place(filename_opts.NetFile, filename_opts.PlaceFile, nx, ny, num_blocks, block);
 		sync_grid_to_blocks(num_blocks, nx, ny, grid);
 	} else {
 		VTR_ASSERT((PLACE_ONCE == placer_opts.place_freq) || (PLACE_ALWAYS == placer_opts.place_freq));
@@ -93,7 +89,7 @@ bool place_and_route(struct s_placer_opts placer_opts,
                 timing_inf, 
 #endif
                 arch->Directs, arch->num_directs);
-		print_place(filename_opts.ArchFile, arch->architecture_id, filename_opts.NetFile, g_clbs_nlist.netlist_id.c_str(), filename_opts.PlaceFile);
+		print_place(filename_opts.NetFile, g_clbs_nlist.netlist_id.c_str(), filename_opts.PlaceFile);
 		end = clock();
 
 		vtr::printf_info("Placement took %g seconds.\n", (float)(end - begin) / CLOCKS_PER_SEC);
@@ -166,7 +162,7 @@ bool place_and_route(struct s_placer_opts placer_opts,
 
 			vtr::printf_info("Circuit successfully routed with a channel width factor of %d.\n", width_fac);
 
-			print_route(filename_opts.RouteFile);
+			print_route(filename_opts.PlaceFile, filename_opts.RouteFile);
 
 			if (getEchoEnabled() && isEchoFileEnabled(E_ECHO_ROUTING_SINK_DELAYS)) {
 				print_sink_delays(getEchoFileName(E_ECHO_ROUTING_SINK_DELAYS));
@@ -485,8 +481,7 @@ static int binary_search_place_and_route(struct s_placer_opts placer_opts,
 						saved_clb_opins_used_locally);
 
 				if (placer_opts.place_freq == PLACE_ALWAYS) {
-                    print_place(filename_opts.ArchFile, arch->architecture_id, 
-                                filename_opts.NetFile, g_clbs_nlist.netlist_id.c_str(), 
+                    print_place(filename_opts.NetFile, g_clbs_nlist.netlist_id.c_str(), 
                                 filename_opts.PlaceFile);
 				}
 			}
@@ -536,7 +531,7 @@ static int binary_search_place_and_route(struct s_placer_opts placer_opts,
 	}
 	vtr::printf_info("Best routing used a channel width factor of %d.\n", final);
 
-	print_route(filename_opts.RouteFile);
+	print_route(filename_opts.PlaceFile, filename_opts.RouteFile);
 
 	if (getEchoEnabled() && isEchoFileEnabled(E_ECHO_ROUTING_SINK_DELAYS)) {
 		print_sink_delays(getEchoFileName(E_ECHO_ROUTING_SINK_DELAYS));

vpr/SRC/pack/output_clustering.cpp

@@ -11,6 +11,7 @@ using namespace std;
 
 #include "vtr_assert.h"
 #include "vtr_log.h"
+#include "vtr_digest.h"
 
 #include "vpr_types.h"
 #include "vpr_error.h"
@@ -676,4 +677,7 @@ void output_clustering(t_block *clb, int num_clusters, const vector < vector <t_
 		free_pb_graph_pin_lookup_from_index (pb_graph_pin_lookup_from_index_by_type[itype]);
 	}
 	delete[] pb_graph_pin_lookup_from_index_by_type;
+
+    //Calculate the ID of the clustering
+    g_clbs_nlist.netlist_id = vtr::secure_digest_file(out_fname);
 }

vpr/SRC/route/route_common.cpp

@@ -9,6 +9,7 @@ using namespace std;
 #include "vtr_assert.h"
 #include "vtr_util.h"
 #include "vtr_log.h"
+#include "vtr_digest.h"
 
 #include "vpr_types.h"
 #include "vpr_error.h"
@@ -1301,7 +1302,7 @@ alloc_linked_f_pointer(void) {
 	return (temp_ptr);
 }
 
-void print_route(const char *route_file) {
+void print_route(const char* placement_file, const char* route_file) {
 
 	/* Prints out the routing to file route_file.  */
 
@@ -1314,6 +1315,8 @@ void print_route(const char *route_file) {
 
 	fp = fopen(route_file, "w");
 
+    fprintf(fp, "Placement_File: %s Placement_ID: %s\n", placement_file, g_placement_id.c_str());
+
 	fprintf(fp, "Array size: %d x %d logic blocks.\n", nx, ny);
 	fprintf(fp, "\nRouting:");
 	for (inet = 0; inet < g_clbs_nlist.net.size(); inet++) {
@@ -1422,6 +1425,9 @@ void print_route(const char *route_file) {
 		fclose(fp);
 	}
 
+    //Save the digest of the route file
+    g_routing_id = vtr::secure_digest_file(route_file);
+
 }
 
 /* TODO: jluu: I now always enforce logically equivalent outputs to use at most one output pin, should rethink how to do this */

vpr/SRC/route/route_export.h

@@ -38,4 +38,4 @@ void restore_routing(struct s_trace **best_routing,
 
 void get_serial_num(void);
 
-void print_route(const char *name);
+void print_route(const char* place_file, const char* route_file);