Skip to content

Commit a8e4564

Browse files
committed
merged with master
Signed-off-by: Cho Moon <[email protected]>
2 parents 91342f5 + 00560b8 commit a8e4564

Some content is hidden

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

60 files changed

+4633
-4566
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ COPY --from=openroad/lsoracle /LSOracle/core/test.ini ./tools/build/LSOracle/sha
1010
COPY --from=openroad/lsoracle /LSOracle/build/yosys-plugin/oracle.so /OpenROAD-flow/tools/build/yosys/share/yosys/plugins/
1111

1212
# openroad binary
13-
COPY --from=openroad/centos7-builder-gcc /OpenROAD/build/src/openroad ./tools/install/OpenROAD/bin/openroad
13+
COPY --from=openroad/ubuntu22.04-builder-gcc /OpenROAD/build/src/openroad ./tools/install/OpenROAD/bin/openroad
1414

1515
# flow files
1616
COPY ./env.sh .

build_openroad.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ LSORACLE_ARGS="\
3232
-D YOSYS_PLUGIN=ON \
3333
"
3434

35-
DOCKER_OS_NAME="centos7"
35+
DOCKER_OS_NAME="ubuntu22.04"
3636
PROC=-1
3737

3838
function usage() {
@@ -102,7 +102,7 @@ Options:
102102
Options valid only for Docker builds:
103103
-c, --copy-platforms Copy platforms to inside docker image.
104104
105-
--os=DOCKER_OS_NAME Choose beween centos7 (default), ubuntu20.04 and ubuntu22.04.
105+
--os=DOCKER_OS_NAME Choose beween ubuntu22.04 (default), ubuntu20.04.
106106
107107
This script builds the OpenROAD tools: openroad, yosys and yosys plugins.
108108
By default, the tools will be built from the linked submodule hashes.

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
},
112112
{
113113
"name": "Email",
114-
"url": "mailto:openroad@eng.ucsd.edu",
114+
"url": "mailto:[email protected]",
115115
"icon": "fa-solid fa-envelope",
116116
},
117117
{

docs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ We maintain the following channels for communication:
244244
- OpenROAD with OpenROAD Flow Scripts: <https://github.com/The-OpenROAD-Project/OpenROAD/issues/>
245245
- Discussions:
246246
- OpenROAD Flow: <https://github.com/The-OpenROAD-Project/OpenROAD-flow-scripts/discussions>
247-
- Inquiries: openroad@eng.ucsd.edu
247+
- Inquiries: [email protected]
248248

249249
See also our [FAQs](user/FAQS.md).
250250

docs/tutorials/FlowTutorial.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Use the `bash` shell to run commands and scripts.
4949

5050
#### OpenROAD-flow-scripts Installation
5151

52-
To install OpenROAD-flow-scripts, refer to the
52+
To install OpenROAD-flow-scripts, refer to the
5353
[Build or installing ORFS Dependencies](https://openroad-flow-scripts.readthedocs.io/en/latest/#build-or-installing-orfs-dependencies)
5454
documentation.
5555

@@ -69,11 +69,10 @@ OpenROAD-flow-scripts installation is complete.
6969
Launch the docker with OpenROAD-flow-scripts container as follows:
7070

7171
```shell
72-
export OS_NAME=centos7
73-
docker run --rm -it -u $(id -u ${USER}):$(id -g ${USER}) -v $(pwd)/flow:/OpenROAD-flow-scripts/flow openroad/flow-$OS_NAME-builder
72+
docker run --rm -it -u $(id -u ${USER}):$(id -g ${USER}) -v $(pwd)/flow:/OpenROAD-flow-scripts/flow openroad/flow-ubuntu22-builder
7473
```
7574

76-
:::{seealso}
75+
:::{seealso}
7776
To launch OpenROAD GUI inside the docker, based on the OS, use the command from [here](../user/BuildWithDocker.md#enable-gui-support).
7877
:::
7978

@@ -93,7 +92,7 @@ OPENROAD: /OpenROAD-flow-scripts/tools/OpenROAD
9392

9493
To verify the installation run the built-in example design as follows:
9594

96-
```shell
95+
```shell
9796
cd flow
9897
make
9998
```
@@ -348,7 +347,7 @@ abc.constr klayout.lyt klayout_tech.lef lib
348347

349348

350349
- `reports/sky130hd/ibex/base`
351-
Reports directory, which contains congestion report, DRC
350+
Reports directory, which contains congestion report, DRC
352351
report, design statistics and antenna log for reference.
353352

354353
| `reports` | | |

docs/user/BuildWithDocker.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
- For this method you only need to install
66
[Docker](https://docs.docker.com/engine/install) on your machine.
7-
- Ensure that you have sufficient memory allocated to the Virtual Machine (VM)
7+
- Ensure that you have sufficient memory allocated to the Virtual Machine (VM)
88
as per our system [requirements](../index.md#system-requirements). Refer to
99
this [Docker guide](https://docs.docker.com/config/containers/resource_constraints/) for setting CPU cores and memory limits.
1010

@@ -24,40 +24,40 @@ docker run --rm ubuntu:22.04 nproc
2424

2525
### Build Using Docker from pre-built binaries
2626

27-
Courtesy of [Precision Innovations](https://precisioninno.com/),
27+
Courtesy of [Precision Innovations](https://precisioninno.com/),
2828
they release `.deb` installers of OpenROAD for Ubuntu
29-
and Debian on a regular basis.
30-
This greatly helps to reduce the compilation time needed.
29+
and Debian on a regular basis.
30+
This greatly helps to reduce the compilation time needed.
3131

3232
We recommend to use a Docker image of a supported OS
3333
and install OpenROAD using the prebuilt binaries from
34-
Precision Innovations.
35-
You can start the container in an interactive mode using
36-
the command below.
34+
Precision Innovations.
35+
You can start the container in an interactive mode using
36+
the command below.
3737

3838
```shell
3939
docker run -it ubuntu:22.04
4040
```
4141

42-
Now you are ready to install the prebuilt binaries.
43-
Please refer to the instructions for installing prebuilt binaries
42+
Now you are ready to install the prebuilt binaries.
43+
Please refer to the instructions for installing prebuilt binaries
4444
[here](./BuildWithPrebuilt.md).
4545

4646
### Build Using Docker from sources
4747

4848
Alternatively, if you would like the latest commits from the OpenROAD repositories,
49-
do follow the instructions below.
49+
do follow the instructions below.
5050

5151

5252
#### Clone and Build
5353

54-
The following instructions build the docker image with CentOS 7 as the base OS:
54+
The following instructions build the docker image with Ubuntu 22.04 as the base OS:
5555

5656

5757
``` shell
5858
git clone --recursive https://github.com/The-OpenROAD-Project/OpenROAD-flow-scripts
5959
cd OpenROAD-flow-scripts
60-
./build_openroad.sh
60+
./build_openroad.sh
6161
```
6262

6363
You can restrict the number of CPUs with the `-t|--threads N` argument:
@@ -68,10 +68,10 @@ You can restrict the number of CPUs with the `-t|--threads N` argument:
6868

6969
## Verify Installation
7070

71-
The binaries are only available from inside a Docker container. Here is an example of starting a container from the created Docker image.
71+
The binaries are only available from inside a Docker container. Here is an example of starting a container from the created Docker image.
7272

7373
``` shell
74-
docker run --rm -it -u $(id -u ${USER}):$(id -g ${USER}) -v $(pwd)/flow:/OpenROAD-flow-scripts/flow openroad/flow-centos7-builder
74+
docker run --rm -it -u $(id -u ${USER}):$(id -g ${USER}) -v $(pwd)/flow:/OpenROAD-flow-scripts/flow openroad/flow-ubuntu22-builder
7575
```
7676

7777
Then, inside docker:
@@ -90,7 +90,7 @@ exit
9090
To use the GUI feature you will need to start the docker with the
9191
following command,
9292

93-
For Ubuntu/Centos/Debian OS users:
93+
For Ubuntu/Debian OS users:
9494

9595
```
9696
docker run --rm -it \
@@ -121,7 +121,7 @@ user's parameters. Do refer to the documentation [here](./DockerShell.md).
121121

122122
The following instructions build the docker image with a parameterized OS
123123
in two stages. These are for CI and developers that wish to use an OS other
124-
than CentOS 7; regular users should use the steps from previous sections.
124+
than Ubuntu 22.04; regular users should use the steps from previous sections.
125125
The dev stage installs all dependencies and packages required to run OpenROAD
126126
and OpenROAD Flow Scripts. The build stage generates all binaries needed to run
127127
the flow (i.e., `openroad` and `yosys`).

flow/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,6 @@ do-gds-merged:
930930
($(TIME_CMD) $(STDBUF_CMD) $(KLAYOUT_CMD) -zz -rd design_name=$(DESIGN_NAME) \
931931
-rd in_def=$(RESULTS_DIR)/6_final.def \
932932
-rd in_files="$(GDSOAS_FILES) $(WRAPPED_GDSOAS)" \
933-
-rd config_file=$(FILL_CONFIG) \
934933
-rd seal_file="$(SEAL_GDSOAS)" \
935934
-rd out_file=$(GDS_MERGED_FILE) \
936935
-rd tech_file=$(OBJECTS_DIR)/klayout.lyt \

0 commit comments

Comments
 (0)