diff --git a/compiler-rt/lib/builtins/cpu_model.c b/compiler-rt/lib/builtins/cpu_model.c
--- a/compiler-rt/lib/builtins/cpu_model.c
+++ b/compiler-rt/lib/builtins/cpu_model.c
@@ -590,6 +590,10 @@
       *Subtype = AMDFAM19H_ZNVER3;
       break; // 00h-0Fh, 21h: Zen3
     }
+    if (Model >= 0x40 && Model <= 0x5f) {
+      *Subtype = AMDFAM19H_ZNVER3;
+      break; // 40h-4fFh, 50h-5fh: Zen3+
+    }
     break;
   default:
     break; // Unknown AMD CPU.
diff --git a/llvm/lib/Support/Host.cpp b/llvm/lib/Support/Host.cpp
--- a/llvm/lib/Support/Host.cpp
+++ b/llvm/lib/Support/Host.cpp
@@ -1075,6 +1075,10 @@
       *Subtype = X86::AMDFAM19H_ZNVER3;
       break; // 00h-0Fh, 21h: Zen3
     }
+    if (Model >= 0x40 && Model <= 0x5f) {
+      *Subtype = X86::AMDFAM19H_ZNVER3;
+      break; // 40h-4fFh, 50h-5fh: Zen3+
+    }
     break;
   default:
     break; // Unknown AMD CPU.