From 31bd91988f9f6e808ad863e02c576deae18b83df Mon Sep 17 00:00:00 2001
From: Markus Lehtonen <markus.lehtonen@intel.com>
Date: Tue, 6 Jul 2021 11:54:55 +0300
Subject: [PATCH] cpuid: correct the name of SSE4* cpuid flags

The naming was changed in when with cpuid v2
(github.com/klauspost/cpuid/v2) and we didn't catch this in NFD. No
issue reports of the inadvertent naming change so let's just adapt to
the updated naming in NFD configuration. The SSE4* labels are disabled
by default so they're not widely used, if at all.
---
 deployment/node-feature-discovery/values.yaml | 4 ++--
 docs/get-started/features.md                  | 2 +-
 nfd-daemonset-combined.yaml.template          | 4 ++--
 nfd-worker-daemonset.yaml.template            | 4 ++--
 nfd-worker-job.yaml.template                  | 4 ++--
 nfd-worker.conf.example                       | 4 ++--
 source/cpu/cpu.go                             | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/deployment/node-feature-discovery/values.yaml b/deployment/node-feature-discovery/values.yaml
index 0e7553bdf..e854caf77 100644
--- a/deployment/node-feature-discovery/values.yaml
+++ b/deployment/node-feature-discovery/values.yaml
@@ -119,8 +119,8 @@ worker:
     #        - "SSE"
     #        - "SSE2"
     #        - "SSE3"
-    #        - "SSE4.1"
-    #        - "SSE4.2"
+    #        - "SSE4"
+    #        - "SSE42"
     #        - "SSSE3"
     #      attributeWhitelist:
     #  kernel:
diff --git a/docs/get-started/features.md b/docs/get-started/features.md
index 360e4c8bc..c254d259b 100644
--- a/docs/get-started/features.md
+++ b/docs/get-started/features.md
@@ -81,7 +81,7 @@ about configurability, see
 [configuration](deployment-and-usage#worker-configuration).
 By default, the following CPUID flags have been blacklisted:
 BMI1, BMI2, CLMUL, CMOV, CX16, ERMS, F16C, HTT, LZCNT, MMX, MMXEXT, NX, POPCNT,
-RDRAND, RDSEED, RDTSCP, SGX, SSE, SSE2, SSE3, SSE4.1, SSE4.2 and SSSE3.
+RDRAND, RDSEED, RDTSCP, SGX, SSE, SSE2, SSE3, SSE4, SSE42 and SSSE3.
 
 **NOTE** The cpuid features advertise *supported* CPU capabilities, that is, a
 capability might be supported but not enabled.
diff --git a/nfd-daemonset-combined.yaml.template b/nfd-daemonset-combined.yaml.template
index 840247d09..30de125ee 100644
--- a/nfd-daemonset-combined.yaml.template
+++ b/nfd-daemonset-combined.yaml.template
@@ -206,8 +206,8 @@ data:
     #        - "SSE"
     #        - "SSE2"
     #        - "SSE3"
-    #        - "SSE4.1"
-    #        - "SSE4.2"
+    #        - "SSE4"
+    #        - "SSE42"
     #        - "SSSE3"
     #      attributeWhitelist:
     #  kernel:
diff --git a/nfd-worker-daemonset.yaml.template b/nfd-worker-daemonset.yaml.template
index b04d5724e..122bff7f7 100644
--- a/nfd-worker-daemonset.yaml.template
+++ b/nfd-worker-daemonset.yaml.template
@@ -163,8 +163,8 @@ data:
     #        - "SSE"
     #        - "SSE2"
     #        - "SSE3"
-    #        - "SSE4.1"
-    #        - "SSE4.2"
+    #        - "SSE4"
+    #        - "SSE42"
     #        - "SSSE3"
     #      attributeWhitelist:
     #  kernel:
diff --git a/nfd-worker-job.yaml.template b/nfd-worker-job.yaml.template
index 1b016073f..f39b7b211 100644
--- a/nfd-worker-job.yaml.template
+++ b/nfd-worker-job.yaml.template
@@ -180,8 +180,8 @@ data:
     #        - "SSE"
     #        - "SSE2"
     #        - "SSE3"
-    #        - "SSE4.1"
-    #        - "SSE4.2"
+    #        - "SSE4"
+    #        - "SSE42"
     #        - "SSSE3"
     #      attributeWhitelist:
     #  kernel:
diff --git a/nfd-worker.conf.example b/nfd-worker.conf.example
index 3585b6ec9..314c3ef5e 100644
--- a/nfd-worker.conf.example
+++ b/nfd-worker.conf.example
@@ -43,8 +43,8 @@
 #        - "SSE"
 #        - "SSE2"
 #        - "SSE3"
-#        - "SSE4.1"
-#        - "SSE4.2"
+#        - "SSE4"
+#        - "SSE42"
 #        - "SSSE3"
 #      attributeWhitelist:
 #  kernel:
diff --git a/source/cpu/cpu.go b/source/cpu/cpu.go
index 9802e3fc8..1544cd18d 100644
--- a/source/cpu/cpu.go
+++ b/source/cpu/cpu.go
@@ -63,8 +63,8 @@ func newDefaultConfig() *Config {
 				"SSE",
 				"SSE2",
 				"SSE3",
-				"SSE4.1",
-				"SSE4.2",
+				"SSE4",
+				"SSE42",
 				"SSSE3",
 			},
 			AttributeWhitelist: []string{},