Merge branch 'master' into Sub_Cin_Bug_Fix

Author: loglav03

.github/scripts/install_dependencies.sh

@@ -51,6 +51,7 @@ jobs:
         ./dev/upgrade_vtr_archs.sh
         make get_symbiflow_benchmarks
         make get_zeroasic_rr_graphs
+        make get_flat_placements
 
     # Build VTR using the default build options.
     - name: 'Build VTR'
@@ -144,6 +145,7 @@ jobs:
     - uses: actions/setup-python@v5
       with:
         python-version: 3.12.3
+
     - uses: actions/checkout@v4
       with:
         submodules: 'true'
@@ -153,7 +155,7 @@ jobs:
       id: cpu-cores
 
     - name: Install dependencies
-      run: ./.github/scripts/install_dependencies.sh
+      run: ./install_apt_packages.sh
 
     - uses: hendrikmuhs/[email protected]
       with:

.github/scripts/install_jammy_dependencies.sh

@@ -47,7 +47,7 @@ jobs:
       id: cpu-cores
 
     - name: Install dependencies
-      run: ./.github/scripts/install_dependencies.sh
+      run: ./install_apt_packages.sh
 
     - uses: hendrikmuhs/[email protected]
       with:
@@ -87,8 +87,14 @@ jobs:
       uses: SimenB/github-actions-cpu-cores@v2
       id: cpu-cores
 
+    # NOTE: BlifExplorer requires Qt5 to build. We do not currently actually
+    #       run the executable as part of the CI, but we at least want to test
+    #       that it can be compiled.
     - name: Install dependencies
-      run: ./.github/scripts/install_dependencies.sh
+      run: |
+        ./install_apt_packages.sh
+        sudo apt-get update
+        sudo apt-get install qtbase5-dev
 
     - uses: hendrikmuhs/[email protected]
       with:
@@ -194,7 +200,7 @@ jobs:
       id: cpu-cores
 
     - name: Install dependencies
-      run: ./.github/scripts/install_dependencies.sh
+      run: ./install_apt_packages.sh
 
     - name: Download Build Artifact
       uses: actions/download-artifact@v4
@@ -237,7 +243,11 @@ jobs:
       id: cpu-cores
 
     - name: 'Install dependencies'
-      run: ./.github/scripts/install_dependencies.sh
+      run: ./install_apt_packages.sh
+
+    - name: 'Install Python Requirements'
+      run: |
+        pip install -r requirements.txt
 
     - name: 'ccache'
       uses: hendrikmuhs/[email protected]
@@ -320,19 +330,23 @@ jobs:
         include: [
           {
             name: 'Basic',
-            suite: 'vtr_reg_basic'
+            suite: 'vtr_reg_basic',
+            extra_pkgs: ''
           },
           {
             name: 'Strong',
-            suite: 'vtr_reg_strong'
+            suite: 'vtr_reg_strong',
+            extra_pkgs: ''
           },
           {
             name: 'SystemVerilog',
-            suite: 'vtr_reg_system_verilog'
+            suite: 'vtr_reg_system_verilog',
+            extra_pkgs: ''
           },
           {
             name: 'Valgrind Memory',
-            suite: 'vtr_reg_valgrind_small'
+            suite: 'vtr_reg_valgrind_small',
+            extra_pkgs: 'valgrind'
           }
         ]
     name: 'R: ${{ matrix.name }}'
@@ -351,7 +365,17 @@ jobs:
       id: cpu-cores
 
     - name: Install dependencies
-      run: ./.github/scripts/install_dependencies.sh
+      run: ./install_apt_packages.sh
+
+    - name: Install Extra Dependencies
+      if: ${{ matrix.extra_pkgs != '' }}
+      run: |
+        sudo apt update
+        sudo apt install -y ${{ matrix.extra_pkgs }}
+
+    - name: Install Python Requirements
+      run: |
+        pip install -r requirements.txt
 
     - name: Download Build Artifact
       uses: actions/download-artifact@v4
@@ -398,15 +422,18 @@ jobs:
         include: [
           {
             name: 'Basic_odin',
-            suite: 'vtr_reg_basic_odin'
+            suite: 'vtr_reg_basic_odin',
+            extra_pkgs: ''
           },
           {
             name: 'Strong_odin',
-            suite: 'vtr_reg_strong_odin'
+            suite: 'vtr_reg_strong_odin',
+            extra_pkgs: ''
           },
           {
             name: 'Valgrind Memory Odin',
-            suite: 'vtr_reg_valgrind_small_odin'
+            suite: 'vtr_reg_valgrind_small_odin',
+            extra_pkgs: 'valgrind'
           }
         ]
     name: 'R: ${{ matrix.name }}'
