[core] Pre filter sources when querying by layer

.travis.yml

@@ -45,6 +45,7 @@ before_script:
  - cmake --version
 script:
  - make linux
+ - make benchmark
  - make test
  - make run-test
 after_script:

CMakeLists.txt

@@ -59,6 +59,11 @@ if(COMMAND mbgl_platform_test)
  include(cmake/test.cmake)
 endif()
 
+if(COMMAND mbgl_platform_benchmark)
+ include(cmake/benchmark-files.cmake)
+ include(cmake/benchmark.cmake)
+endif()
+
 if(COMMAND mbgl_platform_glfw)
  include(cmake/glfw.cmake)
 endif()

Makefile

@@ -285,6 +285,10 @@ linux: glfw-app render offline
 test: $(LINUX_BUILD)
  $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-test
 
+.PHONY: benchmark
+benchmark: $(LINUX_BUILD)
+ $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-benchmark
+
 ifneq (,$(shell which gdb))
  GDB = gdb -batch -return-child-result -ex 'set print thread-events off' -ex 'run' -ex 'thread apply all bt' --args
 endif
@@ -295,6 +299,12 @@ run-test: run-test-*
 run-test-%: test
  $(GDB) $(LINUX_OUTPUT_PATH)/mbgl-test --gtest_catch_exceptions=0 --gtest_filter=$*
 
+.PHONY: run-benchmark
+run-benchmark: run-benchmark-.
+
+run-benchmark-%: benchmark
+ $(GDB) $(LINUX_OUTPUT_PATH)/mbgl-benchmark --benchmark_filter=$*
+
 .PHONY: render
 render: $(LINUX_BUILD)
  $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-render

benchmark/api/query.benchmark.cpp

@@ -0,0 +1,72 @@
+#include <benchmark/benchmark.h>
+
+#include <mbgl/benchmark/util.hpp>
+#include <mbgl/map/map.hpp>
+#include <mbgl/platform/default/headless_display.hpp>
+#include <mbgl/platform/default/headless_view.hpp>
+#include <mbgl/sprite/sprite_image.hpp>
+#include <mbgl/storage/default_file_source.hpp>
+#include <mbgl/storage/network_status.hpp>
+#include <mbgl/util/image.hpp>
+#include <mbgl/util/io.hpp>
+#include <mbgl/util/run_loop.hpp>
+
+using namespace mbgl;
+
+namespace {
+
+class QueryBenchmark {
+public:
+ QueryBenchmark() {
+ NetworkStatus::Set(NetworkStatus::Status::Offline);
+ fileSource.setAccessToken("foobar");
+
+ map.setStyleJSON(util::read_file("benchmark/fixtures/api/query_style.json"));
+ map.setLatLngZoom({ 40.726989, -73.992857 }, 15); // Manhattan
+
+ auto decoded = decodeImage(util::read_file("benchmark/fixtures/api/default_marker.png"));
+ auto image = std::make_unique<SpriteImage>(std::move(decoded), 1.0);
+ map.addImage("test-icon", std::move(image));
+
+ view.resize(1000, 1000);
+
+ mbgl::benchmark::render(map);
+ }
+
+ util::RunLoop loop;
+ std::shared_ptr<HeadlessDisplay> display{ std::make_shared<HeadlessDisplay>() };
+ HeadlessView view{ display, 1 };
+ DefaultFileSource fileSource{ "benchmark/fixtures/api/cache.db", "." };
+ Map map{ view, fileSource, MapMode::Still };
+ ScreenBox box{{ 0, 0 }, { 1000, 1000 }};
+};
+
+} // end namespace
+
+static void API_queryRenderedFeaturesAll(::benchmark::State& state) {
+ QueryBenchmark bench;
+
+ while (state.KeepRunning()) {
+ bench.map.queryRenderedFeatures(bench.box);
+ }
+}
+
+static void API_queryRenderedFeaturesLayerFromLowDensity(::benchmark::State& state) {
+ QueryBenchmark bench;
+
+ while (state.KeepRunning()) {
+ bench.map.queryRenderedFeatures(bench.box, {{ "testlayer" }});
+ }
+}
+
+static void API_queryRenderedFeaturesLayerFromHighDensity(::benchmark::State& state) {
+ QueryBenchmark bench;
+
+ while (state.KeepRunning()) {
+ bench.map.queryRenderedFeatures(bench.box, {{ "road-street" }});
+ }
+}
+
+BENCHMARK(API_queryRenderedFeaturesAll);
+BENCHMARK(API_queryRenderedFeaturesLayerFromLowDensity);
+BENCHMARK(API_queryRenderedFeaturesLayerFromHighDensity);