mix rebase err

Author: lei137

clang/include/clang/Basic/BuiltinsPPC.def

@@ -1125,26 +1125,6 @@ UNALIASED_CUSTOM_MMA_BUILTIN(mma_dmxvf16gerx2, "vW1024*W256V",
 UNALIASED_CUSTOM_MMA_BUILTIN(mma_pmdmxvf16gerx2, "vW1024*W256Vi255i15i3",
                              "mma,paired-vector-memops")
 
-// MMA builtins with positive/negative multiply/accumulate.
-UNALIASED_CUSTOM_MMA_BUILTIN(mma_xvf16ger2, "vW512*VV",
-                             "mma,paired-vector-memops")
-UNALIASED_CUSTOM_MMA_BUILTIN(mma_xvf32ger, "vW512*VV",
-                             "mma,paired-vector-memops")
-UNALIASED_CUSTOM_MMA_BUILTIN(mma_xvf64ger, "vW512*W256V",
-                             "mma,paired-vector-memops")
-UNALIASED_CUSTOM_MMA_BUILTIN(mma_pmxvf16ger2, "vW512*VVi15i15i3",
-                             "mma,paired-vector-memops")
-UNALIASED_CUSTOM_MMA_BUILTIN(mma_pmxvf32ger, "vW512*VVi15i15",
-                             "mma,paired-vector-memops")
-UNALIASED_CUSTOM_MMA_BUILTIN(mma_pmxvf64ger, "vW512*W256Vi15i3",
-                             "mma,paired-vector-memops")
-UNALIASED_CUSTOM_MMA_BUILTIN(mma_xvbf16ger2, "vW512*VV",
-                             "mma,paired-vector-memops")
-UNALIASED_CUSTOM_MMA_BUILTIN(mma_pmxvbf16ger2, "vW512*VVi15i15i3",
-                             "mma,paired-vector-memops")
-
-=======
->>>>>>> 4cfc00bee224 (fix err in rebase)
 // FIXME: Obviously incomplete.
 
 #undef BUILTIN