Merge remote-tracking branch 'vtr/master' into rr_graph_node_cost_index

Signed-off-by: Ethan Rogers <[email protected]>

Author: ethanroj23

.github/workflows/test.yml

@@ -185,6 +185,25 @@ jobs:
         ./.github/scripts/build.sh
         ./run_reg_test.py odin_reg_basic -show_failures -j2
 
+  
+  VQM2BLIF:
+    name: 'VQM2BLIF Basic Tests'
+    runs-on: ubuntu-18.04
+    steps:
+
+    - uses: actions/setup-python@v2
+      with:
+        python-version: 3.6
+    - uses: actions/checkout@v2
+    - run: ./.github/scripts/install_dependencies.sh
+
+    - name: Test
+      env:
+        BUILD_TYPE: release
+      run: |
+        ./.github/scripts/build.sh
+        ./utils/vqm2blif/test/scripts/test_vqm2blif.sh
+
 
   YOSYSODINII:
     runs-on: ubuntu-18.04
@@ -256,6 +275,7 @@ jobs:
       - Regression
       - Sanitized
       - ODINII
+      - VQM2BLIF
       - YOSYSODINII
       - Compatibility
     runs-on: ubuntu-18.04

doc/src/api/vtrutil/logging.rst

@@ -12,7 +12,7 @@ vtr_error
 ---------
 .. doxygenfile:: vtr_error.h
    :project: vtr
-   :sections: innernamespace innerclass briefdescription detaileddescription user-defined public-func
+   :sections: briefdescription detaileddescription innernamespace innerclass user-defined public-func
 
 vtr_assertion
 -------------

doc/src/vpr/graphics.rst

@@ -42,7 +42,7 @@ A graphical window will now pop up when you run VPR.
 Navigation
 ----------
 Click on **Zoom-Fit** buttons to zoom the view.
-Click and drag the mouse wheel to pan the view, or scroll the mouse wheel to zoom in and out.
+Click and drag with the left mouse button to pan the view, or scroll the mouse wheel to zoom in and out.
 Click on the **Window**, then on the diagonally opposite corners of a box, to zoom in on a particular area.
 
 Click on **Save** to save the image on screen to PDF, PNG, or SVG file.

doc/src/vtr/benchmarks.rst

@@ -38,7 +38,7 @@ They are suitable for FPGA architecture research and medium-scale CAD research.
     stereovision0       Computer Vision
     stereovision1       Computer Vision
     stereovision2       Computer Vision
-    stereovision3       Computer Vision    
+    stereovision3       Computer Vision
     ================    =================
 
 The VTR benchmarks are provided as Verilog under: ::
@@ -66,7 +66,7 @@ The Titan benchmarks are suitable for large-scale FPGA CAD research, and FPGA ar
 
 Koios Benchmarks
 -----------------
-The Koios benchmarks :cite:`koios_benchmarks` are a set of Deep Learning (DL) benchmarks. 
+The Koios benchmarks :cite:`koios_benchmarks` are a set of Deep Learning (DL) benchmarks.
 They are suitable for DL related architecture and CAD research.
 There are 19 designs that include several medium-sized benchmarks and some large benchmarks.
 The designs target different network types (CNNs, RNNs, MLPs, RL) and layer types (fully-connected, convolution, activation, softmax, reduction, eltwise).
@@ -75,8 +75,8 @@ These designs use many precisions including binary, different fixed point types
 
 ..  table_koios_benchmarks:
 
-.. table:: The Koios Benchmarks.  
-  
+.. table:: The Koios Benchmarks.
+
     =================   ======================================
     Benchmark           Description
     =================   ======================================
@@ -85,16 +85,16 @@ These designs use many precisions including binary, different fixed point types
     lstm                LSTM engine
     tpu_like            Google-TPU-v1-like accelerator
     bnn                 4-layer binary neural network
-    tiny_darknet_like   Accelerator for Tiny Darknet    
+    tiny_darknet_like   Accelerator for Tiny Darknet
     gemm_layer          20x20 matrix multiplication engine
     attention_layer     Transformer self-attention layer
     conv_layer          GEMM based convolution
     spmv                Sparse matrix vector multiplication
-    robot_rl            Robot+maze application     
+    robot_rl            Robot+maze application
     reduction_layer     Add/max/min reduction tree
     softmax             Softmax classification layer
     conv_layer_hls      Sliding window convolution
-    eltwise_layer       Matrix elementwise add/sub/mult  
+    eltwise_layer       Matrix elementwise add/sub/mult
     =================   ======================================
 
 The VTR benchmarks are provided as Verilog (enabling full flexibility to modify and change how the designs are implemented) under: ::
@@ -153,3 +153,40 @@ where :math:`K=` ``<#>``.
     tseng       1583
     =========   ========================================
 
