Fixed merge conflict

Author: sfkhalid

.github/kokoro/continuous/nightly.cfg

@@ -16,6 +16,15 @@ action {
     regex: "**/place.log"
     regex: "**/route.log"
     regex: "**/*_qor.csv"
+    regex: "**/*.out.gz"
+    regex: "**/vpr_stdout.log.gz"
+    regex: "**/parse_results.txt.gz"
+    regex: "**/qor_results.txt.gz"
+    regex: "**/pack.log.gz"
+    regex: "**/place.log.gz"
+    regex: "**/route.log.gz"
+    regex: "**/*_qor.csv.gz"
+
     strip_prefix: "github/vtr-verilog-to-routing/"
   }
 }

.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/continuous/strong.cfg

@@ -16,6 +16,14 @@ action {
     regex: "**/place.log"
     regex: "**/route.log"
     regex: "**/*_qor.csv"
+    regex: "**/*.out.gz"
+    regex: "**/vpr_stdout.log.gz"
+    regex: "**/parse_results.txt.gz"
+    regex: "**/qor_results.txt.gz"
+    regex: "**/pack.log.gz"
+    regex: "**/place.log.gz"
+    regex: "**/route.log.gz"
+    regex: "**/*_qor.csv.gz"
     strip_prefix: "github/vtr-verilog-to-routing/"
   }
 }

.github/kokoro/continuous/strong_sanitized.cfg

@@ -16,6 +16,15 @@ action {
     regex: "**/place.log"
     regex: "**/route.log"
     regex: "**/*_qor.csv"
+    regex: "**/*.out.gz"
+    regex: "**/vpr_stdout.log.gz"
+    regex: "**/parse_results.txt.gz"
+    regex: "**/qor_results.txt.gz"
+    regex: "**/pack.log.gz"
+    regex: "**/place.log.gz"
+    regex: "**/route.log.gz"
+    regex: "**/*_qor.csv.gz"
+
     strip_prefix: "github/vtr-verilog-to-routing/"
   }
 }

.github/kokoro/continuous/weekly.cfg

@@ -16,6 +16,15 @@ action {
     regex: "**/place.log"
     regex: "**/route.log"
     regex: "**/*_qor.csv"
+    regex: "**/*.out.gz"
+    regex: "**/vpr_stdout.log.gz"
+    regex: "**/parse_results.txt.gz"
+    regex: "**/qor_results.txt.gz"
+    regex: "**/pack.log.gz"
+    regex: "**/place.log.gz"
+    regex: "**/route.log.gz"
+    regex: "**/*_qor.csv.gz"
+
     strip_prefix: "github/vtr-verilog-to-routing/"
   }
 }

.github/kokoro/presubmit/nightly.cfg

@@ -16,6 +16,14 @@ action {
     regex: "**/place.log"
     regex: "**/route.log"
     regex: "**/*_qor.csv"
+    regex: "**/*.out.gz"
+    regex: "**/vpr_stdout.log.gz"
+    regex: "**/parse_results.txt.gz"
+    regex: "**/qor_results.txt.gz"
+    regex: "**/pack.log.gz"
+    regex: "**/place.log.gz"
+    regex: "**/route.log.gz"
+    regex: "**/*_qor.csv.gz"
     strip_prefix: "github/vtr-verilog-to-routing/"
   }
 }

.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/CMakeLists.txt

@@ -189,7 +189,7 @@ endforeach()
 #Supress IPO link warnings if IPO is enabled
 get_target_property(ODIN_USES_IPO odin_II INTERPROCEDURAL_OPTIMIZATION)
 if (ODIN_USES_IPO)
-    set_target_properties(odin_II PROPERTIES LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS})
+    set_property(TARGET odin_II APPEND PROPERTY LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS})
 endif()
 
 #add strict odin compiler flags, if set

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;

ODIN_II/regression_test/benchmark/suite/light_suite/task_list.conf

@@ -9,3 +9,4 @@ regression_test/benchmark/task/syntax
 regression_test/benchmark/task/FIR
 regression_test/benchmark/task/micro
 regression_test/benchmark/suite/complex_synthesis_suite
+regression_test/benchmark/suite/vtr_multiclock_suite

ODIN_II/regression_test/benchmark/suite/vtr_multiclock_suite/task_list.conf

@@ -0,0 +1 @@
+vtr::vtr_reg_multiclock

ODIN_II/verify_odin.sh

@@ -1255,7 +1255,7 @@ FILTERED_VTR_TASK_PATH="${NEW_RUN_DIR}/vtr/task_list.txt"
 function run_vtr_reg() {
 	pushd "${VTR_DIR}"  &> /dev/null
 	RELATIVE_PATH_TO_TEST=$(realapath_from "${FILTERED_VTR_TASK_PATH}" "${VTR_REG_DIR}")
-	/usr/bin/env perl run_reg_test.py -j "${_NUMBER_OF_PROCESS}" "${RELATIVE_PATH_TO_TEST}"
+	/usr/bin/env perl run_reg_test.py -j "${_NUMBER_OF_PROCESS}" $(dirname ${RELATIVE_PATH_TO_TEST})
 	popd  &> /dev/null
 }
 
