Merge branch 'master' into manpage_docs

Author: luarss

.dockerignore

@@ -16,7 +16,6 @@ flow/run-me*.sh
 flow/vars*.sh
 flow/vars*.tcl
 flow/vars*.gdb
-flow/versions.txt
 
 # Common temp files
 flow/*.log
@@ -29,6 +28,5 @@ flow/*.log
 # core dumps
 core*
 
-# git
-.git
-.gitignore
+# local dependencies
+dependencies/

.github/workflows/github-actions-cron-test-installer.yml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["ubuntu20.04", "ubuntu22.04", "centos7"]
+        os: ["ubuntu20.04", "ubuntu22.04"]
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
@@ -52,9 +52,4 @@ jobs:
       - name: Test build
         run: |
           cmd="source ./env.sh ; yosys -help ; openroad -help ; make -C flow ;"
-          if [[ ${{ matrix.os }} == "centos7" ]]; then
-            cmd="source /opt/rh/devtoolset-8/enable; ${cmd}"
-            cmd="source /opt/rh/llvm-toolset-7.0/enable; ${cmd}"
-            cmd="source /opt/rh/rh-python38/enable; ${cmd}"
-          fi
           docker run openroad/flow-${{ matrix.os }}-builder /bin/bash -c "${cmd}"

.gitignore

@@ -20,7 +20,6 @@ flow/run-me*.sh
 flow/vars*.sh
 flow/vars*.tcl
 flow/vars*.gdb
-flow/versions.txt
 
 # Common temp files
 flow/pt_shell_command.log
@@ -91,3 +90,4 @@ docs/build
 GitGuide.md
 Manpage.md
 mainREADME.md
+build

README.md

@@ -80,9 +80,9 @@ binaries, including OpenROAD, Yosys and Klayout. See instructions
 > **Disclaimer** The versions of OpenROAD, Yosys and Klayout provided by
 > other third-party vendors are not guaranteed to work with ORFS.
 
-### Local Installation
+### Build from sources locally
 
-Document for detailed local installation steps found [here](./docs/user/BuildLocally.md).
+Document for detailed local build from sources and installation steps found [here](./docs/user/BuildLocally.md).
 
 ## Using the Flow
 

build_openroad.sh

@@ -273,6 +273,12 @@ __local_build()
             set -u
         fi
 
+        YOSYS_ABC_PATH=tools/yosys/abc
+        if [[ -d "${YOSYS_ABC_PATH}/.git" ]]; then
+            # update indexes to make sure git diff-index uses correct data
+            git --work-tree=${YOSYS_ABC_PATH} --git-dir=${YOSYS_ABC_PATH}/.git update-index --refresh
+        fi
+
         echo "[INFO FLW-0017] Compiling Yosys."
         ${NICE} make install -C tools/yosys -j "${PROC}" ${YOSYS_ARGS}
 

docker/Dockerfile.builder

@@ -2,7 +2,7 @@
 # i.e., "./build_openroad.sh --local" from inside a docker container
 # NOTE: don't use this file directly unless you know what you are doing,
 # instead use etc/DockerHelper.sh
-ARG fromImage=openroad/flow-centos7-dev:latest
+ARG fromImage=openroad/flow-ubuntu22.04-dev:latest
 
 FROM $fromImage
 

docker/Dockerfile.dev

@@ -1,7 +1,7 @@
 # create image with dependencies needed to compile openroad app and run openroad flow scripts
 # NOTE: don't use this file directly unless you know what you are doing,
 # instead use etc/DockerHelper.sh
-ARG fromImage=centos:centos7
+ARG fromImage=ubuntu:22.04
 
 FROM $fromImage
 
@@ -12,5 +12,13 @@ COPY DependencyInstaller.sh .
 COPY InstallerOpenROAD.sh \
        /tmp/installer/tools/OpenROAD/etc/DependencyInstaller.sh
 
-RUN ./DependencyInstaller.sh \
+ARG options=""
+
+RUN ./DependencyInstaller.sh $options \
       && rm -rf /tmp/installer
+
+ARG fromImage
+
+RUN echo "$fromImage" | grep -q "ubuntu" && \
+    strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so || \
+    echo "Skipping strip command as fromImage does not contain 'ubuntu'"

docs/user/BuildWithDocker.md

@@ -71,7 +71,7 @@ You can restrict the number of CPUs with the `-t|--threads N` argument:
 The binaries are only available from inside a Docker container. Here is an example of starting a container from the created Docker image.
 
 ``` shell
-docker run --rm -it -u $(id -u ${USER}):$(id -g ${USER}) -v $(pwd)/flow:/OpenROAD-flow-scripts/flow openroad/flow-ubuntu22-builder
+docker run --rm -it -u $(id -u ${USER}):$(id -g ${USER}) -v $(pwd)/flow:/OpenROAD-flow-scripts/flow openroad/flow-ubuntu22.04-builder
 ```
 
 Then, inside docker:

docs/user/BuildWithPrebuilt.md

@@ -5,7 +5,7 @@ Please ensure the Klayout version (denoted with `klayoutVersion` variable) is co
 
 Instructions for installing:
 - [Klayout>=0.28.8](https://www.klayout.de/build.html)
-- [Yosys>=0.21](https://github.com/YosysHQ/oss-cad-suite-build/blob/master/README.md#installation)
+- [Yosys>=0.39](https://github.com/YosysHQ/oss-cad-suite-build/blob/master/README.md#installation)
 
 ```{tip} Unfortunately KLayout maintainers do not provide Debian 10/11 compatible packages. You can follow the build-from-sources instruction (Version >=0.25) and Ubuntu 22 instructions [here](https://www.klayout.de/build.html#:~:text=Building%20KLayout%20on%20Linux%20(Version%20%3E%3D%200.25)). 
 ```

docs/user/FlowVariables.md

@@ -239,8 +239,9 @@ configuration file.
 
 | Variable                 | Description                                                                                        |
 |--------------------------|----------------------------------------------------------------------------------------------------|
-| `ADDITIONAL_LEFS`        | Hardened macro LEF view files listed here.                                                         |
-| `ADDITIONAL_LIBS`        | Hardened macro library files listed here.                                                          |
+| `ADDITIONAL_FILES`       | Additional files to be added to `make issue` archive |
+| `ADDITIONAL_LEFS`        | Hardened macro LEF view files listed here. The LEF information of the macros is immutable and used throughout all stages. Stored in the .odb file. |
+| `ADDITIONAL_LIBS`        | Hardened macro library files listed here. The library information is immutable and used throughout all stages. Not stored in the .odb file. |
 | `ADDITIONAL_GDS`         | Hardened macro GDS files listed here.                                                              |
 | `VERILOG_INCLUDE_DIRS`   | Specifies the include directories for the Verilog input files.                                     |
 | `CORNER`                 | PVT corner library selection. Only available for ASAP7 and GF180 PDK.                                                                 |