Merge pull request #2 from verilog-to-routing/master

Pulling down changes to VTR upstream

Author: jgoeders

.github/kokoro/continuous/strong_sanitized.cfg

@@ -2,8 +2,8 @@
 
 build_file: "vtr-verilog-to-routing/.github/kokoro/run-vtr.sh"
 
-# 1 hour
-timeout_mins: 60
+# 2 hour
+timeout_mins: 120
 
 action {
   define_artifacts {

.github/kokoro/presubmit/strong_sanitized.cfg

@@ -2,8 +2,8 @@
 
 build_file: "vtr-verilog-to-routing/.github/kokoro/run-vtr.sh"
 
-# 1 hour
-timeout_mins: 60
+# 2 hour
+timeout_mins: 120
 
 action {
   define_artifacts {

.travis.yml

@@ -142,7 +142,7 @@ jobs:
       script:
         - ./.github/travis/build.sh
         #We skip QoR since we are only checking for errors in sanitizer runs
-        - travis_wait 30 ./run_reg_test.pl vtr_reg_basic -show_failures -skip_qor -j2
+        - travis_wait 50 ./run_reg_test.pl vtr_reg_basic -show_failures -skip_qor -j2
     #Currently strong regression with sanitizers is disabled as it exceeds the maximum travis job run-time
     #- stage: Test
       #name: "Sanitized Strong Regression Tests"

BUILDING.md

@@ -94,6 +94,24 @@ apt-get install \
 	ctags
 ```
 
+#### Using Nix ####
+
+Although the recommended platform is Debian or Ubuntu, Nix can be used to build VTR on other platforms, such as MacOS.
+
+If you don't have [Nix](https://nixos.org/nix/), you can [get it](https://nixos.org/nix/download.html) with:
+
+```shell
+$ curl -L https://nixos.org/nix/install | sh
+```
+
+These commands will set up dependencies for Linux and MacOS and build VTR:
+
+```shell
+#In the VTR root
+$ nix-shell dev/nix/shell.nix
+$ make
+```
+
 ### Building using the Makefile wrapper ###
 Run `make` from the root of the VTR source tree
 

ODIN_II/Makefile

@@ -112,16 +112,30 @@ test:
 	./verify_odin.sh -j $(NB_OF_PROCESS) \
 		-t regression_test/benchmark/suite/heavy_suite
 
-qor:
+generate_expectation:
 # rebuild with sanitize flags on to run the same test as travis
-	$(MAKE) sanitize
+	$(MAKE) sanitize 
 	./verify_odin.sh -j $(NB_OF_PROCESS) \
-		--regenerate_qor \
+		--generate_expectation\
 		-t regression_test/benchmark/suite/light_suite \
 		-t vtr_reg_basic \
-		-t vtr_reg_strong
-# larger test should run with regular flags to speed up the process
+		-t vtr_reg_strong || true
+ # larger test should run with regular flags to speed up the process
+	$(MAKE) build
+	./verify_odin.sh -j $(NB_OF_PROCESS) \
+		--generate_expectation \
+		-t regression_test/benchmark/suite/heavy_suite
+
+regenerate_expectation:
+# rebuild with sanitize flags on to run the same test as travis
+	$(MAKE) sanitize 
+	./verify_odin.sh -j $(NB_OF_PROCESS) \
+		--regenerate_expectation\
+		-t regression_test/benchmark/suite/light_suite \
+		-t vtr_reg_basic \
+		-t vtr_reg_strong || true
+ # larger test should run with regular flags to speed up the process
 	$(MAKE) build
 	./verify_odin.sh -j $(NB_OF_PROCESS) \
-		--regenerate_qor \
+		--regenerate_expectation \
 		-t regression_test/benchmark/suite/heavy_suite

ODIN_II/SRC/adders.cpp

@@ -146,7 +146,7 @@ void declare_hard_adder(nnode_t* node) {
 
     /* See if this size instance of adder exists? */
     if (hard_adders == NULL)
-        warning_message(NETLIST_ERROR, node->related_ast_node->line_number, node->related_ast_node->file_number, "%s\n", "Instantiating adder where adders do not exist");
+        warning_message(NETLIST, node->related_ast_node->line_number, node->related_ast_node->file_number, "%s\n", "Instantiating adder where adders do not exist");
 
     tmp = (t_adder*)hard_adders->instances;
     width_a = node->input_port_sizes[0];

ODIN_II/SRC/ast_elaborate.cpp

@@ -129,25 +129,25 @@ ast_node_t* resolve_for(ast_node_t* node) {
 
     ast_node_t* value = 0;
     if (resolve_pre_condition(pre, &value)) {
-        error_message(PARSE_ERROR, pre->line_number, pre->file_number, "%s", "Unsupported pre-condition node in for loop");
+        error_message(AST, pre->line_number, pre->file_number, "%s", "Unsupported pre-condition node in for loop");
     }
 
     int error_code = 0;
     condition_function cond_func = resolve_condition(cond, pre->children[0], &error_code);
     if (error_code) {
-        error_message(PARSE_ERROR, cond->line_number, cond->file_number, "%s", "Unsupported condition node in for loop");
+        error_message(AST, cond->line_number, cond->file_number, "%s", "Unsupported condition node in for loop");
     }
 
     post_condition_function post_func = resolve_post_condition(post, pre->children[0], &error_code);
     if (error_code) {
-        error_message(PARSE_ERROR, post->line_number, post->file_number, "%s", "Unsupported post-condition node in for loop");
+        error_message(AST, post->line_number, post->file_number, "%s", "Unsupported post-condition node in for loop");
     }
 
     bool dup_body = cond_func(value->types.vnumber->get_value());
     while (dup_body) {
         ast_node_t* new_body = dup_and_fill_body(body, pre, &value, &error_code);
         if (error_code) {
-            error_message(PARSE_ERROR, pre->line_number, pre->file_number, "%s", "Unsupported pre-condition node in for loop");
+            error_message(AST, pre->line_number, pre->file_number, "%s", "Unsupported pre-condition node in for loop");
         }
 
         VNumber* temp_vnum = value->types.vnumber;