Merge commit '6bfedfa0ba31' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit c96e91d9f0db · 2025-02-21T08:15:28.000-08:00
diff --git a/mlir/lib/Dialect/LLVMIR/IR/NVVMDialect.cpp b/mlir/lib/Dialect/LLVMIR/IR/NVVMDialect.cpp
@@ -1133,8 +1133,6 @@ LogicalResult NVVM::Tcgen05CpOp::verify() {
       return emitError(
           "Shape 32x128b requires multicast warpx4 for tcgen05.cp Op");
     break;
-  default:
-    return emitError("Invalid shape for tcgen05.cp Op");
   }
   return success();
 }
@@ -1385,9 +1383,8 @@ llvm::Intrinsic::ID Tcgen05CpOp::getIntrinsicID(Operation &op) {
     return (mc == Tcgen05CpMulticast::WARPX2_01_23)
                ? GET_TCGEN05_CP_ID(_64x128b_warpx2_01_23, srcFmt, is2CTA)
                : GET_TCGEN05_CP_ID(_64x128b_warpx2_02_13, srcFmt, is2CTA);
-  default:
-    llvm_unreachable("Invalid shape in tcgen05 cp Op");
   }
+  llvm_unreachable("Invalid shape in tcgen05 cp Op");
 }
 
 /// Infer the result ranges for the NVVM SpecialRangeableRegisterOp that might

Original file line number	Diff line number	Diff line change
`@@ -1133,8 +1133,6 @@ LogicalResult NVVM::Tcgen05CpOp::verify() {`
`1133`	`1133`	`return emitError(`
`1134`	`1134`	`"Shape 32x128b requires multicast warpx4 for tcgen05.cp Op");`
`1135`	`1135`	`break;`
`1136`		`- default:`
`1137`		`- return emitError("Invalid shape for tcgen05.cp Op");`
`1138`	`1136`	`}`
`1139`	`1137`	`return success();`
`1140`	`1138`	`}`
`@@ -1385,9 +1383,8 @@ llvm::Intrinsic::ID Tcgen05CpOp::getIntrinsicID(Operation &op) {`
`1385`	`1383`	`return (mc == Tcgen05CpMulticast::WARPX2_01_23)`
`1386`	`1384`	`? GET_TCGEN05_CP_ID(_64x128b_warpx2_01_23, srcFmt, is2CTA)`
`1387`	`1385`	`: GET_TCGEN05_CP_ID(_64x128b_warpx2_02_13, srcFmt, is2CTA);`
`1388`		`- default:`
`1389`		`- llvm_unreachable("Invalid shape in tcgen05 cp Op");`
`1390`	`1386`	`}`
	`1387`	`+ llvm_unreachable("Invalid shape in tcgen05 cp Op");`
`1391`	`1388`	`}`
`1392`	`1389`
`1393`	`1390`	`/// Infer the result ranges for the NVVM SpecialRangeableRegisterOp that might`