diff options
author | Alexandre Rames <alexandre.rames@linaro.org> | 2015-08-27 10:51:26 +0100 |
---|---|---|
committer | Alexandre Rames <alexandre.rames@linaro.org> | 2015-09-15 08:44:24 +0000 |
commit | cb75016becbce8d43ac42cb6ca065b552ff8f113 (patch) | |
tree | 29dad3af734256c5a40b9fb5d9c17cd76975616e | |
parent | 5cc4e8cdfd37aa281811bbe0a4a00eb9edc79e3c (diff) |
Move the framework code from com/arm/microbench to org/linaro/bench.
Change-Id: I71d7d06de39ae15b29192dd2697ee9731006336a
12 files changed, 13 insertions, 13 deletions
diff --git a/benchmarking/java-ubenchs/.gitignore b/benchmarking/java-ubenchs/.gitignore index df00d74..cfd1bec 100644 --- a/benchmarking/java-ubenchs/.gitignore +++ b/benchmarking/java-ubenchs/.gitignore @@ -1,2 +1,2 @@ -benchmarks/com/arm/microbench/BenchmarkList.java +benchmarks/org/linaro/bench/BenchmarkList.java build diff --git a/benchmarking/java-ubenchs/benchmarks/deprecated/InstanceTest.java b/benchmarking/java-ubenchs/benchmarks/deprecated/InstanceTest.java index d5418fa..fc1f2ea 100644 --- a/benchmarking/java-ubenchs/benchmarks/deprecated/InstanceTest.java +++ b/benchmarking/java-ubenchs/benchmarks/deprecated/InstanceTest.java @@ -19,7 +19,7 @@ import java.lang.System; import java.util.ArrayList; import java.util.Random; -import com.arm.microbench.IterationsAnnotation; +import org.linaro.bench.IterationsAnnotation; public class InstanceTest { diff --git a/benchmarking/java-ubenchs/benchmarks/deprecated/JoinTest.java b/benchmarking/java-ubenchs/benchmarks/deprecated/JoinTest.java index 7f4c534..7ac041b 100644 --- a/benchmarking/java-ubenchs/benchmarks/deprecated/JoinTest.java +++ b/benchmarking/java-ubenchs/benchmarks/deprecated/JoinTest.java @@ -21,7 +21,7 @@ import java.lang.InterruptedException; import java.util.ArrayList; import java.util.Random; -import com.arm.microbench.IterationsAnnotation; +import org.linaro.bench.IterationsAnnotation; public class JoinTest extends Thread { diff --git a/benchmarking/java-ubenchs/benchmarks/deprecated/LockTest.java b/benchmarking/java-ubenchs/benchmarks/deprecated/LockTest.java index 91d4000..84c2b3a 100644 --- a/benchmarking/java-ubenchs/benchmarks/deprecated/LockTest.java +++ b/benchmarking/java-ubenchs/benchmarks/deprecated/LockTest.java @@ -17,7 +17,7 @@ import java.lang.System; -import com.arm.microbench.IterationsAnnotation; +import org.linaro.bench.IterationsAnnotation; public class LockTest { diff --git a/benchmarking/java-ubenchs/benchmarks/deprecated/SyncFib.java b/benchmarking/java-ubenchs/benchmarks/deprecated/SyncFib.java index 09c3742..6f302c4 100644 --- a/benchmarking/java-ubenchs/benchmarks/deprecated/SyncFib.java +++ b/benchmarking/java-ubenchs/benchmarks/deprecated/SyncFib.java @@ -17,7 +17,7 @@ import java.lang.System; -import com.arm.microbench.IterationsAnnotation; +import org.linaro.bench.IterationsAnnotation; public class SyncFib { diff --git a/benchmarking/java-ubenchs/benchmarks/com/arm/microbench/BenchmarkList.java.template b/benchmarking/java-ubenchs/benchmarks/org/linaro/bench/BenchmarkList.java.template index ee450d0..90b2f9c 100644 --- a/benchmarking/java-ubenchs/benchmarks/com/arm/microbench/BenchmarkList.java.template +++ b/benchmarking/java-ubenchs/benchmarks/org/linaro/bench/BenchmarkList.java.template @@ -15,7 +15,7 @@ * */ -package com.arm.microbench; +package org.linaro.bench; public class BenchmarkList { diff --git a/benchmarking/java-ubenchs/benchmarks/com/arm/microbench/CheckEnv.java b/benchmarking/java-ubenchs/benchmarks/org/linaro/bench/CheckEnv.java index bfbe520..45010bb 100644 --- a/benchmarking/java-ubenchs/benchmarks/com/arm/microbench/CheckEnv.java +++ b/benchmarking/java-ubenchs/benchmarks/org/linaro/bench/CheckEnv.java @@ -15,7 +15,7 @@ * */ -package com.arm.microbench; +package org.linaro.bench; public class CheckEnv { public static boolean isAndroid() { diff --git a/benchmarking/java-ubenchs/benchmarks/com/arm/microbench/IterationsAnnotation.java b/benchmarking/java-ubenchs/benchmarks/org/linaro/bench/IterationsAnnotation.java index 7e59655..aaf2141 100644 --- a/benchmarking/java-ubenchs/benchmarks/com/arm/microbench/IterationsAnnotation.java +++ b/benchmarking/java-ubenchs/benchmarks/org/linaro/bench/IterationsAnnotation.java @@ -15,7 +15,7 @@ * */ -package com.arm.microbench; +package org.linaro.bench; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/benchmarking/java-ubenchs/benchmarks/com/arm/microbench/RunBench.java b/benchmarking/java-ubenchs/benchmarks/org/linaro/bench/RunBench.java index 933a0be..e94d381 100644 --- a/benchmarking/java-ubenchs/benchmarks/com/arm/microbench/RunBench.java +++ b/benchmarking/java-ubenchs/benchmarks/org/linaro/bench/RunBench.java @@ -15,7 +15,7 @@ * */ -package com.arm.microbench; +package org.linaro.bench; import java.lang.reflect.Method; import java.util.ArrayList; @@ -157,7 +157,7 @@ public class RunBench { } public static final String helpMessage = - "Usage: java com.arm.microbench.RunBench [OPTIONS] [Benchmark...]\n" + + "Usage: java org.linaro.bench.RunBench [OPTIONS] [Benchmark...]\n" + "OPTIONS:\n" + "\t--help Print this error message.\n" + "\t--verbose Be verbose.\n" + diff --git a/benchmarking/java-ubenchs/benchmarks/com/arm/microbench/SimpleLogger.java b/benchmarking/java-ubenchs/benchmarks/org/linaro/bench/SimpleLogger.java index 10503c2..37a2e3a 100644 --- a/benchmarking/java-ubenchs/benchmarks/com/arm/microbench/SimpleLogger.java +++ b/benchmarking/java-ubenchs/benchmarks/org/linaro/bench/SimpleLogger.java @@ -15,7 +15,7 @@ * */ -package com.arm.microbench; +package org.linaro.bench; public class SimpleLogger { public enum LogLevel { diff --git a/benchmarking/java-ubenchs/build.sh b/benchmarking/java-ubenchs/build.sh index 2c47ab8..829488e 100755 --- a/benchmarking/java-ubenchs/build.sh +++ b/benchmarking/java-ubenchs/build.sh @@ -108,7 +108,7 @@ shift $((OPTIND - 1)) pushd $DIR_BENCHMARKS &> /dev/null RDIR_BENCHMARKS=. -RDIR_FRAMEWORK=$RDIR_BENCHMARKS/com/arm/microbench +RDIR_FRAMEWORK=$RDIR_BENCHMARKS/org/linaro/bench JAVA_BENCHMARK_FILES= FIND_BENCHMARKS_COMMAND="find $RDIR_BENCHMARKS ! -path $RDIR_FRAMEWORK/* -type f" diff --git a/benchmarking/java-ubenchs/run.py b/benchmarking/java-ubenchs/run.py index 2d49cdb..0763854 100755 --- a/benchmarking/java-ubenchs/run.py +++ b/benchmarking/java-ubenchs/run.py @@ -35,7 +35,7 @@ dir_framework = os.path.join(dir_pwd, 'framework') dir_tools = os.path.join(dir_pwd, 'tools') dir_build = os.path.join(dir_pwd, 'build') dir_build_java_classes = os.path.join(dir_build, 'classes') -bench_runner_main = 'com.arm.microbench.RunBench' +bench_runner_main = 'org.linaro.bench.RunBench' # The script must be executed from an Android environment, which will be passed # to run the commands. |