Remove regalloc_gc flag from our test infra
Since we removed the graph color (aosp/2584792),
the regalloc_gc flag is equivalent to optimizing.
Test: Presubmit
Bug: 281793697
Change-Id: Ifc08c7e32205c6d650acfa2d4ea6b9dc0a13b057
diff --git a/compiler/driver/compiler_options.cc b/compiler/driver/compiler_options.cc
index 1ff7b1f..45664b7 100644
--- a/compiler/driver/compiler_options.cc
+++ b/compiler/driver/compiler_options.cc
@@ -123,7 +123,7 @@
LOG(ERROR) << "Graph coloring allocator has been removed, using linear scan instead.";
register_allocation_strategy_ = RegisterAllocator::Strategy::kRegisterAllocatorLinearScan;
} else {
- *error_msg = "Unrecognized register allocation strategy. Try linear-scan, or graph-color.";
+ *error_msg = "Unrecognized register allocation strategy. Try linear-scan.";
return false;
}
return true;
diff --git a/test/knownfailures.json b/test/knownfailures.json
index a498652..45b07a1 100644
--- a/test/knownfailures.json
+++ b/test/knownfailures.json
@@ -289,22 +289,13 @@
"variant": "jit"
},
{
- "tests": ["570-checker-select",
- "484-checker-register-hints"],
- "description": ["These tests were based on the linear scan allocator,",
- "which makes different decisions than the graph",
- "coloring allocator. (These attempt to test for code",
- "quality, not correctness.)"],
- "variant": "regalloc_gc"
- },
- {
"tests": ["454-get-vreg",
"457-regs",
"602-deoptimizeable",
"685-deoptimizeable"],
"description": ["Tests that should fail when the optimizing compiler ",
"compiles them non-debuggable."],
- "variant": "optimizing & ndebuggable | regalloc_gc & ndebuggable | speed-profile & ndebuggable | jit & ndebuggable | jit-on-first-use & ndebuggable"
+ "variant": "optimizing & ndebuggable | speed-profile & ndebuggable | jit & ndebuggable | jit-on-first-use & ndebuggable"
},
{
"tests": ["596-app-images", "597-app-images-same-classloader"],
@@ -328,7 +319,7 @@
},
{
"tests": "055-enum-performance",
- "variant": "optimizing | regalloc_gc",
+ "variant": "optimizing",
"description": ["055: Exceeds run time limits due to heap poisoning ",
"instrumentation (on ARM and ARM64 devices)."]
},
@@ -348,7 +339,7 @@
"595-profile-saving"],
"description": "The doesn't compile anything",
"env_vars": {"ART_TEST_BISECTION": "true"},
- "variant": "optimizing | regalloc_gc"
+ "variant": "optimizing"
},
{
"tests": ["018-stack-overflow",
@@ -358,21 +349,21 @@
"137-cfi"],
"description": "The test run dalvikvm more than once.",
"env_vars": {"ART_TEST_BISECTION": "true"},
- "variant": "optimizing | regalloc_gc"
+ "variant": "optimizing"
},
{
"tests": ["115-native-bridge",
"088-monitor-verification"],
"description": "The test assume they are always compiled.",
"env_vars": {"ART_TEST_BISECTION": "true"},
- "variant": "optimizing | regalloc_gc"
+ "variant": "optimizing"
},
{
"tests": "055-enum-performance",
"description": ["The test tests performance which degrades during",
"bisecting."],
"env_vars": {"ART_TEST_BISECTION": "true"},
- "variant": "optimizing | regalloc_gc"
+ "variant": "optimizing"
},
{
"tests": ["537-checker-arraycopy",
diff --git a/test/testrunner/testrunner.py b/test/testrunner/testrunner.py
index 00f34d3..78f83de 100755
--- a/test/testrunner/testrunner.py
+++ b/test/testrunner/testrunner.py
@@ -242,11 +242,7 @@
VARIANT_TYPE_DICT['jvmti'] = {'no-jvmti', 'jvmti-stress', 'redefine-stress', 'trace-stress',
'field-stress', 'step-stress'}
VARIANT_TYPE_DICT['compiler'] = {'interp-ac', 'interpreter', 'jit', 'jit-on-first-use',
- 'optimizing', 'regalloc_gc',
- 'speed-profile', 'baseline'}
-
- # Regalloc_GC cannot work with prebuild.
- NONFUNCTIONAL_VARIANT_SETS.add(frozenset({'regalloc_gc', 'prebuild'}))
+ 'optimizing', 'speed-profile', 'baseline'}
for v_type in VARIANT_TYPE_DICT:
TOTAL_VARIANTS_SET = TOTAL_VARIANTS_SET.union(VARIANT_TYPE_DICT.get(v_type))
@@ -526,10 +522,6 @@
if compiler == 'optimizing':
args_test += ['--optimizing']
- elif compiler == 'regalloc_gc':
- args_test += ['--optimizing',
- '-Xcompiler-option',
- '--register-allocation-strategy=graph-color']
elif compiler == 'interpreter':
args_test += ['--interpreter']
elif compiler == 'interp-ac':