tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add arch variants for Intel Atom CPUs" am: 7853388422 am: 0c8d0c782c

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

Change-Id: I188dc6728fbaa9bef68d20334f9dad48a3c84f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2022-12-14 04:21:42 +00:00 committed by Automerger Merge Worker
commit e8f7279940
5 changed files with 96 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
android/arch_list.go
View file

@ -31,6 +31,8 @@ var archVariants = map[ArchType][]string{
"amberlake",
"atom",
"broadwell",
"goldmont",
"goldmont-plus",
"haswell",
"icelake",
"ivybridge",
@ -40,12 +42,15 @@ var archVariants = map[ArchType][]string{
"skylake",
"stoneyridge",
"tigerlake",
"tremont",
"whiskeylake",
"x86_64",
},
X86_64: {
"amberlake",
"broadwell",
"goldmont",
"goldmont-plus",
"haswell",
"icelake",
"ivybridge",
@ -55,6 +60,7 @@ var archVariants = map[ArchType][]string{
"skylake",
"stoneyridge",
"tigerlake",
"tremont",
"whiskeylake",
},
}
@ -168,6 +174,24 @@ var androidArchFeatureMap = map[ArchType]map[string][]string{
"aes_ni",
"popcnt",
},
"goldmont": {
"ssse3",
"sse4",
"sse4_1",
"sse4_2",
"aes_ni",
"popcnt",
"movbe",
},
"goldmont-plus": {
"ssse3",
"sse4",
"sse4_1",
"sse4_2",
"aes_ni",
"popcnt",
"movbe",
},
"haswell": {
"ssse3",
"sse4",
@ -257,6 +281,15 @@ var androidArchFeatureMap = map[ArchType]map[string][]string{
"aes_ni",
"popcnt",
},
"tremont": {
"ssse3",
"sse4",
"sse4_1",
"sse4_2",
"aes_ni",
"popcnt",
"movbe",
},
"whiskeylake": {
"ssse3",
"sse4",
@ -304,6 +337,22 @@ var androidArchFeatureMap = map[ArchType]map[string][]string{
"aes_ni",
"popcnt",
},
"goldmont": {
"ssse3",
"sse4",
"sse4_1",
"sse4_2",
"aes_ni",
"popcnt",
},
"goldmont-plus": {
"ssse3",
"sse4",
"sse4_1",
"sse4_2",
"aes_ni",
"popcnt",
},
"haswell": {
"ssse3",
"sse4",
@ -390,6 +439,14 @@ var androidArchFeatureMap = map[ArchType]map[string][]string{
"aes_ni",
"popcnt",
},
"tremont": {
"ssse3",
"sse4",
"sse4_1",
"sse4_2",
"aes_ni",
"popcnt",
},
"whiskeylake": {
"ssse3",
"sse4",

9
cc/config/x86_64_device.go
View file

@ -41,6 +41,12 @@ var (
"broadwell": []string{
"-march=broadwell",
},
"goldmont": []string{
"-march=goldmont",
},
"goldmont-plus": []string{
"-march=goldmont-plus",
},
"haswell": []string{
"-march=core-avx2",
},
@ -59,6 +65,9 @@ var (
"stoneyridge": []string{
"-march=bdver4",
},
"tremont": []string{
"-march=tremont",
},
}
x86_64ArchFeatureCflags = map[string][]string{

9
cc/config/x86_device.go
View file

@ -50,6 +50,12 @@ var (
"broadwell": []string{
"-march=broadwell",
},
"goldmont": []string{
"-march=goldmont",
},
"goldmont-plus": []string{
"-march=goldmont-plus",
},
"haswell": []string{
"-march=core-avx2",
},
@ -68,6 +74,9 @@ var (
"stoneyridge": []string{
"-march=bdver4",
},
"tremont": []string{
"-march=tremont",
},
}
x86ArchFeatureCflags = map[string][]string{

17
rust/config/x86_64_device.go
View file

@ -26,15 +26,18 @@ var (
x86_64LinkFlags = []string{}
x86_64ArchVariantRustFlags = map[string][]string{
"": []string{},
"broadwell": []string{"-C target-cpu=broadwell"},
"haswell": []string{"-C target-cpu=haswell"},
"ivybridge": []string{"-C target-cpu=ivybridge"},
"sandybridge": []string{"-C target-cpu=sandybridge"},
"silvermont": []string{"-C target-cpu=silvermont"},
"skylake": []string{"-C target-cpu=skylake"},
"": []string{},
"broadwell": []string{"-C target-cpu=broadwell"},
"goldmont": []string{"-C target-cpu=goldmont"},
"goldmont-plus": []string{"-C target-cpu=goldmont-plus"},
"haswell": []string{"-C target-cpu=haswell"},
"ivybridge": []string{"-C target-cpu=ivybridge"},
"sandybridge": []string{"-C target-cpu=sandybridge"},
"silvermont": []string{"-C target-cpu=silvermont"},
"skylake": []string{"-C target-cpu=skylake"},
//TODO: Add target-cpu=stoneyridge when rustc supports it.
"stoneyridge": []string{""},
"tremont": []string{"-C target-cpu=tremont"},
}
)

19
rust/config/x86_device.go
View file

@ -26,16 +26,19 @@ var (
x86LinkFlags = []string{}
x86ArchVariantRustFlags = map[string][]string{
"": []string{},
"atom": []string{"-C target-cpu=atom"},
"broadwell": []string{"-C target-cpu=broadwell"},
"haswell": []string{"-C target-cpu=haswell"},
"ivybridge": []string{"-C target-cpu=ivybridge"},
"sandybridge": []string{"-C target-cpu=sandybridge"},
"silvermont": []string{"-C target-cpu=silvermont"},
"skylake": []string{"-C target-cpu=skylake"},
"": []string{},
"atom": []string{"-C target-cpu=atom"},
"broadwell": []string{"-C target-cpu=broadwell"},
"goldmont": []string{"-C target-cpu=goldmont"},
"goldmont-plus": []string{"-C target-cpu=goldmont-plus"},
"haswell": []string{"-C target-cpu=haswell"},
"ivybridge": []string{"-C target-cpu=ivybridge"},
"sandybridge": []string{"-C target-cpu=sandybridge"},
"silvermont": []string{"-C target-cpu=silvermont"},
"skylake": []string{"-C target-cpu=skylake"},
//TODO: Add target-cpu=stoneyridge when rustc supports it.
"stoneyridge": []string{""},
"tremont": []string{"-C target-cpu=tremont"},
// use prescott for x86_64, like cc/config/x86_device.go
"x86_64": []string{"-C target-cpu=prescott"},
}