Revert master+wip to master (2780988)

Signed-off-by: Keith Rothman <[email protected]>

Author: litghost

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,9 +1,6 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
 
 ---
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,9 +1,6 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
 
 ---
 

.github/ISSUE_TEMPLATE/vtr-change.md

@@ -1,14 +1,5 @@
-
-SymbiFlow WIP changes for Verilog to Routing (VTR)
-==================================================
-
-This branch contains work in progress changes for using Verilog to Routing
-(VTR) as part of SymbiFlow.
-
----
-
 # Verilog to Routing (VTR)
-[![Build Status](https://travis-ci.com/SymbiFlow/vtr-verilog-to-routing.svg?branch=master)](https://travis-ci.com/SymbiFlow/vtr-verilog-to-routing) [![Documentation Status](https://readthedocs.org/projects/vtr/badge/?version=latest)](http://docs.verilogtorouting.org/en/latest/?badge=latest)
+[![Build Status](https://travis-ci.com/verilog-to-routing/vtr-verilog-to-routing.svg?branch=master)](https://travis-ci.org/verilog-to-routing/vtr-verilog-to-routing) [![Documentation Status](https://readthedocs.org/projects/vtr/badge/?version=latest)](http://docs.verilogtorouting.org/en/latest/?badge=latest)
 
 ## Introduction
 The Verilog-to-Routing (VTR) project is a world-wide collaborative effort to provide a open-source framework for conducting FPGA architecture and CAD research and development.

README.md

@@ -8,7 +8,7 @@ add_subdirectory(libsdcparse)
 add_subdirectory(libblifparse)
 add_subdirectory(libtatum)
 
-#VPR_USE_EZGL is initialized in the root CMakeLists.
+#VPR_USE_EZGL is initialized in the root CMakeLists. 
 #compile libezgl only if the user asks for or has its dependencies installed.
 if(VPR_USE_EZGL STREQUAL "on")
     add_subdirectory(libezgl)

libs/EXTERNAL/CMakeLists.txt

@@ -56,8 +56,8 @@ FLOAT_EXP ([eE][-+]?{DIGIT10}+)
 FLOAT_NUMBER ({NAN}|([-+]?({INF}|({FLOAT_BASE}{FLOAT_EXP}?))))
 INT_NUMBER ([-+]?{DIGIT10}+)
 ALPHA [a-zA-Z_]
-SYMBOL [-~|:*\\/^\$\.]
-ID_FIRST ({ALPHA}|{SYMBOL})
+SYMBOL [-~|:*\\/^]
+ID_FIRST ({ALPHA})
 ID_MID ({ALPHA}|{DIGIT10}|{SYMBOL})
 ID_INDEX (\[{DIGIT10}+\])
 ID ({ID_FIRST}{ID_MID}*{ID_INDEX}?)

libs/EXTERNAL/libsdcparse/src/sdc_lexer.l

@@ -731,8 +731,9 @@ bool TimingGraph::validate_structure() const {
 
             } else if (src_type == NodeType::CPIN) {
                 if(   sink_type != NodeType::SOURCE
-                   && sink_type != NodeType::SINK) {
-                    throw tatum::Error("CPIN nodes should only drive SOURCE or SINK nodes", src_node, out_edge);
+                   && sink_type != NodeType::SINK 
+                   && sink_type != NodeType::OPIN) {
+                    throw tatum::Error("CPIN nodes should only drive SOURCE, OPIN or SINK nodes", src_node, out_edge);
                 }
 
                 if(sink_type == NodeType::SOURCE && out_edge_type != EdgeType::PRIMITIVE_CLOCK_LAUNCH) {

libs/EXTERNAL/libtatum/libtatum/tatum/TimingGraph.cpp

@@ -1321,38 +1321,3 @@ bool is_library_model(const char* model_name) {
 bool is_library_model(const t_model* model) {
     return is_library_model(model->name);
 }
-
-//Returns true if the specified block type contains the specified blif model name
-bool block_type_contains_blif_model(t_logical_block_type_ptr type, const std::string& blif_model_name) {
-    return pb_type_contains_blif_model(type->pb_type, blif_model_name);
-}
-
-//Returns true of a pb_type (or it's children) contain the specified blif model name
-bool pb_type_contains_blif_model(const t_pb_type* pb_type, const std::string& blif_model_name) {
-    if (!pb_type) {
-        return false;
-    }
-
-    if (pb_type->blif_model != nullptr) {
-        //Leaf pb_type
-        VTR_ASSERT(pb_type->num_modes == 0);
-        if (blif_model_name == pb_type->blif_model
-            || ".subckt " + blif_model_name == pb_type->blif_model) {
-            return true;
-        } else {
-            return false;
-        }
-    } else {
-        for (int imode = 0; imode < pb_type->num_modes; ++imode) {
-            const t_mode* mode = &pb_type->modes[imode];
-
-            for (int ichild = 0; ichild < mode->num_pb_type_children; ++ichild) {
-                const t_pb_type* pb_type_child = &mode->pb_type_children[ichild];
-                if (pb_type_contains_blif_model(pb_type_child, blif_model_name)) {
-                    return true;
-                }
-            }
-        }
-    }
-    return false;
-}

libs/libarchfpga/src/arch_util.cpp

@@ -1,7 +1,6 @@
 #ifndef ARCH_UTIL_H
 #define ARCH_UTIL_H
 
-#include <regex>
 #include "physical_types.h"
 
 class InstPort {
@@ -75,11 +74,4 @@ bool segment_exists(const t_arch* arch, std::string name);
 const t_segment_inf* find_segment(const t_arch* arch, std::string name);
 bool is_library_model(const char* model_name);
 bool is_library_model(const t_model* model);
-
-//Returns true if the specified block type contains the specified blif model name
-bool block_type_contains_blif_model(t_logical_block_type_ptr type, const std::string& blif_model_name);
-
-//Returns true of a pb_type (or it's children) contain the specified blif model name
-bool pb_type_contains_blif_model(const t_pb_type* pb_type, const std::string& blif_model_name);
-
 #endif

libs/libarchfpga/src/arch_util.h

@@ -110,12 +110,7 @@ std::vector<int> t_physical_tile_type::get_clock_pins_indices() const {
     int clock_pins_start_idx = 0;
     int clock_pins_stop_idx = 0;
 
-    int num_capacity = 1;
-    if (capacity_type == e_capacity_type::DUPLICATE) {
-        num_capacity = this->capacity;
-    }
-
-    for (int capacity_num = 0; capacity_num < num_capacity; capacity_num++) {
+    for (int capacity_num = 0; capacity_num < this->capacity; capacity_num++) {
         // Ranges are picked on the basis that pins are ordered: inputs, outputs, then clock pins
         // This is because ProcessPb_type assigns pb_type port indices in that order and
         // SetupPinLocationsAndPinClasses assigns t_logical_block_type_ptr pin indices in the order of port indices

libs/libarchfpga/src/physical_types.cpp

@@ -39,7 +39,6 @@
 #include "vtr_ndmatrix.h"
 #include "vtr_hash.h"
 #include "vtr_bimap.h"
-#include "vtr_string_interning.h"
 
 #include "logic_types.h"
 #include "clock_types.h"
@@ -91,32 +90,31 @@ enum class e_sb_type;
 // Metadata value storage.
 class t_metadata_value {
   public:
-    explicit t_metadata_value(vtr::interned_string v)
+    explicit t_metadata_value(std::string v)
         : value_(v) {}
     explicit t_metadata_value(const t_metadata_value& o)
         : value_(o.value_) {}
 
     // Return string value.
-    vtr::interned_string as_string() const { return value_; }
+    std::string as_string() const { return value_; }
 
   private:
-    vtr::interned_string value_;
+    std::string value_;
 };
 
 // Metadata storage dictionary.
-struct t_metadata_dict : vtr::flat_map<
-                             vtr::interned_string,
-                             std::vector<t_metadata_value>,
-                             vtr::interned_string_less> {
+struct t_metadata_dict : std::unordered_map<
+                             std::string,
+                             std::vector<t_metadata_value>> {
     // Is this key present in the map?
-    inline bool has(vtr::interned_string key) const {
+    inline bool has(std::string key) const {
         return this->count(key) >= 1;
     }
 
     // Get all metadata values matching key.
     //
     // Returns nullptr if key is not found.
-    inline const std::vector<t_metadata_value>* get(vtr::interned_string key) const {
+    inline const std::vector<t_metadata_value>* get(std::string key) const {
         auto iter = this->find(key);
         if (iter != this->end()) {
             return &iter->second;
@@ -128,7 +126,7 @@ struct t_metadata_dict : vtr::flat_map<
     //
     // Returns nullptr if key is not found or if multiple values are prsent
     // per key.
-    inline const t_metadata_value* one(vtr::interned_string key) const {
+    inline const t_metadata_value* one(std::string key) const {
         auto values = get(key);
         if (values == nullptr) {
             return nullptr;
@@ -140,10 +138,11 @@ struct t_metadata_dict : vtr::flat_map<
     }
 
     // Adds value to key.
-    void add(vtr::interned_string key, vtr::interned_string value) {
+    void add(std::string key, std::string value) {
         // Get the iterator to the key, which may already have elements if
         // add was called with this key in the past.
-        (*this)[key].emplace_back(t_metadata_value(value));
+        auto iter_inserted = this->emplace(key, std::vector<t_metadata_value>());
+        iter_inserted.first->second.push_back(t_metadata_value(value));
     }
 };
 
@@ -524,12 +523,6 @@ enum class e_sb_type {
 
 };
 
-enum class e_capacity_type {
-    DUPLICATE, // Capacity duplicates ports.
-    EXPLICIT   // Capacity increases the number of logical tiles, but does not
-               // modify the physical ports.
-};
-
 constexpr int NO_SWITCH = -1;
 constexpr int DEFAULT_SWITCH = -2;
 
@@ -584,7 +577,6 @@ struct t_physical_tile_type {
     int num_clock_pins = 0;
 
     int capacity = 0;
-    e_capacity_type capacity_type = e_capacity_type::DUPLICATE;
 
     int width = 0;
     int height = 0;
@@ -626,30 +618,25 @@ struct t_physical_tile_type {
 
     /* Returns the indices of pins that contain a clock for this physical logic block */
     std::vector<int> get_clock_pins_indices() const;
-
-    bool is_input_type;
-    bool is_output_type;
 };
 
 /** A logical pin defines the pin index of a logical block type (i.e. a top level PB type)
  *  This structure wraps the int value of the logical pin to allow its storage in the
  *  vtr::bimap container.
  */
 struct t_logical_pin {
-    int z_index = -1;
     int pin = -1;
 
-    t_logical_pin(int z_index_value, int value) {
-        z_index = z_index_value;
+    t_logical_pin(int value) {
         pin = value;
     }
 
     bool operator==(const t_logical_pin o) const {
-        return z_index == o.z_index && pin == o.pin;
+        return pin == o.pin;
     }
 
     bool operator<(const t_logical_pin o) const {
-        return std::make_pair(z_index, pin) < std::make_pair(o.z_index, o.pin);
+        return pin < o.pin;
     }
 };
 
@@ -1387,7 +1374,6 @@ struct t_arch_switch_inf {
     float Cin = 0.;
     float Cout = 0.;
     float Cinternal = 0.;
-    float penalty_cost = 0.;
     float mux_trans_size = 1.;
     BufferSize buf_size_type = BufferSize::AUTO;
     float buf_size = 0.;
@@ -1452,7 +1438,6 @@ struct t_rr_switch_inf {
     float Cout = 0.;
     float Cinternal = 0.;
     float Tdel = 0.;
-    float penalty_cost = 0.;
     float mux_trans_size = 0.;
     float buf_size = 0.;
     const char* name = nullptr;
@@ -1600,8 +1585,6 @@ struct t_clock_arch_spec {
 
 /*   Detailed routing architecture */
 struct t_arch {
-    mutable vtr::string_internment strings;
-
     char* architecture_id; //Secure hash digest of the architecture file to uniquely identify this architecture
 
     t_chan_width_dist Chans;