Revert "Set cpu affinity for time benchmarks"
This reverts commit 845915eddea964d35076f69bd735e532f7b06a9c.
Reason for revert: regression on the benchmarks
Change-Id: I4c5d6e46cbee74b5deaf54e240d3bfca7c5a24a2
diff --git a/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java b/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
index c9ceaae..7bf3c4e 100644
--- a/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
+++ b/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
@@ -143,11 +143,7 @@
// To grab boot events from log, set debug mode to FULL
VirtualMachineConfig normalConfig =
- builder.debugLevel(DebugLevel.FULL)
- .memoryMib(256)
- .numCpus(2)
- .cpuAffinity("0=0:1=1")
- .build();
+ builder.debugLevel(DebugLevel.FULL).memoryMib(256).build();
mInner.forceCreateNewVirtualMachine("test_vm_boot_time", normalConfig);
BootResult result = tryBootVm(TAG, "test_vm_boot_time");
@@ -194,8 +190,6 @@
VirtualMachineConfig config =
mInner.newVmConfigBuilder("assets/vm_config_io.json")
.debugLevel(DebugLevel.FULL)
- .numCpus(2)
- .cpuAffinity("0=0:1=1")
.build();
List<Double> transferRates = new ArrayList<>(IO_TEST_TRIAL_COUNT);
@@ -223,8 +217,6 @@
VirtualMachineConfig config =
mInner.newVmConfigBuilder("assets/vm_config_io.json")
.debugLevel(DebugLevel.FULL)
- .numCpus(2)
- .cpuAffinity("0=0:1=1")
.build();
List<Double> readRates = new ArrayList<>(IO_TEST_TRIAL_COUNT);