Merge pull request #2854 from Liamolucko/macos

Get VTR working on macOS again

Author: vaughnbetz

libs/libarchfpga/src/read_xml_arch_file_noc_tag.cpp

@@ -1,3 +1,4 @@
+#include <sstream>
 
 #include "read_xml_arch_file_noc_tag.h"
 

parmys/CMakeLists.txt

@@ -35,6 +35,7 @@ target_link_libraries(parmys
 )
 
 set_target_properties(parmys PROPERTIES PREFIX "") # Avoid extra 'lib' prefix
+set_target_properties(parmys PROPERTIES SUFFIX ".so") # Yosys expects the suffix to be '.so' even on macOS
 
 add_custom_target(parmys-plugin ALL
 		DEPENDS parmys

vpr/src/base/vpr_types.cpp

@@ -1,4 +1,5 @@
 #include <cmath>
+#include <sstream>
 #include "vpr_types.h"
 #include "globals.h"
 

vpr/src/noc/noc_storage.cpp

@@ -256,6 +256,7 @@ void NocStorage::clear_noc() {
     link_storage.clear();
     router_outgoing_links_list.clear();
     router_incoming_links_list.clear();
+    router_id_conversion_table.clear();
     grid_location_to_router_id.clear();
 
     built_noc = false;

vpr/test/test_compressed_grid.cpp

@@ -330,6 +330,8 @@ TEST_CASE("test_compressed_grid", "[vpr_compressed_grid]") {
         REQUIRE(grid_loc == t_physical_tile_loc{98, 98, 0});
     }
 
+    logical_block_types.clear();
+
 }
 
 } // namespace