Merge branch 'master' into master

Signed-off-by: Austin Rovinski <rovinski@users.noreply.github.com>
rovinski · Sep 13, 2024 · bce80f5 · bce80f5
2 parents 15f751c + 3eff2c7
commit bce80f5
Show file tree

Hide file tree

Showing 82 changed files with 80,576 additions and 53,318 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,3 +1,4 @@
 .git
 build*
 Dockerfile
+etc/openroad_deps_prefixes.txt
diff --git a/.gitignore b/.gitignore
@@ -38,3 +38,5 @@ debug/
 
 coverage-output
 .metals/
+
+etc/openroad_deps_prefixes.txt
diff --git a/docker/Dockerfile.builder b/docker/Dockerfile.builder
@@ -10,11 +10,12 @@ FROM $fromImage
 
 ARG compiler=gcc
 ARG numThreads=$(nproc)
+ARG depsPrefixFile="/etc/openroad_deps_prefixes.txt"
 ARG LOCAL_PATH=""
 
 COPY . /OpenROAD
 WORKDIR /OpenROAD
 
 ENV PATH=${LOCAL_PATH}:${PATH}
 
-RUN ./etc/Build.sh -compiler=${compiler} -threads=${numThreads}
+RUN ./etc/Build.sh -compiler=${compiler} -threads=${numThreads} -deps-prefixes-file=${depsPrefixFile}
diff --git a/etc/Build.sh b/etc/Build.sh
@@ -2,7 +2,8 @@
 
 set -euo pipefail
 
-cd "$(dirname $(readlink -f $0))/../"
+DIR="$(dirname $(readlink -f $0))"
+cd "$DIR/../"
 
 # default values, can be overwritten by cmdline args
 buildDir="build"
@@ -19,6 +20,7 @@ EOF
 fi
 cmakeOptions=""
 cleanBefore=no
+depsPrefixesFile=""
 keepLog=no
 compiler=gcc
 
@@ -30,7 +32,7 @@ OPTIONS:
   -cmake='-<key>=<value> [-<key>=<value> ...]'  User defined cmake options
                                                   Note: use single quote after
                                                   -cmake= and double quotes if
-                                                  <key> has muliple <values>
+                                                  <key> has multiple <values>
                                                   e.g.: -cmake='-DFLAGS="-a -b"'
   -compiler=COMPILER_NAME                       Compiler name: gcc or clang
                                                   Default: gcc
@@ -50,6 +52,11 @@ OPTIONS:
   -keep-log                                     Keep a compile log in build dir
   -help                                         Shows this message
   -gpu                                          Enable GPU to accelerate the process
+  -deps-prefixes-file=FILE                      File with CMake packages roots,
+                                                  its content extends -cmake argument.
+                                                  By default, "openroad_deps_prefixes.txt"
+                                                  file from OpenROAD's "etc" directory
+                                                  or from system "/etc".
 
 EOF
     exit "${1:-1}"
@@ -102,7 +109,15 @@ while [ "$#" -gt 0 ]; do
         -threads=* )
             numThreads="${1#*=}"
             ;;
-        -compiler | -cmake | -dir | -threads )
+        -deps-prefixes-file=*)
+            file="${1#-deps-prefixes-file=}"
+            if [[ ! -f "$file" ]]; then 
+                echo "${file} does not exist" >&2
+                _help
+            fi
+            depsPrefixesFile="$file"
+            ;;
+        -compiler | -cmake | -dir | -threads | -install | -deps-prefixes-file )
             echo "${1} requires an argument" >&2
             _help
             ;;
@@ -117,6 +132,20 @@ while [ "$#" -gt 0 ]; do
     shift 1
 done
 
+if [[ -z "$depsPrefixesFile" ]]; then
+    if [[ -f "$DIR/openroad_deps_prefixes.txt" ]]; then
+        depsPrefixesFile="$DIR/openroad_deps_prefixes.txt"
+    elif [[ -f "/etc/openroad_deps_prefixes.txt" ]]; then
+        depsPrefixesFile="/etc/openroad_deps_prefixes.txt"
+    fi
+fi
+if [[ -f "$depsPrefixesFile" ]]; then
+    cmakeOptions+=" $(cat "$depsPrefixesFile")"
+    echo "[INFO] Using additional CMake parameters from $depsPrefixesFile"
+else
+    echo "[INFO] Auto-generated prefix file does not exist - CMake will choose the dependencies automatically"
+fi
+
 case "${compiler}" in
     "gcc" )
         if [[ -f "/opt/rh/devtoolset-8/enable" ]]; then

diff --git a/etc/DependencyInstaller.sh b/etc/DependencyInstaller.sh
@@ -2,6 +2,8 @@
 
 set -euo pipefail
 
