Merge pull request #8005 from The-OpenROAD-Project-staging/rmp-test-fix

rmp: in test/const_cell_removal.tcl, add -work_dir results

Author: maliberty

src/rmp/src/Restructure.cpp

@@ -140,8 +140,9 @@ void Restructure::getBlob(unsigned max_depth)
 
 void Restructure::runABC()
 {
-  input_blif_file_name_ = work_dir_name_ + std::string(block_->getConstName())
-                          + "_crit_path.blif";
+  const std::string prefix
+      = work_dir_name_ + std::string(block_->getConstName());
+  input_blif_file_name_ = prefix + "_crit_path.blif";
   std::vector<std::string> files_to_remove;
 
   debugPrint(logger_,
@@ -183,15 +184,14 @@ void Restructure::runABC()
   for (size_t curr_mode_idx = 0; curr_mode_idx < modes.size();
        curr_mode_idx++) {
     output_blif_file_name_
-        = work_dir_name_ + std::string(block_->getConstName())
-          + std::to_string(curr_mode_idx) + "_crit_path_out.blif";
+        = prefix + std::to_string(curr_mode_idx) + "_crit_path_out.blif";
 
     opt_mode_ = modes[curr_mode_idx];
 
     const std::string abc_script_file
-        = work_dir_name_ + std::to_string(curr_mode_idx) + "ord_abc_script.tcl";
+        = prefix + std::to_string(curr_mode_idx) + "ord_abc_script.tcl";
     if (logfile_ == "") {
-      logfile_ = work_dir_name_ + "abc.log";
+      logfile_ = prefix + "abc.log";
     }
 
     debugPrint(logger_,
@@ -226,8 +226,7 @@ void Restructure::runABC()
     }
 
     output_blif_file_name_
-        = work_dir_name_ + std::string(block_->getConstName())
-          + std::to_string(curr_mode_idx) + "_crit_path_out.blif";
+        = prefix + std::to_string(curr_mode_idx) + "_crit_path_out.blif";
     const std::string abc_log_name = logfile_ + std::to_string(curr_mode_idx);
 
     int level_gain = 0;

src/rmp/test/const_cell_removal.tcl

@@ -10,6 +10,7 @@ set tiehi "LOGIC1_X1/Z"
 set tielo "LOGIC0_X1/Z"
 
 restructure -liberty_file Nangate45/Nangate45_typ.lib -target area \
-  -abc_logfile results/abc_rcon.log -tielo_port $tielo -tiehi_port $tiehi
+  -abc_logfile results/abc_rcon.log -tielo_port $tielo -tiehi_port $tiehi \
+  -work_dir results
 
 report_design_area