Merge branch 'master' of github.com:verilog-to-routing/vtr-verilog-to-routing into merge-upstream

Signed-off-by: Alessandro Comodi <[email protected]>

 Conflicts that have been solved are in the following files:
	.travis/script.sh
	libs/libarchfpga/src/cad_types.h
	libs/libarchfpga/src/physical_types.h
	vpr/CMakeLists.txt
	vpr/src/base/SetupVPR.cpp
	vpr/src/base/read_options.cpp
	vpr/src/base/vpr_types.h
	vpr/src/pack/cluster.cpp
	vpr/src/pack/cluster_router.cpp
	vpr/src/pack/pack.cpp
	vpr/src/pack/prepack.cpp
	vtr_flow/scripts/run_vtr_flow.pl

Author: acomodi

.travis/script.sh

@@ -44,3 +44,15 @@ start_section "vtr.test.3" "${GREEN}Testing..${NC} ${CYAN}vtr_reg_valgrind_small
 end_section "vtr.test.3"
 
 $SPACER
+
+start_section "vtr.test.4" "${GREEN}Testing..${NC} ${CYAN}odin_reg_micro${NC}"
+./run_reg_test.pl odin_reg_micro
+end_section "vtr.test.4"
+
+$SPACER
+
+start_section "vtr.test.5" "${GREEN}Testing..${NC} ${CYAN}odin_reg_operators${NC}"
+./run_reg_test.pl odin_reg_operators
+end_section "vtr.test.5"
+
+$SPACER

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.3.0)
 
 project("VTR")
 
@@ -24,7 +24,6 @@ option(VTR_ENABLE_DEBUG_LOGGING "Enable debug logging" OFF)
 
 option(WITH_BLIFEXPLORER "Enable build with blifexplorer" OFF)
 option(WITH_LIBRTLNUMBER "Enable build with librtlnumber" OFF)
-option(WITH_OLD_ABC "Enable build with old abc" OFF)
 option(ODIN_DEBUG "Enable building oding with extra debug flags" OFF)
 
 set(VTR_VERSION_MAJOR 8)
@@ -60,12 +59,9 @@ include(CheckCXXCompilerFlag)
 #
 # We require c++14 support
 #
-CHECK_CXX_COMPILER_FLAG("-std=c++14" CXX_COMPILER_SUPPORTS_CXX14_FLAG)
-if(CXX_COMPILER_SUPPORTS_CXX14_FLAG)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
-else()
-    message(FATAL_ERROR "Could not determine C++14 support for compiler ${CMAKE_CXX_COMPILER}. C++14 support is required.")
-endif()
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF) #No compiler specific extensions
 
 #
 # Warning flags
@@ -262,9 +258,6 @@ add_subdirectory(utils)
 if(WITH_BLIFEXPLORER)
     add_subdirectory(blifexplorer)
 endif()
-if(WITH_OLD_ABC)
-	add_subdirectory(abc_with_bb_support)
-endif()
 
 #Add extra compilation flags to suppress warnings from some libraries/tools
 # Note that target_compile_options() *appends* to the current compilation options of
@@ -276,20 +269,10 @@ if(CXX_COMPILER_SUPPORTS_-w)
     target_compile_options(libabc PRIVATE "-w")
     target_compile_options(abc PRIVATE "-w")
 endif()
-if(CXX_COMPILER_SUPPORTS_-w)
-    if(WITH_OLD_ABC)
-    target_compile_options(liboldabc PRIVATE "-w")
-    target_compile_options(oldabc PRIVATE "-w")
-    endif()
-endif()
 
 #Some ABC headers generate warnings, treat them as system headers to suppress warnings
 get_property(ABC_INCLUDE_DIRS TARGET libabc PROPERTY INCLUDE_DIRECTORIES)
 target_include_directories(libabc SYSTEM INTERFACE ${ABC_INCLUDE_DIRS})
-if(WITH_OLD_ABC)
-	get_property(OLD_ABC_INCLUDE_DIRS TARGET liboldabc PROPERTY INCLUDE_DIRECTORIES)
-	target_include_directories(liboldabc SYSTEM INTERFACE ${OLD_ABC_INCLUDE_DIRS})
-endif()
 
 #PugiXml has some deliberate switch fallthrough cases (as indicated by comments), but they
 #are tagged as warnings with g++-7 (the comments don't match g++-7's suppression regexes). 
@@ -359,13 +342,6 @@ set_target_properties(libabc abc
     ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/abc"
     LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/abc"
     RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/abc")
-if(WITH_OLD_ABC)
-	set_target_properties(liboldabc oldabc
-		PROPERTIES
-		ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/abc_with_bb_support"
-		LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/abc_with_bb_support"
-		RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/abc_with_bb_support")
-endif()
 set_target_properties(libvpr vpr
     PROPERTIES
     ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/vpr"

ODIN_II/.gitignore

@@ -1,3 +1,4 @@
 regression_test/runs
 OUTPUT/*
 temp
+regression_test/latest

ODIN_II/Makefile

@@ -12,6 +12,8 @@ else
   CMAKE_GEN_ARGS := -G'Unix Makefiles'
 endif
 
+CMAKE_ARGS := -DVPR_IPO_BUILD=off
+
 #Default build type
 # Possible values:
 #    release
@@ -21,29 +23,33 @@ MAKEFLAGS := -s
 
 BUILD_DIR=../build
 
-.PHONY: help build debug
+.PHONY: help build debug test
 
 help:
 	@echo -e "\n\
 	The Following three options are available\n\n\
 		build		build using the VTR_ROOT makefile \n\
 		debug		build using the VTR_ROOT makefile with debug flags and extra warning flags for ODIN only\n\
 		clean		remove the build file for ODIN only\n\
+		test		run the complete battery of test before commiting changes or to assert functionnalityn\
 	"
 
 init:
 	mkdir -p $(BUILD_DIR)
 
 build: clean init
 	cd $(BUILD_DIR);\
-	cmake $(CMAKE_GEN_ARGS) .. &&\
+	cmake $(CMAKE_GEN_ARGS) $(CMAKE_ARGS) .. &&\
 	$(BUILDER)
 
 debug: clean init
 	cd $(BUILD_DIR);\
-	cmake $(CMAKE_GEN_ARGS) -DODIN_DEBUG=on .. &&\
+	cmake $(CMAKE_GEN_ARGS) $(CMAKE_ARGS) -DODIN_DEBUG=on .. &&\
 	$(BUILDER)
 
 clean:
 	$(RM) -Rf $(BUILD_DIR)/CMakeCache.txt
 	$(RM) -Rf $(BUILD_DIR)/ODIN_II
+
+test:
+	./verify_odin.sh --test pre_commit --nb_of_process $(( $(nproc --all) + 1 )) --limit_ressource