[Power9] Add missing instructions: extswsli, popcntb

[stefanp]

Summary

Added the following instructions:

• extswsli
• extswsli.
• popcntb

[nemanjai]

lib/Target/PowerPC/PPCInstr64Bit.td

646 ↗

(On Diff #113423)

This isn't the right instruction format to use as far as I can tell. This instruction *does not* modify CARRY according to the ISA.

[stefanp]

Fixed according to Nemanja's comment.

[nemanjai]

The update to the EXTSWSLI definition looks fine. However, you'll want to coordinate with https://reviews.llvm.org/D37404 for POPCNTB.

[echristo]

Let's go ahead with this one for now. Sam's patch can go on after if we decide to go with a C API way of accessing this rather than just inline assembly.

Thanks!

-eric

llvm/trunk/lib/Target/PowerPC/PPCInstr64Bit.td

 let isCodeGenOnly = 1 in
 def EXTSW_32 : XForm_11<31, 986, (outs gprc:$rA), (ins gprc:$rS),
                         "extsw $rA, $rS", IIC_IntSimple,
                         []>, isPPC64;
 
 defm SRADI  : XSForm_1rc<31, 413, (outs g8rc:$rA), (ins g8rc:$rS, u6imm:$SH),
                          "sradi", "$rA, $rS, $SH", IIC_IntRotateDI,
                          [(set i64:$rA, (sra i64:$rS, (i32 imm:$SH)))]>, isPPC64;
+
+defm EXTSWSLI : XSForm_1r<31, 445, (outs g8rc:$rA), (ins g8rc:$rS, u6imm:$SH),
+                          "extswsli", "$rA, $rS, $SH", IIC_IntRotateDI,
+                          []>, isPPC64;
+
 // For fast-isel:
 let isCodeGenOnly = 1, Defs = [CARRY] in
 def SRADI_32  : XSForm_1<31, 413, (outs gprc:$rA), (ins gprc:$rS, u6imm:$SH),
                          "sradi $rA, $rS, $SH", IIC_IntRotateDI, []>, isPPC64;
 
 defm CNTLZD : XForm_11r<31,  58, (outs g8rc:$rA), (ins g8rc:$rS),
                         "cntlzd", "$rA, $rS", IIC_IntGeneral,
                         [(set i64:$rA, (ctlz i64:$rS))]>;

 
 // popcntw also does a population count on the high 32 bits (storing the
 // results in the high 32-bits of the output). We'll ignore that here (which is
 // safe because we never separately use the high part of the 64-bit registers).
 def POPCNTW : XForm_11<31, 378, (outs gprc:$rA), (ins gprc:$rS),
                        "popcntw $rA, $rS", IIC_IntGeneral,
                        [(set i32:$rA, (ctpop i32:$rS))]>;
 
+def POPCNTB : XForm_11<31, 122, (outs gprc:$rA), (ins gprc:$rS),
+                       "popcntb $rA, $rS", IIC_IntGeneral, []>;
+
 defm DIVD  : XOForm_1rcr<31, 489, 0, (outs g8rc:$rT), (ins g8rc:$rA, g8rc:$rB),
                           "divd", "$rT, $rA, $rB", IIC_IntDivD,
                           [(set i64:$rT, (sdiv i64:$rA, i64:$rB))]>, isPPC64;
 defm DIVDU : XOForm_1rcr<31, 457, 0, (outs g8rc:$rT), (ins g8rc:$rA, g8rc:$rB),
                           "divdu", "$rT, $rA, $rB", IIC_IntDivD,
                           [(set i64:$rT, (udiv i64:$rA, i64:$rB))]>, isPPC64;
 def DIVDE : XOForm_1<31, 425, 0, (outs g8rc:$rT), (ins g8rc:$rA, g8rc:$rB),
                      "divde $rT, $rA, $rB", IIC_IntDivD,

llvm/trunk/lib/Target/PowerPC/PPCInstrInfo.td

def NAME : XSForm_1<opcode, xo, OOL, IOL,
                        pattern>, RecFormRel;
     let Defs = [CARRY, CR0] in
     def o    : XSForm_1<opcode, xo, OOL, IOL,
                        !strconcat(asmbase, !strconcat(". ", asmstr)), itin,
                        []>, isDOT, RecFormRel;
   }
 }
 
