Skip to content

Commit 98f81bd

Browse files
jeanlegojeanlego
authored
Merge branch 'master' into empty_always
2 parents ce23e02 + 4cfe982 commit 98f81bd

File tree

1,447 files changed

+95712
-2706468
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,447 files changed

+95712
-2706468
lines changed

‎.clang-format

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
Language: Cpp
2+
BasedOnStyle: Chromium
3+
AccessModifierOffset: -2
4+
AlignAfterOpenBracket: Align
5+
AlignConsecutiveAssignments: false
6+
AlignConsecutiveDeclarations: false
7+
AlignEscapedNewlines: Left
8+
AlignOperands: true
9+
AlignTrailingComments: true
10+
AllowAllParametersOfDeclarationOnNextLine: false
11+
AllowShortBlocksOnASingleLine: true
12+
AllowShortCaseLabelsOnASingleLine: false
13+
AllowShortFunctionsOnASingleLine: true
14+
AllowShortIfStatementsOnASingleLine: true
15+
AllowShortLoopsOnASingleLine: false
16+
AlwaysBreakAfterDefinitionReturnType: None
17+
AlwaysBreakAfterReturnType: None
18+
AlwaysBreakBeforeMultilineStrings: true
19+
AlwaysBreakTemplateDeclarations: true
20+
BinPackArguments: true
21+
BinPackParameters: false
22+
BraceWrapping:
23+
AfterClass: false
24+
AfterControlStatement: false
25+
AfterEnum: false
26+
AfterFunction: false
27+
AfterNamespace: false
28+
AfterObjCDeclaration: false
29+
AfterStruct: false
30+
AfterUnion: false
31+
BeforeCatch: false
32+
BeforeElse: false
33+
IndentBraces: false
34+
SplitEmptyFunction: false
35+
SplitEmptyRecord: true
36+
SplitEmptyNamespace: true
37+
BreakBeforeBinaryOperators: All
38+
BreakBeforeBraces: Custom
39+
BreakBeforeInheritanceComma: false
40+
BreakBeforeTernaryOperators: true
41+
BreakConstructorInitializersBeforeComma: false
42+
BreakConstructorInitializers: BeforeComma
43+
BreakAfterJavaFieldAnnotations: false
44+
BreakStringLiterals: true
45+
ColumnLimit: 0
46+
CommentPragmas: '^ IWYU pragma:'
47+
CompactNamespaces: false
48+
ConstructorInitializerAllOnOneLineOrOnePerLine: false
49+
ConstructorInitializerIndentWidth: 4
50+
ContinuationIndentWidth: 4
51+
Cpp11BracedListStyle: true
52+
DerivePointerAlignment: false
53+
DisableFormat: false
54+
ExperimentalAutoDetectBinPacking: false
55+
FixNamespaceComments: true
56+
ForEachMacros:
57+
- foreach
58+
- Q_FOREACH
59+
- BOOST_FOREACH
60+
IncludeCategories:
61+
- Regex: '^<.*\.h>'
62+
Priority: 1
63+
- Regex: '^<.*'
64+
Priority: 2
65+
- Regex: '.*'
66+
Priority: 3
67+
IncludeIsMainRegex: '([-_](test|unittest))?$'
68+
IndentCaseLabels: true
69+
IndentWidth: 4
70+
IndentWrappedFunctionNames: false
71+
IndentPPDirectives: AfterHash
72+
JavaScriptQuotes: Leave
73+
JavaScriptWrapImports: true
74+
KeepEmptyLinesAtTheStartOfBlocks: false
75+
MacroBlockBegin: ''
76+
MacroBlockEnd: ''
77+
MaxEmptyLinesToKeep: 1
78+
NamespaceIndentation: None
79+
ObjCBlockIndentWidth: 2
80+
ObjCSpaceAfterProperty: false
81+
ObjCSpaceBeforeProtocolList: false
82+
PenaltyBreakAssignment: 2
83+
PenaltyBreakBeforeFirstCallParameter: 1
84+
PenaltyBreakComment: 300
85+
PenaltyBreakFirstLessLess: 120
86+
PenaltyBreakString: 1000
87+
PenaltyExcessCharacter: 1000000
88+
PenaltyReturnTypeOnItsOwnLine: 200
89+
PointerAlignment: Left
90+
ReflowComments: false
91+
SortIncludes: false
92+
SortUsingDeclarations: true
93+
SpaceAfterCStyleCast: false
94+
SpaceAfterTemplateKeyword: false
95+
SpaceBeforeAssignmentOperators: true
96+
SpaceBeforeParens: ControlStatements
97+
SpaceInEmptyParentheses: false
98+
SpacesBeforeTrailingComments: 1
99+
SpacesInAngles: false
100+
SpacesInContainerLiterals: true
101+
SpacesInCStyleCastParentheses: false
102+
SpacesInParentheses: false
103+
SpacesInSquareBrackets: false
104+
Standard: Auto
105+
TabWidth: 4
106+
UseTab: Never

