Merge branch 'master' into reorganizing_vqm2blif_source_code

Author: vaughnbetz

.github/kokoro/continuous/odin_tech_strong.cfg

@@ -0,0 +1,61 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+# Odin_tech_strong test checks the Odin-II technology mapping for 
+# Yosys+Odin-II over Odin-II techmap_heavysuite (excluding ABC and VPR)
+
+build_file: "vtr-verilog-to-routing/.github/kokoro/run-vtr.sh"
+
+# 12 hours
+timeout_mins: 720
+
+action {
+  define_artifacts {
+    # File types
+    regex: "**/*.out"
+    regex: "**/vpr_stdout.log"
+    regex: "**/parse_results.txt"
+    regex: "**/qor_results.txt"
+    regex: "**/pack.log"
+    regex: "**/place.log"
+    regex: "**/route.log"
+    regex: "**/*_qor.csv"
+    strip_prefix: "github/vtr-verilog-to-routing/"
+  }
+}
+
+env_vars {
+  key: "KOKORO_TYPE"
+  value: "continuous"
+}
+
+env_vars {
+  key: "KOKORO_DIR"
+  value: "vtr-verilog-to-routing"
+}
+
+env_vars {
+  key: "VTR_DIR"
+  value: "vtr-verilog-to-routing"
+}
+
+#Use default build configuration
+env_vars {
+  key: "VTR_CMAKE_PARAMS"
+  value: "-DODIN_USE_YOSYS=ON"
+}
+
+env_vars {
+  key: "VTR_TEST"
+  value: "odin_tech_strong"
+}
+
+#Options for run_reg_test.py
+# -show_failures: show tool failures in main log output
+env_vars {
+  key: "VTR_TEST_OPTIONS"
+  value: "-show_failures"
+}
+
+env_vars {
+  key: "NUM_CORES"
+  value: "3"
+}

.github/kokoro/continuous/yosys_odin_test.cfg

@@ -0,0 +1,69 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+# vtr_reg_yosys_odin test runs the VTR benchmarks through 
+# the entire VTR with Yosys+Odin-II as the first CAD tool 
+
+build_file: "vtr-verilog-to-routing/.github/kokoro/run-vtr.sh"
+
+# 72 hours
+timeout_mins: 4320
+
+action {
+  define_artifacts {
+    # File types
+    regex: "**/*.out"
+    regex: "**/vpr_stdout.log"
+    regex: "**/parse_results.txt"
+    regex: "**/qor_results.txt"
+    regex: "**/pack.log"
+    regex: "**/place.log"
+    regex: "**/route.log"
+    regex: "**/*_qor.csv"
+    regex: "**/*.out.gz"
+    regex: "**/vpr_stdout.log.gz"
+    regex: "**/parse_results.txt.gz"
+    regex: "**/qor_results.txt.gz"
+    regex: "**/pack.log.gz"
+    regex: "**/place.log.gz"
+    regex: "**/route.log.gz"
+    regex: "**/*_qor.csv.gz"
+    strip_prefix: "github/vtr-verilog-to-routing/"
+  }
+}
+
+env_vars {
+  key: "KOKORO_TYPE"
+  value: "continuous"
+}
+
+env_vars {
+  key: "KOKORO_DIR"
+  value: "vtr-verilog-to-routing"
+}
+
+env_vars {
+  key: "VTR_DIR"
+  value: "vtr-verilog-to-routing"
+}
+
+#Use default build configuration
+env_vars {
+  key: "VTR_CMAKE_PARAMS"
+  value: "-DODIN_USE_YOSYS=ON"
+}
+
+env_vars {
+  key: "VTR_TEST"
+  value: "vtr_reg_yosys_odin"
+}
+
+#Options for run_reg_test.py
+# -show_failures: show tool failures in main log output
+env_vars {
+  key: "VTR_TEST_OPTIONS"
+  value: "-show_failures"
+}
+
+env_vars {
+  key: "NUM_CORES"
+  value: "8"
+}

