fix merge conflict

Signed-off-by: habibayassin <[email protected]>

Author: habibayassin

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

@@ -51,31 +51,10 @@ jobs:
           ./etc/DockerHelper.sh create -target=builder -os=${{ matrix.os }}
       - name: Test build
         run: |
-          cmd="yosys -help; openroad -help; make -C flow;"
+          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}"
-  testInstaller-macos:
-    strategy:
-      fail-fast: false
-    runs-on: macos-latest
-    steps:
-      - name: Setup xcode
-        uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: latest-stable
-      - name: Check out repository code
-        uses: actions/checkout@v3
-        with:
-          submodules: 'recursive'
-      - name: Run installer
-        shell: bash
-        run: |
-          ./etc/DependencyInstaller.sh
-      - name: Build project
-        shell: bash
-        run: |
-          ./build_openroad.sh --local

.gitignore

@@ -58,6 +58,7 @@ flow/*.opennet
 # Platforms
 flow/platforms/*
 !flow/platforms/asap7
+!flow/platforms/ihp-sg13g2
 !flow/platforms/nangate45
 !flow/platforms/sky130hd
 !flow/platforms/sky130hs
@@ -88,3 +89,4 @@ perf.data.old
 docs/main
 docs/build
 GitGuide.md
+mainREADME.md

Dockerfile

@@ -10,7 +10,7 @@ COPY --from=openroad/lsoracle /LSOracle/core/test.ini ./tools/build/LSOracle/sha
 COPY --from=openroad/lsoracle /LSOracle/build/yosys-plugin/oracle.so /OpenROAD-flow/tools/build/yosys/share/yosys/plugins/
 
 # openroad binary
-COPY --from=openroad/centos7-builder-gcc /OpenROAD/build/src/openroad ./tools/install/OpenROAD/bin/openroad
+COPY --from=openroad/ubuntu22.04-builder-gcc /OpenROAD/build/src/openroad ./tools/install/OpenROAD/bin/openroad
 
 # flow files
 COPY ./env.sh .

README.md

@@ -9,7 +9,40 @@ of QoR and detailed physical design implementation. However, ORFS
 also enables manual intervention for finer user control of individual
 flow stages through Tcl commands and Python APIs.
 
-![ORFS_Flow](./docs/images/ORFS_Flow.svg)
+```mermaid
+%%{init: { 'logLevel': 'debug', 'theme': 'dark'
+  } }%%
+timeline
+  title RTL-GDSII Using OpenROAD-flow-scripts
+  Synthesis
+    : Inputs  [RTL, SDC, .lib, .lef]
+    : Logic Synthesis  (Yosys)
+    : Output files  [Netlist, SDC]
+  Floorplan
+    : Floorplan Initialization
+    : IO placement  (random)
+    : Timing-driven mixed-size placement
+    : Macro placement
+    : Tapcell and welltie insertion
+    : PDN generation
+  Placement
+    : Global placement without placed IOs
+    : IO placement  (optimized)
+    : Global placement with placed IOs
+    : Resizing and buffering
+    : Detailed placement
+  CTS : Clock Tree Synthesis
+    : Timing optimization
+    : Filler cell insertion
+  Routing
+    : Global Routing
+    : Detailed Routing
+  Finishing
+    : Metal Fill insertion
+    : Signoff timing report
+    : Generate GDSII  (KLayout)
+    : DRC/LVS check (KLayout)
+```
 
 ## Tool Installation
 

build_openroad.sh

@@ -20,10 +20,7 @@ OPENROAD_APP_BRANCH="master"
 INSTALL_PATH="$(pwd)/tools/install"
 
 YOSYS_USER_ARGS=""
-YOSYS_ARGS="\
-CONFIG=gcc \
-ABCREV=bafd2a7 ABCURL=https://github.com/berkeley-abc/abc \
-"
+YOSYS_ARGS="CONFIG=gcc"
 
 OPENROAD_APP_USER_ARGS=""
 OPENROAD_APP_ARGS=""
@@ -35,7 +32,7 @@ LSORACLE_ARGS="\
 -D YOSYS_PLUGIN=ON \
 "
 
-DOCKER_OS_NAME="centos7"
+DOCKER_OS_NAME="ubuntu22.04"
 PROC=-1
 
 function usage() {
@@ -105,7 +102,7 @@ Options:
 Options valid only for Docker builds:
     -c, --copy-platforms    Copy platforms to inside docker image.
 
-    --os=DOCKER_OS_NAME     Choose beween centos7 (default), ubuntu20.04 and ubuntu22.04.
+    --os=DOCKER_OS_NAME     Choose beween ubuntu22.04 (default), ubuntu20.04.
 
     This script builds the OpenROAD tools: openroad, yosys and yosys plugins.
     By default, the tools will be built from the linked submodule hashes.

docs/Makefile

@@ -19,9 +19,11 @@ help:
 %: Makefile
 	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 	rm -f main
+	./revert-links.py
 
 checklinks:
 	$(SPHINXBUILD) -b linkcheck "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 	@echo
 	@echo "Check finished. Report is in $(BUILDDIR)."
-	rm -f main
+	rm -f main
+	./revert-links.py

docs/conf.py

@@ -36,6 +36,7 @@
     'sphinx_external_toc',
     'sphinx_copybutton',
     'myst_parser',
+    'sphinxcontrib.mermaid'
 ]
 
 myst_enable_extensions = [
@@ -110,7 +111,7 @@
         },
         {
             "name": "Email",
-            "url": "mailto:openroad@eng.ucsd.edu",
+            "url": "mailto:[email protected]",
             "icon": "fa-solid fa-envelope",
         },
         {
@@ -136,17 +137,20 @@ def get_file_from_url(url, fname):
     with open(fname, 'wb') as f:
         f.write(r.content)
 
-def setup(app):
-    if not os.path.exists('main'):
-        os.symlink('..', 'main')
-    prefix = '(../'
-    newPath = '(./main/'
-    with open('index.md', 'r') as f:
+def swap_prefix(file, old, new):
+    with open(file, 'r') as f:
         lines = f.read()
-    lines = lines.replace(prefix, newPath)
-    with open('index.md', 'wt') as f:
+    lines = lines.replace(old, new)
+    with open(file, 'wt') as f:
         f.write(lines)
 
+def setup(app):
+    import shutil
+    
+    # symlink does not work for ORFS because of long recursive file links
+    shutil.copy('../README.md', 'mainREADME.md')
+    swap_prefix('mainREADME.md', '```mermaid', '```{mermaid}\n:align: center\n')   
+
     url = 'https://raw.githubusercontent.com/The-OpenROAD-Project/OpenROAD/master/docs/contrib/GitGuide.md'
     get_file_from_url(url, 'contrib/GitGuide.md')