remove cpuinfo format detection

CPU detection is now done using compiler tags, so the manual
detection is no longer needed.

Signed-off-by: Paul Gier <[email protected]>

Author: pgier

cpuinfo.go

@@ -19,7 +19,6 @@ import (
 	"bufio"
 	"bytes"
 	"errors"
-	"fmt"
 	"regexp"
 	"strconv"
 	"strings"
@@ -57,52 +56,18 @@ type CPUInfo struct {
 	PowerManagement string
 }
 
-const (
-	platformX86     = "x86"
-	platformARM     = "arm"
-	platformS390X   = "s390x"
-	platformPPC     = "ppc"
-	platformUnknown = "unknown"
-)
-
 var (
-	cpuinfoX86Regexp   = regexp.MustCompile(`(?m)^\s*processor\s*:\s*\d+\s*vendor`)
-	cpuinfoARMRegexp   = regexp.MustCompile(`^\s*Processor\s*:\s*ARM`)
-	cpuinfoS390XRegexp = regexp.MustCompile(`^\s*vendor_id\s*:\s*IBM/S390`)
-	cpuinfoPPCRegexp   = regexp.MustCompile(`(?m)^\s*processor\s*:\s*\d+\s+cpu\s+:\s+POWER`)
-
 	cpuinfoClockRegexp          = regexp.MustCompile(`([\d.]+)`)
 	cpuinfoS390XProcessorRegexp = regexp.MustCompile(`^processor\s+(\d+):.*`)
 )
 
-// cpuinfoDetectFormat attempts to determine the format used by the cpuinfo.
-// This format corresponds to the platform generating the /proc/cpuinfo file.
-// Returns "unknown"
-func cpuinfoDetectFormat(info []byte) string {
-	switch {
-	case cpuinfoX86Regexp.Match(info):
-		return platformX86
-	case cpuinfoARMRegexp.Match(info):
-		return platformARM
-	case cpuinfoPPCRegexp.Match(info):
-		return platformPPC
-	case cpuinfoS390XRegexp.Match(info):
-		return platformS390X
-	}
-	return platformUnknown
-}
-
 // CPUInfo returns information about current system CPUs.
 // See https://www.kernel.org/doc/Documentation/filesystems/proc.txt
 func (fs FS) CPUInfo() ([]CPUInfo, error) {
 	data, err := util.ReadFileNoStat(fs.proc.Path("cpuinfo"))
 	if err != nil {
 		return nil, err
 	}
-	if format := cpuinfoDetectFormat(data); format != expectedPlatform {
-		return nil, fmt.Errorf("unable to parse CPU info, expected format %v, found: %v",
-			expectedPlatform, format)
-	}
 	return parseCPUInfo(data)
 }
 

cpuinfo_amd64.go

@@ -16,6 +16,4 @@
 
 package procfs
 
-const expectedPlatform = platformX86
-
 var parseCPUInfo = parseCPUInfoX86

cpuinfo_arm64.go

@@ -16,6 +16,4 @@
 
 package procfs
 
-const expectedPlatform = platformARM
-
 var parseCPUInfo = parseCPUInfoARM

cpuinfo_ppc64.go

@@ -16,6 +16,4 @@
 
 package procfs
 
-const expectedPlatform = platformPPC
-
 var parseCPUInfo = parseCPUInfoPPC

cpuinfo_s390x.go

@@ -16,6 +16,4 @@
 
 package procfs
 
-const expectedPlatform = platformS390X
-
 var parseCPUInfo = parseCPUInfoS390x

cpuinfo_test.go

@@ -110,25 +110,6 @@ machine		: CHRP IBM,8233-E8B
 `
 )
 
-func TestCPUInfoDetectFormat(t *testing.T) {
-	cpuinfoX86Bytes := []byte("processor  : 0\nvendor_id : GenuineIntel")
-	if want, have := platformX86, cpuinfoDetectFormat(cpuinfoX86Bytes); want != have {
-		t.Errorf("want cpuinfo format %v, have %v", want, have)
-	}
-	cpuinfoArm7Bytes := []byte(cpuinfoArm7)
-	if want, have := platformARM, cpuinfoDetectFormat(cpuinfoArm7Bytes); want != have {
-		t.Errorf("want cpuinfo format %v, have %v", want, have)
-	}
-	cpuinfoS390xBytes := []byte(cpuinfoS390x)
-	if want, have := platformS390X, cpuinfoDetectFormat(cpuinfoS390xBytes); want != have {
-		t.Errorf("want cpuinfo format %v, have %v", want, have)
-	}
-	cpuinfoPpc64Bytes := []byte(cpuinfoPpc64)
-	if want, have := platformPPC, cpuinfoDetectFormat(cpuinfoPpc64Bytes); want != have {
-		t.Errorf("want cpuinfo format %v, have %v", want, have)
-	}
-}
-
 func TestCPUInfoX86(t *testing.T) {
 	cpuinfo, err := getProcFixtures(t).CPUInfo()
 	if err != nil {