[gcc(refs/users/wschmidt/heads/builtins7)] rs6000: **split me and squash me**

[William Schmidt]

https://gcc.gnu.org/g:b7ecd352fffb709fa7eb8fe47dab268134010194

commit b7ecd352fffb709fa7eb8fe47dab268134010194
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date:   Tue Mar 9 17:02:08 2021 -0600

    rs6000: **split me and squash me**
    
    2021-03-09  Bill Schmidt  <wschmidt@linux.ibm.com>
    
    gcc/
            * config/rs6000/rs6000-builtin-new.def (DISASSEMBLE_ACC_INTERNAL):
            Correct constant restriction.
            * config/rs6000/rs6000-call.c
            (rs6000_gimple_fold_new_mma_builtin): Fix built-in code.

Diff:
---
 gcc/config/rs6000/rs6000-builtin-new.def | 2 +-
 gcc/config/rs6000/rs6000-call.c          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gcc/config/rs6000/rs6000-builtin-new.def b/gcc/config/rs6000/rs6000-builtin-new.def
index 2398d84f3d7..eb9b7724158 100644
--- a/gcc/config/rs6000/rs6000-builtin-new.def
+++ b/gcc/config/rs6000/rs6000-builtin-new.def
@@ -3504,7 +3504,7 @@
   void __builtin_mma_disassemble_acc (void *, v512 *);
     DISASSEMBLE_ACC nothing {mma,quad}
 
-  vuc __builtin_mma_disassemble_acc_internal (v512, const int<1>);
+  vuc __builtin_mma_disassemble_acc_internal (v512, const int<2>);
     DISASSEMBLE_ACC_INTERNAL mma_disassemble_acc {mma}
 
   void __builtin_mma_disassemble_pair (void *, v256 *);
diff --git a/gcc/config/rs6000/rs6000-call.c b/gcc/config/rs6000/rs6000-call.c
index 7e058bc5aad..46776571959 100644
--- a/gcc/config/rs6000/rs6000-call.c
+++ b/gcc/config/rs6000/rs6000-call.c
@@ -13173,7 +13173,7 @@ rs6000_gimple_fold_new_mma_builtin (gimple_stmt_iterator *gsi,
     {
       /* This is an MMA disassemble built-in function.  */
       push_gimplify_context (true);
-      unsigned nvec = (fncode == MMA_BUILTIN_DISASSEMBLE_ACC) ? 4 : 2;
+      unsigned nvec = (fncode == RS6000_BIF_DISASSEMBLE_ACC) ? 4 : 2;
       tree dst_ptr = gimple_call_arg (stmt, 0);
       tree src_ptr = gimple_call_arg (stmt, 1);
       tree src_type = TREE_TYPE (src_ptr);