Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[benchmark] Pull latest; disable -Werror
Pulled the latest (b000672), which adds an option to disable -Werror, which caused issues previously (see for instance https://reviews.llvm.org/D112012) Applied google/benchmark#1305 to unblock, as this issue is causing downstream buildbot failures. The only change is in llvm/CMakeLists.txt, where we set BENCHMARK_ENABLE_WERROR to have the same value as LLVM_ENABLE_WERROR. This patch also introduces a convenience script to pull benchmark from upstream. Differential Revision: https://reviews.llvm.org/D115684
- Loading branch information
Showing
101 changed files
with
3,523 additions
and
1,901 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
Language: Cpp | ||
BasedOnStyle: Google | ||
PointerAlignment: Left | ||
... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
--- | ||
Checks: 'clang-analyzer-*,readability-redundant-*,performance-*' | ||
WarningsAsErrors: 'clang-analyzer-*,readability-redundant-*,performance-*' | ||
HeaderFilterRegex: '.*' | ||
AnalyzeTemporaryDtors: false | ||
FormatStyle: none | ||
User: user |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,208 @@ | ||
sudo: required | ||
dist: trusty | ||
language: cpp | ||
|
||
matrix: | ||
include: | ||
- compiler: gcc | ||
addons: | ||
apt: | ||
packages: | ||
- lcov | ||
env: COMPILER=g++ C_COMPILER=gcc BUILD_TYPE=Coverage | ||
- compiler: gcc | ||
addons: | ||
apt: | ||
packages: | ||
- g++-multilib | ||
- libc6:i386 | ||
env: | ||
- COMPILER=g++ | ||
- C_COMPILER=gcc | ||
- BUILD_TYPE=Debug | ||
- BUILD_32_BITS=ON | ||
- EXTRA_FLAGS="-m32" | ||
- compiler: gcc | ||
addons: | ||
apt: | ||
packages: | ||
- g++-multilib | ||
- libc6:i386 | ||
env: | ||
- COMPILER=g++ | ||
- C_COMPILER=gcc | ||
- BUILD_TYPE=Release | ||
- BUILD_32_BITS=ON | ||
- EXTRA_FLAGS="-m32" | ||
- compiler: gcc | ||
env: | ||
- INSTALL_GCC6_FROM_PPA=1 | ||
- COMPILER=g++-6 C_COMPILER=gcc-6 BUILD_TYPE=Debug | ||
- ENABLE_SANITIZER=1 | ||
- EXTRA_FLAGS="-fno-omit-frame-pointer -g -O2 -fsanitize=undefined,address -fuse-ld=gold" | ||
# Clang w/ libc++ | ||
- compiler: clang | ||
dist: xenial | ||
addons: | ||
apt: | ||
packages: | ||
clang-3.8 | ||
env: | ||
- INSTALL_GCC6_FROM_PPA=1 | ||
- COMPILER=clang++-3.8 C_COMPILER=clang-3.8 BUILD_TYPE=Debug | ||
- LIBCXX_BUILD=1 | ||
- EXTRA_CXX_FLAGS="-stdlib=libc++" | ||
- compiler: clang | ||
dist: xenial | ||
addons: | ||
apt: | ||
packages: | ||
clang-3.8 | ||
env: | ||
- INSTALL_GCC6_FROM_PPA=1 | ||
- COMPILER=clang++-3.8 C_COMPILER=clang-3.8 BUILD_TYPE=Release | ||
- LIBCXX_BUILD=1 | ||
- EXTRA_CXX_FLAGS="-stdlib=libc++" | ||
# Clang w/ 32bit libc++ | ||
- compiler: clang | ||
dist: xenial | ||
addons: | ||
apt: | ||
packages: | ||
- clang-3.8 | ||
- g++-multilib | ||
- libc6:i386 | ||
env: | ||
- INSTALL_GCC6_FROM_PPA=1 | ||
- COMPILER=clang++-3.8 C_COMPILER=clang-3.8 BUILD_TYPE=Debug | ||
- LIBCXX_BUILD=1 | ||
- BUILD_32_BITS=ON | ||
- EXTRA_FLAGS="-m32" | ||
- EXTRA_CXX_FLAGS="-stdlib=libc++" | ||
# Clang w/ 32bit libc++ | ||
- compiler: clang | ||
dist: xenial | ||
addons: | ||
apt: | ||
packages: | ||
- clang-3.8 | ||
- g++-multilib | ||
- libc6:i386 | ||
env: | ||
- INSTALL_GCC6_FROM_PPA=1 | ||
- COMPILER=clang++-3.8 C_COMPILER=clang-3.8 BUILD_TYPE=Release | ||
- LIBCXX_BUILD=1 | ||
- BUILD_32_BITS=ON | ||
- EXTRA_FLAGS="-m32" | ||
- EXTRA_CXX_FLAGS="-stdlib=libc++" | ||
# Clang w/ libc++, ASAN, UBSAN | ||
- compiler: clang | ||
dist: xenial | ||
addons: | ||
apt: | ||
packages: | ||
clang-3.8 | ||
env: | ||
- INSTALL_GCC6_FROM_PPA=1 | ||
- COMPILER=clang++-3.8 C_COMPILER=clang-3.8 BUILD_TYPE=Debug | ||
- LIBCXX_BUILD=1 LIBCXX_SANITIZER="Undefined;Address" | ||
- ENABLE_SANITIZER=1 | ||
- EXTRA_FLAGS="-g -O2 -fno-omit-frame-pointer -fsanitize=undefined,address -fno-sanitize-recover=all" | ||
- EXTRA_CXX_FLAGS="-stdlib=libc++" | ||
- UBSAN_OPTIONS=print_stacktrace=1 | ||
# Clang w/ libc++ and MSAN | ||
- compiler: clang | ||
dist: xenial | ||
addons: | ||
apt: | ||
packages: | ||
clang-3.8 | ||
env: | ||
- INSTALL_GCC6_FROM_PPA=1 | ||
- COMPILER=clang++-3.8 C_COMPILER=clang-3.8 BUILD_TYPE=Debug | ||
- LIBCXX_BUILD=1 LIBCXX_SANITIZER=MemoryWithOrigins | ||
- ENABLE_SANITIZER=1 | ||
- EXTRA_FLAGS="-g -O2 -fno-omit-frame-pointer -fsanitize=memory -fsanitize-memory-track-origins" | ||
- EXTRA_CXX_FLAGS="-stdlib=libc++" | ||
# Clang w/ libc++ and MSAN | ||
- compiler: clang | ||
dist: xenial | ||
addons: | ||
apt: | ||
packages: | ||
clang-3.8 | ||
env: | ||
- INSTALL_GCC6_FROM_PPA=1 | ||
- COMPILER=clang++-3.8 C_COMPILER=clang-3.8 BUILD_TYPE=RelWithDebInfo | ||
- LIBCXX_BUILD=1 LIBCXX_SANITIZER=Thread | ||
- ENABLE_SANITIZER=1 | ||
- EXTRA_FLAGS="-g -O2 -fno-omit-frame-pointer -fsanitize=thread -fno-sanitize-recover=all" | ||
- EXTRA_CXX_FLAGS="-stdlib=libc++" | ||
- os: osx | ||
osx_image: xcode8.3 | ||
compiler: clang | ||
env: | ||
- COMPILER=clang++ | ||
- BUILD_TYPE=Release | ||
- BUILD_32_BITS=ON | ||
- EXTRA_FLAGS="-m32" | ||
|
||
before_script: | ||
- if [ -n "${LIBCXX_BUILD}" ]; then | ||
source .libcxx-setup.sh; | ||
fi | ||
- if [ -n "${ENABLE_SANITIZER}" ]; then | ||
export EXTRA_OPTIONS="-DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF"; | ||
else | ||
export EXTRA_OPTIONS=""; | ||
fi | ||
- mkdir -p build && cd build | ||
|
||
before_install: | ||
- if [ -z "$BUILD_32_BITS" ]; then | ||
export BUILD_32_BITS=OFF && echo disabling 32 bit build; | ||
fi | ||
- if [ -n "${INSTALL_GCC6_FROM_PPA}" ]; then | ||
sudo add-apt-repository -y "ppa:ubuntu-toolchain-r/test"; | ||
sudo apt-get update --option Acquire::Retries=100 --option Acquire::http::Timeout="60"; | ||
fi | ||
|
||
install: | ||
- if [ -n "${INSTALL_GCC6_FROM_PPA}" ]; then | ||
travis_wait sudo -E apt-get -yq --no-install-suggests --no-install-recommends install g++-6; | ||
fi | ||
- if [ "${TRAVIS_OS_NAME}" == "linux" -a "${BUILD_32_BITS}" == "OFF" ]; then | ||
travis_wait sudo -E apt-get -y --no-install-suggests --no-install-recommends install llvm-3.9-tools; | ||
sudo cp /usr/lib/llvm-3.9/bin/FileCheck /usr/local/bin/; | ||
fi | ||
- if [ "${BUILD_TYPE}" == "Coverage" -a "${TRAVIS_OS_NAME}" == "linux" ]; then | ||
PATH=~/.local/bin:${PATH}; | ||
pip install --user --upgrade pip; | ||
travis_wait pip install --user cpp-coveralls; | ||
fi | ||
- if [ "${C_COMPILER}" == "gcc-7" -a "${TRAVIS_OS_NAME}" == "osx" ]; then | ||
rm -f /usr/local/include/c++; | ||
brew update; | ||
travis_wait brew install gcc@7; | ||
fi | ||
- if [ "${TRAVIS_OS_NAME}" == "linux" ]; then | ||
sudo apt-get update -qq; | ||
sudo apt-get install -qq unzip cmake3; | ||
wget https://github.com/bazelbuild/bazel/releases/download/3.2.0/bazel-3.2.0-installer-linux-x86_64.sh --output-document bazel-installer.sh; | ||
travis_wait sudo bash bazel-installer.sh; | ||
fi | ||
- if [ "${TRAVIS_OS_NAME}" == "osx" ]; then | ||
curl -L -o bazel-installer.sh https://github.com/bazelbuild/bazel/releases/download/3.2.0/bazel-3.2.0-installer-darwin-x86_64.sh; | ||
travis_wait sudo bash bazel-installer.sh; | ||
fi | ||
|
||
script: | ||
- cmake -DCMAKE_C_COMPILER=${C_COMPILER} -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_C_FLAGS="${EXTRA_FLAGS}" -DCMAKE_CXX_FLAGS="${EXTRA_FLAGS} ${EXTRA_CXX_FLAGS}" -DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON -DBENCHMARK_BUILD_32_BITS=${BUILD_32_BITS} ${EXTRA_OPTIONS} .. | ||
- make | ||
- ctest -C ${BUILD_TYPE} --output-on-failure | ||
- bazel test -c dbg --define google_benchmark.have_regex=posix --announce_rc --verbose_failures --test_output=errors --keep_going //test/... | ||
|
||
after_success: | ||
- if [ "${BUILD_TYPE}" == "Coverage" -a "${TRAVIS_OS_NAME}" == "linux" ]; then | ||
coveralls --include src --include include --gcov-options '\-lp' --root .. --build-root .; | ||
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,115 @@ | ||
import os | ||
import ycm_core | ||
|
||
# These are the compilation flags that will be used in case there's no | ||
# compilation database set (by default, one is not set). | ||
# CHANGE THIS LIST OF FLAGS. YES, THIS IS THE DROID YOU HAVE BEEN LOOKING FOR. | ||
flags = [ | ||
'-Wall', | ||
'-Werror', | ||
'-pedantic-errors', | ||
'-std=c++0x', | ||
'-fno-strict-aliasing', | ||
'-O3', | ||
'-DNDEBUG', | ||
# ...and the same thing goes for the magic -x option which specifies the | ||
# language that the files to be compiled are written in. This is mostly | ||
# relevant for c++ headers. | ||
# For a C project, you would set this to 'c' instead of 'c++'. | ||
'-x', 'c++', | ||
'-I', 'include', | ||
'-isystem', '/usr/include', | ||
'-isystem', '/usr/local/include', | ||
] | ||
|
||
|
||
# Set this to the absolute path to the folder (NOT the file!) containing the | ||
# compile_commands.json file to use that instead of 'flags'. See here for | ||
# more details: http://clang.llvm.org/docs/JSONCompilationDatabase.html | ||
# | ||
# Most projects will NOT need to set this to anything; you can just change the | ||
# 'flags' list of compilation flags. Notice that YCM itself uses that approach. | ||
compilation_database_folder = '' | ||
|
||
if os.path.exists( compilation_database_folder ): | ||
database = ycm_core.CompilationDatabase( compilation_database_folder ) | ||
else: | ||
database = None | ||
|
||
SOURCE_EXTENSIONS = [ '.cc' ] | ||
|
||
def DirectoryOfThisScript(): | ||
return os.path.dirname( os.path.abspath( __file__ ) ) | ||
|
||
|
||
def MakeRelativePathsInFlagsAbsolute( flags, working_directory ): | ||
if not working_directory: | ||
return list( flags ) | ||
new_flags = [] | ||
make_next_absolute = False | ||
path_flags = [ '-isystem', '-I', '-iquote', '--sysroot=' ] | ||
for flag in flags: | ||
new_flag = flag | ||
|
||
if make_next_absolute: | ||
make_next_absolute = False | ||
if not flag.startswith( '/' ): | ||
new_flag = os.path.join( working_directory, flag ) | ||
|
||
for path_flag in path_flags: | ||
if flag == path_flag: | ||
make_next_absolute = True | ||
break | ||
|
||
if flag.startswith( path_flag ): | ||
path = flag[ len( path_flag ): ] | ||
new_flag = path_flag + os.path.join( working_directory, path ) | ||
break | ||
|
||
if new_flag: | ||
new_flags.append( new_flag ) | ||
return new_flags | ||
|
||
|
||
def IsHeaderFile( filename ): | ||
extension = os.path.splitext( filename )[ 1 ] | ||
return extension in [ '.h', '.hxx', '.hpp', '.hh' ] | ||
|
||
|
||
def GetCompilationInfoForFile( filename ): | ||
# The compilation_commands.json file generated by CMake does not have entries | ||
# for header files. So we do our best by asking the db for flags for a | ||
# corresponding source file, if any. If one exists, the flags for that file | ||
# should be good enough. | ||
if IsHeaderFile( filename ): | ||
basename = os.path.splitext( filename )[ 0 ] | ||
for extension in SOURCE_EXTENSIONS: | ||
replacement_file = basename + extension | ||
if os.path.exists( replacement_file ): | ||
compilation_info = database.GetCompilationInfoForFile( | ||
replacement_file ) | ||
if compilation_info.compiler_flags_: | ||
return compilation_info | ||
return None | ||
return database.GetCompilationInfoForFile( filename ) | ||
|
||
|
||
def FlagsForFile( filename, **kwargs ): | ||
if database: | ||
# Bear in mind that compilation_info.compiler_flags_ does NOT return a | ||
# python list, but a "list-like" StringVec object | ||
compilation_info = GetCompilationInfoForFile( filename ) | ||
if not compilation_info: | ||
return None | ||
|
||
final_flags = MakeRelativePathsInFlagsAbsolute( | ||
compilation_info.compiler_flags_, | ||
compilation_info.compiler_working_dir_ ) | ||
else: | ||
relative_to = DirectoryOfThisScript() | ||
final_flags = MakeRelativePathsInFlagsAbsolute( flags, relative_to ) | ||
|
||
return { | ||
'flags': final_flags, | ||
'do_cache': True | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.