@@ -425,7 +452,17 @@ jobs:
       id: cpu-cores
 
     - name: Install dependencies
-      run: ./.github/scripts/install_dependencies.sh
+      run: ./install_apt_packages.sh
+
+    - name: Install Extra Dependencies
+      if: ${{ matrix.extra_pkgs != '' }}
+      run: |
+        sudo apt update
+        sudo apt install -y ${{ matrix.extra_pkgs }}
+
+    - name: Install Python Requirements
+      run: |
+        pip install -r requirements.txt
 
     - name: Download Build Artifact
       uses: actions/download-artifact@v4
@@ -493,7 +530,11 @@ jobs:
       id: cpu-cores
 
     - name: Install dependencies
-      run: ./.github/scripts/install_dependencies.sh
+      run: ./install_apt_packages.sh
+
+    - name: Install Python Requirements
+      run: |
+        pip install -r requirements.txt
 
     - uses: hendrikmuhs/[email protected]
       with:
@@ -536,7 +577,11 @@ jobs:
         id: cpu-cores
 
       - name: Install dependencies
-        run: ./.github/scripts/install_dependencies.sh
+        run: ./install_apt_packages.sh
+
+      - name: Install Python Requirements
+        run: |
+          pip install -r requirements.txt
 
       - name: Download Build Artifact
         uses: actions/download-artifact@v4
@@ -571,7 +616,11 @@ jobs:
       id: cpu-cores
 
     - name: Install dependencies
-      run: ./.github/scripts/install_dependencies.sh
+      run: ./install_apt_packages.sh
+
+    - name: Install Python Requirements
+      run: |
+        pip install -r requirements.txt
 
     - name: Download Build Artifact
       uses: actions/download-artifact@v4
@@ -607,7 +656,7 @@ jobs:
       id: cpu-cores
 
     - name: Install dependencies
-      run: ./.github/scripts/install_dependencies.sh
+      run: ./install_apt_packages.sh
 
     - name: Download Build Artifact
       uses: actions/download-artifact@v4
@@ -652,7 +701,7 @@ jobs:
       id: cpu-cores
 
     - name: Install dependencies
-      run: ./.github/scripts/install_dependencies.sh
+      run: ./install_apt_packages.sh
 
     - uses: hendrikmuhs/[email protected]
       with:
@@ -683,7 +732,7 @@ jobs:
       id: cpu-cores
 
     - name: Install Dependencies
-      run: ./.github/scripts/install_jammy_dependencies.sh
+      run: ./install_apt_packages.sh
 
     - uses: hendrikmuhs/[email protected]
       with:

.github/workflows/nightly_test_manual.yml

@@ -368,6 +368,14 @@ add_custom_target(get_zeroasic_rr_graphs
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     COMMENT "Downloading (~2MB) and extracting Zero ASIC RR graphs (~0.1GB) into VTR source tree.")
 
+#
+# Flat Placement Files
+#
+add_custom_target(get_flat_placements
+    COMMAND ./vtr_flow/scripts/get_flat_placement_files.py --vtr_flow_dir ./vtr_flow
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    COMMENT "Downloading (~5MB) and extracting Flat Placement Files (~0.1GB) into VTR source tree.")
+
 #
 # Unit Testing
 #

.github/workflows/test.yml

@@ -11,14 +11,13 @@ ENV PIP_BREAK_SYSTEM_PACKAGES=1
 # Install and cleanup is done in one command to minimize the build cache size
 RUN apt-get update -qq \
 # Extract package names from install_apt_packages.sh
-    && sed '/sudo/d' install_apt_packages.sh | sed '/#/d' | sed '/if\s.*then$/d' | sed '/else$/d' | sed '/fi$/d' | sed '/echo\s/d' | sed 's/ \\//g' | sed '/^$/d' | sed '/^[[:space:]]*$/d' | sed 's/\s//g' \
+    && sed '/sudo/d' install_apt_packages.sh | sed '/#/d' | sed '/packages_to_install/d' | sed '/)/d' | sed '/if\s.*then$/d' | sed '/else$/d' | sed '/fi$/d' | sed '/echo\s/d' | sed 's/ \\//g' | sed '/^$/d' | sed '/^[[:space:]]*$/d' | sed 's/\s//g' \
 # Install packages
     | xargs apt-get -y install --no-install-recommends \
 # Additional packages not listed in install_apt_packages.sh
     && apt-get -y install --no-install-recommends \
     wget \
     ninja-build \
-    libeigen3-dev \
     python3-pip \
     time \
 # Install python packages