+CMAKE_PACKAGE_ROOT_ARGS=""
+
 _versionCompare() {
     local a b IFS=. ; set -f
     printf -v a %08d $1; printf -v b %08d $3
@@ -21,7 +23,7 @@ _equivalenceDeps() {
         git clone --depth=1 -b "${yosysVersion}" --recursive https://github.com/YosysHQ/yosys
         cd yosys
         # use of no-register flag is required for some compilers,
-        # e.g., gcc and clang fron RHEL8
+        # e.g., gcc and clang from RHEL8
         make -j $(nproc) PREFIX="${yosysPrefix}" ABC_ARCHFLAGS=-Wno-register
         make install
     ) fi
@@ -127,6 +129,7 @@ _installCommonDev() {
     else
         echo "Swig already installed."
     fi
+    CMAKE_PACKAGE_ROOT_ARGS+=" -D SWIG_ROOT=$(realpath $swigPrefix) "
 
     # boost
     boostPrefix=${PREFIX:-"/usr/local"}
@@ -143,6 +146,7 @@ _installCommonDev() {
     else
         echo "Boost already installed."
     fi
+    CMAKE_PACKAGE_ROOT_ARGS+=" -D Boost_ROOT=$(realpath $boostPrefix) "
 
     # eigen
     eigenPrefix=${PREFIX:-"/usr/local"}
@@ -155,10 +159,11 @@ _installCommonDev() {
     else
         echo "Eigen already installed."
     fi
+    CMAKE_PACKAGE_ROOT_ARGS+=" -D Eigen3_ROOT=$(realpath $eigenPrefix) "
 
     # cudd
     cuddPrefix=${PREFIX:-"/usr/local"}
-    if [[ ! -d ${cuddPrefix}/include/cudd.h ]]; then
+    if [[ ! -f ${cuddPrefix}/include/cudd.h ]]; then
         cd "${baseDir}"
         git clone --depth=1 -b ${cuddVersion} https://github.com/The-OpenROAD-Project/cudd.git
         cd cudd
@@ -191,6 +196,7 @@ _installCommonDev() {
     else
         echo "Lemon already installed."
     fi
+    CMAKE_PACKAGE_ROOT_ARGS+=" -D LEMON_ROOT=$(realpath $lemonPrefix) "
 
     # spdlog
     spdlogPrefix=${PREFIX:-"/usr/local"}
@@ -203,6 +209,7 @@ _installCommonDev() {
     else
         echo "spdlog already installed."
     fi
+    CMAKE_PACKAGE_ROOT_ARGS+=" -D spdlog_ROOT=$(realpath $spdlogPrefix) "
 
     # gtest
     gtestPrefix=${PREFIX:-"/usr/local"}
@@ -217,6 +224,7 @@ _installCommonDev() {
     else
         echo "gtest already installed."
     fi
+    CMAKE_PACKAGE_ROOT_ARGS+=" -D GTest_ROOT=$(realpath $gtestPrefix) "
 
     if [[ ${equivalenceDeps} == "yes" ]]; then
         _equivalenceDeps
@@ -264,23 +272,28 @@ _installOrTools() {
     if [[ ! -z "${PREFIX}" ]]; then mkdir -p "${PREFIX}"; fi
     cd "${baseDir}"
 
-    orToolsPath=${PREFIX:-"/opt/or-tools"}
-    if [ "$(uname -m)" == "aarch64" ]; then
-        # Disable exit on error for 'find' command, as it might return non zero
-        set +euo pipefail
-        LIST=($(find / -type f -name "libortools.so*" 2>/dev/null))
-        # Bring back exit on error
-        set -euo pipefail
-        if [ ${#LIST[@]} -eq 0 ]; then
-            echo "OR-TOOLS NOT FOUND"
-            echo "Installing  OR-Tools for aarch64..."
-            git clone --depth=1 -b "v${orToolsVersionBig}" https://github.com/google/or-tools.git
-            cd or-tools
-            ${cmakePrefix}/bin/cmake -S. -Bbuild -DBUILD_DEPS:BOOL=ON -DBUILD_EXAMPLES:BOOL=OFF -DBUILD_SAMPLES:BOOL=OFF -DBUILD_TESTING:BOOL=OFF -DCMAKE_INSTALL_PREFIX=${orToolsPath} -DCMAKE_CXX_FLAGS="-w" -DCMAKE_C_FLAGS="-w"
-            ${cmakePrefix}/bin/cmake --build build --config Release --target install -v -j $(nproc)
-        else
+    # Disable exit on error for 'find' command, as it might return non zero
+    set +euo pipefail
+    LIST=($(find / -type f -name "libortools.so*" 2>/dev/null))
+    # Bring back exit on error
+    set -euo pipefail
+    # Return if right version of or-tools is installed
+    for lib in ${LIST[@]}; do
+        if [[ "$lib" =~ .*"/libortools.so.${orToolsVersionSmall}" ]]; then
             echo "OR-Tools is already installed"
+            CMAKE_PACKAGE_ROOT_ARGS+=" -D ortools_ROOT=$(realpath $(dirname $lib)/..) "
+            return
         fi
+    done
+
+    orToolsPath=${PREFIX:-"/opt/or-tools"}
+    if [ "$(uname -m)" == "aarch64" ]; then
+        echo "OR-TOOLS NOT FOUND"
+        echo "Installing  OR-Tools for aarch64..."
+        git clone --depth=1 -b "v${orToolsVersionBig}" https://github.com/google/or-tools.git
+        cd or-tools
+        ${cmakePrefix}/bin/cmake -S. -Bbuild -DBUILD_DEPS:BOOL=ON -DBUILD_EXAMPLES:BOOL=OFF -DBUILD_SAMPLES:BOOL=OFF -DBUILD_TESTING:BOOL=OFF -DCMAKE_INSTALL_PREFIX=${orToolsPath} -DCMAKE_CXX_FLAGS="-w" -DCMAKE_C_FLAGS="-w"
+        ${cmakePrefix}/bin/cmake --build build --config Release --target install -v -j $(nproc)
     else
         if [[ $version == rodete ]]; then
             version=11
@@ -295,6 +308,7 @@ _installOrTools() {
         tar --strip 1 --dir ${orToolsPath} -xf ${orToolsFile}
         rm -rf ${baseDir}
     fi
+    CMAKE_PACKAGE_ROOT_ARGS+=" -D ortools_ROOT=$(realpath $orToolsPath) "
 }
 
 _installUbuntuCleanUp() {
@@ -571,7 +585,7 @@ EOF
     fi
     brew install bison boost cmake eigen flex fmt groff libomp or-tools pandoc pyqt5 python spdlog tcl-tk zlib
 
-    # Some systems neeed this to correclty find OpenMP package during build
+    # Some systems need this to correctly find OpenMP package during build
     brew link --force libomp
 
     # Lemon is not in the homebrew-core repo
@@ -725,6 +739,12 @@ Usage: $0
                                 #    like working around a firewall. This opens
                                 #    vulnerability to man-in-the-middle (MITM)
                                 #    attacks.
+       $0 -save-deps-prefixes=FILE
+                                # Dumps OpenROAD build arguments and variables
+                                # to FILE
+       $0 -constant-build-dir
+                                # Use constant build directory, instead of
+                                #    random one.
 
 EOF
     exit "${1:-1}"
@@ -736,6 +756,7 @@ option="all"
 isLocal="false"
 equivalenceDeps="no"
 CI="no"
+saveDepsPrefixes=""
 # temp dir to download and compile
 baseDir=$(mktemp -d /tmp/DependencyInstaller-XXXXXX)
 
@@ -780,6 +801,14 @@ while [ "$#" -gt 0 ]; do
             export PREFIX="${HOME}/.local"
             export isLocal="true"
             ;;
+        -constant-build-dir)
+            if [[ -d "$baseDir" ]]; then
+                echo "INFO: removing old building directory $baseDir"
+                rm -r "$baseDir"
+            fi
+            baseDir="/tmp/DependencyInstaller-OpenROAD"
+            mkdir -p "$baseDir"
+            ;;
         -prefix=*)
             if [[ ! -z ${PREFIX} ]]; then
                 echo "WARNING: previous argument -local will be overwritten with -prefix"
@@ -795,6 +824,9 @@ while [ "$#" -gt 0 ]; do
             alias wget="wget --no-check-certificate"
             export GIT_SSL_NO_VERIFY=true
             ;;
+        -save-deps-prefixes=*)
+            saveDepsPrefixes=$(realpath ${1#-save-deps-prefixes=})
+            ;;
         *)
             echo "unknown option: ${1}" >&2
             _help
@@ -803,6 +835,11 @@ while [ "$#" -gt 0 ]; do
     shift 1
 done
 
+if [[ -z "${saveDepsPrefixes}" ]]; then
+    DIR="$(dirname $(readlink -f $0))"
+    saveDepsPrefixes="$DIR/openroad_deps_prefixes.txt"
+fi
+
 platform="$(uname -s)"
 case "${platform}" in
     "Linux" )
@@ -938,3 +975,7 @@ EOF
         _help
         ;;
 esac
+if [[ ! -z ${saveDepsPrefixes} ]]; then
+    mkdir -p "$(dirname $saveDepsPrefixes)"
+    echo "$CMAKE_PACKAGE_ROOT_ARGS" > $saveDepsPrefixes
+fi
diff --git a/etc/DockerHelper.sh b/etc/DockerHelper.sh
@@ -7,6 +7,7 @@ cd "$(dirname $(readlink -f $0))/../"
 baseDir="$(pwd)"
 # docker hub organization/user from where to pull/push images
 org=openroad
+depsPrefixesFile="/etc/openroad_deps_prefixes.txt"
 
 _help() {
     cat <<EOF
@@ -18,8 +19,8 @@ usage: $0 [CMD] [OPTIONS]
   push                          Push the docker image to Docker Hub
 
   OPTIONS:
-  -os=OS_NAME                   Choose beween ubuntu22.04 (default), ubuntu20.04, rhel, opensuse, debian10 and debian11.
-  -target=TARGET                Choose target fo the Docker image:
+  -os=OS_NAME                   Choose between ubuntu22.04 (default), ubuntu20.04, rhel, opensuse, debian10 and debian11.
+  -target=TARGET                Choose target for the Docker image:
                                   'dev': os + packages to compile app
                                   'builder': os + packages to compile app +
                                              copy source code and build app
@@ -34,6 +35,7 @@ usage: $0 [CMD] [OPTIONS]
   -local                        Installs with prefix /home/openroad-deps
   -username                     Docker Username
   -password                     Docker Password
+  -deps-prefixes-path=PATH      Path where the file with dependency prefixes should be stored (in Docker image)
 
 EOF
     exit "${1:-1}"
@@ -84,6 +86,7 @@ _setup() {
             context="."
             buildArgs="--build-arg compiler=${compiler}"
             buildArgs="${buildArgs} --build-arg numThreads=${numThreads}"
+            buildArgs="${buildArgs} --build-arg depsPrefixFile=${depsPrefixesFile}"
             if [[ "${isLocal}" == "yes" ]]; then
                 buildArgs="${buildArgs} --build-arg LOCAL_PATH=${LOCAL_PATH}/bin"
             fi
@@ -92,9 +95,9 @@ _setup() {
         "dev" )
             fromImage="${FROM_IMAGE_OVERRIDE:-$osBaseImage}"
             context="etc"
-            buildArgs=""
+            buildArgs="-save-deps-prefixes=${depsPrefixesFile}"
             if [[ "${isLocal}" == "yes" ]]; then
-                buildArgs="-prefix=${LOCAL_PATH}"
+                buildArgs="${buildArgs} -prefix=${LOCAL_PATH}"
             fi
             if [[ "${equivalenceDeps}" == "yes" ]]; then
                 buildArgs="${buildArgs} -eqy"
@@ -244,7 +247,10 @@ while [ "$#" -gt 0 ]; do
         -tag=* )
             tag="${1#*=}"
             ;;
-        -os | -target | -compiler | -threads | -username | -password | -tag )
+        -deps-prefixes-path=* )
+            depsPrefixesFile="${1#-deps-prefixes-path=}"
+            ;;
+        -os | -target | -compiler | -threads | -username | -password | -tag | -deps-prefixes-path )
             echo "${1} requires an argument" >&2
             _help
             ;;

diff --git a/src/ant/include/ant/AntennaChecker.hh b/src/ant/include/ant/AntennaChecker.hh
@@ -33,7 +33,7 @@
 
 #include <map>
 #include <queue>
-#include <unordered_set>
+#include <set>
 
 #include "odb/db.h"
 #include "odb/dbWireGraph.h"
@@ -127,11 +127,11 @@ struct Violation
 
 using LayerToNodeInfo = std::map<odb::dbTechLayer*, NodeInfo>;
 using GraphNodes = std::vector<std::unique_ptr<GraphNode>>;
-using LayerToGraphNodes = std::unordered_map<odb::dbTechLayer*, GraphNodes>;
+using LayerToGraphNodes = std::map<odb::dbTechLayer*, GraphNodes>;
 using GateToLayerToNodeInfo = std::map<odb::dbITerm*, LayerToNodeInfo>;
 using Violations = std::vector<Violation>;
 using GateToViolationLayers
-    = std::unordered_map<odb::dbITerm*, std::unordered_set<odb::dbTechLayer*>>;
+    = std::map<odb::dbITerm*, std::set<odb::dbTechLayer*>>;
 
 class AntennaChecker
 {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -38,3 +38,5 @@ debug/

		coverage-output
		.metals/

		etc/openroad_deps_prefixes.txt