diff --git a/mlir/include/mlir/Dialect/GPU/IR/GPUOps.td b/mlir/include/mlir/Dialect/GPU/IR/GPUOps.td
--- a/mlir/include/mlir/Dialect/GPU/IR/GPUOps.td
+++ b/mlir/include/mlir/Dialect/GPU/IR/GPUOps.td
@@ -1247,7 +1247,6 @@
 def GPU_SubgroupMmaElementwiseOp : GPU_Op<"subgroup_mma_elementwise",
     [NoSideEffect,
      AllTypesMatch<["args"]>]>{
-
   let summary = "GPU warp elementwise operation on a matrix";
 
   let description = [{
diff --git a/mlir/include/mlir/IR/OpBase.td b/mlir/include/mlir/IR/OpBase.td
--- a/mlir/include/mlir/IR/OpBase.td
+++ b/mlir/include/mlir/IR/OpBase.td
@@ -2278,7 +2278,9 @@
 class ElementType<string name> : StrFunc<"getElementTypeOrSelf($" # name # ")">;
 
 class AllMatchPred<list<string> values> :
-    CPred<"::llvm::is_splat(::llvm::makeArrayRef({"
+    CPred<"::llvm::is_splat(::llvm::makeArrayRef<std::conditional_t<"
+            # "std::is_base_of<::mlir::Type, decltype(" # !head(values) # ")>::value,"
+            # "::mlir::Type, decltype(" # !head(values) # ")>>({"
           # !interleave(values, ", ") #"}))">;
 
 class AllMatch<list<string> values, string summary> :