StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Introduce new Arm64 arch variant with dot product features" am: dba548af83 am: c3f8bb9f35 am: 9cf2103acd am: 76c2720461 am: 3288c6c9c9

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1426708

Change-Id: I8673220c20841c39fb83d0ba45974c37904f9184
This commit is contained in:
Roland Levillain
2020-09-21 19:04:40 +00:00
committed by Automerger Merge Worker
parent d53a5af1ca 3288c6c9c9
commit 842410d9e5
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cc/config/arm64_device.go
View File

@@ -34,6 +34,9 @@ var (
"armv8-2a": []string{
"-march=armv8.2-a",
},
"armv8-2a-dotprod": []string{
"-march=armv8.2-a+dotprod",
},
}
arm64Ldflags = []string{
@@ -100,6 +103,7 @@ func init() {
pctx.StaticVariable("Arm64ClangArmv8ACflags", strings.Join(arm64ArchVariantCflags["armv8-a"], " "))
pctx.StaticVariable("Arm64ClangArmv82ACflags", strings.Join(arm64ArchVariantCflags["armv8-2a"], " "))
pctx.StaticVariable("Arm64ClangArmv82ADotprodCflags", strings.Join(arm64ArchVariantCflags["armv8-2a-dotprod"], " "))
pctx.StaticVariable("Arm64ClangCortexA53Cflags",
strings.Join(arm64ClangCpuVariantCflags["cortex-a53"], " "))
@@ -121,6 +125,7 @@ var (
arm64ClangArchVariantCflagsVar = map[string]string{
"armv8-a": "${config.Arm64ClangArmv8ACflags}",
"armv8-2a": "${config.Arm64ClangArmv82ACflags}",
"armv8-2a-dotprod": "${config.Arm64ClangArmv82ADotprodCflags}",
}
arm64ClangCpuVariantCflagsVar = map[string]string{
@@ -198,6 +203,7 @@ func arm64ToolchainFactory(arch android.Arch) Toolchain {
switch arch.ArchVariant {
case "armv8-a":
case "armv8-2a":
case "armv8-2a-dotprod":
// Nothing extra for armv8-a/armv8-2a
default:
panic(fmt.Sprintf("Unknown ARM architecture version: %q", arch.ArchVariant))