Added EBLIF parameter validation and fixed post-route verilog output

Signed-off-by: Maciej Kurc <[email protected]>

Author: mkurc-ant

vpr/src/base/netlist_writer.cpp

@@ -19,6 +19,8 @@
 
 #include "vpr_error.h"
 
+#include "read_blif.h"
+
 #include "netlist_walker.h"
 #include "netlist_writer.h"
 
@@ -619,7 +621,13 @@ class BlackBoxInst : public Instance {
 
         //Verilog parameters
         for (auto iter = params_.begin(); iter != params_.end(); ++iter) {
-            os << indent(depth + 1) << "." << iter->first << "(" << iter->second << ")";
+            /* Prepend a prefix if needed */
+            std::stringstream prefix;
+            if (is_binary_param(iter->second)) {
+                prefix << iter->second.length() << "'b";
+            }
+
+            os << indent(depth + 1) << "." << iter->first << "(" << prefix.str() << iter->second << ")";
             if (iter != --params_.end()) {
                 os << ",";
             }

vpr/src/base/read_blif.cpp

@@ -386,6 +386,13 @@ struct BlifAllocCallback : public blifparse::Callback {
             parse_error(lineno_, ".param", "Supported only in extended BLIF format");
         }
 
+        // Validate the parameter value
+        bool is_valid = is_string_param(value) || is_binary_param(value) || is_real_param(value);
+
+        if (!is_valid) {
+            parse_error(lineno_, ".param", "Incorrect parameter value specification");
+        }
+
         curr_model().set_block_param(curr_block(), name, value);
     }
 
@@ -666,6 +673,70 @@ vtr::LogicValue to_vtr_logic_value(blifparse::LogicValue val) {
     return new_val;
 }
 
+bool is_string_param(const std::string& param) {
+    /* Empty param is considered a string */
+    if (param.empty()) {
+        return true;
+    }
+
+    /* There have to be at least 2 characters (the quotes) */
+    if (param.length() < 2) {
+        return false;
+    }
+
+    /* The first and the last characters must be quotes */
+    size_t len = param.length();
+    if (param[0] != '"' || param[len - 1] != '"') {
+        return false;
+    }
+
+    /* There mustn't be any other quotes except for escaped ones */
+    for (size_t i = 1; i < (len - 1); ++i) {
+        if (param[i] == '"' && param[i - 1] != '\\') {
+            return false;
+        }
+    }
+
+    /* This is a string param */
+    return true;
+}
+
+bool is_binary_param(const std::string& param) {
+    /* Must be non-empty */
+    if (param.empty()) {
+        return false;
+    }
+
+    /* The string must contain only '0' and '1' */
+    for (size_t i = 0; i < param.length(); ++i) {
+        if (param[i] != '0' && param[i] != '1') {
+            return false;
+        }
+    }
+
+    /* This is a binary word param */
+    return true;
+}
+
+bool is_real_param(const std::string& param) {
+    const std::string chars = "012345678.";
+
+    /* Must be non-empty */
+    if (param.empty()) {
+        return false;
+    }
+
+    /* The string mustn't contain any other chars that the expected ones */
+    for (size_t i = 0; i < param.length(); ++i) {
+        if (chars.find(param[i]) == std::string::npos) {
+            return false;
+        }
+    }
+
+    /* This is a real number param */
+    return true;
+}
+
 AtomNetlist read_blif(e_circuit_format circuit_format,
                       const char* blif_file,
                       const t_model* user_models,

vpr/src/base/read_blif.h

@@ -4,6 +4,10 @@
 #include "atom_netlist_fwd.h"
 #include "read_circuit.h"
 
+bool is_string_param(const std::string& param);
+bool is_binary_param(const std::string& param);
+bool is_real_param(const std::string& param);
+
 AtomNetlist read_blif(e_circuit_format circuit_format,
                       const char* blif_file,
                       const t_model* user_models,