+SymbiFlow Benchmarks
+--------------------
+
+SymbiFlow benchmarks are a set of small and medium sized tests to verify and test the SymbiFlow-generated
+architectures, including primarily the Xilinx Artix-7 device families.
+
+The tests are generated by nightly builds from the `symbiflow-arch-defs repository <https://github.com/SymbiFlow/symbiflow-arch-defs>`_, and uploaded to a Google Cloud Platform
+from where they are fetched and executed in the VTR benchmarking suite.
+
+The circuits are the following:
+
+.. _table_symbiflow_benchmarks:
+
+.. table:: The SymbiFlow benchmarks.
+
+    =================   ==========================================================================
+    Benchmark           Description
+    =================   ==========================================================================
+    picosoc @100 MHz    simple SoC with a picorv32 CPU running @100MHz
+    picosoc @50MHz      simple SoC with a picorv32 CPU running @50MHz
+    base-litex          LiteX-based SoC with a VexRiscv CPU booting into a BIOS only
+    ddr-litex           LiteX-based SoC with a VexRiscv CPU and a DDR controller
+    ddr-eth-litex       LiteX=based SoC with a VexRiscv CPU, a DDR controller and an Ethernet core
+    linux-litex         LiteX-based SoC with a VexRiscv CPU capable of booting linux
+    =================   ==========================================================================
+
+The SymbiFlow benchmarks can be downloaded and extracted by running the following:
+
+.. code-block:: bash
+
+    cd $VTR_ROOT
+    make get_symbiflow_benchmarks
+
+Once downloaded and extracted, benchmarks are provided as post-synthesized eblif files under: ::
+
+    $VTR_ROOT/vtr_flow/benchmarks/symbiflow
+

libs/EXTERNAL/libezgl/examples/basic-application/basic_application.cpp

