From ee66940409ab5e0b5128fedcd889238f1f76f3c8 Mon Sep 17 00:00:00 2001 From: Juha Alanen Date: Tue, 17 Dec 2019 14:51:04 +0200 Subject: [benchmark] Run benchmark as NativeActivity application on Android --- benchmark/android/README.md | 3 + benchmark/android/app/build.gradle | 52 +++++++ .../java/android/app/NativeActivityTest.java | 32 ++++ .../androidTest/java/android/app/TestState.java | 6 + benchmark/android/app/src/main/AndroidManifest.xml | 28 ++++ benchmark/android/app/src/main/assets/to_zip.txt | 3 + .../app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 3418 bytes .../app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 2206 bytes .../app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 4842 bytes .../app/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 7718 bytes .../android/app/src/main/res/values/strings.xml | 4 + benchmark/android/build.gradle | 21 +++ benchmark/android/gradle.properties | 1 + .../android/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 49896 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + benchmark/android/gradlew | 164 +++++++++++++++++++++ benchmark/android/gradlew.bat | 90 +++++++++++ benchmark/android/settings.gradle | 2 + benchmark/include/mbgl/benchmark.hpp | 4 +- 19 files changed, 413 insertions(+), 3 deletions(-) create mode 100644 benchmark/android/README.md create mode 100644 benchmark/android/app/build.gradle create mode 100644 benchmark/android/app/src/androidTest/java/android/app/NativeActivityTest.java create mode 100644 benchmark/android/app/src/androidTest/java/android/app/TestState.java create mode 100644 benchmark/android/app/src/main/AndroidManifest.xml create mode 100644 benchmark/android/app/src/main/assets/to_zip.txt create mode 100644 benchmark/android/app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 benchmark/android/app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 benchmark/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 benchmark/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 benchmark/android/app/src/main/res/values/strings.xml create mode 100644 benchmark/android/build.gradle create mode 100644 benchmark/android/gradle.properties create mode 100644 benchmark/android/gradle/wrapper/gradle-wrapper.jar create mode 100644 benchmark/android/gradle/wrapper/gradle-wrapper.properties create mode 100755 benchmark/android/gradlew create mode 100644 benchmark/android/gradlew.bat create mode 100644 benchmark/android/settings.gradle (limited to 'benchmark') diff --git a/benchmark/android/README.md b/benchmark/android/README.md new file mode 100644 index 0000000000..fb809d3dab --- /dev/null +++ b/benchmark/android/README.md @@ -0,0 +1,3 @@ +# BenchmarkRunner + +This app is a purely native application that can run **mbgl-benchmark-runner** on Android devices. diff --git a/benchmark/android/app/build.gradle b/benchmark/android/app/build.gradle new file mode 100644 index 0000000000..d355286585 --- /dev/null +++ b/benchmark/android/app/build.gradle @@ -0,0 +1,52 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 28 + + defaultConfig { + applicationId = 'com.mapbox.mapboxsdk.maps.benchmark_runner' + minSdkVersion 14 + targetSdkVersion 28 + def abi = 'all' + if (project.hasProperty('mapbox.abis')) { + abi = project.getProperty('mapbox.abis') + } + ndk { + if (abi != 'all') { + abiFilters abi.split(' ') + } else { + abiFilters 'armeabi-v7a', 'x86', 'arm64-v8a', 'x86_64' + } + } + externalNativeBuild { + cmake { + arguments '-DANDROID_CCACHE=ccache' + arguments '-DANDROID_STL=c++_static' + targets 'mbgl-benchmark-runner' + } + } + android { + testBuildType 'release' + } + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' + } + externalNativeBuild { + cmake { + version '3.10.2' + path '../../../next/CMakeLists.txt' + } + } + buildTypes { + release { + signingConfig signingConfigs.debug + } + } +} + +dependencies { + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + androidTestImplementation 'androidx.test:rules:1.2.0' +} diff --git a/benchmark/android/app/src/androidTest/java/android/app/NativeActivityTest.java b/benchmark/android/app/src/androidTest/java/android/app/NativeActivityTest.java new file mode 100644 index 0000000000..795ca4973a --- /dev/null +++ b/benchmark/android/app/src/androidTest/java/android/app/NativeActivityTest.java @@ -0,0 +1,32 @@ +package android.app; + +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.LargeTest; +import androidx.test.rule.ActivityTestRule; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.Assert; +import org.junit.runner.RunWith; +import android.util.Log; + +@LargeTest +@RunWith(AndroidJUnit4.class) +public class NativeActivityTest { + + @Rule + public ActivityTestRule mActivityTestRule = new ActivityTestRule<>(NativeActivity.class, false, false); + + @Test(timeout = 1200000L) + public void runBenchmark() throws Exception { + Log.v("Benchmark", "Start the benchmark"); + mActivityTestRule.launchActivity(null); + while (TestState.running) { + Log.v("Benchmark", "Benchmark is running..."); + Thread.sleep(1000L); + } + Log.v("Benchmark", "All benchmarks are finished!"); + mActivityTestRule.finishActivity(); + Assert.assertTrue("Benchmark was successfully finished", TestState.testResult); + } +} diff --git a/benchmark/android/app/src/androidTest/java/android/app/TestState.java b/benchmark/android/app/src/androidTest/java/android/app/TestState.java new file mode 100644 index 0000000000..b7d4b73543 --- /dev/null +++ b/benchmark/android/app/src/androidTest/java/android/app/TestState.java @@ -0,0 +1,6 @@ +package android.app; + +public class TestState { + static boolean running = true; + static boolean testResult = true; +} diff --git a/benchmark/android/app/src/main/AndroidManifest.xml b/benchmark/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..33cfade1e1 --- /dev/null +++ b/benchmark/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + diff --git a/benchmark/android/app/src/main/assets/to_zip.txt b/benchmark/android/app/src/main/assets/to_zip.txt new file mode 100644 index 0000000000..2fa7604f6d --- /dev/null +++ b/benchmark/android/app/src/main/assets/to_zip.txt @@ -0,0 +1,3 @@ +benchmark/results/ +benchmark/fixtures/ +test/fixtures/api/assets/streets/ diff --git a/benchmark/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/benchmark/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000..cde69bccce Binary files /dev/null and b/benchmark/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/benchmark/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/benchmark/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000..c133a0cbd3 Binary files /dev/null and b/benchmark/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/benchmark/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/benchmark/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000000..bfa42f0e7b Binary files /dev/null and b/benchmark/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/benchmark/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/benchmark/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000..324e72cdd7 Binary files /dev/null and b/benchmark/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/benchmark/android/app/src/main/res/values/strings.xml b/benchmark/android/app/src/main/res/values/strings.xml new file mode 100644 index 0000000000..39be3fc37e --- /dev/null +++ b/benchmark/android/app/src/main/res/values/strings.xml @@ -0,0 +1,4 @@ + + + BenchmarkRunner + diff --git a/benchmark/android/build.gradle b/benchmark/android/build.gradle new file mode 100644 index 0000000000..de7242684e --- /dev/null +++ b/benchmark/android/build.gradle @@ -0,0 +1,21 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +buildscript { + repositories { + google() + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:3.5.3' + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/benchmark/android/gradle.properties b/benchmark/android/gradle.properties new file mode 100644 index 0000000000..6ed0f8f960 --- /dev/null +++ b/benchmark/android/gradle.properties @@ -0,0 +1 @@ +org.gradle.jvmargs=-Xmx1536m diff --git a/benchmark/android/gradle/wrapper/gradle-wrapper.jar b/benchmark/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..8c0fb64a86 Binary files /dev/null and b/benchmark/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/benchmark/android/gradle/wrapper/gradle-wrapper.properties b/benchmark/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..48c45760fb --- /dev/null +++ b/benchmark/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sun Feb 05 19:39:12 IST 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/benchmark/android/gradlew b/benchmark/android/gradlew new file mode 100755 index 0000000000..91a7e269e1 --- /dev/null +++ b/benchmark/android/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/benchmark/android/gradlew.bat b/benchmark/android/gradlew.bat new file mode 100644 index 0000000000..aec99730b4 --- /dev/null +++ b/benchmark/android/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/benchmark/android/settings.gradle b/benchmark/android/settings.gradle new file mode 100644 index 0000000000..573abcb323 --- /dev/null +++ b/benchmark/android/settings.gradle @@ -0,0 +1,2 @@ +include ':app' + diff --git a/benchmark/include/mbgl/benchmark.hpp b/benchmark/include/mbgl/benchmark.hpp index f68c847a74..1a9904de51 100644 --- a/benchmark/include/mbgl/benchmark.hpp +++ b/benchmark/include/mbgl/benchmark.hpp @@ -1,9 +1,7 @@ #pragma once -#include - namespace mbgl { -MBGL_EXPORT int runBenchmark(int argc, char* argv[]); +int runBenchmark(int argc, char* argv[]); } // namespace mbgl -- cgit v1.2.1