Merge commit 'bdace105387f' from llvm.org/main into next

Author: git apple-llvm automerger

mlir/include/mlir/Dialect/Tosa/IR/TosaOps.td

@@ -301,7 +301,7 @@ def Tosa_MatMulOp : Tosa_InferShapedTypeOp<"matmul"> {
   );
 
   let results = (outs
-    Tosa_Tensor3D:$c
+    Tosa_Tensor3D:$output
   );
 
   list<Availability> availability = [