Merge branch 'master' into fix_cluster_constraints_init

Author: sfkhalid

.github/kokoro/continuous/odin_strong.cfg

@@ -0,0 +1,59 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+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: ""
+}
+
+env_vars {
+  key: "VTR_TEST"
+  value: "odin_reg_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/odin_strong.cfg

@@ -0,0 +1,59 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+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: ""
+}
+
+env_vars {
+  key: "VTR_TEST"
+  value: "odin_reg_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/run-vtr.sh

@@ -16,7 +16,7 @@ source $SCRIPT_DIR/steps/hostinfo.sh
 # Output git information
 source $SCRIPT_DIR/steps/git.sh
 
-if [ $VTR_TEST == "vtr_reg_strong" ]; then
+if [ $VTR_TEST == "vtr_reg_strong" ] || [ $VTR_TEST == "odin_reg_strong" ]; then
 	source $SCRIPT_DIR/steps/vtr-min-setup.sh
 else
 	source $SCRIPT_DIR/steps/vtr-full-setup.sh

.github/workflows/test.yml

@@ -199,7 +199,7 @@ jobs:
         ./.github/travis/setup.sh
 
   ODINII:
-    name: 'ODIN-II Micro Tests'
+    name: 'ODIN-II Basic Tests'
     runs-on: ubuntu-18.04
     steps:
 
@@ -219,7 +219,7 @@ jobs:
         source .github/travis/common.sh
         ./.github/travis/setup.sh
         ./.github/travis/build.sh
-        ./run_reg_test.py odin_reg_micro -show_failures -j2
+        ./run_reg_test.py odin_reg_basic -show_failures -j2
         ./.github/travis/setup.sh
 
 

ODIN_II/SRC/ast_elaborate.cpp

@@ -1813,8 +1813,11 @@ ast_node_t* reduce_expressions(ast_node_t* node, sc_hierarchy* local_ref, long*
 
                     vtr::free(max_size);
 
-                    /* cast to unsigned if necessary */
-                    if (node_is_constant(node->children[1])) {
+                    /* 
+                     * cast to unsigned if necessary
+                     * Concatenate results are unsigned, regardless of the operands. IEEE.1364-2005 pp.65
+                     */
+                    if (node->children[0]->type != CONCATENATE && node_is_constant(node->children[1])) {
                         char* id = NULL;
                         if (node->children[0]->type == IDENTIFIERS) {
                             id = node->children[0]->types.identifier;

README.developers.md

@@ -285,14 +285,14 @@ $ ./run_reg_test.py vtr_reg_basic vtr_reg_strong -j4
 
 Odin has its own set of tests to verify the correctness of its synthesis results:
 
-* `odin_reg_micro`: ~2 minutes serial
-* `odin_reg_full`: ~6 minutes serial
+* `odin_reg_basic`: ~2 minutes serial
+* `odin_reg_strong`: ~6 minutes serial
 
 These can be run with:
 ```shell
 #From the VTR root directory
-$ ./run_reg_test.py odin_reg_micro
-$ ./run_reg_test.py odin_reg_full
+$ ./run_reg_test.py odin_reg_basic
+$ ./run_reg_test.py odin_reg_strong
 ```
 and should be used when making changes to Odin.
 

run_reg_test.py

@@ -269,12 +269,12 @@ def run_odin_test(args, test_name):
         odin_reg_script[-1] += "task/arch_sweep"
     elif test_name == "odin_reg_operators":
         odin_reg_script[-1] += "task/operators"
-    elif test_name == "odin_reg_large":
-        odin_reg_script[-1] += "task/large"
     elif test_name == "odin_reg":
         odin_reg_script[-1] += "task/full"
-    elif test_name == "odin_reg_micro":
+    elif test_name == "odin_reg_basic":
         odin_reg_script[-1] += "suite/light_suite"
+    elif test_name == "odin_reg_strong":
+        odin_reg_script[-1] += "suite/heavy_suite"
     else:
         raise IOError("Test does not exist: {}".format(test_name))
 

utils/fasm/test/test_fasm.cpp

@@ -169,7 +169,22 @@ TEST_CASE("match_lut_init", "[fasm]") {
     CHECK(match_lut_init("16'b0000000011111111", "16'b0000111100001111"));
 }
 
-std::string get_pin_feature (size_t inode) {
+/*
+The following function returns a string describing a block pin given an IPIN/
+OPIN rr node index. This is needed to correlate rr nodes with port names as
+defined in the architecture and used for checking if genfasm correctlty honors
+equivalent port pins rotation.
+
+The output pin description format is:
+"PIN_<xlow>_<ylow>_<sub_tile_type>_<sub_tile_port>_<port_pin_index>"
+
+Pin decriptions returned by this functions are injected as FASM features to the
+edges of a rr graph that are immediately connected with pins from "outside"
+(not to from/to a SOURCE or SINK). Then, after genfasm is run they are identified,
+and decoded to get all the pin information. This allows to get information
+which block pins are used from the "FASM perspective".
+*/
+static std::string get_pin_feature (size_t inode) {
     auto& device_ctx = g_vpr_ctx.device();
 
     // Get tile physical tile and the pin number
@@ -178,7 +193,8 @@ std::string get_pin_feature (size_t inode) {
     auto physical_tile = device_ctx.grid[ilow][jlow].type;
     int pin_num = device_ctx.rr_nodes[inode].ptc_num();
 
-    // Get the sub tile (type, not instance)
+    // Get the sub tile (type, not instance) and index of its pin that matches
+    // the node index.
     const t_sub_tile* sub_tile_type = nullptr;
     int sub_tile_pin = -1;
 
@@ -200,14 +216,13 @@ std::string get_pin_feature (size_t inode) {
     REQUIRE(sub_tile_type != nullptr);
     REQUIRE(sub_tile_pin  != -1);
 
-    // Find the sub tile port and pin index
+    // Find the sub tile port and pin index for the sub-tile type pin index.
     for (const auto& port : sub_tile_type->ports) {
         int pin_lo = port.absolute_first_pin_index;
         int pin_hi = pin_lo + port.num_pins;
 
         if (sub_tile_pin >= pin_lo && sub_tile_pin < pin_hi) {
             int port_pin = sub_tile_pin - pin_lo;
-            fprintf(stderr, "    %zu %s %d\n", inode, port.name, port_pin);
             return vtr::string_fmt("PIN_%d_%d_%s_%s_%d", ilow, jlow, sub_tile_type->name, port.name, port_pin);
         }
     }
@@ -331,7 +346,6 @@ TEST_CASE("fasm_integration_test", "[fasm]") {
         if (line.find(".names") != std::string::npos) {
             REQUIRE(lut_def.length() > 0);
             lut_defs.push_back(lut_def);
-            //fprintf(stderr, "'%s'\n", lut_def.c_str());
             lut_def = "";
             continue;
         }
@@ -568,7 +582,6 @@ TEST_CASE("fasm_integration_test", "[fasm]") {
         // Decompose the xbar feature - extract only the necessary information
         // such as block location and pin index.
         std::smatch m;
-        fprintf(stderr, "%s\n", xbar_feature.c_str());
         auto res = std::regex_match(xbar_feature, m, std::regex(
             ".*_X([0-9]+)Y([0-9]+)\\.IN([0-9])_XBAR_I([0-9]+)$"));
         REQUIRE(res == true);