Merge branch 'master' into modeling_multi_die_stack

Author: saaramahmoudi

.github/scripts/install_dependencies.sh

@@ -43,15 +43,19 @@ sudo apt install -y \
   qtbase5-dev \
   uuid-dev \
   default-jdk \
-  clang \
-  clang-format-12 \
   g++-9 \
   gcc-9 \
   g++-10 \
   gcc-10 \
   g++-11 \
   gcc-11 \
+  g++-12 \
+  gcc-12 \
+  clang-11 \
   clang-12 \
+  clang-13 \
+  clang-14 \
+  clang-format-14 \
   libtbb12
 
 pip install -r requirements.txt

.github/workflows/build_dependency_ubuntu-22.04.sh

@@ -363,7 +363,11 @@ jobs:
         - { name: 'GCC 9 (Ubuntu Jammy - 22.04)',     eval: 'CC=gcc-9 && CXX=g++-9',           }
         - { name: 'GCC 10 (Ubuntu Jammy - 22.04)',  eval: 'CC=gcc-10 && CXX=g++-10',         }
         - { name: 'GCC 11 (Ubuntu Jammy - 22.04)',                  eval: 'CC=gcc-11 && CXX=g++-11',         }
+        - { name: 'GCC 12 (Ubuntu Jammy - 22.04)',                  eval: 'CC=gcc-12 && CXX=g++-12',         }
+        - { name: 'Clang 11 (Ubuntu Jammy - 22.04)',  eval: 'CC=clang-11 && CXX=clang++-11',   }
         - { name: 'Clang 12 (Ubuntu Jammy - 22.04)',  eval: 'CC=clang-12 && CXX=clang++-12',   }
+        - { name: 'Clang 13 (Ubuntu Jammy - 22.04)',  eval: 'CC=clang-13 && CXX=clang++-13',   }
+        - { name: 'Clang 14 (Ubuntu Jammy - 22.04)',  eval: 'CC=clang-14 && CXX=clang++-14',   }
     name: 'B: ${{ matrix.name }}'
     steps:
 

.github/workflows/test.yml

@@ -32,6 +32,7 @@ option(VTR_ENABLE_PROFILING "Enable performance profiler (gprof)" OFF)
 option(VTR_ENABLE_COVERAGE "Enable code coverage tracking (gcov)" OFF)
 option(VTR_ENABLE_DEBUG_LOGGING "Enable debug logging" OFF)
 option(VTR_ENABLE_VERBOSE "Enable increased debug verbosity" OFF)
+option(SPEC_CPU "Enable SPEC CPU v8 support" OFF)
 
 #Allow the user to decide whether to compile the graphics library
 set(VPR_USE_EZGL "auto" CACHE STRING "Specify whether vpr uses the graphics library")
@@ -298,6 +299,16 @@ if(VTR_ENABLE_VERBOSE)
     message(STATUS "Enabling increased debugging verbosity")
 endif()
 
+#
+# Build for SPEC CPU Benchmark v8
+#
+set(SPEC_CPU_FLAGS "")
+if(SPEC_CPU)
+    # Enable SPEC CPU flag - Maximizes portability of code and minimizing the variation in how much work we do on different platforms
+    set(SPEC_CPU_FLAGS "-DSPEC_CPU")
+    message(STATUS "SPEC CPU FLAGS: ${SPEC_CPU_FLAGS}")
+endif()
+
 if (CMAKE_MAKE_PROGRAM EQUAL "ninja" )
     #Only for coloured output for ninja, it may be desired
     #to not force colours with other make programs (e.g. if
@@ -315,7 +326,7 @@ endif()
 # Set final flags
 #
 separate_arguments(
-    ADDITIONAL_FLAGS UNIX_COMMAND "${SANITIZE_FLAGS} ${PROFILING_FLAGS} ${COVERAGE_FLAGS} ${LOGGING_FLAGS} ${COLORED_COMPILE} ${EXTRA_FLAGS}"
+    ADDITIONAL_FLAGS UNIX_COMMAND "${SANITIZE_FLAGS} ${PROFILING_FLAGS} ${COVERAGE_FLAGS} ${LOGGING_FLAGS} ${COLORED_COMPILE} ${EXTRA_FLAGS} ${SPEC_CPU_FLAGS}"
     )
 separate_arguments(
     WARN_FLAGS UNIX_COMMAND "${WARN_FLAGS}"

CMakeLists.txt

@@ -21,11 +21,11 @@ add_custom_target(format-cpp-files
     COMMAND find ${DIRS_TO_FORMAT_CPP} ${FIND_TO_FORMAT_CPP})
 
 #
-# Use clang-format-12 for code format
+# Use clang-format-14 for code format
 #
 add_custom_target(format-cpp
     COMMAND find ${DIRS_TO_FORMAT_CPP} ${FIND_TO_FORMAT_CPP} |
-    xargs -P ${CPU_COUNT} clang-format-12 -style=file -i)
+    xargs -P ${CPU_COUNT} clang-format-14 -style=file -i)
 
 #
 # Use simple python script for fixing C like boxed comments

