Merge "Performance improvements by removing a DMB and inlining." into dalvik-dev
diff --git a/Android.mk b/Android.mk
index 1f67f35..38c0419 100644
--- a/Android.mk
+++ b/Android.mk
@@ -104,9 +104,6 @@
# product targets
include $(build_path)/Android.libart.mk
include $(build_path)/Android.libart-compiler.mk
-ifeq ($(ART_USE_LLVM_COMPILER),true)
-include $(build_path)/Android.libart-compiler-llvm.mk
-endif
include $(build_path)/Android.executable.mk
include $(build_path)/Android.oat.mk
diff --git a/build/Android.libart-compiler-llvm.mk b/build/Android.libart-compiler-llvm.mk
deleted file mode 100644
index 3265246..0000000
--- a/build/Android.libart-compiler-llvm.mk
+++ /dev/null
@@ -1,194 +0,0 @@
-#
-# Copyright (C) 2012 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-
-LIBART_COMPILER_LLVM_CFLAGS := -DART_USE_LLVM_COMPILER=1
-ifeq ($(ART_USE_PORTABLE_COMPILER),true)
- LIBART_COMPILER_LLVM_CFLAGS += -DART_USE_PORTABLE_COMPILER=1
-endif
-
-LIBART_COMPILER_LLVM_SRC_FILES += \
- src/compiler/write_elf.cc \
- src/compiler_llvm/compiler_llvm.cc \
- src/compiler_llvm/generated/art_module.cc \
- src/compiler_llvm/ir_builder.cc \
- src/compiler_llvm/jni_compiler.cc \
- src/compiler_llvm/llvm_compilation_unit.cc \
- src/compiler_llvm/md_builder.cc \
- src/compiler_llvm/runtime_support_builder.cc \
- src/compiler_llvm/runtime_support_builder_arm.cc \
- src/compiler_llvm/runtime_support_builder_thumb2.cc \
- src/compiler_llvm/runtime_support_builder_x86.cc \
- src/compiler_llvm/runtime_support_llvm.cc \
- src/compiler_llvm/stub_compiler.cc \
- src/elf_writer.cc \
- src/greenland/inferred_reg_category_map.cc
-
-ifeq ($(ART_USE_PORTABLE_COMPILER),true)
- LIBART_COMPILER_LLVM_SRC_FILES += \
- src/compiler/bb_opt.cc \
- src/compiler/codegen/arm/assemble_arm.cc \
- src/compiler/codegen/arm/call_arm.cc \
- src/compiler/codegen/arm/fp_arm.cc \
- src/compiler/codegen/arm/int_arm.cc \
- src/compiler/codegen/arm/target_arm.cc \
- src/compiler/codegen/arm/utility_arm.cc \
- src/compiler/codegen/codegen_util.cc \
- src/compiler/codegen/gen_common.cc \
- src/compiler/codegen/gen_invoke.cc \
- src/compiler/codegen/gen_loadstore.cc \
- src/compiler/codegen/local_optimizations.cc \
- src/compiler/codegen/mips/assemble_mips.cc \
- src/compiler/codegen/mips/call_mips.cc \
- src/compiler/codegen/mips/fp_mips.cc \
- src/compiler/codegen/mips/int_mips.cc \
- src/compiler/codegen/mips/target_mips.cc \
- src/compiler/codegen/mips/utility_mips.cc \
- src/compiler/codegen/mir_to_gbc.cc \
- src/compiler/codegen/mir_to_lir.cc \
- src/compiler/codegen/ralloc_util.cc \
- src/compiler/codegen/x86/assemble_x86.cc \
- src/compiler/codegen/x86/call_x86.cc \
- src/compiler/codegen/x86/fp_x86.cc \
- src/compiler/codegen/x86/int_x86.cc \
- src/compiler/codegen/x86/target_x86.cc \
- src/compiler/codegen/x86/utility_x86.cc \
- src/compiler/compiler_utility.cc \
- src/compiler/dataflow.cc \
- src/compiler/frontend.cc \
- src/compiler/ralloc.cc \
- src/compiler/ssa_transformation.cc \
- src/compiler_llvm/dalvik_reg.cc \
- src/compiler_llvm/gbc_expander.cc \
- src/compiler_llvm/method_compiler.cc \
- src/greenland/intrinsic_helper.cc \
- src/greenland/ir_builder.cc
-else
- LIBART_COMPILER_LLVM_SRC_FILES += \
- src/compiler_llvm/dalvik_reg.cc \
- src/compiler_llvm/method_compiler.cc
-endif
-
-# $(1): target or host
-# $(2): ndebug or debug
-define build-libart-compiler-llvm
- ifneq ($(1),target)
- ifneq ($(1),host)
- $$(error expected target or host for argument 1, received $(1))
- endif
- endif
- ifneq ($(2),ndebug)
- ifneq ($(2),debug)
- $$(error expected ndebug or debug for argument 2, received $(2))
- endif
- endif
-
- art_target_or_host := $(1)
- art_ndebug_or_debug := $(2)
-
- include $(CLEAR_VARS)
- ifeq ($$(art_target_or_host),target)
- include external/stlport/libstlport.mk
- endif
- LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION)
- ifeq ($$(art_ndebug_or_debug),ndebug)
- LOCAL_MODULE := libart-compiler-llvm
- else # debug
- LOCAL_MODULE := libartd-compiler-llvm
- endif
-
- LOCAL_MODULE_TAGS := optional
- LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-
- LOCAL_SRC_FILES := $(LIBART_COMPILER_LLVM_SRC_FILES)
- LOCAL_CFLAGS := $(LIBART_COMPILER_LLVM_CFLAGS)
- ifeq ($$(art_target_or_host),target)
- LOCAL_CFLAGS += $(ART_TARGET_CFLAGS)
- else # host
- LOCAL_CFLAGS += $(ART_HOST_CFLAGS)
- endif
-
- LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
-
- LOCAL_SHARED_LIBRARIES := liblog libnativehelper
- LOCAL_SHARED_LIBRARIES += libcorkscrew # native stack trace support
- LOCAL_SHARED_LIBRARIES += libbcc
- ifeq ($$(art_target_or_host),target)
- LOCAL_SHARED_LIBRARIES += libcutils libstlport libz libdl
- LOCAL_SHARED_LIBRARIES += libdynamic_annotations # tsan support
- else # host
- LOCAL_STATIC_LIBRARIES += libcutils
- LOCAL_SHARED_LIBRARIES += libz-host
- LOCAL_SHARED_LIBRARIES += libdynamic_annotations-host # tsan support
- LOCAL_LDLIBS := -ldl -lpthread
- ifeq ($(HOST_OS),linux)
- LOCAL_LDLIBS += -lrt
- endif
- endif
- ifeq ($$(art_ndebug_or_debug),debug)
- ifeq ($$(art_target_or_host),target)
- LOCAL_CFLAGS += $(ART_TARGET_DEBUG_CFLAGS)
- else # host
- LOCAL_CFLAGS += $(ART_HOST_DEBUG_CFLAGS)
- endif
- LOCAL_SHARED_LIBRARIES += libartd
- else
- ifeq ($$(art_target_or_host),target)
- LOCAL_CFLAGS += $(ART_TARGET_NON_DEBUG_CFLAGS)
- else # host
- LOCAL_CFLAGS += $(ART_HOST_NON_DEBUG_CFLAGS)
- endif
- LOCAL_SHARED_LIBRARIES += libart
- endif
- ifeq ($$(art_target_or_host),target)
- include $(LLVM_GEN_INTRINSICS_MK)
- include $(LLVM_DEVICE_BUILD_MK)
- include $(BUILD_SHARED_LIBRARY)
- else # host
- LOCAL_IS_HOST_MODULE := true
- include $(LLVM_GEN_INTRINSICS_MK)
- include $(LLVM_HOST_BUILD_MK)
- include $(BUILD_HOST_SHARED_LIBRARY)
- endif
-
- ifeq ($$(art_target_or_host),target)
- ifeq ($$(art_ndebug_or_debug),debug)
- $(TARGET_OUT_EXECUTABLES)/dex2oatd: $$(LOCAL_INSTALLED_MODULE)
- else
- $(TARGET_OUT_EXECUTABLES)/dex2oat: $$(LOCAL_INSTALLED_MODULE)
- endif
- else # host
- ifeq ($$(art_ndebug_or_debug),debug)
- $(HOST_OUT_EXECUTABLES)/dex2oatd: $$(LOCAL_INSTALLED_MODULE)
- else
- $(HOST_OUT_EXECUTABLES)/dex2oat: $$(LOCAL_INSTALLED_MODULE)
- endif
- endif
-
-endef
-
-ifeq ($(ART_BUILD_TARGET_NDEBUG),true)
- $(eval $(call build-libart-compiler-llvm,target,ndebug))
-endif
-ifeq ($(ART_BUILD_TARGET_DEBUG),true)
- $(eval $(call build-libart-compiler-llvm,target,debug))
-endif
-ifeq ($(ART_BUILD_HOST_NDEBUG),true)
- $(eval $(call build-libart-compiler-llvm,host,ndebug))
-endif
-ifeq ($(ART_BUILD_HOST_DEBUG),true)
- $(eval $(call build-libart-compiler-llvm,host,debug))
-endif
diff --git a/build/Android.libart-compiler.mk b/build/Android.libart-compiler.mk
index ce5d578..5ae7ffb 100644
--- a/build/Android.libart-compiler.mk
+++ b/build/Android.libart-compiler.mk
@@ -14,52 +14,84 @@
# limitations under the License.
#
-LIBART_COMPILER_SRC_FILES += \
- src/elf_writer.cc \
- src/compiler/write_elf.cc \
- src/compiler/dataflow.cc \
- src/compiler/frontend.cc \
- src/compiler/ralloc.cc \
+LIBART_COMPILER_SRC_FILES := \
src/compiler/bb_opt.cc \
- src/compiler/ssa_transformation.cc \
- src/compiler/compiler_utility.cc \
- src/compiler/codegen/ralloc_util.cc \
- src/compiler/codegen/codegen_util.cc \
- src/compiler/codegen/gen_loadstore.cc \
- src/compiler/codegen/gen_common.cc \
- src/compiler/codegen/gen_invoke.cc \
- src/compiler/codegen/mir_to_gbc.cc \
- src/compiler/codegen/mir_to_lir.cc \
- src/compiler/codegen/local_optimizations.cc \
- src/oat/jni/calling_convention.cc \
- src/oat/jni/jni_compiler.cc \
- src/oat/jni/arm/calling_convention_arm.cc \
- src/oat/jni/mips/calling_convention_mips.cc \
- src/oat/jni/x86/calling_convention_x86.cc \
- src/greenland/ir_builder.cc \
- src/greenland/intrinsic_helper.cc \
- src/compiler/codegen/arm/target_arm.cc \
src/compiler/codegen/arm/assemble_arm.cc \
- src/compiler/codegen/arm/utility_arm.cc \
src/compiler/codegen/arm/call_arm.cc \
src/compiler/codegen/arm/fp_arm.cc \
src/compiler/codegen/arm/int_arm.cc \
- src/compiler/codegen/mips/target_mips.cc \
+ src/compiler/codegen/arm/target_arm.cc \
+ src/compiler/codegen/arm/utility_arm.cc \
+ src/compiler/codegen/codegen_util.cc \
+ src/compiler/codegen/gen_common.cc \
+ src/compiler/codegen/gen_invoke.cc \
+ src/compiler/codegen/gen_loadstore.cc \
+ src/compiler/codegen/local_optimizations.cc \
src/compiler/codegen/mips/assemble_mips.cc \
- src/compiler/codegen/mips/utility_mips.cc \
src/compiler/codegen/mips/call_mips.cc \
src/compiler/codegen/mips/fp_mips.cc \
src/compiler/codegen/mips/int_mips.cc \
- src/compiler/codegen/x86/target_x86.cc \
+ src/compiler/codegen/mips/target_mips.cc \
+ src/compiler/codegen/mips/utility_mips.cc \
+ src/compiler/codegen/mir_to_gbc.cc \
+ src/compiler/codegen/mir_to_lir.cc \
+ src/compiler/codegen/ralloc_util.cc \
src/compiler/codegen/x86/assemble_x86.cc \
- src/compiler/codegen/x86/utility_x86.cc \
src/compiler/codegen/x86/call_x86.cc \
src/compiler/codegen/x86/fp_x86.cc \
src/compiler/codegen/x86/int_x86.cc \
+ src/compiler/codegen/x86/target_x86.cc \
+ src/compiler/codegen/x86/utility_x86.cc \
+ src/compiler/compiler_utility.cc \
+ src/compiler/dataflow.cc \
+ src/compiler/frontend.cc \
+ src/compiler/ralloc.cc \
+ src/compiler/ssa_transformation.cc \
+ src/compiler/write_elf.cc \
+ src/elf_writer.cc \
+ src/greenland/intrinsic_helper.cc \
+ src/greenland/ir_builder.cc \
+ src/oat/jni/arm/calling_convention_arm.cc \
src/oat/jni/arm/jni_internal_arm.cc \
+ src/oat/jni/calling_convention.cc \
+ src/oat/jni/jni_compiler.cc \
+ src/oat/jni/mips/calling_convention_mips.cc \
src/oat/jni/mips/jni_internal_mips.cc \
+ src/oat/jni/x86/calling_convention_x86.cc \
src/oat/jni/x86/jni_internal_x86.cc
+LIBART_COMPILER_CFLAGS :=
+ifeq ($(ART_USE_LLVM_COMPILER),true)
+ LIBART_COMPILER_CFLAGS += -DART_USE_LLVM_COMPILER=1
+endif
+ifeq ($(ART_USE_PORTABLE_COMPILER),true)
+ LIBART_COMPILER_CFLAGS += -DART_USE_PORTABLE_COMPILER=1
+endif
+
+ifeq ($(ART_USE_LLVM_COMPILER),true)
+ LIBART_COMPILER_SRC_FILES += \
+ src/compiler_llvm/compiler_llvm.cc \
+ src/compiler_llvm/dalvik_reg.cc \
+ src/compiler_llvm/generated/art_module.cc \
+ src/compiler_llvm/ir_builder.cc \
+ src/compiler_llvm/jni_compiler.cc \
+ src/compiler_llvm/llvm_compilation_unit.cc \
+ src/compiler_llvm/md_builder.cc \
+ src/compiler_llvm/method_compiler.cc \
+ src/compiler_llvm/runtime_support_builder.cc \
+ src/compiler_llvm/runtime_support_builder_arm.cc \
+ src/compiler_llvm/runtime_support_builder_thumb2.cc \
+ src/compiler_llvm/runtime_support_builder_x86.cc \
+ src/compiler_llvm/runtime_support_llvm.cc \
+ src/compiler_llvm/stub_compiler.cc \
+ src/greenland/inferred_reg_category_map.cc
+endif
+
+ifeq ($(ART_USE_PORTABLE_COMPILER),true)
+ LIBART_COMPILER_SRC_FILES += \
+ src/compiler_llvm/gbc_expander.cc
+endif
+
# $(1): target or host
# $(2): ndebug or debug
define build-libart-compiler
@@ -93,10 +125,11 @@
LOCAL_SRC_FILES := $$(LIBART_COMPILER_SRC_FILES)
+ LOCAL_CFLAGS := $$(LIBART_COMPILER_CFLAGS)
ifeq ($$(art_target_or_host),target)
- LOCAL_CFLAGS := $(ART_TARGET_CFLAGS)
+ LOCAL_CFLAGS += $(ART_TARGET_CFLAGS)
else # host
- LOCAL_CFLAGS := $(ART_HOST_CFLAGS)
+ LOCAL_CFLAGS += $(ART_HOST_CFLAGS)
endif
# TODO: clean up the compilers and remove this.
diff --git a/src/compiler.cc b/src/compiler.cc
index 903b70a..48aa335 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -246,12 +246,7 @@
const char* suffix = (kIsDebugBuild ? "d" : "");
// Work out the filename for the compiler library.
- std::string library_name;
- if ((compiler_backend == kPortable) || (compiler_backend == kIceland)) {
- library_name = StringPrintf("art%s-compiler-llvm", suffix);
- } else {
- library_name = StringPrintf("art%s-compiler", suffix);
- }
+ std::string library_name(StringPrintf("art%s-compiler", suffix));
std::string filename(StringPrintf(OS_SHARED_LIB_FORMAT_STR, library_name.c_str()));
#if defined(__APPLE__)
@@ -336,7 +331,12 @@
init_compiler_context(*this);
- jni_compiler_ = FindFunction<JniCompilerFn>(compiler_so_name, compiler_library_, "ArtJniCompileMethod");
+ if ((compiler_backend_ == kPortable) || (compiler_backend_ == kIceland)){
+ jni_compiler_ = FindFunction<JniCompilerFn>(compiler_so_name, compiler_library_, "ArtLLVMJniCompileMethod");
+ } else {
+ jni_compiler_ = FindFunction<JniCompilerFn>(compiler_so_name, compiler_library_, "ArtQuickJniCompileMethod");
+ }
+
if ((compiler_backend_ == kPortable) || (compiler_backend_ == kIceland)){
create_invoke_stub_ =
FindFunction<CreateInvokeStubFn>(compiler_so_name, compiler_library_, "ArtCreateLLVMInvokeStub");
diff --git a/src/compiler_llvm/compiler_llvm.cc b/src/compiler_llvm/compiler_llvm.cc
index 7237911..55c7edb 100644
--- a/src/compiler_llvm/compiler_llvm.cc
+++ b/src/compiler_llvm/compiler_llvm.cc
@@ -262,9 +262,9 @@
return result;
}
-extern "C" art::CompiledMethod* ArtJniCompileMethod(art::Compiler& compiler,
- uint32_t access_flags, uint32_t method_idx,
- const art::DexFile& dex_file) {
+extern "C" art::CompiledMethod* ArtLLVMJniCompileMethod(art::Compiler& compiler,
+ uint32_t access_flags, uint32_t method_idx,
+ const art::DexFile& dex_file) {
art::ClassLinker *class_linker = art::Runtime::Current()->GetClassLinker();
art::OatCompilationUnit oat_compilation_unit(
diff --git a/src/oat/jni/jni_compiler.cc b/src/oat/jni/jni_compiler.cc
index c0298de..ae5bce4 100644
--- a/src/oat/jni/jni_compiler.cc
+++ b/src/oat/jni/jni_compiler.cc
@@ -481,8 +481,8 @@
} // namespace art
-extern "C" art::CompiledMethod* ArtJniCompileMethod(art::Compiler& compiler,
- uint32_t access_flags, uint32_t method_idx,
- const art::DexFile& dex_file) {
+extern "C" art::CompiledMethod* ArtQuickJniCompileMethod(art::Compiler& compiler,
+ uint32_t access_flags, uint32_t method_idx,
+ const art::DexFile& dex_file) {
return ArtJniCompileMethodInternal(compiler, access_flags, method_idx, dex_file);
}