.github/kokoro/presubmit/odin_tech_strong.cfg

@@ -0,0 +1,61 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+# Odin_tech_strong test checks the Odin-II technology mapping for 
+# Yosys+Odin-II over Odin-II techmap_heavysuite (excluding ABC and VPR)
+
+build_file: "vtr-verilog-to-routing/.github/kokoro/run-vtr.sh"
+
+# 12 hours
+timeout_mins: 720
+
+action {
+  define_artifacts {
+    # File types
+    regex: "**/*.out"
+    regex: "**/vpr_stdout.log"
+    regex: "**/parse_results.txt"
+    regex: "**/qor_results.txt"
+    regex: "**/pack.log"
+    regex: "**/place.log"
+    regex: "**/route.log"
+    regex: "**/*_qor.csv"
+    strip_prefix: "github/vtr-verilog-to-routing/"
+  }
+}
+
+env_vars {
+  key: "KOKORO_TYPE"
+  value: "presubmit"
+}
+
+env_vars {
+  key: "KOKORO_DIR"
+  value: "vtr-verilog-to-routing"
+}
+
+env_vars {
+  key: "VTR_DIR"
+  value: "vtr-verilog-to-routing"
+}
+
+#Use default build configuration
+env_vars {
+  key: "VTR_CMAKE_PARAMS"
+  value: "-DODIN_USE_YOSYS=ON"
+}
+
+env_vars {
+  key: "VTR_TEST"
+  value: "odin_tech_strong"
+}
+
+#Options for run_reg_test.py
+# -show_failures: show tool failures in main log output
+env_vars {
+  key: "VTR_TEST_OPTIONS"
+  value: "-show_failures"
+}
+
+env_vars {
+  key: "NUM_CORES"
+  value: "3"
+}

.github/kokoro/presubmit/yosys_odin_test.cfg

@@ -0,0 +1,69 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+# vtr_reg_yosys_odin test runs the VTR benchmarks through 
+# the entire VTR with Yosys+Odin-II as the first CAD tool
+
+build_file: "vtr-verilog-to-routing/.github/kokoro/run-vtr.sh"
+
+# 72 hours
+timeout_mins: 4320
+
+action {
+  define_artifacts {
+    # File types
+    regex: "**/*.out"
+    regex: "**/vpr_stdout.log"
+    regex: "**/parse_results.txt"
+    regex: "**/qor_results.txt"
+    regex: "**/pack.log"
+    regex: "**/place.log"
+    regex: "**/route.log"
+    regex: "**/*_qor.csv"
+    regex: "**/*.out.gz"
+    regex: "**/vpr_stdout.log.gz"
+    regex: "**/parse_results.txt.gz"
+    regex: "**/qor_results.txt.gz"
+    regex: "**/pack.log.gz"
+    regex: "**/place.log.gz"
+    regex: "**/route.log.gz"
+    regex: "**/*_qor.csv.gz"
+    strip_prefix: "github/vtr-verilog-to-routing/"
+  }
+}
+
+env_vars {
+  key: "KOKORO_TYPE"
+  value: "presubmit"
+}
+
+env_vars {
+  key: "KOKORO_DIR"
+  value: "vtr-verilog-to-routing"
+}
+
+env_vars {
+  key: "VTR_DIR"
+  value: "vtr-verilog-to-routing"
+}
+
+#Use default build configuration
+env_vars {
+  key: "VTR_CMAKE_PARAMS"
+  value: "-DODIN_USE_YOSYS=ON"
+}
+
+env_vars {
+  key: "VTR_TEST"
+  value: "vtr_reg_yosys_odin"
+}
+
+#Options for run_reg_test.py
+# -show_failures: show tool failures in main log output
+env_vars {
+  key: "VTR_TEST_OPTIONS"
+  value: "-show_failures"
+}
+
+env_vars {
+  key: "NUM_CORES"
+  value: "8"
+}

.github/kokoro/run-vtr.sh