+multiclass XSForm_1r<bits<6> opcode, bits<9> xo, dag OOL, dag IOL,
+                    string asmbase, string asmstr, InstrItinClass itin,
+                    list<dag> pattern> {
+  let BaseName = asmbase in {
+    def NAME : XSForm_1<opcode, xo, OOL, IOL,
+                       !strconcat(asmbase, !strconcat(" ", asmstr)), itin,
+                       pattern>, RecFormRel;
+    let Defs = [CR0] in
+    def o    : XSForm_1<opcode, xo, OOL, IOL,
+                       !strconcat(asmbase, !strconcat(". ", asmstr)), itin,
+                       []>, isDOT, RecFormRel;
+  }
+}
+
 multiclass XForm_26r<bits<6> opcode, bits<10> xo, dag OOL, dag IOL,
                     string asmbase, string asmstr, InstrItinClass itin,
                     list<dag> pattern> {
   let BaseName = asmbase in {
     def NAME : XForm_26<opcode, xo, OOL, IOL,
                        !strconcat(asmbase, !strconcat(" ", asmstr)), itin,
                        pattern>, RecFormRel;
     let Defs = [CR1] in

llvm/trunk/test/MC/Disassembler/PowerPC/ppc64-encoding.txt

 0x7c 0x62 0x00 0x34
 
 # CHECK: cntlzw. 2, 3
 0x7c 0x62 0x00 0x35
 
 # CHECK: popcntw 2, 3                    
 0x7c 0x62 0x02 0xf4
 
+# CHECK: popcntb 2, 3                    
+0x7c 0x62 0x00 0xf4
+
 # CHECK: extsw 2, 3                      
 0x7c 0x62 0x07 0xb4
 
 # CHECK: extsw. 2, 3                     
 0x7c 0x62 0x07 0xb5
 
 # CHECK: cntlzd 2, 3                     
 0x7c 0x62 0x00 0x74

 0x7c 0x62 0x26 0x75
 
 # CHECK: srad 2, 3, 4                    
 0x7c 0x62 0x26 0x34
 
 # CHECK: srad. 2, 3, 4                   
 0x7c 0x62 0x26 0x35
 
+# CHECK: extswsli 2, 3, 4                
+0x7c 0x62 0x26 0xf4
+
+# CHECK: extswsli. 2, 3, 4               
+0x7c 0x62 0x26 0xf5
+
 # CHECK: mtspr 600, 2                    
 0x7c 0x58 0x93 0xa6
 
 # CHECK: mfspr 2, 600                    
 0x7c 0x58 0x92 0xa6
 
 # CHECK: mtcrf 123, 2                    
 0x7c 0x47 0xb1 0x20

llvm/trunk/test/MC/PowerPC/ppc64-encoding.s

 # CHECK-LE: cntlzw 2, 3                     # encoding: [0x34,0x00,0x62,0x7c]
             cntlz 2, 3
 # CHECK-BE: cntlzw. 2, 3                    # encoding: [0x7c,0x62,0x00,0x35]
 # CHECK-LE: cntlzw. 2, 3                    # encoding: [0x35,0x00,0x62,0x7c]
             cntlz. 2, 3
             cmpb 7, 21, 4
 # CHECK-BE: cmpb 7, 21, 4                   # encoding: [0x7e,0xa7,0x23,0xf8]
 # CHECK-LE: cmpb 7, 21, 4                   # encoding: [0xf8,0x23,0xa7,0x7e]
-# FIXME:    popcntb 2, 3
+# CHECK-BE: popcntb 2, 3                    # encoding: [0x7c,0x62,0x00,0xf4]
+# CHECK-LE: popcntb 2, 3                    # encoding: [0xf4,0x00,0x62,0x7c]
+            popcntb 2, 3
 # CHECK-BE: popcntw 2, 3                    # encoding: [0x7c,0x62,0x02,0xf4]
 # CHECK-LE: popcntw 2, 3                    # encoding: [0xf4,0x02,0x62,0x7c]
             popcntw 2, 3
 # FIXME:    prtyd 2, 3
 # FIXME:    prtyw 2, 3
 
 # CHECK-BE: extsw 2, 3                      # encoding: [0x7c,0x62,0x07,0xb4]
 # CHECK-LE: extsw 2, 3                      # encoding: [0xb4,0x07,0x62,0x7c]

 # CHECK-LE: sradi. 2, 3, 4                  # encoding: [0x75,0x26,0x62,0x7c]
             sradi. 2, 3, 4
 # CHECK-BE: srad 2, 3, 4                    # encoding: [0x7c,0x62,0x26,0x34]
 # CHECK-LE: srad 2, 3, 4                    # encoding: [0x34,0x26,0x62,0x7c]
             srad 2, 3, 4
 # CHECK-BE: srad. 2, 3, 4                   # encoding: [0x7c,0x62,0x26,0x35]
 # CHECK-LE: srad. 2, 3, 4                   # encoding: [0x35,0x26,0x62,0x7c]
             srad. 2, 3, 4
+# CHECK-BE: extswsli 2, 3, 4                # encoding: [0x7c,0x62,0x26,0xf4]
+# CHECK-LE: extswsli 2, 3, 4                # encoding: [0xf4,0x26,0x62,0x7c]
+            extswsli 2, 3, 4
+# CHECK-BE: extswsli. 2, 3, 4               # encoding: [0x7c,0x62,0x26,0xf5]
+# CHECK-LE: extswsli. 2, 3, 4               # encoding: [0xf5,0x26,0x62,0x7c]
+            extswsli. 2, 3, 4
+
 
 # FIXME: BCD assist instructions
 
 # Move to/from system register instructions
 
 # CHECK-BE: mtspr 600, 2                    # encoding: [0x7c,0x58,0x93,0xa6]
 # CHECK-LE: mtspr 600, 2                    # encoding: [0xa6,0x93,0x58,0x7c]
             mtspr 600, 2