From 1ec46bc71778dc1463e60c53f7126dcf6c913a44 Mon Sep 17 00:00:00 2001 From: Stephen Kyle Date: Fri, 27 Mar 2015 18:50:10 +0000 Subject: [PATCH] Update dexfuzz after optimizing default selection. Now that the optimizing compiler is the default backend, the quick compiler must be explicitly selected as an argument. Change-Id: I5e6b8e6a79432118e0a91c9aea85bdd9cd7305dc --- tools/dexfuzz/src/dexfuzz/executors/Arm64QuickBackendExecutor.java | 2 +- tools/dexfuzz/src/dexfuzz/executors/ArmQuickBackendExecutor.java | 2 +- tools/dexfuzz/src/dexfuzz/executors/Mips64QuickBackendExecutor.java | 2 +- tools/dexfuzz/src/dexfuzz/executors/MipsQuickBackendExecutor.java | 2 +- tools/dexfuzz/src/dexfuzz/executors/X86QuickBackendExecutor.java | 2 +- tools/dexfuzz/src/dexfuzz/executors/X86_64QuickBackendExecutor.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/dexfuzz/src/dexfuzz/executors/Arm64QuickBackendExecutor.java b/tools/dexfuzz/src/dexfuzz/executors/Arm64QuickBackendExecutor.java index 726a7a8fe..7251ec553 100644 --- a/tools/dexfuzz/src/dexfuzz/executors/Arm64QuickBackendExecutor.java +++ b/tools/dexfuzz/src/dexfuzz/executors/Arm64QuickBackendExecutor.java @@ -27,7 +27,7 @@ public class Arm64QuickBackendExecutor extends Executor { @Override public void execute(String programName) { StringBuilder commandBuilder = new StringBuilder(); - commandBuilder.append("dalvikvm64 "); + commandBuilder.append("dalvikvm64 -Xcompiler-option --compiler-backend=Quick "); if (device.noBootImageAvailable()) { commandBuilder.append("-Ximage:/data/art-test/core.art -Xnorelocate "); } diff --git a/tools/dexfuzz/src/dexfuzz/executors/ArmQuickBackendExecutor.java b/tools/dexfuzz/src/dexfuzz/executors/ArmQuickBackendExecutor.java index 611270b67..7d226e89a 100644 --- a/tools/dexfuzz/src/dexfuzz/executors/ArmQuickBackendExecutor.java +++ b/tools/dexfuzz/src/dexfuzz/executors/ArmQuickBackendExecutor.java @@ -27,7 +27,7 @@ public class ArmQuickBackendExecutor extends Executor { @Override public void execute(String programName) { StringBuilder commandBuilder = new StringBuilder(); - commandBuilder.append("dalvikvm32 "); + commandBuilder.append("dalvikvm32 -Xcompiler-option --compiler-backend=Quick "); if (device.noBootImageAvailable()) { commandBuilder.append("-Ximage:/data/art-test/core.art -Xnorelocate "); } diff --git a/tools/dexfuzz/src/dexfuzz/executors/Mips64QuickBackendExecutor.java b/tools/dexfuzz/src/dexfuzz/executors/Mips64QuickBackendExecutor.java index bebf27c51..36e39c27e 100644 --- a/tools/dexfuzz/src/dexfuzz/executors/Mips64QuickBackendExecutor.java +++ b/tools/dexfuzz/src/dexfuzz/executors/Mips64QuickBackendExecutor.java @@ -27,7 +27,7 @@ public class Mips64QuickBackendExecutor extends Executor { @Override public void execute(String programName) { StringBuilder commandBuilder = new StringBuilder(); - commandBuilder.append("dalvikvm64 "); + commandBuilder.append("dalvikvm64 -Xcompiler-option --compiler-backend=Quick "); commandBuilder.append("-cp ").append(testLocation).append("/").append(programName).append(" "); commandBuilder.append(executeClass); executionResult = executeCommandWithTimeout(commandBuilder.toString(), true); diff --git a/tools/dexfuzz/src/dexfuzz/executors/MipsQuickBackendExecutor.java b/tools/dexfuzz/src/dexfuzz/executors/MipsQuickBackendExecutor.java index a53486677..0ea166ba6 100644 --- a/tools/dexfuzz/src/dexfuzz/executors/MipsQuickBackendExecutor.java +++ b/tools/dexfuzz/src/dexfuzz/executors/MipsQuickBackendExecutor.java @@ -27,7 +27,7 @@ public class MipsQuickBackendExecutor extends Executor { @Override public void execute(String programName) { StringBuilder commandBuilder = new StringBuilder(); - commandBuilder.append("dalvikvm32 "); + commandBuilder.append("dalvikvm32 -Xcompiler-option --compiler-backend=Quick "); commandBuilder.append("-cp ").append(testLocation).append("/").append(programName).append(" "); commandBuilder.append(executeClass); executionResult = executeCommandWithTimeout(commandBuilder.toString(), true); diff --git a/tools/dexfuzz/src/dexfuzz/executors/X86QuickBackendExecutor.java b/tools/dexfuzz/src/dexfuzz/executors/X86QuickBackendExecutor.java index 4a68bdeba..7e4a2f697 100644 --- a/tools/dexfuzz/src/dexfuzz/executors/X86QuickBackendExecutor.java +++ b/tools/dexfuzz/src/dexfuzz/executors/X86QuickBackendExecutor.java @@ -28,7 +28,7 @@ public class X86QuickBackendExecutor extends Executor { @Override public void execute(String programName) { StringBuilder commandBuilder = new StringBuilder(); - commandBuilder.append("dalvikvm32 "); + commandBuilder.append("dalvikvm32 -Xcompiler-option --compiler-backend=Quick "); if (Options.executeOnHost) { commandBuilder.append(device.getHostExecutionFlags()).append(" "); } diff --git a/tools/dexfuzz/src/dexfuzz/executors/X86_64QuickBackendExecutor.java b/tools/dexfuzz/src/dexfuzz/executors/X86_64QuickBackendExecutor.java index 9579b7652..995cba2ac 100644 --- a/tools/dexfuzz/src/dexfuzz/executors/X86_64QuickBackendExecutor.java +++ b/tools/dexfuzz/src/dexfuzz/executors/X86_64QuickBackendExecutor.java @@ -27,7 +27,7 @@ public class X86_64QuickBackendExecutor extends Executor { @Override public void execute(String programName) { StringBuilder commandBuilder = new StringBuilder(); - commandBuilder.append("dalvikvm64 "); + commandBuilder.append("dalvikvm64 -Xcompiler-option --compiler-backend=Quick "); commandBuilder.append("-cp ").append(testLocation).append("/").append(programName).append(" "); commandBuilder.append(executeClass); executionResult = executeCommandWithTimeout(commandBuilder.toString(), true); -- 2.11.0