Merge pull request #2751 from heshpdx/master

Couple fixes from SPEC CPU work

Author: vaughnbetz

libs/librrgraph/src/base/rr_graph_utils.cpp

@@ -139,7 +139,8 @@ vtr::vector<RRNodeId, std::vector<RREdgeId>> get_fan_in_list(const RRGraphView&
 
     //Walk the graph and increment fanin on all dwnstream nodes
     rr_graph.rr_nodes().for_each_edge(
-        [&](RREdgeId edge, __attribute__((unused)) RRNodeId src, RRNodeId sink) {
+        [&](RREdgeId edge, RRNodeId src, RRNodeId sink) -> void {
+            (void) src;
             node_fan_in_list[sink].push_back(edge);
         });
 
@@ -258,4 +259,4 @@ bool inter_layer_connections_limited_to_opin(const RRGraphView& rr_graph) {
     }
 
     return limited_to_opin;
-}
+}

libs/librrgraph/src/io/gen/rr_graph_uxsdcxx.h

@@ -202,10 +202,15 @@ inline void write_rr_graph_xml(T &in, Context &context, std::ostream &os){
 }
 
 
+#if defined(_MSC_VER)
+typedef const uint32_t __declspec(align(1)) triehash_uu32;
+typedef const uint64_t __declspec(align(1)) triehash_uu64;
+#else
 typedef const uint32_t __attribute__((aligned(1))) triehash_uu32;
 typedef const uint64_t __attribute__((aligned(1))) triehash_uu64;
 static_assert(alignof(triehash_uu32) == 1, "Unaligned 32-bit access not found.");
 static_assert(alignof(triehash_uu64) == 1, "Unaligned 64-bit access not found.");
+#endif
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
 #define onechar(c, s, l) (((uint64_t)(c)) << (s))
 #else