Merge remote-tracking branch 'private/master' into gpl-filler-gcell-removal

Author: gudeh

Jenkinsfile

@@ -162,31 +162,6 @@ def getParallelTests(String image) {
             }
         },
 
-        'Build with Bazel': {
-            node {
-                withDockerContainer(args: '-u root -v /var/run/docker.sock:/var/run/docker.sock', image: image) {
-                    stage('Setup Bazel Build') {
-                        echo "Build with Bazel";
-                        sh label: 'Configure git', script: "git config --system --add safe.directory '*'";
-                        checkout scm;
-                    }
-                    stage('Bazel Build') {
-                        withCredentials([file(credentialsId: 'bazel-cache-sa', variable: 'GCS_SA_KEY')]) {
-                            timeout(time: 120, unit: 'MINUTES') {
-                                def cmd = 'bazelisk test --config=ci --show_timestamps --test_output=errors --curses=no --force_pic'
-
-                                if (env.BRANCH_NAME != 'master') {
-                                    cmd += ' --remote_upload_local_results=false'
-                                }
-
-                                sh label: 'Bazel Build', script: cmd + ' --google_credentials=$GCS_SA_KEY ...'
-                            }
-                        }
-                    }
-                }
-            }
-        },
-
         'Check message IDs': {
             dir('src') {
                 sh label: 'Find duplicated message IDs', script: '../etc/find_messages.py > messages.txt';
@@ -274,21 +249,31 @@ def getParallelTests(String image) {
     return ret;
 }
 
-node {
-
-    def isDefaultBranch = (env.BRANCH_NAME == 'master') 
-    def daysToKeep = '20';
-    def numToKeep = (isDefaultBranch ? '-1' : '10');
-
-    properties([
-        buildDiscarder(logRotator(
-            daysToKeepStr:         daysToKeep,
-            artifactDaysToKeepStr: daysToKeep,
+def bazelTest = {
+    stage ('Build with Bazel') {
+        node {
+            stage('Setup Bazel Build') {
+                checkout scm;
+                sh label: 'Setup Docker Image', script: 'docker build -f docker/Dockerfile.bazel -t openroad/bazel-ci .';
+            }
+            withDockerContainer(args: '-u root -v /var/run/docker.sock:/var/run/docker.sock', image: 'openroad/bazel-ci:latest') {
+                stage('Bazel Build') {
+                    withCredentials([file(credentialsId: 'bazel-cache-sa', variable: 'GCS_SA_KEY')]) {
+                        timeout(time: 120, unit: 'MINUTES') {
+                            def cmd = 'bazelisk test --config=ci --show_timestamps --test_output=errors --curses=no --force_pic';
+                            if (env.BRANCH_NAME != 'master') {
+                                cmd += ' --remote_upload_local_results=false';
+                            }
+                            sh label: 'Bazel Build', script: cmd + ' --google_credentials=$GCS_SA_KEY ...';
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
 
-            numToKeepStr:          numToKeep,
-            artifactNumToKeepStr:  numToKeep
-        ))
-    ]);
+def dockerTests = {
     stage('Checkout') {
         checkout scm;
     }
@@ -317,6 +302,24 @@ node {
         echo "Docker image is ${DOCKER_IMAGE}";
     }
     parallel(getParallelTests(DOCKER_IMAGE));
+}
+
+node {
+    def isDefaultBranch = (env.BRANCH_NAME == 'master')
+    def daysToKeep = '20';
+    def numToKeep = (isDefaultBranch ? '-1' : '10');
+    properties([
+        buildDiscarder(logRotator(
+            daysToKeepStr:         daysToKeep,
+            artifactDaysToKeepStr: daysToKeep,
+            numToKeepStr:          numToKeep,
+            artifactNumToKeepStr:  numToKeep
+        ))
+    ]);
+    parallel(
+            "Bazel Tests": bazelTest,
+            "Docker Tests": dockerTests
+    );
     stage('Send Email Report') {
         sendEmail();
     }

MODULE.bazel

@@ -7,6 +7,7 @@ module(
 
 bazel_dep(name = "platforms", version = "0.0.11")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "rules_cc", version = "0.1.2")
 bazel_dep(name = "rules_flex", version = "0.3.1")
 bazel_dep(name = "rules_bison", version = "0.3.1")
 bazel_dep(name = "rules_jvm_external", version = "6.4")
@@ -17,17 +18,6 @@ git_override(
     remote = "https://github.com/bazelbuild/rules_scala",
 )
 
-# The current rules_cc 0.1.1 hardcodes script locations to `#!/bin/bash`
-# instead of using `#!/usr/bin/env bash`.
-# This is fixed by https://github.com/bazelbuild/rules_cc/pull/306 but
-# is not released yet. Use rules_cc from that commit.
-bazel_dep(name = "rules_cc", version = "0.1.1")
-git_override(
-    module_name = "rules_cc",
-    commit = "d74915024017250e46d95e91a3defc34174effe0",
-    remote = "https://github.com/bazelbuild/rules_cc",
-)
-
 bazel_dep(name = "rules_verilator", version = "5.034")
 single_version_override(
     module_name = "rules_verilator",

MODULE.bazel.lock

@@ -0,0 +1,31 @@
+FROM ubuntu:24.04
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get -y update \
+    && apt-get -y install curl git
+
+RUN curl -Lo bazelisk https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-amd64 \
+    && chmod +x bazelisk \
+    && mv bazelisk /usr/local/bin/bazelisk
+
+RUN install -m 0755 -d /etc/apt/keyrings \
+    && curl -fsSL https://download.docker.com/linux/ubuntu/gpg \
+        -o /etc/apt/keyrings/docker.asc \
+    && chmod a+r /etc/apt/keyrings/docker.asc \
+    && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
+        $(. /etc/os-release && echo "${VERSION_CODENAME}") stable" | \
+        tee /etc/apt/sources.list.d/docker.list > /dev/null
+
+RUN apt-get -y update \
+    && apt-get -y install --no-install-recommends \
+      build-essential \
+      clang \
+      containerd.io \
+      docker-buildx-plugin \
+      docker-ce \
+      docker-ce-cli \
+      openjdk-21-jre-headless \
+      python3 \
+      python3-yaml \
+      time

docker/Dockerfile.bazel

@@ -1110,6 +1110,10 @@ NesterovBaseCommon::NesterovBaseCommon(NesterovBaseVars nbVars,
     gPinMap_[gPin.pin()] = &gPin;
     if (gPin.pin()->isITerm()) {
       db_iterm_to_index_map_[gPin.pin()->dbITerm()] = i;
+    } else if (gPin.pin()->isBTerm()) {
+      db_bterm_to_index_map_[gPin.pin()->dbBTerm()] = i;
+    } else {
+      debugPrint(log_, GPL, "callbacks", 1, "gPin neither bterm or iterm!");
     }
   }
 
@@ -1405,7 +1409,8 @@ FloatPoint NesterovBaseCommon::getWireLengthGradientPinWA(const GPin* gPin,
              GPL,
              "getGradientWAPin",
              1,
-             "gradient:  X[{:g} {:g}]  Y[{:g} {:g}]",
+             "{}, X[{:g} {:g}]  Y[{:g} {:g}]",
+             gPin->gCell()->name(),
              gradientMinX,
              gradientMaxX,
              gradientMinY,
@@ -1540,13 +1545,18 @@ void NesterovBaseCommon::fixPointers()
   gPins_.clear();
   gPinMap_.clear();
   db_iterm_to_index_map_.clear();
+  db_bterm_to_index_map_.clear();
   gPins_.reserve(gPinStor_.size());
   for (size_t i = 0; i < gPinStor_.size(); ++i) {
     GPin& gPin = gPinStor_[i];
     gPins_.push_back(&gPin);
     gPinMap_[gPin.pin()] = &gPin;
     if (gPin.pin()->isITerm()) {
       db_iterm_to_index_map_[gPin.pin()->dbITerm()] = i;
+    } else if (gPin.pin()->isBTerm()) {
+      db_bterm_to_index_map_[gPin.pin()->dbBTerm()] = i;
+    } else {
+      debugPrint(log_, GPL, "callbacks", 1, "gPin neither bterm or iterm!");
     }
   }
 
@@ -1565,6 +1575,7 @@ void NesterovBaseCommon::fixPointers()
     if (gCell.isFiller()) {
       continue;
     }
+
     gCell.clearGPins();
     for (Instance* inst : gCell.insts()) {
       for (odb::dbITerm* iterm : inst->dbInst()->getITerms()) {
@@ -1632,6 +1643,26 @@ void NesterovBaseCommon::fixPointers()
         }
       }
     }
+
+    for (odb::dbBTerm* bterm : gNet.net()->dbNet()->getBTerms()) {
+      if (isValidSigType(bterm->getSigType())) {
+        auto it = db_bterm_to_index_map_.find(bterm);
+        if (it != db_bterm_to_index_map_.end()) {
+          size_t gpin_index = it->second;
+          gNet.addGPin(&gPinStor_[gpin_index]);
+          if (gPinStor_[gpin_index].gCell()) {
+            gPinStor_[gpin_index].gCell()->addGPin(&gPinStor_[gpin_index]);
+          }
+        } else {
+          debugPrint(log_,
+                     GPL,
+                     "callbacks",
+                     1,
+                     "warning: gpin not found for BTerm: {}",
+                     bterm->getName());
+        }
+      }
+    }
   }
 }
 
@@ -3532,7 +3563,6 @@ void NesterovBaseCommon::destroyCbkGNet(odb::dbNet* db_net)
 }
 
 void NesterovBaseCommon::destroyCbkITerm(odb::dbITerm* db_iterm)
-
 {
   debugPrint(log_, GPL, "callbacks", 2, "NesterovBaseCommon::destroyITerm");
   auto db_it = db_iterm_to_index_map_.find(db_iterm);

src/gpl/src/nesterovBase.cpp

@@ -915,6 +915,7 @@ class NesterovBaseCommon
   std::unordered_map<odb::dbInst*, size_t> db_inst_to_nbc_index_map_;
   std::unordered_map<odb::dbNet*, size_t> db_net_to_index_map_;
   std::unordered_map<odb::dbITerm*, size_t> db_iterm_to_index_map_;
+  std::unordered_map<odb::dbBTerm*, size_t> db_bterm_to_index_map_;
 
   // These three deques should not be required if placerBase allows for dynamic
   // modifications on its vectors.