Remove MIPS support from dexfuzz.
Test: m dexfuzz
Bug: 147346243
Change-Id: I135326516f5013e02fc0fc0d35986fc9e3b640c0
diff --git a/tools/dexfuzz/README b/tools/dexfuzz/README
index fff5473..e6ec1ec 100644
--- a/tools/dexfuzz/README
+++ b/tools/dexfuzz/README
@@ -48,8 +48,6 @@
--arm64
--x86
--x86_64
- --mips
- --mips64
And also at least two of the following backends:
--interpreter
diff --git a/tools/dexfuzz/src/dexfuzz/Options.java b/tools/dexfuzz/src/dexfuzz/Options.java
index d1d8172..5b45c89 100644
--- a/tools/dexfuzz/src/dexfuzz/Options.java
+++ b/tools/dexfuzz/src/dexfuzz/Options.java
@@ -68,8 +68,6 @@
public static boolean useArchArm64;
public static boolean useArchX86;
public static boolean useArchX86_64;
- public static boolean useArchMips;
- public static boolean useArchMips64;
public static boolean skipHostVerify;
public static boolean shortTimeouts;
public static boolean dumpOutput;
@@ -112,8 +110,6 @@
Log.always(" --allarm : Short for --arm --arm64");
Log.always(" --x86 : Include x86 backends in comparisons");
Log.always(" --x86-64 : Include x86-64 backends in comparisons");
- Log.always(" --mips : Include MIPS backends in comparisons");
- Log.always(" --mips64 : Include MIPS64 backends in comparisons");
Log.always("");
Log.always(" --dump-output : Dump outputs of executed programs");
Log.always(" --dump-verify : Dump outputs of verification");
@@ -179,10 +175,6 @@
useArchX86 = true;
} else if (flag.equals("x86-64")) {
useArchX86_64 = true;
- } else if (flag.equals("mips")) {
- useArchMips = true;
- } else if (flag.equals("mips64")) {
- useArchMips64 = true;
} else if (flag.equals("mutate-limit")) {
mutateLimit = true;
} else if (flag.equals("report-unique")) {
@@ -411,9 +403,7 @@
if (!(useArchArm
|| useArchArm64
|| useArchX86
- || useArchX86_64
- || useArchMips
- || useArchMips64)) {
+ || useArchX86_64)) {
Log.error("No architecture to execute on was specified!");
return false;
}
@@ -425,14 +415,6 @@
Log.error("Did you mean to specify ARM and x86?");
return false;
}
- if ((useArchArm || useArchArm64) && (useArchMips || useArchMips64)) {
- Log.error("Did you mean to specify ARM and MIPS?");
- return false;
- }
- if ((useArchX86 || useArchX86_64) && (useArchMips || useArchMips64)) {
- Log.error("Did you mean to specify x86 and MIPS?");
- return false;
- }
int backends = 0;
if (useInterpreter) {
backends++;
diff --git a/tools/dexfuzz/src/dexfuzz/executors/Architecture.java b/tools/dexfuzz/src/dexfuzz/executors/Architecture.java
index 051d80e..ab0c758 100644
--- a/tools/dexfuzz/src/dexfuzz/executors/Architecture.java
+++ b/tools/dexfuzz/src/dexfuzz/executors/Architecture.java
@@ -23,9 +23,7 @@
ARM("arm"),
ARM64("arm64"),
X86("x86"),
- X86_64("x86_64"),
- MIPS("mips"),
- MIPS64("mips64");
+ X86_64("x86_64");
private String archString = "";
diff --git a/tools/dexfuzz/src/dexfuzz/executors/Mips64InterpreterExecutor.java b/tools/dexfuzz/src/dexfuzz/executors/Mips64InterpreterExecutor.java
deleted file mode 100644
index eee6111..0000000
--- a/tools/dexfuzz/src/dexfuzz/executors/Mips64InterpreterExecutor.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dexfuzz.executors;
-
-import dexfuzz.listeners.BaseListener;
-
-public class Mips64InterpreterExecutor extends Executor {
-
- public Mips64InterpreterExecutor(BaseListener listener, Device device) {
- super("MIPS64 Interpreter", 30, listener, Architecture.MIPS64, device,
- /*needsCleanCodeCache*/ false, /*isBisectable*/ false);
- }
-
- @Override
- protected String constructCommand(String programName) {
- StringBuilder commandBuilder = new StringBuilder();
- commandBuilder.append("dalvikvm64 -Xint ");
- commandBuilder.append("-cp ").append(testLocation).append("/").append(programName).append(" ");
- commandBuilder.append(executeClass);
- return commandBuilder.toString();
-
- }
-}
diff --git a/tools/dexfuzz/src/dexfuzz/executors/Mips64OptimizingBackendExecutor.java b/tools/dexfuzz/src/dexfuzz/executors/Mips64OptimizingBackendExecutor.java
deleted file mode 100644
index 883ff2a..0000000
--- a/tools/dexfuzz/src/dexfuzz/executors/Mips64OptimizingBackendExecutor.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dexfuzz.executors;
-
-import dexfuzz.listeners.BaseListener;
-
-public class Mips64OptimizingBackendExecutor extends Executor {
-
- public Mips64OptimizingBackendExecutor(BaseListener listener, Device device) {
- super("MIPS64 Optimizing Backend", 5, listener, Architecture.MIPS64, device,
- /*needsCleanCodeCache*/ true, /*isBisectable*/ true);
- }
-
- @Override
- protected String constructCommand(String programName) {
- StringBuilder commandBuilder = new StringBuilder();
- commandBuilder.append("dalvikvm64 -Xcompiler-option --compiler-backend=Optimizing ");
- // The -Xno-dex-file-fallback option ensures that the execution does not default to
- // interpreter if compilations fails.
- commandBuilder.append("-Xno-dex-file-fallback ");
- commandBuilder.append("-cp ").append(testLocation).append("/").append(programName).append(" ");
- commandBuilder.append(executeClass);
- return commandBuilder.toString();
- }
-}
diff --git a/tools/dexfuzz/src/dexfuzz/executors/MipsInterpreterExecutor.java b/tools/dexfuzz/src/dexfuzz/executors/MipsInterpreterExecutor.java
deleted file mode 100644
index 4a403db..0000000
--- a/tools/dexfuzz/src/dexfuzz/executors/MipsInterpreterExecutor.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dexfuzz.executors;
-
-import dexfuzz.listeners.BaseListener;
-
-public class MipsInterpreterExecutor extends Executor {
-
- public MipsInterpreterExecutor(BaseListener listener, Device device) {
- super("MIPS Interpreter", 30, listener, Architecture.MIPS, device,
- /*needsCleanCodeCache*/ false, /*isBisectable*/ false);
- }
-
- @Override
- protected String constructCommand(String programName) {
- StringBuilder commandBuilder = new StringBuilder();
- commandBuilder.append("dalvikvm32 -Xint ");
- commandBuilder.append("-cp ").append(testLocation).append("/").append(programName).append(" ");
- commandBuilder.append(executeClass);
- return commandBuilder.toString();
- }
-}
diff --git a/tools/dexfuzz/src/dexfuzz/executors/MipsOptimizingBackendExecutor.java b/tools/dexfuzz/src/dexfuzz/executors/MipsOptimizingBackendExecutor.java
deleted file mode 100644
index b7babdc..0000000
--- a/tools/dexfuzz/src/dexfuzz/executors/MipsOptimizingBackendExecutor.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dexfuzz.executors;
-
-import dexfuzz.listeners.BaseListener;
-
-public class MipsOptimizingBackendExecutor extends Executor {
-
- public MipsOptimizingBackendExecutor(BaseListener listener, Device device) {
- super("MIPS Optimizing Backend", 5, listener, Architecture.MIPS, device,
- /*needsCleanCodeCache*/ true, /*isBisectable*/ true);
- }
-
- @Override
- protected String constructCommand(String programName) {
- StringBuilder commandBuilder = new StringBuilder();
- commandBuilder.append("dalvikvm32 -Xcompiler-option --compiler-backend=Optimizing ");
- // The -Xno-dex-file-fallback option ensures that the execution does not default to
- // interpreter if compilations fails.
- commandBuilder.append("-Xno-dex-file-fallback ");
- commandBuilder.append("-cp ").append(testLocation).append("/").append(programName).append(" ");
- commandBuilder.append(executeClass);
- return commandBuilder.toString();
- }
-}
diff --git a/tools/dexfuzz/src/dexfuzz/fuzzers/Fuzzer.java b/tools/dexfuzz/src/dexfuzz/fuzzers/Fuzzer.java
index ccc426c..56e6846 100644
--- a/tools/dexfuzz/src/dexfuzz/fuzzers/Fuzzer.java
+++ b/tools/dexfuzz/src/dexfuzz/fuzzers/Fuzzer.java
@@ -26,10 +26,6 @@
import dexfuzz.executors.ArmOptimizingBackendExecutor;
import dexfuzz.executors.Device;
import dexfuzz.executors.Executor;
-import dexfuzz.executors.Mips64InterpreterExecutor;
-import dexfuzz.executors.Mips64OptimizingBackendExecutor;
-import dexfuzz.executors.MipsInterpreterExecutor;
-import dexfuzz.executors.MipsOptimizingBackendExecutor;
import dexfuzz.executors.X86InterpreterExecutor;
import dexfuzz.executors.X86OptimizingBackendExecutor;
import dexfuzz.executors.X86_64InterpreterExecutor;
@@ -173,16 +169,6 @@
X86InterpreterExecutor.class);
}
- if (Options.useArchMips64) {
- addExecutorsForArchitecture(device, Mips64OptimizingBackendExecutor.class,
- Mips64InterpreterExecutor.class);
- }
-
- if (Options.useArchMips) {
- addExecutorsForArchitecture(device, MipsOptimizingBackendExecutor.class,
- MipsInterpreterExecutor.class);
- }
-
// Add the first backend as the golden executor for self-divergence tests.
goldenExecutor = executors.get(0);
}