Merge pull request hdl#196 from mithro/openroad-upgrade

Upgrade OpenROAD
mithro · Oct 4, 2023 · 64688e6 · 64688e6
2 parents 2d5d753 + 1f3a708
commit 64688e6
Show file tree

Hide file tree

Showing 18 changed files with 940 additions and 620 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -90,6 +90,16 @@ llvm_toolchain(
     # },
 )
 
+maybe(
+    http_archive,
+    name = "rules_proto",
+    sha256 = "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd",
+    strip_prefix = "rules_proto-5.3.0-21.7",
+    urls = [
+        "https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.7.tar.gz",
+    ],
+)
+
 maybe(
     http_archive,
     name = "rules_python",

diff --git a/dependency_support/com_github_quantamhd_lemon/bundled.BUILD.bazel b/dependency_support/com_github_quantamhd_lemon/bundled.BUILD.bazel
@@ -54,6 +54,7 @@ cc_library(
       "-fexceptions",
     ],
     features = ["-use_header_modules"],  # Incompatible with -fexception.
+    includes = ["."],
     deps = ["@org_gnu_glpk//:glpk"],
     visibility = [
         "//visibility:public",

diff --git a/dependency_support/com_github_yosyshq_nextpnr/bundled.BUILD.bazel b/dependency_support/com_github_yosyshq_nextpnr/bundled.BUILD.bazel
@@ -43,7 +43,7 @@ DEPS = [
     "@boost//:system",
     "@boost//:thread",
     "@local_config_python//:python_headers",
-    "@org_tuxfamily_eigen//:eigen3",
+    "@eigen//:eigen3",
 ]
 
 DEFINES = [

diff --git a/dependency_support/com_google_absl/com_google_absl.bzl b/dependency_support/com_google_absl/com_google_absl.bzl
@@ -14,14 +14,15 @@
 
 """Registers Bazel workspaces for the GNU readline library."""
 
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
 def com_google_absl():
     maybe(
-        http_archive,
+        git_repository,
         name = "com_google_absl",
-        strip_prefix = "abseil-cpp-20211102.0",
-        urls = ["https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.zip"],
-        sha256 = "a4567ff02faca671b95e31d315bab18b42b6c6f1a60e91c6ea84e5a2142112c2",
+        tag = "20230125.3",
+        patches = ["@com_google_ortools//patches:abseil-cpp-20230125.3.patch"],
+        patch_args = ["-p1"],
+        remote = "https://github.com/abseil/abseil-cpp.git",
     )
diff --git a/dependency_support/com_google_ortools/BUILD b/dependency_support/com_google_ortools/BUILD
@@ -0,0 +1,15 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Required to make this a package.
diff --git a/dependency_support/com_google_ortools/com_google_ortools.bzl b/dependency_support/com_google_ortools/com_google_ortools.bzl
@@ -0,0 +1,61 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Registers Bazel workspaces for the GNU readline library."""
+
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
+
+def com_google_ortools():
+    maybe(
+        http_archive,
+        name = "com_google_ortools",
+        strip_prefix = "or-tools-9.7",
+        urls = ["https://github.com/google/or-tools/archive/refs/tags/v9.7.tar.gz"],
+        sha256 = "054d9517fc6c83f15150c93ef1c2c674ffd7d4a0d1fdc78f6ef8bc3e25c2e339",
+    )
+    maybe(
+        new_git_repository,
+        name = "scip",
+        build_file = "@com_google_ortools//bazel:scip.BUILD",
+        patches = ["@com_google_ortools//bazel:scip.patch"],
+        patch_args = ["-p1"],
+        tag = "v803",
+        remote = "https://github.com/scipopt/scip.git",
+    )
+    maybe(
+        http_archive,
+        name = "bliss",
+        build_file = "@com_google_ortools//bazel:bliss.BUILD",
+        patches = ["@com_google_ortools//bazel:bliss-0.73.patch"],
+        sha256 = "f57bf32804140cad58b1240b804e0dbd68f7e6bf67eba8e0c0fa3a62fd7f0f84",
+        url = "https://github.com/google/or-tools/releases/download/v9.0/bliss-0.73.zip",
+        #url = "http://www.tcs.hut.fi/Software/bliss/bliss-0.73.zip",
+    )
+    maybe(
+        new_git_repository,
+        name = "eigen",
+        tag = "3.4.0",
+        remote = "https://gitlab.com/libeigen/eigen.git",
+        build_file_content = """
+cc_library(
+    name = 'eigen3',
+    srcs = [],
+    includes = ['.'],
+    hdrs = glob(['Eigen/**']),
+    visibility = ['//visibility:public'],
+)
+""",
+    )
diff --git a/dependency_support/com_google_protobuf/BUILD b/dependency_support/com_google_protobuf/BUILD
@@ -0,0 +1,15 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Required to make this a package.
diff --git a/...g_tuxfamily_eigen/org_tuxfamily_eigen.bzl → ...m_google_protobuf/com_google_protobuf.bzl b/...g_tuxfamily_eigen/org_tuxfamily_eigen.bzl → ...m_google_protobuf/com_google_protobuf.bzl
@@ -12,17 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Loads the Eigen C++ template library for linear algebra."""
+"""Registers Bazel workspaces for the GNU readline library."""
 
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
-def org_tuxfamily_eigen():
+def com_google_protobuf():
     maybe(
-        new_git_repository,
-        name = "org_tuxfamily_eigen",
-        build_file = Label("@rules_hdl//dependency_support/org_tuxfamily_eigen:bundled.BUILD.bazel"),
-        commit = "eb71e5db988d4a23e619ed054efd3eb751cdd026",  # 2021-03-17
-        remote = "https://gitlab.com/libeigen/eigen.git",
-        shallow_since = "1615946824 +0100",
+        git_repository,
+        name = "com_google_protobuf",
+        tag = "v23.3",
+        patches = ["@com_google_ortools//patches:protobuf-v23.3.patch"],
+        patch_args = ["-p1"],
+        remote = "https://github.com/protocolbuffers/protobuf.git",
     )
diff --git a/dependency_support/dependency_support.bzl b/dependency_support/dependency_support.bzl
@@ -33,6 +33,8 @@ load("@rules_hdl//dependency_support/com_github_yosyshq_prjtrellis:com_github_yo
 load("@rules_hdl//dependency_support/com_github_yosyshq_prjtrellis_db:com_github_yosyshq_prjtrellis_db.bzl", "com_github_yosyshq_prjtrellis_db")
 load("@rules_hdl//dependency_support/com_google_absl:com_google_absl.bzl", "com_google_absl")
 load("@rules_hdl//dependency_support/com_google_googletest:com_google_googletest.bzl", "com_google_googletest")
+load("@rules_hdl//dependency_support/com_google_ortools:com_google_ortools.bzl", "com_google_ortools")
+load("@rules_hdl//dependency_support/com_google_protobuf:com_google_protobuf.bzl", "com_google_protobuf")
 load("@rules_hdl//dependency_support/com_google_skywater_pdk:com_google_skywater_pdk.bzl", "com_google_skywater_pdk")
 load("@rules_hdl//dependency_support/com_icarus_iverilog:com_icarus_iverilog.bzl", "com_icarus_iverilog")
 load("@rules_hdl//dependency_support/com_opencircuitdesign_magic:com_opencircuitdesign_magic.bzl", "com_opencircuitdesign_magic")
@@ -56,7 +58,6 @@ load("@rules_hdl//dependency_support/org_sourceware_libffi:org_sourceware_libffi
 load("@rules_hdl//dependency_support/org_swig:org_swig.bzl", "org_swig")
 load("@rules_hdl//dependency_support/org_theopenroadproject:org_theopenroadproject.bzl", "org_theopenroadproject")
 load("@rules_hdl//dependency_support/org_theopenroadproject_asap7:org_theopenroadproject_asap7.bzl", "org_theopenroadproject_asap7")
-load("@rules_hdl//dependency_support/org_tuxfamily_eigen:org_tuxfamily_eigen.bzl", "org_tuxfamily_eigen")
 load("@rules_hdl//dependency_support/pybind11:pybind11.bzl", "pybind11")
 load("@rules_hdl//dependency_support/tk_tcl:tk_tcl.bzl", "tk_tcl")
 load("@rules_hdl//dependency_support/verilator:verilator.bzl", "verilator")
@@ -78,6 +79,8 @@ def dependency_support():
     com_github_yosyshq_prjtrellis_db()
     com_google_absl()
     com_google_googletest()
+    com_google_protobuf()
+    com_google_ortools()
     com_google_skywater_pdk()
     com_icarus_iverilog()
     com_opencircuitdesign_magic()
@@ -101,7 +104,6 @@ def dependency_support():
     org_swig()
     org_theopenroadproject()
     org_theopenroadproject_asap7()
-    org_tuxfamily_eigen()
     pybind11()
     tk_tcl()
     verilator()