Update Makefile and scripts after Quick removal.
Change-Id: I7610b34da337d81d9176ceca74e55ab85642a72b
diff --git a/build/Android.common_test.mk b/build/Android.common_test.mk
index c9af1c6..cde41e0 100644
--- a/build/Android.common_test.mk
+++ b/build/Android.common_test.mk
@@ -47,9 +47,6 @@
# Do you want run-test to be quieter? run-tests will only show output if they fail.
ART_TEST_QUIET ?= true
-# Do you want default compiler tests run?
-ART_TEST_DEFAULT_COMPILER ?= true
-
# Do you want interpreter tests run?
ART_TEST_INTERPRETER ?= $(ART_TEST_FULL)
ART_TEST_INTERPRETER_ACCESS_CHECKS ?= $(ART_TEST_FULL)
@@ -58,7 +55,7 @@
ART_TEST_JIT ?= $(ART_TEST_FULL)
# Do you want optimizing compiler tests run?
-ART_TEST_OPTIMIZING ?= $(ART_TEST_FULL)
+ART_TEST_OPTIMIZING ?= true
# Do we want to test a PIC-compiled core image?
ART_TEST_PIC_IMAGE ?= $(ART_TEST_FULL)
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 30f1d78..1b00270 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -111,9 +111,6 @@
PREBUILD_TYPES += no-dex2oat
endif
COMPILER_TYPES :=
-ifeq ($(ART_TEST_DEFAULT_COMPILER),true)
- COMPILER_TYPES += default
-endif
ifeq ($(ART_TEST_INTERPRETER_ACCESS_CHECKS),true)
COMPILER_TYPES += interp-ac
endif
@@ -471,19 +468,6 @@
TEST_ART_BROKEN_JIT_RUN_TESTS :=
-# Known broken tests for the default compiler (Quick).
-TEST_ART_BROKEN_DEFAULT_RUN_TESTS := \
- 457-regs \
- 563-checker-fakestring
-
-ifneq (,$(filter default,$(COMPILER_TYPES)))
- ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),$(RUN_TYPES),$(PREBUILD_TYPES), \
- default,$(RELOCATE_TYPES),$(TRACE_TYPES),$(GC_TYPES),$(JNI_TYPES), \
- $(IMAGE_TYPES),$(PICTEST_TYPES),$(DEBUGGABLE_TYPES),$(TEST_ART_BROKEN_DEFAULT_RUN_TESTS),$(ALL_ADDRESS_SIZES))
-endif
-
-TEST_ART_BROKEN_DEFAULT_RUN_TESTS :=
-
# Known broken tests for the mips32 optimizing compiler backend.
TEST_ART_BROKEN_OPTIMIZING_MIPS_RUN_TESTS := \
510-checker-try-catch \
@@ -540,13 +524,6 @@
# Tests that should fail in the read barrier configuration with the interpreter.
TEST_ART_BROKEN_INTERPRETER_READ_BARRIER_RUN_TESTS :=
-# Tests that should fail in the read barrier configuration with the default (Quick) compiler (AOT).
-# Quick has no support for read barriers and punts to the interpreter, so this list is composed of
-# tests expected to fail with the interpreter, both on the concurrent collector and in general.
-TEST_ART_BROKEN_DEFAULT_READ_BARRIER_RUN_TESTS := \
- $(TEST_ART_BROKEN_INTERPRETER_READ_BARRIER_RUN_TESTS) \
- $(TEST_ART_BROKEN_INTERPRETER_RUN_TESTS)
-
# Tests that should fail in the read barrier configuration with the Optimizing compiler (AOT).
# 484: Baker's fast path based read barrier compiler instrumentation generates code containing
# more parallel moves on x86, thus some Checker assertions may fail.
@@ -570,13 +547,6 @@
$(TEST_ART_BROKEN_INTERPRETER_READ_BARRIER_RUN_TESTS),$(ALL_ADDRESS_SIZES))
endif
- ifneq (,$(filter default,$(COMPILER_TYPES)))
- ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),$(RUN_TYPES), \
- $(PREBUILD_TYPES),default,$(RELOCATE_TYPES),$(TRACE_TYPES),$(GC_TYPES), \
- $(JNI_TYPES),$(IMAGE_TYPES),$(PICTEST_TYPES),$(DEBUGGABLE_TYPES), \
- $(TEST_ART_BROKEN_DEFAULT_READ_BARRIER_RUN_TESTS),$(ALL_ADDRESS_SIZES))
- endif
-
ifneq (,$(filter optimizing,$(COMPILER_TYPES)))
ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),$(RUN_TYPES), \
$(PREBUILD_TYPES),optimizing,$(RELOCATE_TYPES),$(TRACE_TYPES),$(GC_TYPES), \
@@ -592,30 +562,15 @@
endif
endif
-TEST_ART_BROKEN_DEFAULT_READ_BARRIER_RUN_TESTS :=
TEST_ART_BROKEN_OPTIMIZING_READ_BARRIER_RUN_TESTS :=
TEST_ART_BROKEN_JIT_READ_BARRIER_RUN_TESTS :=
-# Tests that should fail in the heap poisoning configuration with the default (Quick) compiler.
-# 137: Quick has no support for read barriers and punts to the
-# interpreter, but CFI unwinding expects managed frames.
-# 554: Quick does not support JIT profiling.
-TEST_ART_BROKEN_DEFAULT_HEAP_POISONING_RUN_TESTS := \
- 137-cfi \
- 554-jit-profile-file
# Tests that should fail in the heap poisoning configuration with the Optimizing compiler.
# 055: Exceeds run time limits due to heap poisoning instrumentation (on ARM and ARM64 devices).
TEST_ART_BROKEN_OPTIMIZING_HEAP_POISONING_RUN_TESTS := \
055-enum-performance
ifeq ($(ART_HEAP_POISONING),true)
- ifneq (,$(filter default,$(COMPILER_TYPES)))
- ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),$(RUN_TYPES), \
- $(PREBUILD_TYPES),default,$(RELOCATE_TYPES),$(TRACE_TYPES),$(GC_TYPES),$(JNI_TYPES), \
- $(IMAGE_TYPES),$(PICTEST_TYPES),$(DEBUGGABLE_TYPES), \
- $(TEST_ART_BROKEN_DEFAULT_HEAP_POISONING_RUN_TESTS),$(ALL_ADDRESS_SIZES))
- endif
-
ifneq (,$(filter optimizing,$(COMPILER_TYPES)))
ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),$(RUN_TYPES), \
$(PREBUILD_TYPES),optimizing,$(RELOCATE_TYPES),$(TRACE_TYPES),$(GC_TYPES),$(JNI_TYPES), \
@@ -624,7 +579,6 @@
endif
endif
-TEST_ART_BROKEN_DEFAULT_HEAP_POISONING_RUN_TESTS :=
TEST_ART_BROKEN_OPTIMIZING_HEAP_POISONING_RUN_TESTS :=
# Clear variables ahead of appending to them when defining tests.
@@ -704,7 +658,7 @@
# Create a rule to build and run a tests following the form:
# test-art-{1: host or target}-run-test-{2: debug ndebug}-{3: prebuild no-prebuild no-dex2oat}-
-# {4: interpreter default optimizing jit interp-ac}-
+# {4: interpreter optimizing jit interp-ac}-
# {5: relocate nrelocate relocate-npatchoat}-
# {6: trace or ntrace}-{7: gcstress gcverify cms}-{8: forcecopy checkjni jni}-
# {9: no-image image picimage}-{10: pictest npictest}-
@@ -779,16 +733,11 @@
test_groups += ART_RUN_TEST_$$(uc_host_or_target)_INTERPRETER_ACCESS_CHECKS_RULES
run_test_options += --interpreter --verify-soft-fail
else
- ifeq ($(4),default)
- test_groups += ART_RUN_TEST_$$(uc_host_or_target)_DEFAULT_RULES
- run_test_options += --quick
+ ifeq ($(4),jit)
+ test_groups += ART_RUN_TEST_$$(uc_host_or_target)_JIT_RULES
+ run_test_options += --jit
else
- ifeq ($(4),jit)
- test_groups += ART_RUN_TEST_$$(uc_host_or_target)_JIT_RULES
- run_test_options += --jit
- else
- $$(error found $(4) expected $(COMPILER_TYPES))
- endif
+ $$(error found $(4) expected $(COMPILER_TYPES))
endif
endif
endif
diff --git a/test/run-all-tests b/test/run-all-tests
index 6d5c28c..402c299 100755
--- a/test/run-all-tests
+++ b/test/run-all-tests
@@ -47,9 +47,6 @@
elif [ "x$1" = "x--no-image" ]; then
run_args="${run_args} --no-image"
shift
- elif [ "x$1" = "x--quick" ]; then
- run_args="${run_args} --quick"
- shift
elif [ "x$1" = "x--optimizing" ]; then
run_args="${run_args} --optimizing"
shift
@@ -181,7 +178,7 @@
echo " --trace --no-patchoat --no-dex2oat --use-java-home --pic-image"
echo " --pic-test --strace --debuggable --dalvik --dex2oat-swap"
echo " --build-only --build-with-jack --build-with-javac-dx"
- echo " --never-clean --image --no-image --quick --optimizing"
+ echo " --never-clean --image --no-image --optimizing"
echo " --no-relocate --no-prebuild"
echo " Specific Runtime Options:"
echo " --seq Run tests one-by-one, avoiding failures caused by busy CPU"
diff --git a/test/run-test b/test/run-test
index 3350b35..55989c6 100755
--- a/test/run-test
+++ b/test/run-test
@@ -252,9 +252,6 @@
run_args="${run_args} -Xcompiler-option --compiler-backend=Optimizing"
image_suffix="-optimizing"
shift
- elif [ "x$1" = "x--quick" ]; then
- run_args="${run_args} -Xcompiler-option --compiler-backend=Quick"
- shift
elif [ "x$1" = "x--no-verify" ]; then
run_args="${run_args} --no-verify"
shift
@@ -560,7 +557,6 @@
echo " --interpreter Enable interpreter only mode (off by default)."
echo " --jit Enable jit (off by default)."
echo " --optimizing Enable optimizing compiler (default)."
- echo " --quick Use Quick compiler (off by default)."
echo " --no-verify Turn off verification (on by default)."
echo " --verify-soft-fail Force soft fail verification (off by default)."
echo " Verification is enabled if neither --no-verify"