‎.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Autoformat run on 2019-05-27T17:22:16.670814
2+
d91bc203bf1ae80e6a4371ef7c168886bb536c1c
3+

‎.travis/after_failure.sh renamed to ‎.github/travis/after_failure.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
source .travis/common.sh
3+
source .github/travis/common.sh
44
set -e
55

66
# Close the after_success.1 fold travis has created already.

‎.github/travis/after_script.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
3+
source .github/travis/common.sh
4+
set -e
5+
6+
$SPACER
7+
8+
start_section "vtr.ccache.2" "${GREEN}ccache info..${NC}"
9+
ccache --show-stats
10+
end_section "vtr.ccache.2"
11+
12+
$SPACER

‎.travis/after_success.sh renamed to ‎.github/travis/after_success.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
source .travis/common.sh
3+
source .github/travis/common.sh
44
set -e
55

66
# Close the after_success fold travis has created already.

‎.github/travis/build.sh

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/bash
2+
3+
source .github/travis/common.sh
4+
set -e
5+
6+
$SPACER
7+
8+
start_section "vtr.build" "${GREEN}Building..${NC}"
9+
export FAILURE=0
10+
make -k CMAKE_PARAMS="-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on" -j2 || export FAILURE=1
11+
end_section "vtr.build"
12+
13+
# When the build fails, produce the failure output in a clear way
14+
if [ $FAILURE -ne 0 ]; then
15+
start_section "vtr.failure" "${RED}Build failure output..${NC}"
16+
make CMAKE_PARAMS="-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on" -j1
17+
end_section "vtr.failure"
18+
exit 1
19+
fi
20+
21+
$SPACER
22+
23+
start_section "vtr.build" "${GREEN}Installing..${NC}"
24+
make install
25+
mkdir $PREFIX/lib
26+
mv $PREFIX/bin/*.a $PREFIX/lib/
27+
end_section "vtr.build"
28+
29+
$SPACER
30+
31+
start_section "vtr.du" "${GREEN}Disk usage..${NC}"
32+
du -h $PREFIX
33+
find $PREFIX | sort && ldd $PREFIX/bin/vpr
34+
35+
end_section "vtr.du"
36+
37+
$SPACER

‎.travis/common.sh renamed to ‎.github/travis/common.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,4 @@ export CXX=g++-6
3232

3333
export PREFIX=$HOME/vtr
3434
export CMAKE_PARAMS="-DCMAKE_INSTALL_PREFIX=$PREFIX"
35+
export BUILD_DIR=$HOME/vtr-build

‎.travis/install.sh renamed to ‎.github/travis/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
source .travis/common.sh
3+
source .github/travis/common.sh
44
set -e
55

66
# Git repo fixup

‎.github/travis/setup.sh

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/bin/bash
2+
3+
source .github/travis/common.sh
4+
set -e
5+
6+
$SPACER
7+
8+
start_section "vtr.setup" "${GREEN}Setting up..${NC}"
9+
10+
# Cleanup any cached build artifacts
11+
if [ "$TRAVIS_BUILD_STAGE_NAME" = "Build" ]; then
12+
echo "Cleaning up any previous builds"
13+
rm -rf $BUILD_DIR
14+
rm -rf $PREFIX
15+
fi
16+
17+
make version
18+
19+
end_section "vtr.setup"
20+
21+
start_section "vtr.ccache.1" "${GREEN}ccache info..${NC}"
22+
ccache --show-stats
23+
ccache --zero-stats
24+
end_section "vtr.ccache.1"
25+
26+
$SPACER

‎.github/travis/unittest.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
3+
source .github/travis/common.sh
4+
set -e
5+
6+
$SPACER
7+
8+
start_section "vtr.test.0" "${GREEN}Testing..${NC} ${CYAN}C++ unit tests${NC}"
9+
make test
10+
end_section "vtr.test.0"
11+
12+
$SPACER

‎.gitignore

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22
#Executables and generated files
33
#
44
*.exe
5-
ODIN_II/odin_II
6-
abc_with_bb_support/abc
7-
ace2/ace
8-
vpr/vpr
9-
blifexplorer/blifexplorer
105

116
#Install
127
bin/

‎.travis.yml

Lines changed: 54 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
language: cpp
22

3-
#dist: trusty
4-
sudo: false
3+
dist: trusty
54
addons:
65
apt:
76
sources:
87
- ubuntu-toolchain-r-test # For newer GCC
98
- george-edison55-precise-backports # For cmake
9+
- llvm-toolchain-trusty-7
1010
packages:
1111
- autoconf
1212
- automake
@@ -30,6 +30,7 @@ addons:
3030
- libfontconfig1-dev
3131
- liblist-moreutils-perl
3232
- libncurses5-dev
33+
# - libtbb-dev
3334
- libx11-dev
3435
- libxft-dev
3536
- libxml++2.6-dev
@@ -40,18 +41,59 @@ addons:
4041
- valgrind
4142
- zip
4243
- qt5-default
44+
- clang-format-7
4345

44-
before_install:
45-
- source .travis/common.sh
46+
cache:
47+
ccache: true
48+
directories:
49+
- /home/travis/vtr-build
50+
- /home/travis/vtr
4651

47-
install:
48-
- ./.travis/install.sh
52+
stages:
53+
- Build
54+
- Test
4955

50-
script:
51-
- ./.travis/script.sh
56+
jobs:
57+
include:
58+
- stage: Build
59+
name: "Building VtR"
60+
script:
61+
- ./.github/travis/build.sh
62+
- stage: Test
63+
name: "Code Formatting"
64+
script:
65+
- ./dev/check-format.sh
66+
- stage: Test
67+
name: "C++ Unit Tests"
68+
script:
69+
- ./.github/travis/unittest.sh
70+
- stage: Test
71+
name: "Basic Regression Tests"
72+
script:
73+
- ./run_reg_test.pl vtr_reg_basic -j2
74+
- stage: Test
75+
name: "Strong Regression Tests"
76+
script:
77+
- ./run_reg_test.pl vtr_reg_strong -j2
78+
- stage: Test
79+
name: "Basic Valgrind Memory Tests"
80+
script:
81+
- ./run_reg_test.pl vtr_reg_valgrind_small -j2
82+
- stage: Test
83+
name: "ODIN-II Micro Tests"
84+
script:
85+
- ./run_reg_test.pl odin_reg_micro -j2
86+
- stage: Test
87+
name: "ODIN-II Operators Tests"
88+
script:
89+
- ./run_reg_test.pl odin_reg_operators -j2
90+
91+
before_script:
92+
- source .github/travis/common.sh
93+
- ./.github/travis/setup.sh
5294

53-
after_failure:
54-
- ./.travis/after_failure.sh
95+
after_script:
96+
- ./.github/travis/setup.sh
5597

56-
after_success:
57-
- ./.travis/after_success.sh
98+
script:
99+
- true

‎.travis/script.sh

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)