Merge pull request #545 from acomodi/sync_with_upstream

Sync with upstream

Author: acomodi

.git-blame-ignore-revs

@@ -7,3 +7,6 @@ d91bc203bf1ae80e6a4371ef7c168886bb536c1c
 # Autoformat run on 2019-07-25T20:04:01.740240
 80de7854fa5fea9a281df72cbbd2413ae4018c7c
 
+# Autoformat run on 2020-08-13T15:57:15.777946
+03b0b77b06943b595e9cb1f38ffa0ff00ff1ab76
+            

.github/kokoro/run-vtr.sh

@@ -6,14 +6,14 @@ set -x
 set -e
 
 # Set up the host
-source $SCRIPT_DIR/steps/hostsetup.sh
-source $SCRIPT_DIR/steps/hostinfo.sh
-
-# Output git information
 ls -l
 cd github
 ls -l
 cd vtr-verilog-to-routing
+source $SCRIPT_DIR/steps/hostsetup.sh
+source $SCRIPT_DIR/steps/hostinfo.sh
+
+# Output git information
 source $SCRIPT_DIR/steps/git.sh
 
 if [ $VTR_TEST == "vtr_reg_strong" ]; then

.github/kokoro/steps/hostsetup.sh

@@ -28,6 +28,7 @@ echo
 echo "========================================"
 echo "Host install packages"
 echo "----------------------------------------"
+
 sudo apt-get install -y \
         bash \
         bison \
@@ -58,6 +59,15 @@ sudo apt-get install -y \
         #Don't include libtbb-dev since it may increase memory usage
         #libtbb-dev \
 
+export PATH="$PATH:/home/kbuilder/.local/bin"
+
+pyenv install -f 3.6.3
+pyenv global 3.6.3
+curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+python3 get-pip.py   
+rm get-pip.py
+python3 -m pip install -r requirements.txt
+
 if [ -z "${BUILD_TOOL}" ]; then
     export BUILD_TOOL=make
 fi

.gitignore

@@ -66,6 +66,12 @@ vgcore*
 *.place
 *.route
 *.out
+*.bin
+
+#
+# FASM result files
+#
+*.fasm
 
 #
 #Odin test outputs

.readthedocs.yaml

@@ -7,14 +7,14 @@ version: 2
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
-  builder: htmldir
+  builder: dirhtml
   configuration: doc/src/conf.py
 
 # Optionally build your docs in additional formats such as PDF and ePub
 formats: all
 
 # Optionally set the version of Python and requirements required to build your docs
 python:
-  version: 2
+  version: 3.7
   install:
     - requirements: doc/requirements.txt

.travis.yml

@@ -1,19 +1,10 @@
 version: ~> 1.0
 language: cpp
 
-dist: trusty
+dist: bionic
 addons:
   apt:
     sources:
-    - sourceline: 'ppa:george-edison55/precise-backports' # For cmake
-    - sourceline: 'deb http://apt.llvm.org/precise llvm-toolchain-precise-3.6 main'
-      key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
-    - sourceline: 'deb http://apt.llvm.org/trusty llvm-toolchain-trusty-6.0 main'
-      key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
-    - sourceline: 'deb http://apt.llvm.org/trusty llvm-toolchain-trusty-7 main' # For clang-format-7
-      key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
-    - sourceline: 'deb http://apt.llvm.org/trusty llvm-toolchain-trusty-8 main'
-      key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
     - sourceline: 'ppa:ubuntu-toolchain-r/test'
     packages:
     - autoconf
@@ -43,8 +34,6 @@ addons:
     - libxft-dev
     - libxml++2.6-dev
     - perl
-    - python
-    - python-lxml
     - texinfo
     - time
     - valgrind
@@ -88,9 +77,17 @@ jobs:
         #- ./.github/travis/build.sh
 
     - stage: Test
-      name: "Code Formatting"
+      name: "Code Formatting - C/C++"
       script:
         - ./dev/check-format.sh
+    - stage: Test
+      name: "Code Formatting - Python"
+      script:
+        - ./dev/check-format-py.sh
+    - stage: Test
+      name: "Python Lint"
+      script:
+        - python3 ./dev/pylint_check.py
     - stage: Test
       name: "C++ Unit Tests"
       env:
@@ -116,6 +113,22 @@ jobs:
       script:
         - ./.github/travis/build.sh
         - travis_wait 30 ./run_reg_test.pl vtr_reg_basic -show_failures -j2
+    - stage: Test
+      name: "Basic Regression Tests with NO_GRAPHICS"
+      env:
+        - CMAKE_PARAMS="-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVPR_USE_EZGL=off"
+        - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
+      script:
+        - ./.github/travis/build.sh
+        - travis_wait 30 ./run_reg_test.pl vtr_reg_basic -show_failures -j2
+    - stage: Test
+      name: "Basic Regression Tests with VTR_ENABLE_DEBUG_LOGGING"
+      env:
+        - CMAKE_PARAMS="-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_DEBUG_LOGGING=on"
+        - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
+      script:
+        - ./.github/travis/build.sh
+        - travis_wait 30 ./run_reg_test.pl vtr_reg_basic -show_failures -j2
     - stage: Test
       name: "Strong Regression Tests"
       env:
@@ -228,6 +241,15 @@ jobs:
         - ./.github/travis/cron_build.sh
 
 before_script:
+  # Switch to python 3.6.3
+  - pyenv install -f 3.6.3
+  - pyenv global 3.6.3
+  # Install python modules
+  - curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+  - python3 get-pip.py
+  - rm get-pip.py
+  - python3 -m pip install -r requirements.txt
+
   - source .github/travis/common.sh
   - ./.github/travis/setup.sh
 

CMakeLists.txt

@@ -32,11 +32,15 @@ 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)
 
-#Allow the user to decide weather to compile the graphics library
+#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")
 set_property(CACHE VPR_USE_EZGL PROPERTY STRINGS auto off on)
 option(VTR_ENABLE_CAPNPROTO "Enable capnproto binary serialization support in VPR." ON)
 
+#Allow the user to enable/disable VPR analytic placement
+#VPR option --enable_analytic_placer is also required for Analytic Placement
+option(VPR_ANALYTIC_PLACE "Enable analytic placement in VPR." ON)
+
 option(WITH_BLIFEXPLORER "Enable build with blifexplorer" OFF)
 
 option(WITH_ABC "Enable building abc" ON)
@@ -109,6 +113,16 @@ else()
     message(STATUS "Building with IPO: off")
 endif()
 
+#
+# Build type flags
+#
+
+if(NOT MSVC)
+    # for GCC and Clang
+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g3")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g3")
+endif()
+
 #
 # Warning flags
 #
@@ -336,7 +350,7 @@ if (VPR_USE_EZGL STREQUAL "auto")
         message(STATUS "VPR Graphics: Enabled")
     else()
         set(VPR_USE_EZGL "off")
-        message(STATUS "VPR Graphics: Disabled (required libraries missing, on debia/ubuntu try: sudo apt install libgtk-3 libx11-dev")
+        message(STATUS "VPR Graphics: Disabled (required libraries missing, on debian/ubuntu try: sudo apt install libgtk-3-dev libx11-dev")
     endif()
 endif()
 
@@ -407,5 +421,13 @@ list(APPEND DIRS_TO_FORMAT_CPP "${CMAKE_CURRENT_SOURCE_DIR}/libs/liblog")
 list(APPEND DIRS_TO_FORMAT_CPP "${CMAKE_CURRENT_SOURCE_DIR}/libs/librtlnumber")
 list(APPEND DIRS_TO_FORMAT_CPP "${CMAKE_CURRENT_SOURCE_DIR}/ODIN_II")
 
-
 include(AutoClangFormat)
+
+list(APPEND DIRS_TO_FORMAT_PY "${CMAKE_CURRENT_SOURCE_DIR}/ODIN_II")
+list(APPEND DIRS_TO_FORMAT_PY "${CMAKE_CURRENT_SOURCE_DIR}/ace2")
+list(APPEND DIRS_TO_FORMAT_PY "${CMAKE_CURRENT_SOURCE_DIR}/dev")
+list(APPEND DIRS_TO_FORMAT_PY "${CMAKE_CURRENT_SOURCE_DIR}/doc")
+list(APPEND DIRS_TO_FORMAT_PY "${CMAKE_CURRENT_SOURCE_DIR}/vpr")
+list(APPEND DIRS_TO_FORMAT_PY "${CMAKE_CURRENT_SOURCE_DIR}/vtr_flow")
+
+include(AutoPyFormat)

ODIN_II/CMakeLists.txt

@@ -64,7 +64,9 @@ if(ODIN_COVERAGE)
     )
 
     set(ODIN_EXTRA_LINK_FLAGS
-        "-lgcov --coverage"
+        "-lgcov"
+        "--coverage"
+        ${ODIN_EXTRA_LINK_FLAGS}
     )
 
 endif()
@@ -74,13 +76,23 @@ if(ODIN_SANITIZE)
     message("*** Compiling with Odin Coverage flags")
 
     set(ODIN_EXTRA_FLAGS
-        "-g"
+        "-O1"
+        "-fno-omit-frame-pointer"
         "-fsanitize=address"
+        "-fsanitize=leak"
+        "-fsanitize=undefined"
+        "-fuse-ld=gold"
         ${ODIN_EXTRA_FLAGS}
     )
 
     set(ODIN_EXTRA_LINK_FLAGS
+        "-O1"
+        "-fno-omit-frame-pointer"
         "-fsanitize=address"
+        "-fsanitize=leak"
+        "-fsanitize=undefined"        
+        "-fuse-ld=gold"
+        ${ODIN_EXTRA_LINK_FLAGS}
     )
 
 endif()
@@ -169,10 +181,10 @@ foreach(ODIN_FLAG ${ODIN_EXTRA_FLAGS})
 endforeach()
 
 #add extra link flags for odin
