s390: TF Optimize 32-bit Mul/Div/Mod/Popcnt

src/compiler/s390/code-generator-s390.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/compiler/code-generator.h"
 
 #include "src/compilation-info.h"
 #include "src/compiler/code-generator-impl.h"
 #include "src/compiler/gap-resolver.h"
 #include "src/compiler/node-matchers.h"
@@ skipping 1513 matching lines @@
         __ Mul64(i.InputRegister(0), i.InputImmediate(1));
       } else if (HasStackSlotInput(instr, 1)) {
         __ Mul64(i.InputRegister(0), i.InputStackSlot(1));
       } else {
         UNIMPLEMENTED();
       }
       break;
     case kS390_MulHigh32:
       ASSEMBLE_BIN_OP(MulHigh32, MulHigh32, MulHigh32);
       break;
-    case kS390_Mul32WithHigh32:
-      __ LoadRR(r1, i.InputRegister(0));
-      __ mr_z(r0, i.InputRegister(1));
-      __ LoadW(i.OutputRegister(0), r1);  // low
-      __ LoadW(i.OutputRegister(1), r0);  // high
-      break;
     case kS390_MulHighU32:
-      __ LoadRR(r1, i.InputRegister(0));
-      if (HasRegisterInput(instr, 1)) {
-        __ mlr(r0, i.InputRegister(1));
-      } else if (HasStackSlotInput(instr, 1)) {
-        __ ml(r0, i.InputStackSlot32(1));
-      } else {
-        UNIMPLEMENTED();
-      }
-      __ LoadlW(i.OutputRegister(), r0);
+      ASSEMBLE_BIN_OP(MulHighU32, MulHighU32, MulHighU32);
       break;
     case kS390_MulFloat:
       // Ensure we don't clobber right
       if (i.OutputDoubleRegister().is(i.InputDoubleRegister(1))) {
         ASSEMBLE_FLOAT_UNOP(meebr);
       } else {
         if (!i.OutputDoubleRegister().is(i.InputDoubleRegister(0)))
           __ ldr(i.OutputDoubleRegister(), i.InputDoubleRegister(0));
         __ meebr(i.OutputDoubleRegister(), i.InputDoubleRegister(1));
       }
       break;
     case kS390_MulDouble:
       // Ensure we don't clobber right
       if (i.OutputDoubleRegister().is(i.InputDoubleRegister(1))) {
         ASSEMBLE_FLOAT_UNOP(mdbr);
       } else {
         if (!i.OutputDoubleRegister().is(i.InputDoubleRegister(0)))
           __ ldr(i.OutputDoubleRegister(), i.InputDoubleRegister(0));
         __ mdbr(i.OutputDoubleRegister(), i.InputDoubleRegister(1));
       }
       break;
 #if V8_TARGET_ARCH_S390X
     case kS390_Div64:
       __ LoadRR(r1, i.InputRegister(0));
       __ dsgr(r0, i.InputRegister(1));  // R1: Dividend
       __ ltgr(i.OutputRegister(), r1);  // Copy R1: Quotient to output
       break;
 #endif
     case kS390_Div32: {
-      AddressingMode mode = AddressingModeField::decode(instr->opcode());
-      __ lgfr(r1, i.InputRegister(0));
-      if (mode != kMode_None) {
-        size_t first_index = 1;
-        MemOperand operand = i.MemoryOperand(&mode, &first_index);
-        __ dsgf(r0, operand);
-      } else if (HasRegisterInput(instr, 1)) {
-        __ dsgfr(r0, i.InputRegister(1));
-      } else if (HasStackSlotInput(instr, 1)) {
-        __ dsgf(r0, i.InputStackSlot32(1));
-      } else {
-        UNREACHABLE();
-      }
-      __ LoadlW(i.OutputRegister(), r1);
+      ASSEMBLE_BIN_OP(Div32, Div32, Div32);
       break;
     }
 #if V8_TARGET_ARCH_S390X
     case kS390_DivU64:
       __ LoadRR(r1, i.InputRegister(0));
       __ LoadImmP(r0, Operand::Zero());
       __ dlgr(r0, i.InputRegister(1));  // R0:R1: Dividend
       __ ltgr(i.OutputRegister(), r1);  // Copy R1: Quotient to output
       break;
 #endif
     case kS390_DivU32: {
-      __ lr(r0, i.InputRegister(0));
-      __ srdl(r0, Operand(32));
-      AddressingMode mode = AddressingModeField::decode(instr->opcode());
-      if (mode != kMode_None) {
-        size_t first_index = 1;
-        MemOperand operand = i.MemoryOperand(&mode, &first_index);
-        __ dl(r0, operand);
-      } else if (HasRegisterInput(instr, 1)) {
-        __ dlr(r0, i.InputRegister(1));
-      } else if (HasStackSlotInput(instr, 1)) {
-        __ dl(r0, i.InputStackSlot32(1));
-      } else {
-        UNREACHABLE();
-      }
-      __ LoadlW(i.OutputRegister(), r1);
+      ASSEMBLE_BIN_OP(DivU32, DivU32, DivU32);
       break;
     }
     case kS390_DivFloat:
       // InputDoubleRegister(1)=InputDoubleRegister(0)/InputDoubleRegister(1)
       if (i.OutputDoubleRegister().is(i.InputDoubleRegister(1))) {
         __ ldr(kScratchDoubleReg, i.InputDoubleRegister(1));
         __ ldr(i.OutputDoubleRegister(), i.InputDoubleRegister(0));
         __ debr(i.OutputDoubleRegister(), kScratchDoubleReg);
       } else {
         if (!i.OutputDoubleRegister().is(i.InputDoubleRegister(0)))
           __ ldr(i.OutputDoubleRegister(), i.InputDoubleRegister(0));
         __ debr(i.OutputDoubleRegister(), i.InputDoubleRegister(1));
       }
       break;
     case kS390_DivDouble:
       // InputDoubleRegister(1)=InputDoubleRegister(0)/InputDoubleRegister(1)
       if (i.OutputDoubleRegister().is(i.InputDoubleRegister(1))) {
         __ ldr(kScratchDoubleReg, i.InputDoubleRegister(1));
         __ ldr(i.OutputDoubleRegister(), i.InputDoubleRegister(0));
         __ ddbr(i.OutputDoubleRegister(), kScratchDoubleReg);
       } else {
         if (!i.OutputDoubleRegister().is(i.InputDoubleRegister(0)))
           __ ldr(i.OutputDoubleRegister(), i.InputDoubleRegister(0));
         __ ddbr(i.OutputDoubleRegister(), i.InputDoubleRegister(1));
       }
       break;
     case kS390_Mod32:
