From 3510a1e32cbc86b73db143aefcc00aadc44c27bd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Martin=20M=C3=B6hrmann?= <moehrmann@google.com>
Date: Thu, 5 Nov 2020 05:59:34 +0100
Subject: [PATCH] internal/cpu: fix and cleanup ARM64 cpu feature fields and
 options
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Remove all cpu features from the ARM64 struct that are not initialized
to reduce cache lines used and to avoid those features being
accidentially used without actual detection if they are present.

Add missing option to mask the CPUID feature.

Change-Id: I94bf90c0655de1af2218ac72117ac6c52adfc289
Reviewed-on: https://go-review.googlesource.com/c/go/+/267658
Run-TryBot: Martin Möhrmann <moehrmann@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Tobias Klauser <tobias.klauser@gmail.com>
Trust: Martin Möhrmann <moehrmann@google.com>
---
 src/internal/cpu/cpu.go       | 17 -----------------
 src/internal/cpu/cpu_arm64.go |  1 +
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/internal/cpu/cpu.go b/src/internal/cpu/cpu.go
index 0ceedcd7d2..dab5d068ef 100644
--- a/src/internal/cpu/cpu.go
+++ b/src/internal/cpu/cpu.go
@@ -57,30 +57,13 @@ var ARM struct {
 // The struct is padded to avoid false sharing.
 var ARM64 struct {
 	_            CacheLinePad
-	HasFP        bool
-	HasASIMD     bool
-	HasEVTSTRM   bool
 	HasAES       bool
 	HasPMULL     bool
 	HasSHA1      bool
 	HasSHA2      bool
 	HasCRC32     bool
 	HasATOMICS   bool
-	HasFPHP      bool
-	HasASIMDHP   bool
 	HasCPUID     bool
-	HasASIMDRDM  bool
-	HasJSCVT     bool
-	HasFCMA      bool
-	HasLRCPC     bool
-	HasDCPOP     bool
-	HasSHA3      bool
-	HasSM3       bool
-	HasSM4       bool
-	HasASIMDDP   bool
-	HasSHA512    bool
-	HasSVE       bool
-	HasASIMDFHM  bool
 	IsNeoverseN1 bool
 	IsZeus       bool
 	_            CacheLinePad
diff --git a/src/internal/cpu/cpu_arm64.go b/src/internal/cpu/cpu_arm64.go
index 8fde39f03e..4e9ea8ca96 100644
--- a/src/internal/cpu/cpu_arm64.go
+++ b/src/internal/cpu/cpu_arm64.go
@@ -29,6 +29,7 @@ func doinit() {
 		{Name: "sha2", Feature: &ARM64.HasSHA2},
 		{Name: "crc32", Feature: &ARM64.HasCRC32},
 		{Name: "atomics", Feature: &ARM64.HasATOMICS},
+		{Name: "cpuid", Feature: &ARM64.HasCPUID},
 		{Name: "isNeoverseN1", Feature: &ARM64.IsNeoverseN1},
 		{Name: "isZeus", Feature: &ARM64.IsZeus},
 	}
-- 
2.51.0