@@ -392,7 +392,7 @@ void draw_line_example(ezgl::renderer *g)
   {
     double offsetY = 50*i;
 
-    g->set_horiz_text_just(ezgl::text_just::left);
+    g->set_horiz_justification(ezgl::justification::left);
 
     if (i == 0) {
       g->set_color(ezgl::BLACK);
@@ -415,7 +415,7 @@ void draw_line_example(ezgl::renderer *g)
       g->draw_text({950, 920+offsetY}, "Butt ends, 67% transparent", 400, DBL_MAX);
     }
 
-    g->set_horiz_text_just(ezgl::text_just::center);
+    g->set_horiz_justification(ezgl::justification::center);
 
     g->draw_text({200, 900+offsetY}, "Thin line (width 1)", 200, DBL_MAX);
     g->set_line_width(1);

libs/EXTERNAL/libezgl/examples/basic-application/main.ui

@@ -31,7 +31,7 @@
             <child>
               <object class="GtkButton" id="UpButton">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
                 <child>
                   <object class="GtkArrow" id="UpArrow">
@@ -49,7 +49,7 @@
             <child>
               <object class="GtkButton" id="DownButton">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
                 <child>
                   <object class="GtkArrow" id="DownArrow">
@@ -67,7 +67,7 @@
             <child>
               <object class="GtkButton" id="LeftButton">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
                 <child>
                   <object class="GtkArrow" id="LeftArrow">
@@ -85,7 +85,7 @@
             <child>
               <object class="GtkButton" id="RightButton">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
                 <child>
                   <object class="GtkArrow" id="RightArrow">
@@ -103,7 +103,7 @@
               <object class="GtkButton" id="ZoomInButton">
                 <property name="label" translatable="yes">Zoom In</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
               </object>
               <packing>
@@ -116,7 +116,7 @@
               <object class="GtkButton" id="ZoomOutButton">
                 <property name="label" translatable="yes">Zoom Out</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
               </object>
               <packing>
@@ -129,7 +129,7 @@
               <object class="GtkButton" id="ZoomFitButton">
                 <property name="label" translatable="yes">Zoom Fit</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
               </object>
               <packing>
@@ -142,7 +142,7 @@
               <object class="GtkButton" id="ProceedButton">
                 <property name="label" translatable="yes">Proceed</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
               </object>
               <packing>

libs/EXTERNAL/libezgl/include/ezgl/application.hpp

@@ -28,6 +28,7 @@
 #include <map>
 #include <memory>
 #include <string>
+#include <ctime>
 
 #include <gtk/gtk.h>
 
@@ -36,6 +37,13 @@
  */
 namespace ezgl {
 
+// A flag to specify whether the GUI is built from an XML file or an XML resource
+#ifndef ECE297
+const bool build_ui_from_file = false;
+#else
+const bool build_ui_from_file = true;
+#endif
+
 class application;
 
 /**
@@ -81,7 +89,7 @@ class application {
    */
   struct settings {
     /**
-     * The resource path that contains the XML file, which describes the GUI.
+     * The resource/file path that contains the XML file, which describes the GUI.
      */
     std::string main_ui_resource;
 
@@ -121,9 +129,13 @@ class application {
      * Create the settings structure with default values
      */
     settings()
-    : main_ui_resource("/ezgl/main.ui"), window_identifier("MainWindow"), canvas_identifier("MainCanvas"), application_identifier("ezgl.app"),
+    : main_ui_resource(build_ui_from_file ? "main_ui" : "/ezgl/main.ui"), window_identifier("MainWindow"), canvas_identifier("MainCanvas"), application_identifier("ezgl.app"),
       setup_callbacks(nullptr)
     {
+      // Uniquify the application_identifier by appending a time stamp,
+      // so that each instance of the same program has a different application ID.
+      // This allows multiple instance of the program to run independelty.
+      application_identifier += ".t" + std::to_string(std::time(nullptr));
     }
 
     /**
@@ -134,6 +146,10 @@ class application {
     : main_ui_resource(m_resource), window_identifier(w_identifier), canvas_identifier(c_identifier), application_identifier(a_identifier),
       setup_callbacks(s_callbacks)
     {
+      // Uniquify the application_identifier by appending a time stamp,
+      // so that each instance of the same program has a different application ID.
+      // This allows multiple instance of the program to run independelty.
+      application_identifier += ".t" + std::to_string(std::time(nullptr));
     }
   };
 
@@ -403,7 +419,6 @@ class application {
 /**
  * Set the disable_event_loop flag to new_setting
  * Call with new_setting == true to make the event_loop immediately return.
- * Needed only for auto-marking
  *
  * @param new_setting The new state of disable_event_loop flag
  */

libs/EXTERNAL/libezgl/include/ezgl/callback.hpp

@@ -27,6 +27,9 @@
 
 #include <iostream>
 
+// Mouse button used for panning (left button (1) - middle button (2) - right button (3))
+#define PANNING_MOUSE_BUTTON 1
+
 namespace ezgl {
 
 /**** Callback functions for keyboard and mouse input, and for all the ezgl predefined buttons. *****/

libs/EXTERNAL/libezgl/include/ezgl/graphics.hpp

@@ -65,9 +65,9 @@ enum t_coordinate_system {
 };
 
 /**
- * Text justification options
+ * Justification options (used for text and surfaces)
  */
-enum class text_just {
+enum class justification {
   /**
    * Center Justification: used for both vertical and horizontal justification
    */
@@ -279,18 +279,18 @@ class renderer {
   void set_text_rotation(double degrees);
 
   /**
-   * set horizontal text justification.
+   * set horizontal justification (used for text and surfaces).
    *
    * @param horiz_just Options: center, left and right justification.
    */
-  void set_horiz_text_just(text_just horiz_just);
+  void set_horiz_justification(justification horiz_just);
 
   /**
-   * set vertical text justification.
+   * set vertical justification (used for text and surfaces).
    *
    * @param vert_just Options: center, top and bottom justification.
    */
-  void set_vert_text_just(text_just vert_just);
+  void set_vert_justification(justification vert_just);
 
   /**** Functions to draw various graphics primitives ****/
 
@@ -425,9 +425,10 @@ class renderer {
    * Draw a surface
    *
    * @param surface The surface to draw
-   * @param top_left The corner point of the drawn surface.
+   * @param anchor_point The anchor_point point of the drawn surface.
+   * @param scale_factor The scaling factor of the drawn surface (optional)
    */
-  void draw_surface(surface *surface, point2d top_left);
+  void draw_surface(surface *p_surface, point2d anchor_point, double scale_factor = 1);
 
   /**
    * load a png image
@@ -516,11 +517,11 @@ class renderer {
   // the rotation angle variable used in rotating text
   double rotation_angle;
 
-  // Current horizontal text justification
-  text_just horiz_text_just = text_just::center;
+  // Current horizontal justification (used for text and surfaces)
+  justification horiz_justification = justification::center;
 
-  // Current vertical text justification
-  text_just vert_text_just = text_just::center;
+  // Current vertical justification (used for text and surfaces)
+  justification vert_justification = justification::center;
 
   // Current line width
   int current_line_width = 1;

libs/EXTERNAL/libezgl/include/ezgl/point.hpp

@@ -26,6 +26,13 @@ namespace ezgl {
  */
 class point2d {
 public:
+  /**
+   * Default constructor: Create a point at (0, 0).
+   */
+  point2d() : x(0.0), y(0.0)
+  {
+  }
+
   /**
    * Create a point at the given x and y position.
    */