Merge branch 'master' into remove-yosys+odin

Author: poname

vpr/src/place/simpleRL_move_generator.cpp

@@ -242,12 +242,12 @@ void SoftmaxAgent::set_action_prob() {
         }
     }
 
-    // normalize all the action probabilities to guarantee the sum(all actyion probs) = 1
+    // normalize all the action probabilities to guarantee the sum(all action probs) = 1
     float sum_prob = std::accumulate(action_prob_.begin(), action_prob_.end(), 0.0);
     std::transform(action_prob_.begin(), action_prob_.end(), action_prob_.begin(),
-                   bind2nd(std::plus<float>(), (1.0 - sum_prob) / num_available_actions_));
+                   [sum_prob, this](float x) { return x + ((1.0 - sum_prob) / this->num_available_actions_); });
 
-    //calulcate the accumulative action probability of each action
+    // calculate the accumulative action probability of each action
     // e.g. if we have 5 actions with equal probability of 0.2, the cumm_action_prob will be {0.2,0.4,0.6,0.8,1.0}
     float accum = 0;
     for (size_t i = 0; i < num_available_actions_; ++i) {

vpr/src/route/clock_connection_builders.cpp

@@ -49,7 +49,8 @@ void RoutingToClockConnection::create_switches(const ClockRRGraphBuilder& clock_
     // Initialize random seed
     // Must be done during every call in order for restored rr_graphs after a binary
     // search to be consistent
-    std::srand(seed);
+    std::mt19937 rand_generator;
+    rand_generator.seed(seed);
 
     auto& device_ctx = g_vpr_ctx.device();
     const auto& node_lookup = device_ctx.rr_graph.node_lookup();
@@ -68,8 +69,8 @@ void RoutingToClockConnection::create_switches(const ClockRRGraphBuilder& clock_
 
     for (auto clock_index : clock_indices) {
         // Select wires to connect to at random
-        std::random_shuffle(x_wire_indices.begin(), x_wire_indices.end());
-        std::random_shuffle(y_wire_indices.begin(), y_wire_indices.end());
+        std::shuffle(x_wire_indices.begin(), x_wire_indices.end(), rand_generator);
+        std::shuffle(y_wire_indices.begin(), y_wire_indices.end(), rand_generator);
 
         // Connect to x-channel wires
         unsigned num_wires_x = x_wire_indices.size() * fc;