@@ -1277,7 +1277,7 @@ function filter_vtr_test() {
 		pushd "${VTR_REG_DIR}"  &> /dev/null
 		for test in $(cat "${VTR_TASK_PATH}")
 		do 
-			if grep -E "circuit_list_add=.*\.v" "${test/regression_tests\//}/config/config.txt" &> "/dev/null"
+			if grep -E "circuit_list_add=.*\.v" "${VTR_REG_DIR/regression_tests}${test}/config/config.txt" &> "/dev/null"
 			then 
 				echo $test >> "${FILTERED_VTR_TASK_PATH}"; 
 			fi

README.developers.md

@@ -72,7 +72,7 @@ The overall approach is similar, but we call out the differences below.
 
 8. Create a Pull Request (PR) to request your changes be merged into VTR.
 
-    * Navitage to your branch on GitHub
+    * Navigate to your branch on GitHub
 
         a. **External Developers**
 
@@ -92,7 +92,7 @@ The overall approach is similar, but we call out the differences below.
 
 ## Commit Messages
 
-Commit messagaes are an important part of understanding the code base and it's history.
+Commit messages are an important part of understanding the code base and it's history.
 It is therefore *extremely* important to provide the following information in the commit message:
 
 * What is being changed?
@@ -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.
 

blifexplorer/CMakeLists.txt

@@ -59,7 +59,7 @@ else()
     #Supress IPO link warnings if IPO is enabled
     get_target_property(TEST_BLIFEXPLORER_USES_IPO blifexplorer INTERPROCEDURAL_OPTIMIZATION)
     if (TEST_BLIFEXPLORER_USES_IPO)
-        set_target_properties(blifexplorer PROPERTIES LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS})
+        set_property(TARGET blifexplorer APPEND PROPERTY LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS})
     endif()
 
 

dev/pylint_check.py

@@ -90,7 +90,7 @@
 
 
 class TermColor:
-    """ Terminal codes for printing in color """
+    """Terminal codes for printing in color"""
 
     # pylint: disable=too-few-public-methods
 
@@ -105,14 +105,14 @@ class TermColor:
 
 
 def error(*msg, returncode=-1):
-    """ Print an error message and exit program """
+    """Print an error message and exit program"""
 
     print(TermColor.RED + "ERROR:", " ".join(str(item) for item in msg), TermColor.END)
     sys.exit(returncode)
 
 
 def expand_paths():
-    """ Build a list of all python files to process by going through 'paths_to_lint' """
+    """Build a list of all python files to process by going through 'paths_to_lint'"""
 
     paths = []
     for (path, is_recursive) in paths_to_lint:

libs/EXTERNAL/libargparse/src/argparse.cpp

@@ -4,6 +4,7 @@
 #include <cassert>
 #include <string>
 #include <set>
+#include <limits>
 
 #include "argparse.hpp"
 #include "argparse_util.hpp"

libs/EXTERNAL/libblifparse/CMakeLists.txt

@@ -57,7 +57,7 @@ if (USES_IPO)
         CHECK_CXX_COMPILER_FLAG(${flag} CXX_COMPILER_SUPPORTS_${flag})
         if(CXX_COMPILER_SUPPORTS_${flag})
             #Flag supported, so enable it
-            set_target_properties(blifparse_test PROPERTIES LINK_FLAGS ${flag})
+            set_property(TARGET blifparse_test APPEND PROPERTY LINK_FLAGS ${flag})
         endif()
     endforeach()
 endif()
@@ -69,4 +69,4 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
              COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/test/test_parser.sh ${CMAKE_CURRENT_SOURCE_DIR}/test/*/*.blif ${CMAKE_CURRENT_SOURCE_DIR}/test/*/*.eblif)
 endif()
 
-install(TARGETS libblifparse blifparse_test DESTINATION bin)
+install(TARGETS libblifparse DESTINATION bin)

libs/EXTERNAL/libsdcparse/CMakeLists.txt

@@ -61,9 +61,9 @@ if (USES_IPO)
         CHECK_CXX_COMPILER_FLAG(${flag} CXX_COMPILER_SUPPORTS_${flag})
         if(CXX_COMPILER_SUPPORTS_${flag})
             #Flag supported, so enable it
-            set_target_properties(sdcparse_test PROPERTIES LINK_FLAGS ${flag})
+            set_property(TARGET sdcparse_test APPEND PROPERTY LINK_FLAGS ${flag})
         endif()
     endforeach()
 endif()
 
-install(TARGETS libsdcparse sdcparse_test DESTINATION bin)
+install(TARGETS libsdcparse DESTINATION bin)

libs/libarchfpga/CMakeLists.txt

@@ -30,7 +30,7 @@ target_link_libraries(read_arch libarchfpga)
 #Supress IPO link warnings if IPO is enabled
 get_target_property(READ_ARCH_USES_IPO read_arch INTERPROCEDURAL_OPTIMIZATION)
 if (READ_ARCH_USES_IPO)
-    set_target_properties(read_arch PROPERTIES LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS})
+    set_property(TARGET read_arch APPEND PROPERTY LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS})
 endif()
 
 install(TARGETS libarchfpga read_arch DESTINATION bin)

libs/liblog/CMakeLists.txt

@@ -21,4 +21,4 @@ set_target_properties(liblog PROPERTIES PREFIX "") #Avoid extra 'lib' prefix
 add_executable(test_log ${EXEC_SOURCES})
 target_link_libraries(test_log liblog)
 
-install(TARGETS test_log liblog DESTINATION bin)
+install(TARGETS liblog DESTINATION bin)