fix frequency table for CWF

Signed-off-by: Harper, Jason M <jason.m.harper@intel.com>

Author: harp-intel

internal/extract/frequency.go

@@ -124,30 +124,37 @@ func GetSpecFrequencyBuckets(outputs map[string]script.ScriptOutput) ([][]string
 	var dieCoreBuckets []string
 	totalCoreStartRange := 1
 	startRange := 1
-	var archMultiplier int
-	if strings.Contains(arch, cpus.UarchSRF) || strings.Contains(arch, cpus.UarchCWF) {
-		archMultiplier = 4
+	var numDies int
+	var coreMultiplier int
+	if strings.Contains(arch, cpus.UarchSRF) {
+		numDies = 4
+		coreMultiplier = 4
+	} else if strings.Contains(arch, cpus.UarchCWF) {
+		numDies = 3
+		coreMultiplier = 4
 	} else if strings.Contains(arch, cpus.UarchGNR_X3) {
-		archMultiplier = 3
+		numDies = 3
+		coreMultiplier = 1
 	} else if strings.Contains(arch, cpus.UarchGNR_X2) {
-		archMultiplier = 2
+		numDies = 2
+		coreMultiplier = 1
 	} else {
-		archMultiplier = 1
+		numDies = 1
+		coreMultiplier = 1
 	}
 	for _, count := range bucketCoreCounts {
-		if startRange > count {
+		adjustedCount := count * coreMultiplier
+		if startRange > adjustedCount {
 			break
 		}
-		if archMultiplier > 1 {
-			totalCoreCount := count * archMultiplier
-			if totalCoreStartRange > int(totalCoreCount) {
-				break
-			}
-			totalCoreBuckets = append(totalCoreBuckets, fmt.Sprintf("%d-%d", totalCoreStartRange, totalCoreCount))
-			totalCoreStartRange = int(totalCoreCount) + 1
+		totalCoreCount := adjustedCount * numDies
+		if totalCoreStartRange > int(totalCoreCount) {
+			break
 		}
-		dieCoreBuckets = append(dieCoreBuckets, fmt.Sprintf("%d-%d", startRange, count))
-		startRange = int(count) + 1
+		totalCoreBuckets = append(totalCoreBuckets, fmt.Sprintf("%d-%d", totalCoreStartRange, totalCoreCount))
+		totalCoreStartRange = int(totalCoreCount) + 1
+		dieCoreBuckets = append(dieCoreBuckets, fmt.Sprintf("%d-%d", startRange, adjustedCount))
+		startRange = int(adjustedCount) + 1
 	}
 	// get the frequencies for each isa
 	var allIsaFreqs [][]string
@@ -185,7 +192,7 @@ func GetSpecFrequencyBuckets(outputs map[string]script.ScriptOutput) ([][]string
 	specCoreFreqs = make([][]string, 1, len(dieCoreBuckets)+1)
 	// add bucket field name(s)
 	specCoreFreqs[0] = append(specCoreFreqs[0], "Cores")
-	if archMultiplier > 1 {
+	if numDies > 1 {
 		specCoreFreqs[0] = append(specCoreFreqs[0], "Cores per Die")
 	}
 	// add fieldNames for ISAs that have frequencies
@@ -198,7 +205,7 @@ func GetSpecFrequencyBuckets(outputs map[string]script.ScriptOutput) ([][]string
 	for i, bucket := range dieCoreBuckets {
 		row := make([]string, 0, len(allIsaFreqs)+2)
 		// add the total core buckets for multi-die architectures
-		if archMultiplier > 1 {
+		if numDies > 1 {
 			row = append(row, totalCoreBuckets[i])
 		}
 		// add the die core buckets

internal/script/scripts.go

@@ -383,7 +383,14 @@ if ( [ "$family" -eq 6 ] && [ "$model" -eq 173 ] ) || ( [ "$family" -eq 6 ] && [
 	avx512=$(pcm-tpmi 0x5 0xB8 -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $3}') # SST_PPINFO_6
 	avx512h=$(pcm-tpmi 0x5 0xC0 -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $3}') # SST_PPINFO_7
 	amx=$(pcm-tpmi 0x5 0xC8 -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $3}') # SST_PPINFO_8
-elif [ "$family" -eq 6 ] && ( [ "$model" -eq 175 ] || [ "$model" -eq 221 ] ); then  # SRF, CWF
+elif [ "$family" -eq 6 ] && [ "$model" -eq 221 ]; then  # CWF (no AVX-512 or AMX support)
+	cores=$(pcm-tpmi 0x5 0xD8 -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $3}') # SST_PP_INFO_10
+	sse=$(rdmsr 0x1ad) # MSR_TURBO_RATIO_LIMIT: Maximum Ratio Limit of Turbo Mode
+	avx2=$(pcm-tpmi 0x5 0xB0 -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $3}') # SST_PPINFO_5
+	avx512=0
+	avx512h=0
+	amx=0
+elif [ "$family" -eq 6 ] && [ "$model" -eq 175 ]; then  # SRF
 	cores=$(rdmsr 0x1ae) # MSR_TURBO_GROUP_CORE_CNT: Group Size of Active Cores for Turbo Mode Operation
 	# if pstate driver is intel_pstate use 0x774 else use 0x199
 	driver=$(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_driver)