-if(ODIN_EXTRA_LINK_FLAGS)
-    set_target_properties(libodin_ii PROPERTIES LINK_FLAGS ${ODIN_EXTRA_LINK_FLAGS})
-    set_target_properties(odin_II PROPERTIES LINK_FLAGS ${ODIN_EXTRA_LINK_FLAGS})
-endif()
+foreach(ODIN_LINK_FLAG ${ODIN_EXTRA_LINK_FLAGS})
+        target_link_libraries(libodin_ii ${ODIN_LINK_FLAG})
+        target_link_libraries(odin_II ${ODIN_LINK_FLAG})
+endforeach()
 
 #Supress IPO link warnings if IPO is enabled
 get_target_property(ODIN_USES_IPO odin_II INTERPROCEDURAL_OPTIMIZATION)

ODIN_II/Makefile

@@ -101,41 +101,32 @@ test_coverage:
 	$(MAKE) gcovr
 
 test:
-# rebuild with sanitize flags on to run the same test as travis
-	$(MAKE) sanitize
-	./verify_odin.sh -j $(NB_OF_PROCESS) \
-		-t regression_test/benchmark/suite/light_suite \
-		-t vtr_reg_basic \
-		-t vtr_reg_strong
-# larger test should run with regular flags to speed up the process
-	$(MAKE) build
-	./verify_odin.sh -j $(NB_OF_PROCESS) \
-		-t regression_test/benchmark/suite/heavy_suite
+	$(MAKE) sanitize \
+	&& ./verify_odin.sh --no_report -j $(NB_OF_PROCESS) \
+			-t regression_test/benchmark/suite/light_suite \
+			-t regression_test/benchmark/suite/vtr_light_suite \
+	&& $(MAKE) build \
+	&& ./verify_odin.sh --no_report --continue -j $(NB_OF_PROCESS) \
+		-t regression_test/benchmark/suite/heavy_suite; \
+	./verify_odin.sh --status_only	
+
 
 generate_expectation:
-# rebuild with sanitize flags on to run the same test as travis
-	$(MAKE) sanitize 
-	./verify_odin.sh -j $(NB_OF_PROCESS) \
-		--generate_expectation\
-		-t regression_test/benchmark/suite/light_suite \
-		-t vtr_reg_basic \
-		-t vtr_reg_strong || true
- # larger test should run with regular flags to speed up the process
-	$(MAKE) build
-	./verify_odin.sh -j $(NB_OF_PROCESS) \
-		--generate_expectation \
-		-t regression_test/benchmark/suite/heavy_suite
+	$(MAKE) sanitize \
+	&& ./verify_odin.sh --$@ --no_report -j $(NB_OF_PROCESS) \
+			-t regression_test/benchmark/suite/light_suite \
+			-t regression_test/benchmark/suite/vtr_light_suite; \
+	$(MAKE) build \
+	&& ./verify_odin.sh --$@ --no_report --continue -j $(NB_OF_PROCESS) \
+		-t regression_test/benchmark/suite/heavy_suite; \
+	./verify_odin.sh --status_only	
 
 regenerate_expectation:
-# rebuild with sanitize flags on to run the same test as travis
-	$(MAKE) sanitize 
-	./verify_odin.sh -j $(NB_OF_PROCESS) \
-		--regenerate_expectation\
-		-t regression_test/benchmark/suite/light_suite \
-		-t vtr_reg_basic \
-		-t vtr_reg_strong || true
- # larger test should run with regular flags to speed up the process
-	$(MAKE) build
-	./verify_odin.sh -j $(NB_OF_PROCESS) \
-		--regenerate_expectation \
-		-t regression_test/benchmark/suite/heavy_suite
+	$(MAKE) sanitize \
+	&& ./verify_odin.sh --$@ --no_report -j $(NB_OF_PROCESS) \
+			-t regression_test/benchmark/suite/light_suite \
+			-t regression_test/benchmark/suite/vtr_light_suite; \
+	$(MAKE) build \
+	&& ./verify_odin.sh --$@ --no_report --continue -j $(NB_OF_PROCESS) \
+		-t regression_test/benchmark/suite/heavy_suite; \
+	./verify_odin.sh --status_only	

ODIN_II/README.md

@@ -0,0 +1,15 @@
+Odin_II
+=======
+
+Odin II is used for logic synthesis and elaboration, converting a subset of the Verilog Hardware Description Language (HDL) into a BLIF netlist.
+
+-----------------
+
+* **[Quick Start](../doc/src/odin/quickstart.md)**
+* **[User Guide](../doc/src/odin/user_guide.md)**
+* **[Verilog Support](../doc/src/odin/verilog_support.md)**
+* **Developper guide**
+  * [Contributing](../doc/src/odin/dev_guide/contributing)
+  * [Regression Tests](../doc/src/odin/dev_guide/regression_test)
+  * [Regression Tool](../doc/src/odin/dev_guide/verify_script)
+  * [Validating Tests](../doc/src/odin/dev_guide/testing)