Merge pull request #59 from antmicro/merge-upstream

Merge upstream

Author: acomodi

.clang-format

@@ -0,0 +1,106 @@
+Language:        Cpp
+BasedOnStyle:  Chromium
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Left
+AlignOperands: true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: true
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: true
+AllowShortIfStatementsOnASingleLine: true
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: true
+BinPackArguments: true
+BinPackParameters: false
+BraceWrapping:
+  AfterClass:      false
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: All
+BreakBeforeBraces: Custom
+BreakBeforeInheritanceComma: false
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeComma
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit: 0
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeCategories:
+  - Regex:           '^<.*\.h>'
+    Priority:        1
+  - Regex:           '^<.*'
+    Priority:        2
+  - Regex:           '.*'
+    Priority:        3
+IncludeIsMainRegex: '([-_](test|unittest))?$'
+IndentCaseLabels: true
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+IndentPPDirectives: AfterHash
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: false
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerAlignment: Left
+ReflowComments: false
+SortIncludes: false
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Auto
+TabWidth:        4
+UseTab: Never

.git-blame-ignore-revs

@@ -0,0 +1,3 @@
+# Autoformat run on 2019-05-27T17:22:16.670814
+d91bc203bf1ae80e6a4371ef7c168886bb536c1c
+

.travis.yml

@@ -1,12 +1,12 @@
 language: cpp
 
-#dist: trusty
-sudo: false
+dist: trusty
 addons:
   apt:
     sources:
     - ubuntu-toolchain-r-test # For newer GCC
     - george-edison55-precise-backports # For cmake
+    - llvm-toolchain-trusty-7
     packages:
     - autoconf
     - automake
@@ -40,6 +40,7 @@ addons:
     - valgrind
     - zip
     - qt5-default
+    - clang-format-7
 
 before_install:
  - source .travis/common.sh

.travis/script.sh

@@ -62,3 +62,9 @@ start_section "vtr.test.5" "${GREEN}Testing..${NC} ${CYAN}odin_reg_operators${NC
 end_section "vtr.test.5"
 
 $SPACER
+
+start_section "vtr.test.6" "${GREEN}Checking..${NC} ${CYAN}code formatting${NC}"
+./dev/check-format.sh
+end_section "vtr.test.6"
+
+$SPACER

BUILDING.md

@@ -34,6 +34,7 @@ It is also recommended you install the following development tools:
  * ctags
  * gdb
  * valgrind
+ * clang-format-7
 
 For Docs generation you will need:
  * Doxygen

CMakeLists.txt

@@ -364,3 +364,15 @@ if(WITH_BLIFEXPLORER)
         LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/blifexplorer"
         RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/blifexplorer")
 endif()
+
+#
+#
+# Code Autoformatting
+#
+#
+list(APPEND DIRS_TO_FORMAT_CPP "${CMAKE_CURRENT_SOURCE_DIR}/vpr")
+list(APPEND DIRS_TO_FORMAT_CPP "${CMAKE_CURRENT_SOURCE_DIR}/libs/libarchfpga")
+list(APPEND DIRS_TO_FORMAT_CPP "${CMAKE_CURRENT_SOURCE_DIR}/libs/libvtrutil")
+list(APPEND DIRS_TO_FORMAT_CPP "${CMAKE_CURRENT_SOURCE_DIR}/libs/libpugiutil")
+list(APPEND DIRS_TO_FORMAT_CPP "${CMAKE_CURRENT_SOURCE_DIR}/libs/liblog")
+include(AutoClangFormat)

ODIN_II/.gitignore

@@ -3,3 +3,4 @@ OUTPUT/*
 temp
 regression_test/latest
 *_preproc.v
+default_out.blif

ODIN_II/SRC/adders.cpp

@@ -1474,7 +1474,7 @@ nnode_t *make_adder(operation_list funct, nnode_t *current_adder, nnode_t *previ
 		if (current_pin < width[1])
 		{
 			npin_t *temp_pin = node->input_pins[current_pin];
-			if(temp_pin->net->driver_pin->node->type == GND_NODE)
+			if(temp_pin->net->driver_pin == NULL || temp_pin->net->driver_pin->node->type == GND_NODE)
 			{
 				connect_nodes(netlist->gnd_node,0, new_funct, 0+is_three_port_gate);
 				remove_fanout_pins_from_net(temp_pin->net, temp_pin, temp_pin->pin_net_idx);
@@ -1499,7 +1499,7 @@ nnode_t *make_adder(operation_list funct, nnode_t *current_adder, nnode_t *previ
 		{
 			//pin a is neighbor to pin b
 			npin_t *temp_pin = node->input_pins[current_pin+width[1]];
-			if(temp_pin->net->driver_pin->node->type == GND_NODE)
+			if(temp_pin->net->driver_pin == NULL || temp_pin->net->driver_pin->node->type == GND_NODE)
 			{
 				nnode_t* attach_to=(subtraction)? netlist->vcc_node: netlist->gnd_node;
 				connect_nodes(attach_to,0, new_funct, 1+is_three_port_gate);

ODIN_II/SRC/ast_elaborate.cpp

@@ -57,28 +57,39 @@ long count;
 long count_write;
 enode *head, *p;
 
-int simplify_ast()
+void remove_generate(ast_node_t *node)
 {
-	/* for loop support */
-	unroll_loops();
-
-	//ast_node_t *top = find_top_module();
-
-	return 1;
+	for(int i=0; i<node->num_children; i++){
+		if(!node->children[i])
+			continue;
+		ast_node_t* candidate = node->children[i];
+		ast_node_t* body_parent = nullptr;
+
+		if(candidate->type == GENERATE){
+			for(int j = 0; j<candidate->num_children; j++){
+				ast_node_t* new_child = ast_node_deep_copy(candidate->children[j]);
+				body_parent = body_parent ? newList_entry(body_parent, new_child) : newList(BLOCK, new_child);
+			}
+			node->children[i] = body_parent;
+			free_whole_tree(candidate);
+		} else {
+			remove_generate(candidate);
+		}
+	}
 }
 
-int simplify_ast_module(ast_node_t *ast_module)
+int simplify_ast_module(ast_node_t **ast_module)
 {
-	/* for loop support */
-	//unroll_loops(ast_module);
 	/* reduce parameters with their values if they have been set */
-	reduce_parameter(ast_module);
+	reduce_parameter(*ast_module);
 	/* simplify assignment expressions */
-	reduce_assignment_expression(ast_module);
+	reduce_assignment_expression(*ast_module);
+	/* for loop support */
+	unroll_loops(ast_module);
+	/* remove unused node preventing module instantiation */
+	remove_generate(*ast_module);
 	/* find multiply or divide operation that can be replaced with shift operation */
-	shift_operation(ast_module);
-
-	//ast_node_t *top = find_top_module();
+	shift_operation(*ast_module);
 
 	return 1;
 }