Optimizing: Run additional tests on target.
These tests were running only when x86 codegen was supported
but they actually use the runtime instruction set, rather
than x86 codegen. Move them to the generic tests, so that
they run also on target now that it's cheap thanks to
https://android-review.googlesource.com/1310447 .
Test: m test-art-host-gtest
Test: run-gtests.sh
Change-Id: I76338453fbb5112fa07e8cd7c323dcd894790042
diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py
index aa95eb7..f6c81db 100755
--- a/build/apex/art_apex_test.py
+++ b/build/apex/art_apex_test.py
@@ -736,7 +736,9 @@
self._checker.check_art_test_executable('bounds_check_elimination_test')
self._checker.check_art_test_executable('codegen_test')
self._checker.check_art_test_executable('compiled_method_storage_test')
+ self._checker.check_art_test_executable('constant_folding_test')
self._checker.check_art_test_executable('data_type_test')
+ self._checker.check_art_test_executable('dead_code_elimination_test')
self._checker.check_art_test_executable('dedupe_set_test')
self._checker.check_art_test_executable('dominator_test')
self._checker.check_art_test_executable('dwarf_test')
@@ -750,8 +752,11 @@
self._checker.check_art_test_executable('jni_cfi_test')
self._checker.check_art_test_executable('jni_compiler_test')
self._checker.check_art_test_executable('licm_test')
+ self._checker.check_art_test_executable('linearize_test')
self._checker.check_art_test_executable('linker_patch_test')
self._checker.check_art_test_executable('live_interval_test')
+ self._checker.check_art_test_executable('live_ranges_test')
+ self._checker.check_art_test_executable('liveness_test')
self._checker.check_art_test_executable('load_store_analysis_test')
self._checker.check_art_test_executable('load_store_elimination_test')
self._checker.check_art_test_executable('loop_optimization_test')
diff --git a/compiler/Android.bp b/compiler/Android.bp
index 0d306d7..c503eab 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -374,8 +374,9 @@
"linker/linker_patch_test.cc",
"linker/output_stream_test.cc",
"optimizing/bounds_check_elimination_test.cc",
- "optimizing/superblock_cloner_test.cc",
+ "optimizing/constant_folding_test.cc",
"optimizing/data_type_test.cc",
+ "optimizing/dead_code_elimination_test.cc",
"optimizing/dominator_test.cc",
"optimizing/find_loops_test.cc",
"optimizing/graph_checker_test.cc",
@@ -384,7 +385,10 @@
"optimizing/induction_var_analysis_test.cc",
"optimizing/induction_var_range_test.cc",
"optimizing/licm_test.cc",
+ "optimizing/linearize_test.cc",
"optimizing/live_interval_test.cc",
+ "optimizing/live_ranges_test.cc",
+ "optimizing/liveness_test.cc",
"optimizing/loop_optimization_test.cc",
"optimizing/nodes_test.cc",
"optimizing/nodes_vector_test.cc",
@@ -396,6 +400,7 @@
"optimizing/ssa_liveness_analysis_test.cc",
"optimizing/ssa_test.cc",
"optimizing/stack_map_test.cc",
+ "optimizing/superblock_cloner_test.cc",
"optimizing/suspend_check_test.cc",
"utils/atomic_dex_ref_map_test.cc",
"utils/dedupe_set_test.cc",
@@ -424,14 +429,8 @@
srcs: [
"utils/x86/managed_register_x86_test.cc",
- // These tests are testing architecture-independent
- // functionality, but happen to use x86 codegen as part of the
- // test.
- "optimizing/constant_folding_test.cc",
- "optimizing/dead_code_elimination_test.cc",
- "optimizing/linearize_test.cc",
- "optimizing/live_ranges_test.cc",
- "optimizing/liveness_test.cc",
+ // This test is testing architecture-independent functionality,
+ // but happens to use x86 codegen as part of the test.
"optimizing/register_allocator_test.cc",
],
},