Add support for cortex-a55/cortex-a75.
Bug: 78133793
Bug: 78242072
Test: Builds when using cortex-a75 as a target.
Change-Id: Ie3fbe40b15f4d89eeba0d630a82097122fc83b33
Merged-In: Ie3fbe40b15f4d89eeba0d630a82097122fc83b33
(cherry picked from commit 0612597a41ca425150ef33900df8239b304bf654)
diff --git a/cc/config/arm64_device.go b/cc/config/arm64_device.go
index 74c936f..73d9e3b 100644
--- a/cc/config/arm64_device.go
+++ b/cc/config/arm64_device.go
@@ -27,6 +27,15 @@
"-Werror=implicit-function-declaration",
}
+ arm64ArchVariantCflags = map[string][]string{
+ "armv8-a": []string{
+ "-march=armv8-a",
+ },
+ "armv8-2a": []string{
+ "-march=armv8.2a",
+ },
+ }
+
arm64Ldflags = []string{
"-Wl,-m,aarch64_elf64_le_vec",
"-Wl,--hash-style=gnu",
@@ -44,6 +53,17 @@
"cortex-a53": []string{
"-mcpu=cortex-a53",
},
+ "cortex-a55": []string{
+ // The cortex-a55 target is not yet supported,
+ // so use cortex-a53.
+ "-mcpu=cortex-a53",
+ },
+ "cortex-a75": []string{
+ // Use the cortex-a53 since it is similar to the little
+ // core (cortex-a55) and is sensitive to ordering.
+ // The cortex-a55 target is not yet supported.
+ "-mcpu=cortex-a53",
+ },
"kryo": []string{
// Use the cortex-a57 cpu since some compilers
// don't support a Kryo specific target yet.
@@ -67,8 +87,11 @@
func init() {
android.RegisterArchVariants(android.Arm64,
"armv8_a",
+ "armv8_2a",
"cortex-a53",
+ "cortex-a55",
"cortex-a73",
+ "cortex-a75",
"kryo",
"exynos-m1",
"exynos-m2",
@@ -93,11 +116,19 @@
pctx.StaticVariable("Arm64ClangLldflags", strings.Join(ClangFilterUnknownCflags(arm64Lldflags), " "))
pctx.StaticVariable("Arm64ClangCppflags", strings.Join(ClangFilterUnknownCflags(arm64Cppflags), " "))
+ pctx.StaticVariable("Arm64ClangArmv8ACflags", strings.Join(arm64ArchVariantCflags["armv8-a"], " "))
+ pctx.StaticVariable("Arm64ClangArmv82ACflags", strings.Join(arm64ArchVariantCflags["armv8-2a"], " "))
+
pctx.StaticVariable("Arm64CortexA53Cflags",
strings.Join(arm64CpuVariantCflags["cortex-a53"], " "))
pctx.StaticVariable("Arm64ClangCortexA53Cflags",
strings.Join(arm64ClangCpuVariantCflags["cortex-a53"], " "))
+ pctx.StaticVariable("Arm64CortexA55Cflags",
+ strings.Join(arm64CpuVariantCflags["cortex-a55"], " "))
+ pctx.StaticVariable("Arm64ClangCortexA55Cflags",
+ strings.Join(arm64ClangCpuVariantCflags["cortex-a55"], " "))
+
pctx.StaticVariable("Arm64KryoCflags",
strings.Join(arm64CpuVariantCflags["kryo"], " "))
pctx.StaticVariable("Arm64ClangKryoCflags",
@@ -118,16 +149,25 @@
arm64CpuVariantCflagsVar = map[string]string{
"": "",
"cortex-a53": "${config.Arm64CortexA53Cflags}",
+ "cortex-a55": "${config.Arm64CortexA55Cflags}",
"cortex-a73": "${config.Arm64CortexA53Cflags}",
+ "cortex-a75": "${config.Arm64CortexA55Cflags}",
"kryo": "${config.Arm64KryoCflags}",
"exynos-m1": "${config.Arm64ExynosM1Cflags}",
"exynos-m2": "${config.Arm64ExynosM2Cflags}",
}
+ arm64ClangArchVariantCflagsVar = map[string]string{
+ "armv8-a": "${config.Arm64ClangArmv8ACflags}",
+ "armv8-2a": "${config.Arm64ClangArmv82ACflags}",
+ }
+
arm64ClangCpuVariantCflagsVar = map[string]string{
"": "",
"cortex-a53": "${config.Arm64ClangCortexA53Cflags}",
+ "cortex-a55": "${config.Arm64ClangCortexA55Cflags}",
"cortex-a73": "${config.Arm64ClangCortexA53Cflags}",
+ "cortex-a75": "${config.Arm64ClangCortexA55Cflags}",
"kryo": "${config.Arm64ClangKryoCflags}",
"exynos-m1": "${config.Arm64ClangExynosM1Cflags}",
"exynos-m2": "${config.Arm64ClangExynosM2Cflags}",
@@ -206,13 +246,21 @@
}
func arm64ToolchainFactory(arch android.Arch) Toolchain {
- if arch.ArchVariant != "armv8-a" {
+ switch arch.ArchVariant {
+ case "armv8-a":
+ case "armv8-2a":
+ // Nothing extra for armv8-a/armv8-2a
+ default:
panic(fmt.Sprintf("Unknown ARM architecture version: %q", arch.ArchVariant))
}
+ toolchainClangCflags := []string{arm64ClangArchVariantCflagsVar[arch.ArchVariant]}
+ toolchainClangCflags = append(toolchainClangCflags,
+ variantOrDefault(arm64ClangCpuVariantCflagsVar, arch.CpuVariant))
+
return &toolchainArm64{
toolchainCflags: variantOrDefault(arm64CpuVariantCflagsVar, arch.CpuVariant),
- toolchainClangCflags: variantOrDefault(arm64ClangCpuVariantCflagsVar, arch.CpuVariant),
+ toolchainClangCflags: strings.Join(toolchainClangCflags, " "),
}
}