Merge pull request #1386 from vvbandeira/make-issue-gdb-tcl

Make issue fixes for gdb tcl

Author: vvbandeira

flow/util/generate-vars.sh

@@ -5,10 +5,10 @@ FLOW_ROOT=$(realpath "${FLOW_HOME}")
 ORFS_ROOT=$(realpath "${FLOW_HOME}/../")
 
 # exclude system and CI variables
-EXCLUDED_VARS="MAKE|MAKEFLAGS|PERL5LIB|QT_QPA_PLATFORM"
-EXCLUDED_VARS+="|RESULTS_ODB|PUBLIC|ISSUE_SCRIPTS"
-EXCLUDED_VARS+="|HOME|PWD|MAIL|SHELL|NPROC|NUM_CORES|FLOW_HOME"
-EXCLUDED_VARS+="|UNSET_VARIABLES_NAMES|do-step|get_variables|do-copy"
+EXCLUDED_VARS='MAKE|MAKEFLAGS|PERL5LIB|QT_QPA_PLATFORM'
+EXCLUDED_VARS+='|RESULTS_ODB|PUBLIC|ISSUE_SCRIPTS'
+EXCLUDED_VARS+='|HOME|PWD|MAIL|SHELL|NPROC|NUM_CORES|FLOW_HOME|\\n'
+EXCLUDED_VARS+='|UNSET_VARIABLES_NAMES|do-step|get_variables|do-copy'
 
 EXCLUDED_PATTERNS="_EXE$|PATH$|_CMD$|\."
 
@@ -44,17 +44,24 @@ while read -r VAR; do
         # skip variables that match the exclude patterns
         continue
     fi
+    # handle special case where the variable needs to be splitted in Tcl code
+    if [[ "${name}" == "GND_NETS_VOLTAGES" || "${name}" == "PWR_NETS_VOLTAGES" ]]; then
+        echo "export ${name}='${value}'" >> $1.sh
+        echo "set env(${name}) ${value}" >> $1.tcl
+        echo "set env ${name} ${value}" >> $1.gdb
+        continue
+    fi
     if [[ ${value} == /* ]]; then
         # convert absolute paths if possible to use FLOW_HOME variable
         value=$(sed -e "s,${FLOW_ROOT},\${FLOW_HOME},g" <<< "${value}")
         value=$(sed -e "s,${ORFS_ROOT},\${FLOW_HOME}/\.\.,g" <<< "${value}")
     fi
-    # handle special case where the variable needs to be splitted in Tcl code
-    if [[ "${name}" == "GND_NETS_VOLTAGES" || "${name}" == "PWR_NETS_VOLTAGES" ]]; then
-        echo "export ${name}='${value}'" >> $1.sh
+    echo "export ${name}=\"${value}\"" >> $1.sh
+    if [[ "${value}" == *'$'* ]]; then
+        echo "set env ${name} $(sed -e 's,${FLOW_HOME},getenv("FLOW_HOME"),' <<< ${value})" >> $1.gdb
+        echo "set env(${name}) \"$(sed -e 's,${FLOW_HOME},$::env(FLOW_HOME),' <<< ${value})\"" >> $1.tcl
     else
-        echo "export ${name}=\"${value}\"" >> $1.sh
+        echo "set env(${name}) \"${value}\"" >> $1.tcl
+        echo "set env ${name} ${value}" >> $1.gdb
     fi
-    echo "set env(${name}) \"${value}\"" >> $1.tcl
-    echo "set env ${name} ${value}" >> $1.gdb
 done <<< "$ISSUE_VARIABLES"

flow/util/makeIssue.sh

@@ -65,9 +65,15 @@ ISSUE_CP_FILES+="${ISSUE_CP_FILES_PLATFORM} \
     $VARS_BASENAME.gdb"
 
 echo "Creating ${RUN_ME_SCRIPT} script"
-echo "#!/usr/bin/env bash"                     >  ${RUN_ME_SCRIPT}
-echo "source ${VARS_BASENAME}.sh"              >> ${RUN_ME_SCRIPT}
-echo "openroad -no_init ${SCRIPTS_DIR}/$1.tcl" >> ${RUN_ME_SCRIPT}
+cat > ${RUN_ME_SCRIPT} <<EOF
+#!/usr/bin/env bash
+source ${VARS_BASENAME}.sh
+if [[ ! -z \${GDB+x} ]]; then
+    gdb --args openroad -no_init ${SCRIPTS_DIR}/$1.tcl
+else
+    openroad -no_init ${SCRIPTS_DIR}/$1.tcl
+fi
+EOF
 chmod +x ${RUN_ME_SCRIPT}
 
 echo "Creating ${VARS_BASENAME}.sh/tcl script"

flow/util/utils.mk

@@ -98,8 +98,8 @@ $(foreach script,$(ISSUE_SCRIPTS),$(script)_issue): %_issue : versions.txt
 
 .PHONY: clean_issues
 clean_issues:
-	rm -rf $(foreach issue, $(ISSUE_SCRIPTS), $(issue)_*.tar.gz)
-	rm -rf $(VARS_BASENAME).sh $(RUN_ME_SCRIPT)
+	rm -f $(foreach issue, $(ISSUE_SCRIPTS), $(issue)_*.tar.gz)
+	rm -f vars*.sh vars*.tcl vars*.gdb run-me*.sh
 
 $(RESULTS_DIR)/6_final_only_clk.def: $(RESULTS_DIR)/6_final.def
 	$(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/deleteNonClkNets.tcl