Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebe0bacc authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 6837ac67: Merge "Refactor FDO support code to ensure arm64 can also be built with FDO." 

* commit '6837ac67':
  Refactor FDO support code to ensure arm64 can also be built with FDO.
parents 786c565e 6837ac67

core/binary.mk

+0 −1
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ my_compiler_dependencies := 
ifneq ($(strip $(LOCAL_FDO_SUPPORT)),)

  ifeq ($(strip $(LOCAL_IS_HOST_MODULE)),)

    my_cflags += $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_FDO_CFLAGS)

    my_cppflags += $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_FDO_CFLAGS)

    my_ldflags += $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_FDO_CFLAGS)

  endif

endif

core/combo/TARGET_linux-arm.mk

+1 −29
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ $(error Unknown ARM architecture version: $(TARGET_$(combo_2nd_arch_prefix)ARCH_ 
endif



include $(TARGET_ARCH_SPECIFIC_MAKEFILE)

include $(BUILD_SYSTEM)/combo/fdo.mk



# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else

ifeq ($(strip $($(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX)),)
@@ -168,35 +169,6 @@ target_libgcov := $(shell $($(combo_2nd_arch_prefix)TARGET_CC) $($(combo_2nd_arc 
        -print-file-name=libgcov.a)

endif



# Define FDO (Feedback Directed Optimization) options.



$(combo_2nd_arch_prefix)TARGET_FDO_CFLAGS:=

$(combo_2nd_arch_prefix)TARGET_FDO_LIB:=



ifneq ($(strip $(BUILD_FDO_INSTRUMENT)),)

  # Set BUILD_FDO_INSTRUMENT=true to turn on FDO instrumentation.

  # The profile will be generated on /data/local/tmp/profile on the device.

  $(combo_2nd_arch_prefix)TARGET_FDO_CFLAGS := -fprofile-generate=/data/local/tmp/profile -DANDROID_FDO

  $(combo_2nd_arch_prefix)TARGET_FDO_LIB := $(target_libgcov)

else

  # If BUILD_FDO_INSTRUMENT is turned off, then consider doing the FDO optimizations.

  # Set TARGET_FDO_PROFILE_PATH to set a custom profile directory for your build.

  ifeq ($(strip $($(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH)),)

    $(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH := fdo/profiles/$(TARGET_$(combo_2nd_arch_prefix)ARCH)/$(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)

  else

    ifeq ($(strip $(wildcard $($(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH))),)

      $(warning Custom $(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH supplied, but directory does not exist. Turn off FDO.)

    endif

  endif



  # If the FDO profile directory can't be found, then FDO is off.

  ifneq ($(strip $(wildcard $($(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH))),)

    $(combo_2nd_arch_prefix)TARGET_FDO_CFLAGS := -fprofile-use=$($(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH) -DANDROID_FDO

    $(combo_2nd_arch_prefix)TARGET_FDO_LIB := $(target_libgcov)

  endif

endif





KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi

KERNEL_HEADERS_ARCH   := $(libc_root)/kernel/uapi/asm-$(TARGET_$(combo_2nd_arch_prefix)ARCH)

KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)

core/combo/TARGET_linux-arm64.mk

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ $(error Unknown ARM architecture version: $(TARGET_ARCH_VARIANT)) 
endif



include $(TARGET_ARCH_SPECIFIC_MAKEFILE)

include $(BUILD_SYSTEM)/combo/fdo.mk



# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else

ifeq ($(strip $(TARGET_TOOLS_PREFIX)),)

core/combo/TARGET_linux-mips.mk

+1 −29
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ $(error Unknown MIPS architecture variant: $(TARGET_$(combo_2nd_arch_prefix)ARCH 
endif



include $(TARGET_ARCH_SPECIFIC_MAKEFILE)

include $(BUILD_SYSTEM)/combo/fdo.mk



# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else

ifeq ($(strip $($(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX)),)
@@ -159,35 +160,6 @@ target_libgcov := $(shell $($(combo_2nd_arch_prefix)TARGET_CC) $($(combo_2nd_arc 
        --print-file-name=libgcov.a)

endif



# Define FDO (Feedback Directed Optimization) options.



$(combo_2nd_arch_prefix)TARGET_FDO_CFLAGS:=

$(combo_2nd_arch_prefix)TARGET_FDO_LIB:=



ifneq ($(strip $(BUILD_FDO_INSTRUMENT)),)

  # Set BUILD_FDO_INSTRUMENT=true to turn on FDO instrumentation.

  # The profile will be generated on /data/local/tmp/profile on the device.

  $(combo_2nd_arch_prefix)TARGET_FDO_CFLAGS := -fprofile-generate=/data/local/tmp/profile -DANDROID_FDO

  $(combo_2nd_arch_prefix)TARGET_FDO_LIB := $(target_libgcov)

else

  # If BUILD_FDO_INSTRUMENT is turned off, then consider doing the FDO optimizations.

  # Set TARGET_FDO_PROFILE_PATH to set a custom profile directory for your build.

  ifeq ($(strip $($(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH)),)

    $(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH := fdo/profiles/$(TARGET_$(combo_2nd_arch_prefix)ARCH)/$(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)

  else

    ifeq ($(strip $(wildcard $($(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH))),)

      $(warning Custom $(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH supplied, but directory does not exist. Turn off FDO.)

    endif

  endif



  # If the FDO profile directory can't be found, then FDO is off.

  ifneq ($(strip $(wildcard $($(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH))),)

    $(combo_2nd_arch_prefix)TARGET_FDO_CFLAGS := -fprofile-use=$($(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH) -DANDROID_FDO

    $(combo_2nd_arch_prefix)TARGET_FDO_LIB := $(target_libgcov)

  endif

endif





KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi

KERNEL_HEADERS_ARCH   := $(libc_root)/kernel/uapi/asm-mips # mips covers both mips and mips64.

KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)

core/combo/TARGET_linux-mips64.mk

+1 −29
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ endif 
WITHOUT_TARGET_CLANG := true



include $(TARGET_ARCH_SPECIFIC_MAKEFILE)

include $(BUILD_SYSTEM)/combo/fdo.mk



# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else

ifeq ($(strip $(TARGET_TOOLS_PREFIX)),)
@@ -163,35 +164,6 @@ target_libgcov := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) \ 
        --print-file-name=libgcov.a)

endif



# Define FDO (Feedback Directed Optimization) options.



TARGET_FDO_CFLAGS:=

TARGET_FDO_LIB:=



ifneq ($(strip $(BUILD_FDO_INSTRUMENT)),)

  # Set BUILD_FDO_INSTRUMENT=true to turn on FDO instrumentation.

  # The profile will be generated on /data/local/tmp/profile on the device.

  TARGET_FDO_CFLAGS := -fprofile-generate=/data/local/tmp/profile -DANDROID_FDO

  TARGET_FDO_LIB := $(target_libgcov)

else

  # If BUILD_FDO_INSTRUMENT is turned off, then consider doing the FDO optimizations.

  # Set TARGET_FDO_PROFILE_PATH to set a custom profile directory for your build.

  ifeq ($(strip $(TARGET_FDO_PROFILE_PATH)),)

    TARGET_FDO_PROFILE_PATH := fdo/profiles/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT)

  else

    ifeq ($(strip $(wildcard $(TARGET_FDO_PROFILE_PATH))),)

      $(warning Custom TARGET_FDO_PROFILE_PATH supplied, but directory does not exist. Turn off FDO.)

    endif

  endif



  # If the FDO profile directory can't be found, then FDO is off.

  ifneq ($(strip $(wildcard $(TARGET_FDO_PROFILE_PATH))),)

    TARGET_FDO_CFLAGS := -fprofile-use=$(TARGET_FDO_PROFILE_PATH) -DANDROID_FDO

    TARGET_FDO_LIB := $(target_libgcov)

  endif

endif





KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi

KERNEL_HEADERS_ARCH   := $(libc_root)/kernel/uapi/asm-mips

# TODO: perhaps use $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH) instead of asm-mips ?