Merge remote-tracking branch 'upstream/master' into vtr_task_and_test_rewrite

Author: jgoeders

.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

.travis.yml

@@ -272,9 +272,8 @@ before_script:
   - curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
   - python3 get-pip.py
   - rm get-pip.py
-  - python3 -m pip install \
-      pylint \
-      black
+  - python3 -m pip install -r requirements.txt
+
   - source .github/travis/common.sh
   - ./.github/travis/setup.sh
 

dev/upgrade_vtr_archs.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-find vpr libs/libarchfpga ODIN_II vtr_flow/arch utils/fasm/test -name '*.xml' | xargs -n 1 ./vtr_flow/scripts/upgrade_arch.py
+find vpr libs/libarchfpga ODIN_II vtr_flow/arch utils/fasm/test -name '*.xml' | xargs -n 1 python3 ./vtr_flow/scripts/upgrade_arch.py

libs/libvtrcapnproto/CMakeLists.txt

@@ -22,6 +22,7 @@ set(CAPNP_DEFS
     matrix.capnp
     gen/rr_graph_uxsdcxx.capnp
     map_lookahead.capnp
+    extended_map_lookahead.capnp
     )
 capnp_generate_cpp(CAPNP_SRCS CAPNP_HDRS
     ${CAPNP_DEFS}

libs/libvtrcapnproto/extended_map_lookahead.capnp

@@ -0,0 +1,25 @@
+@0x876ec83c2fea5a18;
+
+using Matrix = import "matrix.capnp";
+
+struct VprCostEntry {
+    delay @0 :Float32;
+    congestion @1 :Float32;
+    fill @2 :Bool;
+}
+
+struct VprVector2D {
+    x @0 :Int64;
+    y @1 :Int64;
+}
+
+struct VprFloatEntry {
+    value @0 :Float32;
+}
+
+struct VprCostMap {
+    costMap @0 :Matrix.Matrix((Matrix.Matrix(VprCostEntry)));
+    offset @1 :Matrix.Matrix(VprVector2D);
+    depField @2 :List(Int64);
+    penalty @3 :Matrix.Matrix(VprFloatEntry);
+}

libs/libvtrutil/src/vtr_geometry.h

@@ -149,6 +149,12 @@ Rect<T> bounding_box(const Rect<T>& lhs, const Rect<T>& rhs);
 template<typename T, typename std::enable_if<std::is_integral<T>::value>::type...>
 Point<T> sample(const vtr::Rect<T>& r, T x, T y, T d);
 
+// clamps v to be between low (lo) and high (hi), inclusive.
+template<class T>
+static constexpr const T& clamp(const T& v, const T& lo, const T& hi) {
+    return std::min(std::max(v, lo), hi);
+}
+
 //A 2D line
 template<class T>
 class Line {

requirements.txt

@@ -0,0 +1,4 @@
+black
+prettytable
+pylint
+lxml

vpr/src/base/ShowSetup.cpp

@@ -307,6 +307,9 @@ static void ShowRouterOpts(const t_router_opts& RouterOpts) {
                 case e_router_lookahead::MAP:
                     VTR_LOG("MAP\n");
                     break;
+                case e_router_lookahead::EXTENDED_MAP:
+                    VTR_LOG("EXTENDED_MAP\n");
+                    break;
                 case e_router_lookahead::NO_OP:
                     VTR_LOG("NO_OP\n");
                     break;
@@ -444,6 +447,9 @@ static void ShowRouterOpts(const t_router_opts& RouterOpts) {
                 case e_router_lookahead::MAP:
                     VTR_LOG("MAP\n");
                     break;
+                case e_router_lookahead::EXTENDED_MAP:
+                    VTR_LOG("EXTENDED_MAP\n");
+                    break;
                 case e_router_lookahead::NO_OP:
                     VTR_LOG("NO_OP\n");
                     break;

vpr/src/base/echo_files.cpp

@@ -114,6 +114,7 @@ void alloc_and_load_echo_file_info() {
     setEchoFileName(E_ECHO_CHAN_DETAILS, "chan_details.txt");
     setEchoFileName(E_ECHO_SBLOCK_PATTERN, "sblock_pattern.txt");
     setEchoFileName(E_ECHO_ENDPOINT_TIMING, "endpoint_timing.echo.json");
+    setEchoFileName(E_ECHO_LOOKAHEAD_MAP, "lookahead_map.echo");
 }
 
 void free_echo_file_info() {

vpr/src/base/echo_files.h

@@ -46,6 +46,7 @@ enum e_echo_files {
     E_ECHO_CHAN_DETAILS,
     E_ECHO_SBLOCK_PATTERN,
     E_ECHO_ENDPOINT_TIMING,
+    E_ECHO_LOOKAHEAD_MAP,
 
     //Timing Graphs
     E_ECHO_PRE_PACKING_TIMING_GRAPH,

vpr/src/base/read_options.cpp

@@ -773,6 +773,8 @@ struct ParseRouterLookahead {
             conv_value.set_value(e_router_lookahead::CLASSIC);
         else if (str == "map")
             conv_value.set_value(e_router_lookahead::MAP);
+        else if (str == "extended_map")
+            conv_value.set_value(e_router_lookahead::EXTENDED_MAP);
         else {
             std::stringstream msg;
             msg << "Invalid conversion from '"
@@ -788,15 +790,17 @@ struct ParseRouterLookahead {
         ConvertedValue<std::string> conv_value;
         if (val == e_router_lookahead::CLASSIC)
             conv_value.set_value("classic");
-        else {
-            VTR_ASSERT(val == e_router_lookahead::MAP);
+        else if (val == e_router_lookahead::MAP) {
             conv_value.set_value("map");
+        } else {
+            VTR_ASSERT(val == e_router_lookahead::EXTENDED_MAP);
+            conv_value.set_value("extended_map");
         }
         return conv_value;
     }
 
     std::vector<std::string> default_choices() {
-        return {"classic", "map"};
+        return {"classic", "map", "extended_map"};
     }
 };
 
@@ -2093,7 +2097,14 @@ argparse::ArgumentParser create_arg_parser(std::string prog_name, t_options& arg
             "Controls what lookahead the router uses to calculate cost of completing a connection.\n"
             " * classic: The classic VPR lookahead (may perform better on un-buffered routing\n"
             "            architectures)\n"
-            " * map: A more advanced lookahead which accounts for diverse wire type\n")
+            " * map: An advanced lookahead which accounts for diverse wire type\n"
+            " * extended_map: A more advanced and extended lookahead which accounts for a more\n"
+            "                 exhaustive node sampling method\n"
+            "\n"
+            " The extended map differs from the map lookahead in the lookahead computation.\n"
+            " It is better suited for architectures that have specialized routing for specific\n"
+            " kinds of connections, but note that the time and memory necessary to compute the\n"
+            " extended lookahead map are greater than the basic lookahead map.\n")
         .default_value("map")
         .show_in(argparse::ShowIn::HELP_ONLY);
 

vpr/src/base/vpr_context.h

@@ -161,7 +161,8 @@ struct DeviceContext : public Context {
     ///@brief The indicies of rr nodes of a given type at a specific x,y grid location
     t_rr_node_indices rr_node_indices; // [0..NUM_RR_TYPES-1][0..grid.width()-1][0..grid.width()-1][0..size-1]
 
-    std::vector<t_rr_switch_inf> rr_switch_inf; // autogenerated in build_rr_graph based on switch fan-in. [0..(num_rr_switches-1)]
+    ///@brief Autogenerated in build_rr_graph based on switch fan-in. [0..(num_rr_switches-1)]
+    std::vector<t_rr_switch_inf> rr_switch_inf;
 
     ///@brief Wire segment types in RR graph
     std::vector<t_segment_inf> rr_segments;

vpr/src/base/vpr_types.h

@@ -110,9 +110,10 @@ constexpr const char* EMPTY_BLOCK_NAME = "EMPTY";
 #endif
 
 enum class e_router_lookahead {
-    CLASSIC, ///<VPR's classic lookahead (assumes uniform wire types)
-    MAP,     ///<Lookahead considering different wire types (see Oleg Petelin's MASc Thesis)
-    NO_OP    ///<A no-operation lookahead which always returns zero
+    CLASSIC,      ///<VPR's classic lookahead (assumes uniform wire types)
+    MAP,          ///<Lookahead considering different wire types (see Oleg Petelin's MASc Thesis)
+    EXTENDED_MAP, ///<Lookahead with a more extensive node sampling method
+    NO_OP         ///<A no-operation lookahead which always returns zero
 };
 
 enum class e_route_bb_update {

vpr/src/route/route_timing.cpp

@@ -39,8 +39,6 @@
 #include "bucket.h"
 #include "connection_router.h"
 
-#include "router_lookahead_map.h"
-
 #include "tatum/TimingReporter.hpp"
 #include "overuse_report.h"
 

vpr/src/route/route_timing.h

@@ -14,6 +14,8 @@
 #include "heap_type.h"
 #include "routing_predictor.h"
 
+extern bool f_router_debug;
+
 int get_max_pins_per_net();
 
 bool try_timing_driven_route(const t_router_opts& router_opts,

vpr/src/route/router_lookahead.cpp

@@ -1,6 +1,7 @@
 #include "router_lookahead.h"
 
 #include "router_lookahead_map.h"
+#include "router_lookahead_extended_map.h"
 #include "vpr_error.h"
 #include "globals.h"
 #include "route_timing.h"
@@ -13,6 +14,8 @@ static std::unique_ptr<RouterLookahead> make_router_lookahead_object(e_router_lo
         return std::make_unique<ClassicLookahead>();
     } else if (router_lookahead_type == e_router_lookahead::MAP) {
         return std::make_unique<MapLookahead>();
+    } else if (router_lookahead_type == e_router_lookahead::EXTENDED_MAP) {
+        return std::make_unique<ExtendedMapLookahead>();
     } else if (router_lookahead_type == e_router_lookahead::NO_OP) {
         return std::make_unique<NoOpLookahead>();
     }