rmp: use the correct type for the seed

Improves on the fix in #8543 and also fixes the weird .i using float issue.

Signed-off-by: Matt Liberty <[email protected]>

Author: maliberty

src/rmp/include/rmp/Restructure.h

@@ -7,6 +7,7 @@
 #include <fstream>
 #include <functional>
 #include <optional>
+#include <random>
 #include <set>
 #include <string>
 #include <vector>
@@ -76,7 +77,10 @@ class Restructure
            char* workdir_name,
            char* abc_logfile);
 
-  void setAnnealingSeed(uint64_t seed) { annealing_seed_ = seed; }
+  void setAnnealingSeed(std::mt19937::result_type seed)
+  {
+    annealing_seed_ = seed;
+  }
   void setAnnealingTemp(float temp) { annealing_temp_ = temp; }
   void setAnnealingIters(unsigned iters) { annealing_iters_ = iters; }
   void setAnnealingRevertAfter(unsigned revert_after)
@@ -120,7 +124,7 @@ class Restructure
   odb::dbBlock* block_ = nullptr;
 
   // Annealing
-  std::optional<uint64_t> annealing_seed_;
+  std::optional<std::mt19937::result_type> annealing_seed_;
   std::optional<float> annealing_temp_;
   unsigned annealing_iters_ = 100;
   std::optional<unsigned> annealing_revert_after_;

src/rmp/src/annealing_strategy.h

@@ -25,7 +25,7 @@ class AnnealingStrategy : public ResynthesisStrategy
  public:
   explicit AnnealingStrategy(sta::Corner* corner,
                              sta::Slack slack_threshold,
-                             std::optional<uint64_t> seed,
+                             std::optional<std::mt19937::result_type> seed,
                              std::optional<float> temperature,
                              unsigned iterations,
                              std::optional<unsigned> revert_after,
@@ -38,8 +38,7 @@ class AnnealingStrategy : public ResynthesisStrategy
         initial_ops_(initial_ops)
   {
     if (seed) {
-      const uint32_t seed_32 = *seed;
-      random_ = decltype(random_){seed_32};
+      random_.seed(*seed);
     }
   }
   void OptimizeDesign(sta::dbSta* sta,

src/rmp/src/rmp.i

@@ -49,7 +49,7 @@ set_slack_threshold(float slack_threshold)
 }
 
 void
-set_annealing_seed(float annealing_seed)
+set_annealing_seed(std::mt19937::result_type annealing_seed)
 {
   getRestructure()->setAnnealingSeed(annealing_seed);
 }