Is Zen/+ APU determined to be znver1?

[Umio-Yasuno]

Zen/+ APU x86 models are 0x11. 0x18.
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/hwmon/k10temp.c#n587

case 0x11: /* Zen APU */
case 0x18: /* Zen+ APU */

However, 0x0f or less is used for znver1 judgment.
https://github.com/llvm/llvm-project/blob/master/compiler-rt/lib/builtins/cpu_model.c#L478

    if (Model <= 0x0f) {
      *Subtype = AMDFAM17H_ZNVER1;
      break; // "znver1"; 00h-0Fh: Zen1
    }

Is Zen/+ APU determined to be znver1?
As far as I know, GCC uses 0x1f or less.
https://github.com/gcc-mirror/gcc/blob/master/libgcc/config/i386/cpuinfo.c#L109