Tweaks.

Author: klauspost

cpuid.go

@@ -15,6 +15,9 @@ import (
 	"strings"
 )
 
+// AMD refererence: https://www.amd.com/system/files/TechDocs/25481.pdf
+// and Processor Programming Reference (PPR)
+
 // Vendor is a representation of a CPU vendor.
 type Vendor int
 
@@ -186,7 +189,7 @@ type CPUInfo struct {
 		L1I int // L1 Instruction Cache (per core or shared). Will be -1 if undetected
 		L1D int // L1 Data Cache (per core or shared). Will be -1 if undetected
 		L2  int // L2 Cache (per core or shared). Will be -1 if undetected
-		L3  int // L3 Instruction Cache (per core or shared). Will be -1 if undetected
+		L3  int // L3 Cache (per core, per ccx or shared). Will be -1 if undetected
 	}
 	SGX       SGXSupport
 	maxFunc   uint32

private/cpuid.go

@@ -9,6 +9,9 @@ import (
 	"strings"
 )
 
+// AMD refererence: https://www.amd.com/system/files/TechDocs/25481.pdf
+// and Processor Programming Reference (PPR)
+
 // Vendor is a representation of a CPU vendor.
 type vendor int
 
@@ -180,7 +183,7 @@ type cpuInfo struct {
 		l1i int // L1 Instruction Cache (per core or shared). Will be -1 if undetected
 		l1d int // L1 Data Cache (per core or shared). Will be -1 if undetected
 		l2  int // L2 Cache (per core or shared). Will be -1 if undetected
-		l3  int // L3 Instruction Cache (per core or shared). Will be -1 if undetected
+		l3  int // L3 Cache (per core, per ccx or shared). Will be -1 if undetected
 	}
 	sgx       sgxsupport
 	maxFunc   uint32

testdata/cpuid_data.zip

@@ -56,7 +56,7 @@ func main() {
 }
 
 func ParseURL(s string, gw *zip.Writer) error {
-	if strings.Contains(s, "CPUID.txt") {
+	if strings.HasSuffix(s, "CPUID.txt") {
 		fmt.Println("Adding", "http://users.atw.hu/instlatx64/"+s)
 		resp, err := http.Get("http://users.atw.hu/instlatx64/" + s)
 		if err != nil {