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

Commit 87e7f2f6 authored by Benjamin Gordon's avatar Benjamin Gordon
Browse files

Add stoney ridge x86 variant 

Bug: 124445930
Test: compile and deploy to grunt
Change-Id: Ie63217c7c68f5688bf070cbabf9ea5a1b82d3acc
parent 7487fb54

android/arch.go

+25 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ var archVariants = map[ArchType][]string{ 
		"sandybridge",

		"silvermont",

		"skylake",

		"stoneyridge",

		"tigerlake",

		"whiskeylake",

		"x86_64",
@@ -179,6 +180,7 @@ var archVariants = map[ArchType][]string{ 
		"sandybridge",

		"silvermont",

		"skylake",

		"stoneyridge",

		"tigerlake",

		"whiskeylake",

	},
@@ -339,6 +341,17 @@ var archFeatureMap = map[ArchType]map[string][]string{ 
			"aes_ni",

			"popcnt",

		},

		"stoneyridge": {

			"ssse3",

			"sse4",

			"sse4_1",

			"sse4_2",

			"aes_ni",

			"avx",

			"avx2",

			"popcnt",

			"movbe",

		},

		"tigerlake": {

			"ssse3",

			"sse4",
@@ -455,6 +468,16 @@ var archFeatureMap = map[ArchType]map[string][]string{ 
			"aes_ni",

			"popcnt",

		},

		"stoneyridge": {

			"ssse3",

			"sse4",

			"sse4_1",

			"sse4_2",

			"aes_ni",

			"avx",

			"avx2",

			"popcnt",

		},

		"tigerlake": {

			"ssse3",

			"sse4",
@@ -1522,12 +1545,14 @@ func getMegaDeviceConfig() []archConfig { 
		{"x86", "ivybridge", "", []string{"x86"}},

		{"x86", "sandybridge", "", []string{"x86"}},

		{"x86", "silvermont", "", []string{"x86"}},

		{"x86", "stoneyridge", "", []string{"x86"}},

		{"x86", "x86_64", "", []string{"x86"}},

		{"x86_64", "", "", []string{"x86_64"}},

		{"x86_64", "haswell", "", []string{"x86_64"}},

		{"x86_64", "ivybridge", "", []string{"x86_64"}},

		{"x86_64", "sandybridge", "", []string{"x86_64"}},

		{"x86_64", "silvermont", "", []string{"x86_64"}},

		{"x86_64", "stoneyridge", "", []string{"x86_64"}},

	}

}

cc/config/x86_64_device.go

+3 −0
Original line number Diff line number Diff line
@@ -57,6 +57,9 @@ var ( 
		"skylake": []string{

			"-march=skylake",

		},

		"stoneyridge": []string{

			"-march=bdver4",

		},

	}



	x86_64ArchFeatureCflags = map[string][]string{

cc/config/x86_device.go

+5 −0
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@ var ( 
			"-march=skylake",

			"-mfpmath=sse",

		},

		"stoneyridge": []string{

			"-march=bdver4",

			"-mfpmath=sse",

		},

	}



	x86ArchFeatureCflags = map[string][]string{
@@ -83,6 +87,7 @@ var ( 
		"sse4_1": []string{"-msse4.1"},

		"sse4_2": []string{"-msse4.2"},

		"avx":    []string{"-mavx"},

		"avx2":   []string{"-mavx2"},

		"aes_ni": []string{"-maes"},

	}

)