This is an archive of the discontinued LLVM Phabricator instance.

Differential D54998

[clangd] Build and test IndexBenchmark in check-clangd
ClosedPublic

Authored by hokein on Nov 28 2018, 4:02 AM.

Details

Reviewers
ilya-biryukov
Commits
rG90754ef22a23: [clangd] Build and test IndexBenchmark in check-clangd
rL347753: [clangd] Build and test IndexBenchmark in check-clangd
rCTE347753: [clangd] Build and test IndexBenchmark in check-clangd
Summary

Include IndexBenchmark in check-clangd to make sure we won't forget to update
it when doing breaking changes; also fix an out-of-date test input.

Diff Detail

Event Timeline

hokein created this revision.Nov 28 2018, 4:02 AM
Herald added subscribers: kadircet, arphaman, jkorous and 3 others. · View Herald TranscriptNov 28 2018, 4:02 AM
Harbormaster completed remote builds in B25429: Diff 175659.Nov 28 2018, 4:02 AM
ilya-biryukov accepted this revision.Nov 28 2018, 4:54 AM

LGTM

This revision is now accepted and ready to land.Nov 28 2018, 4:54 AM
Closed by commit rCTE347753: [clangd] Build and test IndexBenchmark in check-clangd (authored by hokein). · Explain WhyNov 28 2018, 5:33 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
test/
4 lines
clangd/
Inputs/
14 lines
1 line

Diff 175659

test/CMakeLists.txt

Show First 20 Lines • Show All 66 Lines • ▼ Show 20 Linesset(CLANGD_TEST_DEPS
clangd clangd
ClangdTests ClangdTests
# clangd-related tools which don't have tests, add them to the test to make # clangd-related tools which don't have tests, add them to the test to make
# sure we don't introduce new changes that break their compilations. # sure we don't introduce new changes that break their compilations.
clangd-indexer clangd-indexer
dexp dexp
) )
if (LLVM_INCLUDE_BENCHMARKS)
list(APPEND CLANGD_TEST_DEPS IndexBenchmark)
endif()
# Add lit test dependencies. # Add lit test dependencies.
set(LLVM_UTILS_DEPS set(LLVM_UTILS_DEPS
FileCheck count not FileCheck count not
) )
foreach(dep ${LLVM_UTILS_DEPS}) foreach(dep ${LLVM_UTILS_DEPS})
if(TARGET ${dep}) if(TARGET ${dep})
list(APPEND CLANGD_TEST_DEPS ${dep}) list(APPEND CLANGD_TEST_DEPS ${dep})
endif() endif()
Show All 26 Lines

test/clangd/Inputs/requests.json

[{"Limit":100,"ProximityPaths":["/usr/home/user/clang-tools-extra/clangd/benchmarks/IndexBenchmark.cpp"],"Query":"OMP","RestrictForCodeCompletion":true,"Scopes":["clang::"]}, [{"Limit":100,"ProximityPaths":["/usr/home/user/clang-tools-extra/clangd/benchmarks/IndexBenchmark.cpp"],"Query":"OMP","RestrictForCodeCompletion":true,"Scopes":["clang::"], "AnyScope":false},
{"Limit":100,"ProximityPaths":[],"Query":"s","RestrictForCodeCompletion":true,"Scopes":["llvm::", ""]}, {"Limit":100,"ProximityPaths":[],"Query":"s","RestrictForCodeCompletion":true,"Scopes":["llvm::", ""], "AnyScope":false},
{"Limit":100,"ProximityPaths":[],"Query":"sy","RestrictForCodeCompletion":true,"Scopes":["llvm::", ""]}, {"Limit":100,"ProximityPaths":[],"Query":"sy","RestrictForCodeCompletion":true,"Scopes":["llvm::", ""], "AnyScope":false},
{"Limit":100,"ProximityPaths":[],"Query":"sys","RestrictForCodeCompletion":true,"Scopes":["llvm::", ""]}, {"Limit":100,"ProximityPaths":[],"Query":"sys","RestrictForCodeCompletion":true,"Scopes":["llvm::", ""], "AnyScope":false},
{"Limit":100,"ProximityPaths":[],"Query":"sys","RestrictForCodeCompletion":true,"Scopes":["llvm::", ""]}, {"Limit":100,"ProximityPaths":[],"Query":"sys","RestrictForCodeCompletion":true,"Scopes":["llvm::", ""], "AnyScope":false},
{"Limit":100,"ProximityPaths":[],"Query":"Dex","RestrictForCodeCompletion":true,"Scopes":["clang::clangd::", "clang::", "clang::clangd::dex::"]}, {"Limit":100,"ProximityPaths":[],"Query":"Dex","RestrictForCodeCompletion":true,"Scopes":["clang::clangd::", "clang::", "clang::clangd::dex::"],"AnyScope":false},
{"Limit":100,"ProximityPaths":[],"Query":"Variable","RestrictForCodeCompletion":true,"Scopes":[""]}] {"Limit":100,"ProximityPaths":[],"Query":"Variable","RestrictForCodeCompletion":true,"Scopes":[""], "AnyScope":false}]

test/clangd/index-tools.test

# RUN: clangd-indexer %p/Inputs/BenchmarkSource.cpp -- -I%p/Inputs > %t.index # RUN: clangd-indexer %p/Inputs/BenchmarkSource.cpp -- -I%p/Inputs > %t.index
# FIXME: By default, benchmarks are excluded from the list of default targets hence not built. Find a way to depend on benchmarks to run the next command.
# REQUIRES: shell # REQUIRES: shell
# RUN: if [ -f %clangd-benchmark-dir/IndexBenchmark ]; then %clangd-benchmark-dir/IndexBenchmark %t.index %p/Inputs/requests.json --benchmark_min_time=0.01 ; fi # RUN: if [ -f %clangd-benchmark-dir/IndexBenchmark ]; then %clangd-benchmark-dir/IndexBenchmark %t.index %p/Inputs/requests.json --benchmark_min_time=0.01 ; fi
# Pass invalid JSON file and check that IndexBenchmark fails to parse it. # Pass invalid JSON file and check that IndexBenchmark fails to parse it.
# RUN: if [ -f %clangd-benchmark-dir/IndexBenchmark ]; then not %clangd-benchmark-dir/IndexBenchmark %t.index %t --benchmark_min_time=0.01 ; fi # RUN: if [ -f %clangd-benchmark-dir/IndexBenchmark ]; then not %clangd-benchmark-dir/IndexBenchmark %t.index %t --benchmark_min_time=0.01 ; fi