cmake/modules/AutoClangFormat.cmake

@@ -9,28 +9,32 @@ Prerequisites
 * ctags
 * bison
 * flex
-* gcc 5.x
+* g++ 9.x
 * cmake 3.9 (minimum version)
 * time
 * cairo
-* gawk
-* xdot
-* tcl-dev
+* build-essential
+* libreadline-dev
+* gawk tcl-dev
+* libffi-dev 
+* git
 * graphviz
+* xdot
 * pkg-config
-* python3
-* libffi-dev
-* libreadline-dev
+* python3-dev
 * libboost-system-dev
 * libboost-python-dev
-* libboost-filesystem-dev
+* libboost-filesystem-dev 
 * zlib1g-dev
 
 Building
 --------
 
 To build the VTR flow with the Parmys front-end you may use the VTR Makefile wrapper, by calling the ``make CMAKE_PARAMS="-DWITH_PARMYS=ON"`` command in the `$VTR_ROOT` directory.
 
+.. note::
+    Our CI testing is on Ubuntu 22.04, so that is the best tested platform and recommended for development.
+
 .. note::
 
     Compiling the VTR flow with the ``-DYOSYS_F4PGA_PLUGINS=ON`` flag is required to build and install Yosys SystemVerilog and UHDM plugins.

doc/src/parmys/quickstart.rst

@@ -17,7 +17,7 @@ The first step is to `download VTR <https://verilogtorouting.org/download/>`_ an
 
 Environment Setup
 -----------------
-VTR requires several system packages and Python packages to build and run the flow.  You can install the required system packages using the following command (this works on Ubuntu 18.04 and 20.04, but you may require different packages on other Linux distributions):
+VTR requires several system packages and Python packages to build and run the flow.  You can install the required system packages using the following command (this works on Ubuntu 18.04, 20.04 and 22.04, but you may require different packages on other Linux distributions). Our CI testing is on Ubuntu 22.04, so that is the best tested platform and recommended for development.
 
 .. code-block:: bash
 

doc/src/quickstart/index.rst

@@ -18,13 +18,15 @@ For unix-like systems we provide a wrapper Makefile which supports the tradition
 VTR requires a C++-14 compliant compiler.
 It is tested against the default compilers of all Debian and Ubuntu releases within their standard support lifetime. Currently, those are the following:
 
-* GCC/G++: 7, 8, 9, 10, 11
-* Clang/Clang++: 6, 7, 10
+* GCC/G++: 9, 10, 11, 12
+* Clang/Clang++: 11, 12, 13, 14
 
 Other compilers may work but are untested (your milage may vary).
 
 ### Package Dependencies
 
+  * On Linux, the fastest way to set up all dependencies is to enter the commands listed in the VTR Quick Start [Environment Setup](https://docs.verilogtorouting.org/en/latest/quickstart/#environment-setup).
+  
   * At minimum you will require:
     * A modern C++ compiler supporting C++14 (such as GCC >= 4.9 or clang >= 3.6)
 	* cmake, make

doc/src/vtr/optional_build_info.md

@@ -16,13 +16,25 @@ sudo apt-get install -y \
     libgtk-3-dev \
     libx11-dev
 
-# Required for parmys front-end
+# Required for parmys front-end from https://github.com/YosysHQ/yosys
 sudo apt-get install -y \
+    build-essential \
     clang \
+    bison \
+    flex \
+    libreadline-dev \
+    gawk \
     tcl-dev \
-    uuid-dev \
-    default-jdk \
-    libreadline-dev
+    libffi-dev \
+    git \
+    graphviz \
+    xdot \
+    pkg-config \
+    python3-dev \
+    libboost-system-dev \
+    libboost-python-dev \
+    libboost-filesystem-dev \
+    zlib1g-dev
 
 # Required to build the documentation
 sudo apt-get install -y \

install_apt_packages.sh

@@ -120,7 +120,7 @@ struct edge_swapper {
         std::swap(a.storage_->edge_src_node_[a_edge], a.storage_->edge_src_node_[b_edge]);
         std::swap(a.storage_->edge_dest_node_[a_edge], a.storage_->edge_dest_node_[b_edge]);
         std::swap(a.storage_->edge_switch_[a_edge], a.storage_->edge_switch_[b_edge]);
-        std::swap(a.storage_->edge_remapped_[a_edge], a.storage_->edge_remapped_[b_edge]);
+        std::vector<bool>::swap(a.storage_->edge_remapped_[a_edge], a.storage_->edge_remapped_[b_edge]);
     }
 
     friend void swap(edge_swapper& a, edge_swapper& b) {