Skip to content

Commit f703a4b

Browse files
committed
Merge branch 'master' into est_via_res
Signed-off-by: Eder Monteiro <[email protected]>
2 parents f4e8bc4 + 8b193f4 commit f703a4b

File tree

260 files changed

+136119
-5506
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

260 files changed

+136119
-5506
lines changed

.gitignore

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ build
2929
build_linux
3030
build_mac
3131
test/results
32-
flow
3332

3433
docs/main
3534
README2.md
@@ -57,10 +56,8 @@ obj-x86_64-linux-gnu/
5756

5857
user.bazelrc
5958

60-
bazel-bin
61-
bazel-out
62-
bazel-testlogs
63-
bazel-OpenROAD
59+
# Limit ignore to these files, so we see and clean out other cruft that pollutes grep
60+
/bazel-*
6461

6562
projectview.bazelproject
6663
.bsp/

Jenkinsfile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
@Library('[email protected]') _
22

3+
def logHostname() {
4+
sh label: "Running on ${env.NODE_NAME}", script: "echo 'Node context established.'"
5+
}
6+
37
def baseTests(String image) {
48
Map base_tests = [failFast: false];
59

@@ -43,6 +47,7 @@ def baseTests(String image) {
4347
flow_tests.each { current_test ->
4448
base_tests["Flow Test - ${current_test}"] = {
4549
node {
50+
logHostname()
4651
withDockerContainer(args: '-u root', image: image) {
4752
stage("Setup ${current_test}") {
4853
sh label: 'Configure git', script: "git config --system --add safe.directory '*'";
@@ -78,6 +83,7 @@ def getParallelTests(String image) {
7883
def ret = [
7984
'Docs Tester': {
8085
node {
86+
logHostname()
8187
withDockerContainer(args: '-u root', image: image) {
8288
stage('Setup Docs Test') {
8389
echo "Setting up Docs Tester environment in ${image}";
@@ -101,6 +107,7 @@ def getParallelTests(String image) {
101107

102108
'Build without GUI': {
103109
node {
110+
logHostname()
104111
withDockerContainer(args: '-u root', image: image) {
105112
stage('Setup no-GUI Build') {
106113
echo "Build without GUI";
@@ -118,6 +125,7 @@ def getParallelTests(String image) {
118125

119126
'Build without Test': {
120127
node {
128+
logHostname()
121129
withDockerContainer(args: '-u root', image: image) {
122130
stage('Setup no-test Build') {
123131
echo "Build without Tests";
@@ -139,6 +147,7 @@ def getParallelTests(String image) {
139147

140148
'Build on RHEL8': {
141149
node ('rhel8') {
150+
logHostname()
142151
stage('Setup RHEL8 Build') {
143152
checkout scm;
144153
}
@@ -172,6 +181,7 @@ def getParallelTests(String image) {
172181

173182
'Unit Tests Ninja': {
174183
node {
184+
logHostname()
175185
withDockerContainer(args: '-u root', image: image) {
176186
stage('Setup Ninja Tests') {
177187
sh label: 'Configure git', script: "git config --system --add safe.directory '*'";
@@ -195,6 +205,7 @@ def getParallelTests(String image) {
195205

196206
'Compile with C++20': {
197207
node {
208+
logHostname()
198209
withDockerContainer(args: '-u root', image: image) {
199210
stage('Setup C++20 Compile') {
200211
sh label: 'Configure git', script: "git config --system --add safe.directory '*'";
@@ -213,6 +224,7 @@ def getParallelTests(String image) {
213224

214225
def bazelTest = {
215226
node {
227+
logHostname()
216228
stage('Setup') {
217229
checkout scm;
218230
sh label: 'Setup Docker Image', script: 'docker build -f docker/Dockerfile.bazel -t openroad/bazel-ci .';
@@ -265,6 +277,7 @@ def dockerTests = {
265277
test_os.each { os ->
266278
build_docker_images["Test Installer - ${os.name}"] = {
267279
node {
280+
logHostname()
268281
checkout scm;
269282
sh label: 'Build Docker image', script: "./etc/DockerHelper.sh create -target=builder -os=${os.image}";
270283
sh label: 'Test Docker image', script: "./etc/DockerHelper.sh test -target=builder -os=${os.image} -smoke";

MODULE.bazel

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,13 @@ bazel_dep(name = "tcmalloc", version = "0.0.0-20250331-43fcf6e")
9191
bazel_dep(name = "zlib", version = "1.3.1.bcr.5")
9292
bazel_dep(name = "yaml-cpp", version = "0.8.0")
9393

94+
# Use HEAD of master upstream to fix bugs such as missing stdint include
95+
git_override(
96+
module_name = "yaml-cpp",
97+
commit = "a83cd31548b19d50f3f983b069dceb4f4d50756d",
98+
remote = "https://github.com/jbeder/yaml-cpp.git",
99+
)
100+
94101
# A from source build of QT that allows it to link into OpenROAD.
95102
# Building like any other bazel project. scripts in the docker folder
96103
# of this project generate stubs .ifso for things like X11 that will
@@ -105,11 +112,13 @@ git_override(
105112

106113
bazel_dep(name = "googletest", version = "1.17.0", dev_dependency = True)
107114

115+
bazel_dep(name = "abseil-cpp", version = "20240722.0", repo_name = "com_google_absl")
116+
108117
# Dependencies needed by one of the rules_hdl repos. Once they are on
109118
# BCR, they should depend on their own version.
110119
bazel_dep(name = "glpk", version = "5.0.bcr.3", repo_name = "org_gnu_glpk")
111120

112-
## Fix the compiler version and avoid any local compiler
121+
## Lock the compiler version and avoid any local compiler
113122
bazel_dep(name = "toolchains_llvm", version = "1.5.0")
114123

115124
# Configure and register the toolchain.
@@ -153,7 +162,7 @@ bazel_dep(name = "bazel-orfs")
153162
# To bump version, run: bazelisk run @bazel-orfs//:bump
154163
git_override(
155164
module_name = "bazel-orfs",
156-
commit = "2aa6a9dd3c0006c5358e363fcac9e209c4dccc47",
165+
commit = "aacba96353744e059284a40175b74934a370e5c0",
157166
remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
158167
)
159168

@@ -162,10 +171,10 @@ orfs = use_extension("@bazel-orfs//:extension.bzl", "orfs_repositories")
162171
# To bump version, run: bazelisk run @bazel-orfs//:bump
163172
orfs.default(
164173
# Official image https://hub.docker.com/r/openroad/orfs/tags
165-
image = "docker.io/openroad/orfs:v3.0-4022-ged05b57b7",
174+
image = "docker.io/openroad/orfs:v3.0-4091-gc1e9016cf",
166175
# Use OpenROAD of this repo instead of from the docker image
167176
openroad = "//:openroad",
168-
sha256 = "57ee6a9d8b9d9a3d1c452e3444ac4da7102c060cfb003eea9468ee368499caec",
177+
sha256 = "4e4daf718eb0281738f6f50ae6bb17445fae0c75a30f6570adda1ce6d2dd2308",
169178
)
170179
use_repo(orfs, "com_github_nixos_patchelf_download")
171180
use_repo(orfs, "docker_orfs")
@@ -195,9 +204,9 @@ maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
195204
maven.install(
196205
name = "maven",
197206
artifacts = [
198-
"org.chipsalliance:chisel_2.13:7.0.0",
199-
"org.chipsalliance:chisel-plugin_2.13.16:7.0.0",
200207
],
208+
# Update by running: bazelisk run @maven//:pin
209+
lock_file = "//bazel:maven_install.json",
201210
repositories = [
202211
"https://repo1.maven.org/maven2",
203212
"https://s01.oss.sonatype.org/content/repositories/releases",

MODULE.bazel.lock

Lines changed: 3 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)