Merge branch 'master' into temp_place_est_chan_util

Author: soheilshahrouz

.github/workflows/nightly_test_manual.yml

@@ -50,6 +50,7 @@ jobs:
         make get_ispd_benchmarks
         ./dev/upgrade_vtr_archs.sh
         make get_symbiflow_benchmarks
+        make get_zeroasic_rr_graphs
 
     # Build VTR using the default build options.
     - name: 'Build VTR'
@@ -133,4 +134,4 @@ jobs:
       with:
         name: nightly_tests_golden
         path: |
-          vtr_flow/**/vtr_reg_nightly*/**/golden_results.txt
+          vtr_flow/**/vtr_reg_nightly*/**/golden_results.txt

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "libs/EXTERNAL/libezgl"]
 	path = libs/EXTERNAL/libezgl
 	url = https://github.com/verilog-to-routing/ezgl.git
+[submodule "libs/EXTERNAL/yosys"]
+	path = libs/EXTERNAL/yosys
+	url = https://github.com/YosysHQ/yosys.git

CMakeLists.txt

@@ -360,6 +360,14 @@ add_custom_target(get_symbiflow_benchmarks
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     COMMENT "Downloading (~100MB) and extracting SymbiFlow architectures (~2.7GB) into VTR source tree.")
 
+#
+# Zero ASIC RR Graph Files
+#
+add_custom_target(get_zeroasic_rr_graphs
+    COMMAND ./vtr_flow/scripts/get_zeroasic_rr_graphs.py --vtr_flow_dir ./vtr_flow
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    COMMENT "Downloading (~2MB) and extracting Zero ASIC RR graphs (~0.1GB) into VTR source tree.")
+
 #
 # Unit Testing
 #
@@ -405,24 +413,6 @@ if(${WITH_ABC})
     add_subdirectory(abc)
 endif()
 
-if(${WITH_PARMYS}) # define cmake params to compile Yosys
-    add_definitions("-D_YOSYS_")
-
-    set(MAKE_PROGRAM "$(MAKE)")
-    if(${CMAKE_GENERATOR} STREQUAL "Ninja")
-        set(MAKE_PROGRAM "make")
-    endif()
-
-    # Commented out since a make file should not call another make command with
-    # threads. It should pass this information from the parent automatically.
-    # if(NOT DEFINED "${CMAKE_BUILD_PARALLEL_LEVEL}")
-    #     set(CUSTOM_BUILD_PARALLEL_LEVEL 16)
-    # else()
-    #     set(CUSTOM_BUILD_PARALLEL_LEVEL "${CMAKE_BUILD_PARALLEL_LEVEL}")
-    # endif()
-    add_subdirectory(yosys)
-endif()
-
 add_subdirectory(libs) #libs/CMakeLists.txt handles adding warnings flags to non-external libraries
 
 if(${WITH_PARMYS})

dev/subtree_config.xml

@@ -49,11 +49,6 @@
         internal_path="vtr_flow/benchmarks/system_verilog/fx68k"
         external_url="https://github.com/ijor/fx68k.git"
         default_external_ref="master"/>
-    <subtree
-        name="yosys"
-        internal_path="yosys"
-        external_url="https://github.com/YosysHQ/yosys.git"
-        default_external_ref="yosys-0.32"/>
     <subtree
         name="parmys"
         internal_path="parmys"

doc/.gitignore

@@ -1,2 +1,3 @@
 #Sphinx
 _build
+.venv

doc/README

@@ -14,19 +14,22 @@ Currently VTR's documenation is automatically built by https://readthedocs.org/p
 How to build documentation
 --------------------------
 
-To build the documentation locally you need sphinx installed:
+To build the documentation locally you need to to install Doxygen (Optional) and the python dependencies. You can use your distribution's package manager to install Doxygen. Ubuntu and Debian users can use the following command:
 
-    For ubuntu/debian based systems:
+    $ sudo apt install doxygen
 
-        $ apt-get install python-sphinx
+While Fedora and RHEL users can use the following command:
 
-    To properly build citations and the bibliography, we use the sphinxcontrib-bibtex extension:
+    $ sudo dnf install doxygen
 
-        $ pip install sphinxcontrib-bibtex
+You can install python dependencies by fist optionally making a virtual environment:
 
-    To install all the python requirements:
+    $ python -m venv .venv
+    $ source .venv/bin/activate
 
-        $ pip install -r requirements.txt
+And then using the requirements file to install the dependencies:
+
+    $ pip install -r requirements.txt
 
 To build the documentation just run:
 

doc/requirements.txt

@@ -2,11 +2,12 @@
 # used by Read The Docs to install python required
 # modules with pip.
 
-sphinx<7
+# Pinned sphinx's version to avoid breakage in future
+sphinx == 8.2.3
 sphinx_rtd_theme
 
 # Support custom domains
-sphinxcontrib-domaintools
+git+https://github.com/AmirhosseinPoolad/sphinxcontrib-domaintools
 
 # Support Markdown
 sphinx-markdown-tables

doc/src/api/vtrutil/logging.rst

@@ -14,6 +14,8 @@ vtr_error
    :project: vtr
    :sections: briefdescription detaileddescription innernamespace innerclass user-defined public-func
 
+.. _vtr_assertion:
+
 vtr_assertion
 -------------
 .. doxygenfile:: vtr_assert.h

doc/src/conf.py

@@ -67,13 +67,13 @@
 master_doc = "index"
 
 project = "Verilog-to-Routing"
-copyright = "2012-2022, VTR Developers"
+copyright = "2012-2025, VTR Developers"
 author = "VTR Developers"
 
 version = get_vtr_version()
 release = get_vtr_release()
 
-language = None
+language = "en"
 
 exclude_patterns = ["_build"]
 
@@ -87,8 +87,6 @@
 
 html_theme = "sphinx_rtd_theme"
 
-html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-
 html_logo = "_static/vtr_logo.svg"
 
 html_favicon = "_static/favicon.ico"