AMDGPU: Fix overriding SubtargetPredicate in MUBUF_Real_gfx90a (llvm#96351)

arsenm · AlexisPerry · commit 6c041379fa47 · 2024-06-27T14:47:51.000-06:00
diff --git a/llvm/lib/Target/AMDGPU/BUFInstructions.td b/llvm/lib/Target/AMDGPU/BUFInstructions.td
@@ -3082,9 +3082,9 @@ multiclass MUBUF_Real_vi_gfx90a<bits<7> op, bit isTFE = 0> : MUBUF_Real_vi<op> {
   }
 
   if ps.FPAtomic then {
-    let SubtargetPredicate = isGFX90AOnly,
-        AssemblerPredicate = isGFX90AOnly in
-    defm NAME : MUBUF_Real_gfx90a<op, 0>;
+    let AssemblerPredicate = isGFX90AOnly in
+      defm NAME : MUBUF_Real_gfx90a<op, 0>;
+
     def _gfx940 : MUBUF_Real_gfx940<op, ps>;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -3082,9 +3082,9 @@ multiclass MUBUF_Real_vi_gfx90a<bits<7> op, bit isTFE = 0> : MUBUF_Real_vi<op> {`
`3082`	`3082`	`}`
`3083`	`3083`
`3084`	`3084`	`if ps.FPAtomic then {`
`3085`		`- let SubtargetPredicate = isGFX90AOnly,`
`3086`		`- AssemblerPredicate = isGFX90AOnly in`
`3087`		`- defm NAME : MUBUF_Real_gfx90a<op, 0>;`
	`3085`	`+ let AssemblerPredicate = isGFX90AOnly in`
	`3086`	`+ defm NAME : MUBUF_Real_gfx90a<op, 0>;`
	`3087`	`+`
`3088`	`3088`	`def _gfx940 : MUBUF_Real_gfx940<op, ps>;`
`3089`	`3089`	`}`
`3090`	`3090`	`}`