Merge branch 'master' into make_mode_conflict_non_fatal

Author: KA7E

.github/labeler.yml

@@ -6,101 +6,126 @@
 
 # Tools
 ABC:
- - abc_with_bb_support/*
- - abc_with_bb_support/**/*
- - abc/*
- - abc/**/*
+- changed-files:
+  - any-glob-to-any-file: abc_with_bb_support/*
+  - any-glob-to-any-file: abc_with_bb_support/**/*
+  - any-glob-to-any-file: abc/*
+  - any-glob-to-any-file: abc/**/*
 ACE2:
- - ace2/*
- - ace2/**/*
+- changed-files:
+  - any-glob-to-any-file: ace2/*
+  - any-glob-to-any-file: ace2/**/*
 blifexplorer:
- - blifexplorer/*
- - blifexplorer/**/*
+- changed-files:
+  - any-glob-to-any-file: blifexplorer/*
+  - any-glob-to-any-file: blifexplorer/**/*
 Odin:
- - odin_ii/*
- - odin_ii/**/*
- - odin2_helper/*
- - odin2_helper/**/*
+- changed-files:
+  - any-glob-to-any-file: odin_ii/*
+  - any-glob-to-any-file: odin_ii/**/*
+  - any-glob-to-any-file: odin2_helper/*
+  - any-glob-to-any-file: odin2_helper/**/*
 Parmys:
- - parmys/*
- - parmys/**/*
- - yosys/*
- - yosys/**/*
+- changed-files:
+  - any-glob-to-any-file: parmys/*
+  - any-glob-to-any-file: parmys/**/*
+  - any-glob-to-any-file: yosys/*
+  - any-glob-to-any-file: yosys/**/*
 VPR:
- - vpr/*
- - vpr/**/*
+- changed-files:
+  - any-glob-to-any-file: vpr/*
+  - any-glob-to-any-file: vpr/**/*
 
 # Libraries
 libarchfpga:
- - libs/libarchfpga/*
- - libs/libarchfpga/**/*
+- changed-files:
+  - any-glob-to-any-file: libs/libarchfpga/*
+  - any-glob-to-any-file: libs/libarchfpga/**/*
 libeasygl:
- - libs/libeasygl/*
- - libs/libeasygl/**/*
+- changed-files:
+  - any-glob-to-any-file: libs/libeasygl/*
+  - any-glob-to-any-file: libs/libeasygl/**/*
 liblog:
- - libs/liblog/*
- - libs/liblog/**/*
+- changed-files:
+  - any-glob-to-any-file: libs/liblog/*
+  - any-glob-to-any-file: libs/liblog/**/*
 libpugiutil:
- - libs/libpugiutil/*
- - libs/libpugiutil/**/*
+- changed-files:
+  - any-glob-to-any-file: libs/libpugiutil/*
+  - any-glob-to-any-file: libs/libpugiutil/**/*
 libvtrutil:
- - libs/libvtrutil/*
- - libs/libvtrutil/**/*
+- changed-files:
+  - any-glob-to-any-file: libs/libvtrutil/*
+  - any-glob-to-any-file: libs/libvtrutil/**/*
 external_libs:
- - libs/EXTERNAL/*
- - libs/EXTERNAL/**/*
+- changed-files:
+  - any-glob-to-any-file: libs/EXTERNAL/*
+  - any-glob-to-any-file: libs/EXTERNAL/**/*
 
 # General areas
 docs:
- - docs/*
- - docs/**/*
- - "*README*"
- - "*.md"
- - tutorial
- - "*.rst"
+- changed-files:
+  - any-glob-to-any-file: doc/*
+  - any-glob-to-any-file: doc/**/*
+  - any-glob-to-any-file: "*README*"
+  - any-glob-to-any-file: "*.md"
+  - any-glob-to-any-file: "*.rst"
 infra:
- - .github/*
- - .github/**/*
- - Dockerfile
- - "*docker*"
+- changed-files:
+  - any-glob-to-any-file: .github/*
+  - any-glob-to-any-file: .github/**/*
+  - any-glob-to-any-file: Dockerfile
+  - any-glob-to-any-file: "*docker*"
 build:
- - Makefile
- - "*.make"
- - CMakeLists.txt
- - cmake
+- changed-files:
+  - any-glob-to-any-file: Makefile
+  - any-glob-to-any-file: "*.make"
+  - any-glob-to-any-file: CMakeLists.txt
+  - any-glob-to-any-file: cmake/*
+  - any-glob-to-any-file: cmake/**/*
 tests:
- - "*_test.py"
- - "*test*"
- - "*TESTS*"
+- changed-files:
+  - any-glob-to-any-file: "*_test.py"
+  - any-glob-to-any-file: "*test*"
+  - any-glob-to-any-file: "*TESTS*"
 scripts:
- - scripts
- - "*.pl"
- - "*.py"
- - "*.sh"
+- changed-files:
+  - any-glob-to-any-file: scripts
+  - any-glob-to-any-file: "*.pl"
+  - any-glob-to-any-file: "*.py"
+  - any-glob-to-any-file: "*.sh"
 VTR Flow:
- - vtr_flow
+- changed-files:
+  - any-glob-to-any-file: vtr_flow
 
 # Tag pull requests with the languages used to make it easy to see what is
 # being used.
 lang-hdl:
- - "*.v"
- - "*.sv"
+- changed-files:
+  - any-glob-to-any-file: "**/*.v"
+  - any-glob-to-any-file: "**/*.sv"
 lang-cpp:
- - "*.c*"
- - "*.h"
+- changed-files:
+  - any-glob-to-any-file: "**/*.c*"
+  - any-glob-to-any-file: "**/*.h"
 lang-perl:
- - "*.pl"
- - "*perl*"
+- changed-files:
+  - any-glob-to-any-file: "**/*.pl"
+  - any-glob-to-any-file: "**/*perl*"
 lang-python:
- - "*.py"
+- changed-files:
+  - any-glob-to-any-file: "**/*.py"
 lang-shell:
- - "*.sh"
+- changed-files:
+  - any-glob-to-any-file: "**/*.sh"
 lang-netlist:
- - "*.blif"
- - "*.eblif"
- - "*.edif"
- - "*.vqm"
+- changed-files:
+  - any-glob-to-any-file: "**/*.blif"
+  - any-glob-to-any-file: "**/*.eblif"
+  - any-glob-to-any-file: "**/*.edif"
+  - any-glob-to-any-file: "**/*.vqm"
 lang-make:
- - "*.make"
- - Makefile
- - CMakeLists.txt
+- changed-files:
+  - any-glob-to-any-file: "**/*.make"
+  - any-glob-to-any-file: "**/*Makefile"
+  - any-glob-to-any-file: "**/CMakeLists.txt"

.github/scripts/install_dependencies.sh

@@ -29,6 +29,7 @@ sudo apt install -y \
   libncurses5-dev \
   libx11-dev \
   libxft-dev \
+  libxml2-utils \
   libxml++2.6-dev \
   libreadline-dev \
   tcllib \

.github/workflows/labeler.yml

@@ -6,6 +6,7 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@main
+    - uses: actions/checkout@v3
+    - uses: actions/labeler@master
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/test.yml

@@ -18,6 +18,8 @@ jobs:
     # Prevents from running on forks where no custom runners are available
     if: ${{ github.repository_owner == 'verilog-to-routing' }}
 
+    timeout-minutes: 420
+    
     container: ubuntu:jammy
 
     runs-on: [self-hosted, Linux, X64]
@@ -29,20 +31,20 @@ jobs:
           - {test: "vtr_reg_nightly_test1",      cores: "16", options: "",          cmake: "",                                                             extra_pkgs: ""}
           - {test: "vtr_reg_nightly_test1_odin", cores: "16", options: "",          cmake: "-DWITH_ODIN=ON",                                               extra_pkgs: ""}
           - {test: "vtr_reg_nightly_test2",      cores: "16", options: "",          cmake: "",                                                             extra_pkgs: ""}
-          - {test: "vtr_reg_nightly_test2_odin", cores: "16", options: "",          cmake: "-DWITH_ODIN=ON",                                               extra_pkgs: "" }
+          - {test: "vtr_reg_nightly_test2_odin", cores: "16", options: "",          cmake: "-DWITH_ODIN=ON",                                               extra_pkgs: ""}
           - {test: "vtr_reg_nightly_test3",      cores: "16", options: "",          cmake: "",                                                             extra_pkgs: ""}
           - {test: "vtr_reg_nightly_test3_odin", cores: "16", options: "",          cmake: "-DWITH_ODIN=ON",                                               extra_pkgs: ""}
