Add architecture ID to .net files and verify when loading .net files

The ID is the SHA256 digest of the architecture file. Since it is based
on the file contents it is robust to file path changes.

Author: kmurray

vpr/SRC/base/read_netlist.cpp

@@ -76,7 +76,7 @@ static void set_atom_pin_mapping(const AtomBlockId atom_blk, const AtomPortId at
  * num_nets - number of nets in netlist
  * net_list - nets in netlist [0..num_nets - 1]
  */
-void read_netlist(const char *net_file, const t_arch* /*arch*/,
+void read_netlist(const char *net_file, const t_arch* arch,
 		int *L_num_blocks, struct s_block *block_list[],
 		t_netlist* clb_nlist) {
 	clock_t begin = clock();
@@ -128,6 +128,23 @@ void read_netlist(const char *net_file, const t_arch* /*arch*/,
                     top_instance.value());
         }
 
+        auto architecture_id = top.attribute("architecture_id");
+        if (architecture_id) {
+            //Netlist file has an architecture id, make sure it is 
+            //consistent with the loaded architecture file.
+            //
+            //Note that we currently don't require that the architecture_id exists, 
+            //to remain compatible with old .net files
+            std::string arch_id = architecture_id.value();
+            if (arch_id != arch->architecture_id) {
+                //TODO: make this configurable as warning or error
+                vpr_throw(VPR_ERROR_NET_F, netlist_file_name, loc_data.line(top),
+                        "Netlist was generated from a different architecture file (loaded architecture ID: %s, netlist file architecture ID: %s)",
+                        arch->architecture_id,
+                        arch_id.c_str());
+            }
+        }
+
         //Collect top level I/Os
         auto top_inputs = pugiutil::get_single_child(top, "inputs", loc_data);
         circuit_inputs = vtr::split(top_inputs.text().get());

vpr/SRC/base/vpr_api.cpp

@@ -695,6 +695,8 @@ void free_arch(t_arch* Arch) {
 	}
 	free(Arch->Directs);
 
+    free(Arch->architecture_id);
+
 	free(Arch->model_library[0].name);
 	free(Arch->model_library[0].outputs->name);
 	delete[] Arch->model_library[0].outputs;

vpr/SRC/pack/cluster.cpp

@@ -713,7 +713,7 @@ void do_clustering(const t_arch *arch, t_pack_molecule *molecule_head,
 
 	block = clb;
 
-	output_clustering(clb, num_clb, intra_lb_routing, global_clocks, is_clock, out_fname, false);
+	output_clustering(clb, num_clb, intra_lb_routing, global_clocks, is_clock, arch->architecture_id, out_fname, false);
 
 	block = NULL;
 	for(int irt = 0; irt < (int) intra_lb_routing.size(); irt++){

vpr/SRC/pack/output_clustering.cpp

@@ -579,7 +579,7 @@ static void print_stats(t_block *clb, int num_clusters) {
 }
 
 void output_clustering(t_block *clb, int num_clusters, const vector < vector <t_intra_lb_net> * > &intra_lb_routing, bool global_clocks,
-		const std::unordered_set<AtomNetId>& is_clock, const char *out_fname, bool skip_clustering) {
+		const std::unordered_set<AtomNetId>& is_clock, const std::string& architecture_id, const char *out_fname, bool skip_clustering) {
 
 	/* 
 	 * This routine dumps out the output netlist in a format suitable for  *
@@ -604,8 +604,8 @@ void output_clustering(t_block *clb, int num_clusters, const vector < vector <t_
 
 	fpout = fopen(out_fname, "w");
 
-	fprintf(fpout, "<block name=\"%s\" instance=\"FPGA_packed_netlist[0]\">\n",
-			out_fname);
+	fprintf(fpout, "<block name=\"%s\" instance=\"FPGA_packed_netlist[0]\" architecture_id=\"%s\">\n",
+			out_fname, architecture_id.c_str());
 	fprintf(fpout, "\t<inputs>\n\t\t");
 
 	column = 2 * TAB_LENGTH; /* Organize whitespace to ident data inside block */

vpr/SRC/pack/output_clustering.h

@@ -6,6 +6,6 @@
 #include "pack_types.h"
 
 void output_clustering(t_block *clb, int num_clusters, const std::vector<std::vector <t_intra_lb_net>*> &intra_lb_routing, bool global_clocks,
-		const std::unordered_set<AtomNetId>& is_clock, const char *out_fname, bool skip_clustering);
+		const std::unordered_set<AtomNetId>& is_clock, const std::string& architecture_id, const char *out_fname, bool skip_clustering);
 
 #endif

vpr/SRC/pack/pack.cpp

@@ -19,7 +19,6 @@ using namespace std;
 #include "pack.h"
 #include "read_blif.h"
 #include "cluster.h"
-#include "output_clustering.h"
 #include "ReadOptions.h"
 
 /* #define DUMP_PB_GRAPH 1 */