Skip to content

Commit e4b6cdb

Browse files
committed
Merge remote-tracking branch 'origin/master' into gui-chiplets3
2 parents a83e75a + ff6434e commit e4b6cdb

File tree

349 files changed

+135104
-8528
lines changed

Some content is hidden

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

349 files changed

+135104
-8528
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,3 @@ updates:
44
directory: "/"
55
schedule:
66
interval: "daily"
7-
- package-ecosystem: "gitsubmodule"
8-
directory: "/"
9-
schedule:
10-
interval: "daily"

.github/workflows/github-actions-clang-tidy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: The-OpenROAD-Project/clang-tidy-review@master
1818
id: review
1919
with:
20-
clang_tidy_version: 15
20+
clang_tidy_version: 19
2121
build_dir: "./build"
2222
cmake_command: cmake . -B build
2323
config_file: ".clang-tidy"

.gitignore

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,7 @@ obj-x86_64-linux-gnu/
5757

5858
user.bazelrc
5959

60-
bazel-bin
61-
bazel-out
62-
bazel-testlogs
63-
bazel-OpenROAD
60+
bazel-*
6461

6562
projectview.bazelproject
6663
.bsp/

Jenkinsfile

Lines changed: 34 additions & 16 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,32 +224,38 @@ 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 .';
219231
}
220-
withDockerContainer(args: '-u root -v /var/run/docker.sock:/var/run/docker.sock', image: 'openroad/bazel-ci:latest') {
221-
stage('bazelisk test ...') {
222-
withCredentials([string(credentialsId: 'bazel-auth-token-b64', variable: 'BAZEL_AUTH_TOKEN_B64')]) {
223-
timeout(time: 120, unit: 'MINUTES') {
224-
def cmd = 'bazelisk test --config=ci --show_timestamps --test_output=errors --curses=no --force_pic --remote_header="Authorization=Basic $BAZEL_AUTH_TOKEN_B64" --profile=build.profile'
225-
try {
226-
try {
227-
sh label: 'Test, using cached results and building a minimum of dependencies', script: cmd + ' ...';
228-
} finally {
229-
sh label: 'Analyze build times', script: 'bazelisk analyze-profile build.profile';
230-
}
231-
} catch (e) {
232-
currentBuild.result = 'FAILURE';
232+
try {
233+
withDockerContainer(args: '-u root -v /var/run/docker.sock:/var/run/docker.sock', image: 'openroad/bazel-ci:latest') {
234+
stage('bazelisk test ...') {
235+
withCredentials([string(credentialsId: 'bazel-auth-token-b64', variable: 'BAZEL_AUTH_TOKEN_B64')]) {
236+
timeout(time: 120, unit: 'MINUTES') {
237+
def cmd = 'bazelisk test --config=ci --show_timestamps --test_output=errors --curses=no --force_pic --remote_header="Authorization=Basic $BAZEL_AUTH_TOKEN_B64" --profile=build.profile'
233238
try {
234-
sh label: 'Test (keep_going)', script: cmd + ' --keep_going ...';
235-
} finally {
236-
sh label: 'Analyze build times', script: 'bazelisk analyze-profile build.profile';
239+
try {
240+
sh label: 'Test, using cached results and building a minimum of dependencies', script: cmd + ' ...';
241+
} finally {
242+
sh label: 'Analyze build times', script: 'bazelisk analyze-profile build.profile';
243+
}
244+
} catch (e) {
245+
try {
246+
sh label: 'Test (keep_going)', script: cmd + ' --keep_going ...';
247+
} catch (e2) {
248+
currentBuild.result = 'FAILURE';
249+
} finally {
250+
sh label: 'Analyze build times', script: 'bazelisk analyze-profile build.profile';
251+
}
237252
}
238253
}
239254
}
240255
}
241256
}
257+
} catch (IOException e) {
258+
echo "Caught: ${e}";
242259
}
243260
}
244261
}
@@ -260,6 +277,7 @@ def dockerTests = {
260277
test_os.each { os ->
261278
build_docker_images["Test Installer - ${os.name}"] = {
262279
node {
280+
logHostname()
263281
checkout scm;
264282
sh label: 'Build Docker image', script: "./etc/DockerHelper.sh create -target=builder -os=${os.image}";
265283
sh label: 'Test Docker image', script: "./etc/DockerHelper.sh test -target=builder -os=${os.image} -smoke";

MODULE.bazel

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ bazel_dep(name = "googletest", version = "1.17.0", dev_dependency = True)
109109
# BCR, they should depend on their own version.
110110
bazel_dep(name = "glpk", version = "5.0.bcr.3", repo_name = "org_gnu_glpk")
111111

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

115115
# Configure and register the toolchain.
@@ -153,7 +153,7 @@ bazel_dep(name = "bazel-orfs")
153153
# To bump version, run: bazelisk run @bazel-orfs//:bump
154154
git_override(
155155
module_name = "bazel-orfs",
156-
commit = "2aa6a9dd3c0006c5358e363fcac9e209c4dccc47",
156+
commit = "677ecf4bb7195903bb58beae171d254dac984e27",
157157
remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
158158
)
159159

@@ -162,10 +162,10 @@ orfs = use_extension("@bazel-orfs//:extension.bzl", "orfs_repositories")
162162
# To bump version, run: bazelisk run @bazel-orfs//:bump
163163
orfs.default(
164164
# Official image https://hub.docker.com/r/openroad/orfs/tags
165-
image = "docker.io/openroad/orfs:v3.0-3911-g99312fa58",
165+
image = "docker.io/openroad/orfs:v3.0-4072-g2a1832971",
166166
# Use OpenROAD of this repo instead of from the docker image
167167
openroad = "//:openroad",
168-
sha256 = "36d3ac23732803c9e47181e167a105c69d4d6927a96782c4a4a27ceca40d8ff8",
168+
sha256 = "d5ac8b165ebab339eb98beb63a463eab5ed78364335fb1455c2e1d75eb757c3d",
169169
)
170170
use_repo(orfs, "com_github_nixos_patchelf_download")
171171
use_repo(orfs, "docker_orfs")
@@ -195,9 +195,9 @@ maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
195195
maven.install(
196196
name = "maven",
197197
artifacts = [
198-
"org.chipsalliance:chisel_2.13:7.0.0",
199-
"org.chipsalliance:chisel-plugin_2.13.16:7.0.0",
200198
],
199+
# Update by running: bazelisk run @maven//:pin
200+
lock_file = "//bazel:maven_install.json",
201201
repositories = [
202202
"https://repo1.maven.org/maven2",
203203
"https://s01.oss.sonatype.org/content/repositories/releases",

MODULE.bazel.lock

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

0 commit comments

Comments
 (0)