vpr: resolve merge conflict

Author: tinayang3024

.github/travis/cron_build.sh

@@ -0,0 +1,94 @@
+#!/bin/bash
+
+source .github/travis/common.sh
+set -e
+
+$SPACER
+
+if [ "_${_COVERITY_EMAIL}" == "_" ] ||
+[ "_${_COVERITY_URL}" == "_" ] ||
+[ "_${_COVERITY_MD5}" == "_" ]
+then
+  echo "_COVERITY_EMAIL, _COVERITY_URL and _COVERITY_MD5 must be set before using this script"
+  exit 1
+fi
+
+build_root=${PWD}
+
+##########################
+# download coverity tool
+start_section "coverity download" "${GREEN}Downloading coverity tool..${NC}"
+
+mkdir -p ${HOME}/coverity
+cd ${HOME}/coverity
+
+# get coverity and extract it
+wget --quiet ${_COVERITY_URL} --post-data="token=${COVERITY_SCAN_TOKEN}&project=Verilog+to+Routing" -O coverity.tar.gz
+echo "${_COVERITY_MD5} coverity.tar.gz" | md5sum -c -
+tar xzf coverity.tar.gz
+rm -f coverity.tar.gz
+
+# export the coverity tool
+coverity_dir=$(ls -d cov-analysis-linux64*)
+export PATH="${PATH}:${HOME}/coverity/${coverity_dir}/bin"
+which cov-build
+
+# make sure we use the compiler so we clear the cache, disable ccache and remove it from the path
+ccache --clear
+export CCACHE_DISABLE=1
+export PATH=${PATH/'/usr/bin/ccache:'/}
+export PATH=${PATH/':/usr/lib/ccache'/}
+
+#tell coverity about the CC compiler used
+cov-configure --template --compiler ${CC} --comptype gcc
+
+
+cd ${build_root}
+
+end_section "coverity download"
+
+
+$SPACER
+
+
+#######################
+# build with coverity
+start_section "coverity.vtr.build" "${GREEN}Building..${NC}"
+
+# make sure we use the compiler so we clear the cache
+
+# remove old files in case they exist (usefull if we run this locally)
+rm -f CMakeCache.txt
+rm -Rf build
+
+# prepare the build
+mkdir -p build
+cd build
+cmake -DCMAKE_BUILD_TYPE=debug -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on ..
+
+# now build and scan
+cov-build --dir cov-int make -j$(nproc --all)
+
+end_section "coverity.vtr.build"
+
+
+$SPACER
+
+
+#######################
+# export to coverity
+start_section "coverity.export" "${GREEN}Exporting..${NC}"
+
+tar -czvf vtr_coverity.tar.gz cov-int
+
+curl --form token=${COVERITY_SCAN_TOKEN} \
+  --form email=${_COVERITY_EMAIL} \
+  --form file=@vtr_coverity.tar.gz\
+  --form version="master branch head" \
+  --form description="$(git log -1|head -1)" \
+  https://scan.coverity.com/builds?project=Verilog+to+Routing
+
+end_section "coverity.export"
+
+
+$SPACER

.travis.yml

@@ -71,9 +71,14 @@ env:
   - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
 
 stages:
-  #- Build
-  - Test
-  - Build Compatibility
+  # - name: Build
+  #   if: type != cron
+  - name: Test
+    if: type != cron
+  - name: Build Compatibility
+    if: type != cron
+  - name: Build Coverity
+    if: type = cron
 
 jobs:
   include:
@@ -160,6 +165,14 @@ jobs:
          - MATRIX_EVAL="CC=clang-8 && CXX=clang++-8"
       script:
         - ./.github/travis/build.sh
+    - stage: Build Coverity
+      name: "Coverity Scan"
+      env:
+        - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
+        - _COVERITY_URL="https://scan.coverity.com/download/linux64"
+        - _COVERITY_MD5="d0d7d7df9d6609e578f85096a755fb8f"
+      script:
+        - ./.github/travis/cron_build.sh
 
 before_script:
   - source .github/travis/common.sh

