Updated Our Progress. Added GF12 results. Updated macro shuffling scripts and…

Updated Our Progress. Added GF12 results. Updated macro shuffling scripts and Bookshelf to Protobuf translator.

Signed-off-by: sakundu <sakundu@ucsd.edu>

CodeElements/FormatTranslators/src/BookShelfToProtobuf.py

@@ -462,7 +462,7 @@ class canvas_object:
             if re.match(r"(^\s*#)|(^\s*UCLA\s*scl\s*1.0$)|(^\s*$)|(^\sEnd\s*$)", line):
                 continue
 
-            if re.match("^\s*CoreRow\s*Horizontal\s*$", line):
+            if re.match(r"^\s*CoreRow\s*Horizontal\s*$", line):
                 self.rows.append(row(row_id))
                 crow = self.rows[row_id]
                 row_id += 1

Flows/util/gen_shuffle_macro_def.sh

@@ -4,6 +4,10 @@
 
 setenv SYN_HANDOFF $argv[1]
 setenv SEED $argv[2]
+
+if ($#argv >= 3) then
+    setenv DEF_FILE $argv[3]
+endif
 set util_dir="/home/fetzfs_projects/MacroPlacement/flow_scripts_run/MacroPlacement/Flows/util/"
 
 if ($#argv != 3) then
@@ -17,5 +21,7 @@ innovus -64 -overwrite -log log/macro_shuffle_innovus.log -files ${util_dir}/gen
 
 ## Edit the design file to make sure flow2 reads the new macro placed def instead of the default one
 set def_file=`ls *_fp_shuffled_macros.def | head -n1`
-sed -i "s@\S*_fp_placed_macros.def@${def_file}@" design_setup.tcl
-
+sed -i "s@\S*_fp.def@${def_file}@" design_setup.tcl
+sed -i "s@./syn_handoff@${SYN_HANDOFF}@" run_invs.tcl
+sed -i "s@place_design -concurrent_macros@#place_design -concurrent_macros@" run_invs.tcl
+sed -i "s@refine_macro_place@#refine_macro_place@" run_invs.tcl

Flows/util/gen_shuffle_macro_def.tcl

@@ -45,7 +45,12 @@ generateVias
 createBasicPathGroups -expanded
 
 ## Generate the floorplan ##
-defIn ${handoff_dir}/${DESIGN}.def
+
+if {[info exist ::env(DEF_FILE)] && $::env(DEF_FILE) != ""} {
+    defIn $::env(DEF_FILE) 
+} else {
+    defIn ${handoff_dir}/${DESIGN}.def
+}
 
 #### Unplace the standard cells ###
 dbset [dbget top.insts.cell.subClass core -p2 ].pStatus unplaced
@@ -53,6 +58,7 @@ dbset [dbget top.insts.cell.subClass core -p2 ].pStatus unplaced
 source ../../../../util/shuffle_macro.tcl
 shuffle_macros $::env(SEED)
 
+dbset [dbget top.insts.cell.subClass block -p2 ].pStatus fixed
 defOut -floorplan ./${DESIGN}_fp_shuffled_macros.def
 
 exit

Flows/util/run_grp_main.sh

@@ -11,7 +11,8 @@ if [ $PHY_SYNTH -eq 1 ]; then
     export HMETIS_DIR="/home/zf4_projects/DREAMPlace/sakundu/GB/CT/hmetis-1.5-linux"
     export PLC_WRAPPER_MAIN="/home/zf4_projects/DREAMPlace/sakundu/GB/CT/plc_wrapper_main"
     #export CT_PATH="${PROJ_DIR}/../../../GB/CT/circuit_training"
-    export CT_PATH="/home/zf4_projects/DREAMPlace/sakundu/ABK_MP/CT/09092022/circuit_training"
+    #export CT_PATH="/home/zf4_projects/DREAMPlace/sakundu/ABK_MP/CT/09092022/circuit_training"
+    export CT_PATH="/home/zf4_projects/DREAMPlace/sakundu/ABK_MP/CT/11112022/circuit_training"
     #export CT_PATH="/home/zf4_projects/macro_placer/google_brain/TILOS_repo/grouping/circuit_training"
     bash -i ../../../../util/run_grp.sh 2>&1 | tee log/grouping.log
 fi