-          - {test: "vtr_reg_nightly_test4",      cores: "16", options: "",          cmake: "",                                                             extra_pkgs: "" }
-          - {test: "vtr_reg_nightly_test4_odin", cores: "16", options: "",          cmake: "-DWITH_ODIN=ON",                                               extra_pkgs: "" }
+          - {test: "vtr_reg_nightly_test4",      cores: "16", options: "",          cmake: "",                                                             extra_pkgs: ""}
+          - {test: "vtr_reg_nightly_test4_odin", cores: "16", options: "",          cmake: "-DWITH_ODIN=ON",                                               extra_pkgs: ""}
           - {test: "vtr_reg_nightly_test5",      cores: "16", options: "",          cmake: "",                                                             extra_pkgs: ""}
           - {test: "vtr_reg_nightly_test6",      cores: "16", options: "",          cmake: "",                                                             extra_pkgs: ""}
           - {test: "vtr_reg_nightly_test7",      cores: "16", options: "",          cmake: "",                                                             extra_pkgs: ""}
-          - {test: "vtr_reg_parmys",             cores: "16", options: "",          cmake: "",                                                             extra_pkgs: "" }
           - {test: "vtr_reg_strong",             cores: "16", options: "",          cmake: "-DVTR_ASSERT_LEVEL=3",                                         extra_pkgs: "libeigen3-dev"}
           - {test: "vtr_reg_strong_odin",        cores: "16", options: "",          cmake: "-DVTR_ASSERT_LEVEL=3 -DWITH_ODIN=ON",                          extra_pkgs: "libeigen3-dev"}
           - {test: "vtr_reg_strong_odin",        cores: "16", options: "-skip_qor", cmake: "-DVTR_ASSERT_LEVEL=3 -DVTR_ENABLE_SANITIZE=ON -DWITH_ODIN=ON", extra_pkgs: "libeigen3-dev"}
           - {test: "vtr_reg_system_verilog",     cores: "16", options: "",          cmake: "-DYOSYS_F4PGA_PLUGINS=ON",                                     extra_pkgs: ""}
           - {test: "odin_reg_strong",            cores: "16", options: "",          cmake: "-DWITH_ODIN=ON",                                               extra_pkgs: ""}
+          - {test: "parmys_reg_strong",          cores: "16", options: "",          cmake: "-DYOSYS_F4PGA_PLUGINS=ON",                                     extra_pkgs: ""}
 
     env:
       DEBIAN_FRONTEND: "noninteractive"
@@ -195,6 +197,11 @@ jobs:
             params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVPR_USE_EZGL=off',
             suite: 'vtr_reg_basic'
           },
