From 214ec4e96ad71d8ffefe1c12292ec77b58bd3fb2 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Wed, 5 Oct 2016 15:13:02 +0300 Subject: [PATCH] [build] Add support for 'benchmark' target on macOS --- Makefile | 12 ++++++++++++ benchmark/fixtures/api/cache.db | Bin 405504 -> 405504 bytes platform/macos/bitrise.yml | 10 ++++++++++ platform/macos/config.cmake | 22 ++++++++++++++++++++++ 4 files changed, 44 insertions(+) diff --git a/Makefile b/Makefile index 20c4c0f26..cb623b775 100644 --- a/Makefile +++ b/Makefile @@ -88,6 +88,7 @@ $(MACOS_PROJ_PATH): $(BUILD_DEPS) $(MACOS_USER_DATA_PATH)/WorkspaceSettings.xcse @# Create Xcode schemes so that we can use xcodebuild from the command line. CMake doesn't @# create these automatically. SCHEME_NAME=mbgl-test SCHEME_TYPE=executable platform/macos/scripts/create_scheme.sh + SCHEME_NAME=mbgl-benchmark SCHEME_TYPE=executable platform/macos/scripts/create_scheme.sh SCHEME_NAME=mbgl-render SCHEME_TYPE=executable platform/macos/scripts/create_scheme.sh SCHEME_NAME=mbgl-offline SCHEME_TYPE=executable platform/macos/scripts/create_scheme.sh SCHEME_NAME=mbgl-glfw SCHEME_TYPE=executable platform/macos/scripts/create_scheme.sh @@ -116,6 +117,10 @@ xproj: $(MACOS_PROJ_PATH) test: $(MACOS_PROJ_PATH) set -o pipefail && $(MACOS_XCODEBUILD) -scheme 'mbgl-test' build $(XCPRETTY) +.PHONY: benchmark +benchmark: $(MACOS_PROJ_PATH) + set -o pipefail && $(MACOS_XCODEBUILD) -scheme 'mbgl-benchmark' build $(XCPRETTY) + .PHONY: run-test run-test: run-test-* @@ -124,6 +129,12 @@ run-test-%: test || (lldb -c /cores/core.$$pid --batch --one-line 'thread backtrace all' --one-line 'quit' && exit 1)) set -o pipefail && $(MACOS_XCODEBUILD) -scheme 'CI' test $(XCPRETTY) +.PHONY: run-benchmark +run-benchmark: run-benchmark-. + +run-benchmark-%: benchmark + $(MACOS_OUTPUT_PATH)/$(BUILDTYPE)/mbgl-benchmark --benchmark_filter=$* + .PHONY: glfw-app glfw-app: $(MACOS_PROJ_PATH) set -o pipefail && $(MACOS_XCODEBUILD) -scheme 'mbgl-glfw' build $(XCPRETTY) @@ -392,6 +403,7 @@ $(MACOS_QT_PROJ_PATH): $(BUILD_DEPS) XCODEPROJ=$(MACOS_QT_PROJ_PATH) SCHEME_NAME=mbgl-qt SCHEME_TYPE=executable platform/macos/scripts/create_scheme.sh XCODEPROJ=$(MACOS_QT_PROJ_PATH) SCHEME_NAME=mbgl-qt-qml SCHEME_TYPE=executable platform/macos/scripts/create_scheme.sh XCODEPROJ=$(MACOS_QT_PROJ_PATH) SCHEME_NAME=mbgl-test SCHEME_TYPE=executable platform/macos/scripts/create_scheme.sh + XCODEPROJ=$(MACOS_QT_PROJ_PATH) SCHEME_NAME=mbgl-benchmark SCHEME_TYPE=executable platform/macos/scripts/create_scheme.sh XCODEPROJ=$(MACOS_QT_PROJ_PATH) SCHEME_NAME=mbgl-core SCHEME_TYPE=library BUILDABLE_NAME=libmbgl-core.a BLUEPRINT_NAME=mbgl-core platform/macos/scripts/create_scheme.sh XCODEPROJ=$(MACOS_QT_PROJ_PATH) SCHEME_NAME=qmapboxgl SCHEME_TYPE=library BUILDABLE_NAME=libqmapboxgl.dylib BLUEPRINT_NAME=qmapboxgl platform/macos/scripts/create_scheme.sh diff --git a/benchmark/fixtures/api/cache.db b/benchmark/fixtures/api/cache.db index 033a38de88a065a4f735da67fde99406750e19a1..102c4074ef3f4986c7e36f0be61dd26a7681895a 100644 GIT binary patch delta 952 zcmY+ANpliW6ou*T3!0SLkf1bRfB;G1Kmf;($vDMm9B_=$sA$}{u;dR|h5rDn{{TyO zDir;;{sURNqO5XDWuY4r#d8{xDi`NF?{>fY-g&p$v8o-b78xE&dOV&D=+OK0j1N`z zPv!H=@8&B5-+aUkB16pRfX9Vk5g%>js7EvN@6L*Na#67}2 z?}7a;kg;olU~?iLJd&qvI}2lHq3;GGV~033O#|= zp@$GRKY|`Z?8!p~s0htMbI?4r04=NalJ>z=;x}+x7`M?QNJEb*S)`|s3f?lbEz{Sv z&=*4o^Tm~H>hMHMxN%%b)z~&UzNC^mKTRq5L{BRz)2}M2&?l92=tpn@TAZ@}*VMa~ zQ_-{g;VSo5Z|mMsoOHA$f{n*;CH*);(z6Ijzk-nT97bvUj`#Bwa2xX#aU1>QpguLI zPa`P5pHWhypG8{wG!Ex`uHkU{EcYQ@4N<*8gqa&O%nuqC1`W%DhDD@d<9Uos?@!_a z&fuquXr*65EB!JiLtjF0`U?KzA<8JpmOF~Fa3mq8;=1MZYs;xiFQ<(-Z82)vVLZ&c G{q-Mw+0!Th delta 981 zcmZvaNpliW6ou*T3&xbDA(8|-G9+Ls4g@Ht5E4zCqH&62f=0z*FXi4Uegdif11#OC zQ1F)c55%o2w90)Jx`}8!r@NDti}Rg+_dV`C{hDeoQtd@**5E+V=kvXU4sWLC0$64K zy!rU*ySXH+8$dt@e0;h|%n{Sv9U;bu2oWW$y~6?fODJsjLVlC=aUw;G+V6wYQRkQg z)`p235wo{~apzp#kEOv{fhZF5!~zkv^P!a6h09qYO=O&=_E0F!+5eN%WQAwfi4yUM zcuZ^%Pl%_)Gonm9Ctftag~o>($!I}~HLcQ*fHvGHe||d$p>xQ3|JkE$SL`x?U-6zNsfMANsvC~t&b>4avf2! zrNg5wF<=(9>ElWk=_w_v@De)uMxZt5A@l&c58Z?ALU*85=sI)*x&_^a4nc7!0VSac zXcC%%ve2^HNNVrQmM}}g%aU}nOn6x)y(}|s7A>u$%xu?`ROnMmdi10CxzRV|4F7`$sYDSW5&4kK-=rCvXS!3S@1}u96@=ChQSHK|pN$k^4 zVV{0lNtJ#^NsWG1Nu556{=D0(=ua;qpoV}or1kSQ=Uc-10`kz$VUE6?a6jN8!mzl6 zx7Pd4zyAW}uyhe~=$9~uei