@@ -10,13 +10,15 @@ ls -l
 cd github
 ls -l
 cd vtr-verilog-to-routing
+export VTR_DIR=$( pwd )
 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" ] || [ $VTR_TEST == "odin_reg_strong" ]; then
+if [ $VTR_TEST == "vtr_reg_strong" ] || [ $VTR_TEST == "odin_reg_strong" ] \
+|| [ $VTR_TEST == "odin_tech_strong" ] || [ $VTR_TEST == "vtr_reg_yosys_odin" ]; then
 	source $SCRIPT_DIR/steps/vtr-min-setup.sh
 else
 	source $SCRIPT_DIR/steps/vtr-full-setup.sh

.github/kokoro/steps/hostsetup.sh

@@ -56,6 +56,17 @@ sudo apt-get install -y \
         python3-yaml \
         qt5-default \
         virtualenv \
+        clang \
+	    libreadline-dev \
+        gawk \
+        tcl-dev \
+        libffi-dev \
+        xdot \
+        pkg-config \
+        libboost-system-dev \
+	    libboost-python-dev \
+        libboost-filesystem-dev \
+        zlib1g-dev \
         #Don't include libtbb-dev since it may increase memory usage
         #libtbb-dev \
 

.github/scripts/install_dependencies.sh

@@ -28,6 +28,9 @@ sudo apt install -y \
   libx11-dev \
   libxft-dev \
   libxml++2.6-dev \
+  libreadline-dev \
+  tcl-dev \
+  libffi-dev \
   perl \
   texinfo \
   time \

.github/workflows/test.yml

@@ -167,7 +167,7 @@ jobs:
 
 
   ODINII:
-    name: 'ODIN-II Basic Tests'
+    name: 'ODIN-II Basic Test'
     runs-on: ubuntu-18.04
     steps:
 
@@ -205,6 +205,35 @@ jobs:
         ./utils/vqm2blif/test/scripts/test_vqm2blif.sh
 
 
+  YOSYSODINII:
+    runs-on: ubuntu-18.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include: [
+          {
+            name: 'Yosys+ODIN-II Basic',
+            suite: 'odin_tech_basic'
+          }
+        ]
+    name: '${{ matrix.name }}'
+    steps:
+
+    - uses: actions/setup-python@v2
+      with:
+        python-version: 3.6
+    - uses: actions/checkout@v2
+    - run: ./.github/scripts/install_dependencies.sh
+
+    - name: Test
+      env:
+        CMAKE_PARAMS: '-DVTR_ASSERT_LEVEL=3 -DVTR_ENABLE_SANITIZE=on -DVTR_IPO_BUILD=off -DWITH_BLIFEXPLORER=on -DODIN_USE_YOSYS=ON'
+        BUILD_TYPE: debug
+      run: |
+        ./.github/scripts/build.sh
+        ./run_reg_test.py ${{ matrix.suite }} -show_failures -j2
+
+
   Compatibility:
     runs-on: ubuntu-18.04
     strategy:
@@ -247,6 +276,7 @@ jobs:
       - Sanitized
       - ODINII
       - VQM2BLIF
+      - YOSYSODINII
       - Compatibility
     runs-on: ubuntu-18.04
     steps:

CMakeLists.txt

@@ -51,6 +51,9 @@ option(ODIN_COVERAGE "Enable building odin with coverage flags" OFF)
 option(ODIN_TIDY "Enable building odin with clang tidy" OFF)
 option(ODIN_SANITIZE "Enable building odin with sanitize flags" OFF)
 
+# Allow the user to enable building Yosys
+option(ODIN_USE_YOSYS "Enable building Yosys" OFF)
+
 set(VTR_VERSION_MAJOR 8)
 set(VTR_VERSION_MINOR 1)
 set(VTR_VERSION_PATCH 0)

ODIN_II/.gitignore

@@ -1,6 +1,8 @@
 regression_test/run*
+regression_test/benchmark/_BLIF
 regression_test/latest
 
+/yosys
 /temp
 /*.v
 /*.blif