CMakeLists.txt

@@ -145,6 +145,7 @@ else()
         "-Winit-self"                   #Warn about self-initialization
         "-Wcatch-value=3"               #Warn when catch statements don't catch by reference
         "-Wextra-semi"                  #Warn about redudnant semicolons
+        "-Wimplicit-fallthrough=3"      #Warn about case fallthroughs, but allow 'fallthrough' comments to suppress warnings
         #GCC-like optional
         #"-Wsuggest-final-types"         #Suggest where 'final' would help if specified on a type methods
         #"-Wsuggest-final-methods"       #Suggest where 'final' would help if specified on methods

ODIN_II/Makefile

@@ -36,19 +36,23 @@ help:
 		large_test		run the complete battery of test before merging changes\n\
 	"
 
-_init:
+_init: clean
 	mkdir -p $(ODIN_BUILD_DIR)
 
 clean:
 	$(RM) -f $(ODIN_BUILD_DIR)/.*.build
 	$(RM) -Rf $(BUILD_DIR)/CMakeCache.txt
 	$(RM) -Rf $(BUILD_DIR)/ODIN_II
 
-_build_it:
+define _build_it_gen
+_build_it_$(1): _set_$(1)
 	cd $(BUILD_DIR) &&\
 	$(BUILDER)
 
-$(ODIN_BUILD_DIR)/.%.build: clean _init
+$(1): _build_it_$(1)
+endef
+
+$(ODIN_BUILD_DIR)/.%.build: _init
 	touch $@
 
 _set_build: $(ODIN_BUILD_DIR)/.regular.build
@@ -71,15 +75,8 @@ _set_clang_tidy: $(ODIN_BUILD_DIR)/.tidy.build
 	cd $(BUILD_DIR) &&\
 	cmake  $(CMAKE_GEN_ARGS) $(CMAKE_ARGS) -DODIN_TIDY=on ..
 
-build: _set_build _build_it
-
-debug: _set_debug _build_it
-
-warn: _set_warn _build_it
-
-gcov: _set_gcov _build_it
-
-clang_tidy: _set_clang_tidy _build_it
+BUILD_IT_TARGETS = build debug warn gcov clang_tidy
+$(foreach  t,$(BUILD_IT_TARGETS), $(eval $(call _build_it_gen,$(t))))
 
 scrub:
 	find SRC/ -type f \( -iname \*.gcno -or -iname \*.gcda -or -iname \*.gcov \) -exec rm -f {} \; 

ODIN_II/SRC/adders.cpp

@@ -1500,3 +1500,34 @@ void instantiate_add_w_carry_block(int *width, nnode_t *node, short mark, netlis
 		connect_output_pin_to_node(width, i, 0, node, current_adder, subtraction);
 	}
 }
+
+bool is_ast_adder(ast_node_t *node)
+{
+	bool is_adder;
+	ast_node_t *instance = node->children[1];
+	is_adder = 	(!strcmp(node->children[0]->types.identifier, "adder")) 
+				 && (instance->children[1]->num_children == 5);
+
+	ast_node_t *connect_list = instance->children[1];
+	if (is_adder && connect_list->children[0]->children[0])
+	{
+		/* port connections were passed by name; verify port names */
+		for (int i = 0; i < connect_list->num_children && is_adder; i++)
+		{
+			char *id = connect_list->children[i]->children[0]->types.identifier; 
+
+			if ((strcmp(id, "a") != 0) &&
+				(strcmp(id, "b") != 0) &&
+				(strcmp(id, "cin") != 0) &&
+				(strcmp(id, "cout") != 0) &&
+				(strcmp(id, "sumout") != 0)
+			)
+			{
+				is_adder = false;
+				break;
+			}
+		}
+	}
+
+	return is_adder;
+}