diff --git a/src/amd/llvm/ac_llvm_util.c b/src/amd/llvm/ac_llvm_util.c
index 781562eedc1..ca19a3d1d2c 100644
--- a/src/amd/llvm/ac_llvm_util.c
+++ b/src/amd/llvm/ac_llvm_util.c
@@ -174,12 +174,18 @@ const char *ac_get_llvm_processor_name(enum radeon_family family)
    case CHIP_NAVI14:
       return "gfx1012";
    case CHIP_SIENNA_CICHLID:
+      return "gfx1030";
    case CHIP_NAVY_FLOUNDER:
+      return LLVM_VERSION_MAJOR >= 12 ? "gfx1031" : "gfx1030";
    case CHIP_DIMGREY_CAVEFISH:
-   case CHIP_BEIGE_GOBY:
+      return LLVM_VERSION_MAJOR >= 12 ? "gfx1032" : "gfx1030";
    case CHIP_VANGOGH:
+      return LLVM_VERSION_MAJOR >= 12 ? "gfx1033" : "gfx1030";
+   case CHIP_BEIGE_GOBY:
+      return LLVM_VERSION_MAJOR >= 13 ? "gfx1034" : "gfx1030";
    case CHIP_YELLOW_CARP:
-   case CHIP_GFX1036:
+      return LLVM_VERSION_MAJOR >= 13 ? "gfx1035" : "gfx1030";
+   case CHIP_GFX1036: /* TODO: LLVM 15 doesn't support this yet */
       return "gfx1030";
    default:
       return "";