+          {
+            name: 'Basic with CAPNPROTO disabled',
+            params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_CAPNPROTO=off',
+            suite: 'vtr_reg_basic'
+          },
           {
             name: 'Basic with VTR_ENABLE_DEBUG_LOGGING',
             params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_DEBUG_LOGGING=on',
@@ -295,7 +302,13 @@ jobs:
         CMAKE_PARAMS: ${{ matrix.params }}
         BUILD_TYPE: debug
         LSAN_OPTIONS: 'exitcode=42' #Use a non-standard exit code to ensure LSAN errors are detected
+        # In Ubuntu 20240310.1.0, the entropy of ASLR has increased (28 -> 32). LLVM 14 in this
+        # image is not compatible with this increased ASLR entropy. Apparently, memory sanitizer
+        # depends on LLVM and all CI tests where VTR_ENABLE_SANITIZE is enabled fail. For a temporary
+        # fix, we manually reduce the entropy. This quick fix should be removed in the future
+        # when github deploys a more stable Ubuntu image.
       run: |
+        sudo sysctl -w vm.mmap_rnd_bits=28
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
         ./.github/scripts/build.sh
         # We skip QoR since we are only checking for errors in sanitizer runs
@@ -347,6 +360,7 @@ jobs:
         CMAKE_PARAMS: '-DVTR_ASSERT_LEVEL=3 -DVTR_ENABLE_SANITIZE=on -DVTR_IPO_BUILD=off -DWITH_BLIFEXPLORER=on -DWITH_PARMYS=OFF -DWITH_ODIN=on'
         BUILD_TYPE: debug
       run: |
+        sudo sysctl -w vm.mmap_rnd_bits=28
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
         ./.github/scripts/build.sh
         ./run_reg_test.py odin_reg_basic -show_failures -j2

.gitignore

@@ -38,6 +38,19 @@ vtr_flow/benchmarks/titan_blif/titan23
 vtr_flow/benchmarks/titan_blif/titan_new
 
 
+#
+# NoC MLP benchmarks
+#
+#   We ignore blif and vqm files because of thier large size.
+#   We also ignore symbolic links to traffic flow and blif files.
+#
+vtr_flow/benchmarks/noc/Large_Designs/MLP/**/*.vqm
+vtr_flow/benchmarks/noc/Large_Designs/MLP/**/*.blif
+vtr_flow/benchmarks/noc/Large_Designs/MLP/blif_files/*
+vtr_flow/benchmarks/noc/Large_Designs/MLP/traffic_flow_files/*
+MLP_Benchmark_Netlist_Files_blif.tar.gz
+MLP_Benchmark_Netlist_Files_vqm_blif.tar.gz
+
 #
 # ISPD benchmarks
 #

CHANGELOG.md

@@ -117,6 +117,13 @@ _The following are changes which have been implemented in the VTR master branch
 ### Deprecated
  * VPR's breadth-first router (use the timing-driven router, which provides supperiour QoR and Run-time)
 
+### Docker Image
+ * A docker image is available for VTR 8.0 release on mohamedelgammal/vtr8:latest. You can run it using the following commands:
+```
+$ sudo docker pull mohamedelgammal/vtr8:latest
+$ sudo docker run -it mohamedelgammal/vtr8:latest
+```
+ 
 ## v8.0.0-rc2 - 2019-08-01
 
 ### Changed

CMakeLists.txt

@@ -23,7 +23,7 @@ set(VTR_IPO_BUILD "auto" CACHE STRING "Should VTR be compiled with interprocedur
 set_property(CACHE VTR_IPO_BUILD PROPERTY STRINGS auto on off)
 
 #Allow the user to configure how much assertion checking should occur
-set(VTR_ASSERT_LEVEL "2" CACHE STRING "VTR assertion checking level. 0: no assertions, 1: fast assertions, 2: regular assertions, 3: additional assertions with noticable run-time overhead, 4: all assertions (including those with significant run-time cost)")
+set(VTR_ASSERT_LEVEL "2" CACHE STRING "VTR assertion checking level. 0: no assertions, 1: fast assertions, 2: regular assertions, 3: additional assertions with noticeable run-time overhead, 4: all assertions (including those with significant run-time cost)")
 set_property(CACHE VTR_ASSERT_LEVEL PROPERTY STRINGS 0 1 2 3 4)
 
 option(VTR_ENABLE_STRICT_COMPILE "Specifies whether compiler warnings should be treated as errors (e.g. -Werror)" OFF)
@@ -341,6 +341,14 @@ add_custom_target(get_titan_benchmarks
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     COMMENT "Downloading (~1GB) and extracting Titan benchmarks (~10GB) into VTR source tree.")
 
+#
+# NoC MLP Benchmarks
+#
+add_custom_target(get_noc_mlp_benchmarks
+        COMMAND ./vtr_flow/scripts/download_noc_mlp.py --vtr_flow_dir ./vtr_flow
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        COMMENT "Downloading (~100MB) and extracting NoC MLP benchmarks (~3.2GB) into VTR source tree.")
+
 #
 # ISPD Benchmarks
 #
@@ -410,11 +418,13 @@ if(${WITH_PARMYS}) # define cmake params to compile Yosys
         set(MAKE_PROGRAM "make")
     endif()
 
-    if(NOT DEFINED "${CMAKE_BUILD_PARALLEL_LEVEL}")
-        set(CUSTOM_BUILD_PARALLEL_LEVEL 16)
-    else()
-        set(CUSTOM_BUILD_PARALLEL_LEVEL "${CMAKE_BUILD_PARALLEL_LEVEL}")
-    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()