Change JIT tests to use interpreter image
Bug: 19528920
Change-Id: I079cfcca7bb57e492c82a44f104e41228cb33b4f
diff --git a/build/Android.oat.mk b/build/Android.oat.mk
index 894f98f..4d2fa41 100644
--- a/build/Android.oat.mk
+++ b/build/Android.oat.mk
@@ -64,10 +64,6 @@
core_compile_options += --compiler-filter=interpret-only
core_infix := -interpreter
endif
- ifeq ($(1),jit)
- core_compile_options += --compiler-filter=interpret-only
- core_infix := -jit
- endif
ifeq ($(1),default)
# Default has no infix, no compile options.
endif
@@ -147,14 +143,12 @@
$(eval $(call create-core-oat-host-rule-combination,default,,))
$(eval $(call create-core-oat-host-rule-combination,optimizing,,))
$(eval $(call create-core-oat-host-rule-combination,interpreter,,))
-$(eval $(call create-core-oat-host-rule-combination,jit,,))
valgrindHOST_CORE_IMG_OUTS :=
valgrindHOST_CORE_OAT_OUTS :=
$(eval $(call create-core-oat-host-rule-combination,default,valgrind,32))
$(eval $(call create-core-oat-host-rule-combination,optimizing,valgrind,32))
$(eval $(call create-core-oat-host-rule-combination,interpreter,valgrind,32))
-$(eval $(call create-core-oat-host-rule-combination,jit,valgrind,32))
valgrind-test-art-host-dex2oat-host: $(valgrindHOST_CORE_IMG_OUTS)
@@ -184,10 +178,6 @@
core_compile_options += --compiler-filter=interpret-only
core_infix := -interpreter
endif
- ifeq ($(1),jit)
- core_compile_options += --compiler-filter=interpret-only
- core_infix := -jit
- endif
ifeq ($(1),default)
# Default has no infix, no compile options.
endif
@@ -271,14 +261,12 @@
$(eval $(call create-core-oat-target-rule-combination,default,,))
$(eval $(call create-core-oat-target-rule-combination,optimizing,,))
$(eval $(call create-core-oat-target-rule-combination,interpreter,,))
-$(eval $(call create-core-oat-target-rule-combination,jit,,))
valgrindTARGET_CORE_IMG_OUTS :=
valgrindTARGET_CORE_OAT_OUTS :=
$(eval $(call create-core-oat-target-rule-combination,default,valgrind,32))
$(eval $(call create-core-oat-target-rule-combination,optimizing,valgrind,32))
$(eval $(call create-core-oat-target-rule-combination,interpreter,valgrind,32))
-$(eval $(call create-core-oat-target-rule-combination,jit,valgrind,32))
valgrind-test-art-host-dex2oat-target: $(valgrindTARGET_CORE_IMG_OUTS)
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index e5a07d4..c764414 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -569,32 +569,38 @@
endif
endif
endif
+ ifeq ($(4),jit)
+ # Use interpreter image for JIT.
+ image_suffix := interpreter
+ else
+ image_suffix := $(4)
+ endif
ifeq ($(9),no-image)
test_groups += ART_RUN_TEST_$$(uc_host_or_target)_NO_IMAGE_RULES
run_test_options += --no-image
# Add the core dependency. This is required for pre-building.
ifeq ($(1),host)
- prereq_rule += $(HOST_CORE_IMAGE_$(4)_no-pic_$(12))
+ prereq_rule += $(HOST_CORE_IMAGE_$(image_suffix)_no-pic_$(12))
else
- prereq_rule += $(TARGET_CORE_IMAGE_$(4)_no-pic_$(12))
+ prereq_rule += $(TARGET_CORE_IMAGE_$(image_suffix)_no-pic_$(12))
endif
else
ifeq ($(9),image)
test_groups += ART_RUN_TEST_$$(uc_host_or_target)_IMAGE_RULES
# Add the core dependency.
ifeq ($(1),host)
- prereq_rule += $(HOST_CORE_IMAGE_$(4)_no-pic_$(12))
+ prereq_rule += $(HOST_CORE_IMAGE_$(image_suffix)_no-pic_$(12))
else
- prereq_rule += $(TARGET_CORE_IMAGE_$(4)_no-pic_$(12))
+ prereq_rule += $(TARGET_CORE_IMAGE_$(image_suffix)_no-pic_$(12))
endif
else
ifeq ($(9),picimage)
test_groups += ART_RUN_TEST_$$(uc_host_or_target)_PICIMAGE_RULES
run_test_options += --pic-image
ifeq ($(1),host)
- prereq_rule += $(HOST_CORE_IMAGE_$(4)_pic_$(12))
+ prereq_rule += $(HOST_CORE_IMAGE_$(image_suffix)_pic_$(12))
else
- prereq_rule += $(TARGET_CORE_IMAGE_$(4)_pic_$(12))
+ prereq_rule += $(TARGET_CORE_IMAGE_$(image_suffix)_pic_$(12))
endif
else
$$(error found $(9) expected $(IMAGE_TYPES))
diff --git a/test/run-test b/test/run-test
index 888e4ed..52f5e0c 100755
--- a/test/run-test
+++ b/test/run-test
@@ -195,7 +195,7 @@
shift
elif [ "x$1" = "x--jit" ]; then
run_args="${run_args} --jit"
- image_suffix="-jit"
+ image_suffix="-interpreter"
shift
elif [ "x$1" = "x--optimizing" ]; then
run_args="${run_args} -Xcompiler-option --compiler-backend=Optimizing"