Skip to content

Commit 076bb58

Browse files
g1mvg1mv
authored
Merge pull request #76 from centaurean/dev
Update to 0.14.2
2 parents 69585d9 + 3dbe65f commit 076bb58

26 files changed

+1510
-349
lines changed

‎.gitignore‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
build/*.make
2-
build/Makefile
3-
build/bin/
4-
build/obj/
1+
build/
2+
benchmark/build

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "benchmark/libs/cputime"]
22
path = benchmark/libs/cputime
33
url = https://github.com/centaurean/cputime.git
4+
[submodule "benchmark/libs/spookyhash"]
5+
path = benchmark/libs/spookyhash
6+
url = https://github.com/centaurean/spookyhash.git

‎.travis.yml‎

Lines changed: 267 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,272 @@
11
language: c
2+
matrix:
3+
fast_finish: true
4+
include:
5+
- os: osx
6+
env:
7+
- C_COMPILER=clang
28

3-
os:
4-
- linux
5-
- osx
9+
- os: osx
10+
env:
11+
- C_COMPILER=gcc
612

7-
before_install:
8-
- cd build
9-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then wget https://github.com/premake/premake-core/releases/download/v5.0.0-alpha12/premake-5.0.0-alpha12-macosx.tar.gz -O premake.tar.gz; fi
10-
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then wget https://github.com/premake/premake-core/releases/download/v5.0.0-alpha12/premake-5.0.0-alpha12-linux.tar.gz -O premake.tar.gz; fi
13+
- dist: trusty
14+
sudo: required
15+
addons:
16+
apt:
17+
packages:
18+
- qemu-system-arm
19+
- qemu-user-static
20+
- gcc-aarch64-linux-gnu
21+
- g++-aarch64-linux-gnu
22+
env:
23+
- C_COMPILER=aarch64-linux-gnu-gcc MAKE_OPTIONS="AR=gcc-ar NATIVE=off" QEMU_INTERPRETER=qemu-aarch64-static PRE_SCRIPT="export QEMU_LD_PREFIX=/usr/aarch64-linux-gnu/"
24+
25+
- dist: trusty
26+
sudo: required
27+
addons:
28+
apt:
29+
packages:
30+
- qemu-system-arm
31+
- qemu-user-static
32+
- gcc-arm-linux-gnueabi
33+
- g++-arm-linux-gnueabi
34+
env:
35+
- C_COMPILER=arm-linux-gnueabi-gcc MAKE_OPTIONS="AR=gcc-ar NATIVE=off" QEMU_INTERPRETER=qemu-arm-static PRE_SCRIPT="export QEMU_LD_PREFIX=/usr/arm-linux-gnueabi/"
36+
37+
- dist: trusty
38+
sudo: required
39+
addons:
40+
apt:
41+
packages:
42+
- qemu-system-ppc
43+
- qemu-user-static
44+
- gcc-powerpc-linux-gnu
45+
- g++-powerpc-linux-gnu
46+
env:
47+
- C_COMPILER=powerpc-linux-gnu-gcc MAKE_OPTIONS="AR=gcc-ar ARCH=64" QEMU_INTERPRETER="qemu-ppc64-static" PRE_SCRIPT="export QEMU_LD_PREFIX=/usr/powerpc-linux-gnu/"
48+
49+
- dist: trusty
50+
sudo: required
51+
addons:
52+
apt:
53+
packages:
54+
- qemu-system-ppc
55+
- qemu-user-static
56+
- gcc-powerpc-linux-gnu
57+
- g++-powerpc-linux-gnu
58+
env:
59+
- C_COMPILER=powerpc-linux-gnu-gcc MAKE_OPTIONS="AR=gcc-ar NATIVE=off" QEMU_INTERPRETER="qemu-ppc-static" PRE_SCRIPT="export QEMU_LD_PREFIX=/usr/powerpc-linux-gnu/"
60+
61+
- dist: trusty
62+
sudo: required
63+
addons:
64+
apt:
65+
sources:
66+
- ubuntu-toolchain-r-test
67+
packages:
68+
- gcc-4.8
69+
env:
70+
- C_COMPILER=gcc-4.8 MAKE_OPTIONS="AR=gcc-ar"
71+
72+
- dist: trusty
73+
sudo: required
74+
addons:
75+
apt:
76+
sources:
77+
- ubuntu-toolchain-r-test
78+
packages:
79+
- gcc-4.8
80+
- gcc-4.8-multilib
81+
env:
82+
- C_COMPILER=gcc-4.8 MAKE_OPTIONS="AR=gcc-ar ARCH=32"
83+
84+
- dist: trusty
85+
sudo: required
86+
addons:
87+
apt:
88+
sources:
89+
- ubuntu-toolchain-r-test
90+
packages:
91+
- gcc-4.9
92+
env:
93+
- C_COMPILER=gcc-4.9 MAKE_OPTIONS="AR=gcc-ar"
94+
95+
- dist: trusty
96+
sudo: required
97+
addons:
98+
apt:
99+
sources:
100+
- ubuntu-toolchain-r-test
101+
packages:
102+
- gcc-4.9
103+
- gcc-4.9-multilib
104+
env:
105+
- C_COMPILER=gcc-4.9 MAKE_OPTIONS="AR=gcc-ar ARCH=32"
106+
107+
- dist: trusty
108+
sudo: required
109+
addons:
110+
apt:
111+
sources:
112+
- ubuntu-toolchain-r-test
113+
packages:
114+
- gcc-5
115+
env:
116+
- C_COMPILER=gcc-5 MAKE_OPTIONS="AR=gcc-ar-5"
117+
118+
- dist: trusty
119+
sudo: required
120+
addons:
121+
apt:
122+
sources:
123+
- ubuntu-toolchain-r-test
124+
packages:
125+
- gcc-5
126+
- gcc-5-multilib
127+
env:
128+
- C_COMPILER=gcc-5 MAKE_OPTIONS="AR=gcc-ar-5 ARCH=32"
129+
130+
- dist: trusty
131+
sudo: required
132+
addons:
133+
apt:
134+
sources:
135+
- ubuntu-toolchain-r-test
136+
packages:
137+
- gcc-6
138+
env:
139+
- C_COMPILER=gcc-6 MAKE_OPTIONS="AR=gcc-ar-6"
140+
141+
- dist: trusty
142+
sudo: required
143+
addons:
144+
apt:
145+
sources:
146+
- ubuntu-toolchain-r-test
147+
packages:
148+
- gcc-6
149+
- gcc-6-multilib
150+
env:
151+
- C_COMPILER=gcc-6 MAKE_OPTIONS="AR=gcc-ar-6 ARCH=32"
152+
153+
- dist: trusty
154+
sudo: required
155+
addons:
156+
apt:
157+
sources:
158+
- ubuntu-toolchain-r-test
159+
packages:
160+
- gcc-7
161+
env:
162+
- C_COMPILER=gcc-7 MAKE_OPTIONS="AR=gcc-ar-7"
163+
164+
- dist: trusty
165+
sudo: required
166+
addons:
167+
apt:
168+
sources:
169+
- ubuntu-toolchain-r-test
170+
packages:
171+
- gcc-7
172+
- gcc-7-multilib
173+
env:
174+
- C_COMPILER=gcc-7 MAKE_OPTIONS="AR=gcc-ar-7 ARCH=32"
175+
176+
- dist: trusty
177+
sudo: required
178+
addons:
179+
apt:
180+
sources:
181+
- ubuntu-toolchain-r-test
182+
- llvm-toolchain-trusty-3.5
183+
packages:
184+
- clang-3.5
185+
- llvm-3.5-dev
186+
env:
187+
- C_COMPILER=clang-3.5 MAKE_OPTIONS="AR=llvm-ar-3.5" PRE_SCRIPT="sudo ln -sf ld.gold /usr/bin/ld"
188+
189+
- dist: trusty
190+
sudo: required
191+
addons:
192+
apt:
193+
sources:
194+
- ubuntu-toolchain-r-test
195+
- llvm-toolchain-trusty-3.6
196+
packages:
197+
- clang-3.6
198+
- llvm-3.6-dev
199+
env:
200+
- C_COMPILER=clang-3.6 MAKE_OPTIONS="AR=llvm-ar-3.6" PRE_SCRIPT="sudo ln -sf ld.gold /usr/bin/ld"
201+
202+
- dist: precise
203+
sudo: required
204+
addons:
205+
apt:
206+
sources:
207+
- ubuntu-toolchain-r-test
208+
- llvm-toolchain-precise-3.7
209+
packages:
210+
- clang-3.7
211+
- llvm-3.7-dev
212+
env:
213+
- C_COMPILER=clang-3.7 MAKE_OPTIONS="AR=llvm-ar-3.7" PRE_SCRIPT="sudo ln -sf ld.gold /usr/bin/ld"
214+
215+
# - dist: precise
216+
# sudo: required
217+
# addons:
218+
# apt:
219+
# sources:
220+
# - ubuntu-toolchain-r-test
221+
# - llvm-toolchain-precise-3.8
222+
# packages:
223+
# - clang-3.8
224+
# - llvm-3.8-dev
225+
# env:
226+
# - C_COMPILER=clang-3.8 MAKE_OPTIONS="AR=llvm-ar-3.8" PRE_SCRIPT="sudo ln -sf ld.gold /usr/bin/ld"
227+
228+
- dist: trusty
229+
sudo: required
230+
addons:
231+
apt:
232+
sources:
233+
- ubuntu-toolchain-r-test
234+
- llvm-toolchain-trusty-3.9
235+
packages:
236+
- clang-3.9
237+
- llvm-3.9-dev
238+
env:
239+
- C_COMPILER=clang-3.9 MAKE_OPTIONS="AR=llvm-ar-3.9" PRE_SCRIPT="sudo ln -sf ld.gold /usr/bin/ld"
240+
241+
- dist: trusty
242+
sudo: required
243+
addons:
244+
apt:
245+
sources:
246+
- ubuntu-toolchain-r-test
247+
- llvm-toolchain-trusty-4.0
248+
packages:
249+
- clang-4.0
250+
- llvm-4.0-dev
251+
env:
252+
- C_COMPILER=clang-4.0 MAKE_OPTIONS="AR=llvm-ar-4.0" PRE_SCRIPT="sudo ln -sf ld.gold /usr/bin/ld"
253+
254+
# - dist: trusty
255+
# sudo: required
256+
# addons:
257+
# apt:
258+
# sources:
259+
# - ubuntu-toolchain-r-test
260+
# - llvm-toolchain-trusty-5.0
261+
# packages:
262+
# - clang-5.0
263+
# - llvm-5.0-dev
264+
# env:
265+
# - C_COMPILER=clang-5.0 MAKE_OPTIONS="AR=llvm-ar-5.0" PRE_SCRIPT="sudo ln -sf ld.gold /usr/bin/ld"
11266

12267
script:
13-
- tar zxvf premake.tar.gz
14-
- ./premake5 gmake
15-
- make
16-
- ./bin/Release/benchmark -f
268+
- ${PRE_SCRIPT}
269+
- $C_COMPILER -v
270+
- make CC=$C_COMPILER $MAKE_OPTIONS
271+
- file ./build/*
272+
- $QEMU_INTERPRETER ./build/benchmark -h -f

0 commit comments

Comments
 (0)