diff --git a/llvm/lib/Target/AMDGPU/AMDGPU.td b/llvm/lib/Target/AMDGPU/AMDGPU.td
index f9608ad05df0a..0fd73ba88b1fe 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPU.td
+++ b/llvm/lib/Target/AMDGPU/AMDGPU.td
@@ -1193,7 +1193,7 @@ def FeatureISAVersion9_0_C : FeatureSet<
    FeatureMadMacF32Insts,
    FeatureImageGather4D16Bug]>;
 
-def FeatureISAVersion9_4_0 : FeatureSet<
+def FeatureISAVersion9_4_Common : FeatureSet<
   [FeatureGFX9,
    FeatureGFX90AInsts,
    FeatureGFX940Insts,
@@ -1227,73 +1227,17 @@ def FeatureISAVersion9_4_0 : FeatureSet<
    FullRate64Ops,
    FeatureBackOffBarrier]>;
 
+def FeatureISAVersion9_4_0 : FeatureSet<
+  !listconcat(FeatureISAVersion9_4_Common.Features,
+    [])>;
+
 def FeatureISAVersion9_4_1 : FeatureSet<
-  [FeatureGFX9,
-   FeatureGFX90AInsts,
-   FeatureGFX940Insts,
-   FeatureFmaMixInsts,
-   FeatureLDSBankCount32,
-   FeatureDLInsts,
-   FeatureFmacF64Inst,
-   FeatureDot1Insts,
-   FeatureDot2Insts,
-   FeatureDot3Insts,
-   FeatureDot4Insts,
-   FeatureDot5Insts,
-   FeatureDot6Insts,
-   FeatureDot7Insts,
-   FeatureDot10Insts,
-   FeatureAtomicDsPkAdd16Insts,
-   FeatureAtomicFlatPkAdd16Insts,
-   Feature64BitDPP,
-   FeaturePackedFP32Ops,
-   FeatureMAIInsts,
-   FeatureFP8Insts,
-   FeaturePkFmacF16Inst,
-   FeatureAtomicFaddRtnInsts,
-   FeatureAtomicFaddNoRtnInsts,
-   FeatureAtomicBufferGlobalPkAddF16Insts,
-   FeatureAtomicGlobalPkAddBF16Inst,
-   FeatureFlatAtomicFaddF32Inst,
-   FeatureSupportsSRAMECC,
-   FeaturePackedTID,
-   FeatureArchitectedFlatScratch,
-   FullRate64Ops,
-   FeatureBackOffBarrier]>;
+  !listconcat(FeatureISAVersion9_4_Common.Features,
+    [])>;
 
 def FeatureISAVersion9_4_2 : FeatureSet<
-  [FeatureGFX9,
-   FeatureGFX90AInsts,
-   FeatureGFX940Insts,
-   FeatureFmaMixInsts,
-   FeatureLDSBankCount32,
-   FeatureDLInsts,
-   FeatureFmacF64Inst,
-   FeatureDot1Insts,
-   FeatureDot2Insts,
-   FeatureDot3Insts,
-   FeatureDot4Insts,
-   FeatureDot5Insts,
-   FeatureDot6Insts,
-   FeatureDot7Insts,
-   FeatureDot10Insts,
-   FeatureAtomicDsPkAdd16Insts,
-   FeatureAtomicFlatPkAdd16Insts,
-   Feature64BitDPP,
-   FeaturePackedFP32Ops,
-   FeatureMAIInsts,
-   FeatureFP8Insts,
-   FeaturePkFmacF16Inst,
-   FeatureAtomicFaddRtnInsts,
-   FeatureAtomicFaddNoRtnInsts,
-   FeatureAtomicBufferGlobalPkAddF16Insts,
-   FeatureAtomicGlobalPkAddBF16Inst,
-   FeatureFlatAtomicFaddF32Inst,
-   FeatureSupportsSRAMECC,
-   FeaturePackedTID,
-   FeatureArchitectedFlatScratch,
-   FullRate64Ops,
-   FeatureBackOffBarrier]>;
+  !listconcat(FeatureISAVersion9_4_Common.Features,
+    [])>;
 
 // TODO: Organize more features into groups.
 def FeatureGroup {