-      ASSEMBLE_MODULO(dr, srda);
+      ASSEMBLE_BIN_OP(Mod32, Mod32, Mod32);
       break;
     case kS390_ModU32:
-      ASSEMBLE_MODULO(dlr, srdl);
+      ASSEMBLE_BIN_OP(ModU32, ModU32, ModU32);
       break;
 #if V8_TARGET_ARCH_S390X
     case kS390_Mod64:
       __ LoadRR(r1, i.InputRegister(0));
       __ dsgr(r0, i.InputRegister(1));  // R1: Dividend
       __ ltgr(i.OutputRegister(), r0);  // Copy R0: Remainder to output
       break;
     case kS390_ModU64:
       __ LoadRR(r1, i.InputRegister(0));
       __ LoadImmP(r0, Operand::Zero());
@@ skipping 132 matching lines @@
       break;
     case kS390_NegFloat:
       ASSEMBLE_FLOAT_UNOP(lcebr);
       break;
     case kS390_NegDouble:
       ASSEMBLE_FLOAT_UNOP(lcdbr);
       break;
     case kS390_Cntlz32: {
       __ llgfr(i.OutputRegister(), i.InputRegister(0));
       __ flogr(r0, i.OutputRegister());
-      __ LoadRR(i.OutputRegister(), r0);
-      __ SubP(i.OutputRegister(), Operand(32));
-    } break;
+      __ Add32(i.OutputRegister(), r0, Operand(-32));
+      // No need to zero-ext b/c llgfr is done already
+      break;
+    }
 #if V8_TARGET_ARCH_S390X
     case kS390_Cntlz64: {
       __ flogr(r0, i.InputRegister(0));
       __ LoadRR(i.OutputRegister(), r0);
-    } break;
+      break;
+    }
 #endif
     case kS390_Popcnt32:
       __ Popcnt32(i.OutputRegister(), i.InputRegister(0));
       break;
 #if V8_TARGET_ARCH_S390X
     case kS390_Popcnt64:
       __ Popcnt64(i.OutputRegister(), i.InputRegister(0));
       break;
 #endif
     case kS390_Cmp32:
@@ skipping 905 matching lines @@
       padding_size -= 2;
     }
   }
 }
 
 #undef __
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8