S390: Decouple TF Operator kS390_And/Or/Xor/Not to 32/64

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/ast/scopes.h"
 #include "src/compiler/code-generator-impl.h"
 #include "src/compiler/gap-resolver.h"
 #include "src/compiler/node-matchers.h"
@@ skipping 261 matching lines @@
   do {                                                                \
     __ asm_instr(i.OutputDoubleRegister(), i.InputDoubleRegister(0)); \
   } while (0)
 
 #define ASSEMBLE_FLOAT_BINOP(asm_instr)                              \
   do {                                                               \
     __ asm_instr(i.OutputDoubleRegister(), i.InputDoubleRegister(0), \
                  i.InputDoubleRegister(1));                          \
   } while (0)
 
-#define ASSEMBLE_BINOP(asm_instr_reg, asm_instr_imm)           \
-  do {                                                         \
-    if (HasRegisterInput(instr, 1)) {                          \
-      __ asm_instr_reg(i.OutputRegister(), i.InputRegister(0), \
-                       i.InputRegister(1));                    \
-    } else {                                                   \
-      __ asm_instr_imm(i.OutputRegister(), i.InputRegister(0), \
-                       i.InputImmediate(1));                   \
-    }                                                          \
+#define ASSEMBLE_BINOP(asm_instr)                          \
+  do {                                                     \
+    if (HasRegisterInput(instr, 1)) {                      \
+      __ asm_instr(i.OutputRegister(), i.InputRegister(0), \
+                   i.InputRegister(1));                    \
+    } else {                                               \
+      __ asm_instr(i.OutputRegister(), i.InputRegister(0), \
+                   i.InputImmediate(1));                   \
+    }                                                      \
   } while (0)
 
 #define ASSEMBLE_BINOP_INT(asm_instr_reg, asm_instr_imm)       \
   do {                                                         \
     if (HasRegisterInput(instr, 1)) {                          \
       __ asm_instr_reg(i.OutputRegister(), i.InputRegister(0), \
                        i.InputRegister(1));                    \
     } else {                                                   \
       __ asm_instr_imm(i.OutputRegister(), i.InputRegister(0), \
                        i.InputInt32(1));                       \
@@ skipping 678 matching lines @@
       __ bind(ool->exit());
       break;
     }
     case kArchStackSlot: {
       FrameOffset offset =
           frame_access_state()->GetFrameOffset(i.InputInt32(0));
       __ AddP(i.OutputRegister(), offset.from_stack_pointer() ? sp : fp,
               Operand(offset.offset()));
       break;
     }
-    case kS390_And:
-      ASSEMBLE_BINOP(AndP, AndP);
+    case kS390_And32:
+      ASSEMBLE_BINOP(And);
       break;
-    case kS390_Or:
-      ASSEMBLE_BINOP(OrP, OrP);
+    case kS390_And64:
+      ASSEMBLE_BINOP(AndP);

[JoranSiu, 2016/08/05 13:23:40]

Instead of using AndP masm routines for the 64-bit op, should we just use the
And64 flavours?  That way you are guaranteed to get the 64-bit instruction.

[john.yan, 2016/08/05 14:26:42]

We don't have a And64 for now. And given that And64 won't be generated in 32
bit. So it's save to use AndP here. I want to cleanup this later.

       break;
-    case kS390_Xor:
-      ASSEMBLE_BINOP(XorP, XorP);
+    case kS390_Or32:
+      ASSEMBLE_BINOP(Or);
+    case kS390_Or64:
+      ASSEMBLE_BINOP(OrP);
+      break;
+    case kS390_Xor32:
+      ASSEMBLE_BINOP(Xor);
+      break;
+    case kS390_Xor64:
+      ASSEMBLE_BINOP(XorP);
       break;
     case kS390_ShiftLeft32:
       if (HasRegisterInput(instr, 1)) {
         if (i.OutputRegister().is(i.InputRegister(1)) &&
             !CpuFeatures::IsSupported(DISTINCT_OPS)) {
           __ LoadRR(kScratchReg, i.InputRegister(1));
           __ ShiftLeft(i.OutputRegister(), i.InputRegister(0), kScratchReg);
         } else {
-          ASSEMBLE_BINOP(ShiftLeft, ShiftLeft);
+          ASSEMBLE_BINOP(ShiftLeft);
         }
       } else {
-        ASSEMBLE_BINOP(ShiftLeft, ShiftLeft);
+        ASSEMBLE_BINOP(ShiftLeft);
       }
       __ LoadlW(i.OutputRegister(0), i.OutputRegister(0));
       break;
 #if V8_TARGET_ARCH_S390X
     case kS390_ShiftLeft64:
-      ASSEMBLE_BINOP(sllg, sllg);
+      ASSEMBLE_BINOP(sllg);
       break;
 #endif
     case kS390_ShiftRight32:
       if (HasRegisterInput(instr, 1)) {
         if (i.OutputRegister().is(i.InputRegister(1)) &&
             !CpuFeatures::IsSupported(DISTINCT_OPS)) {
           __ LoadRR(kScratchReg, i.InputRegister(1));
           __ ShiftRight(i.OutputRegister(), i.InputRegister(0), kScratchReg);
         } else {
-          ASSEMBLE_BINOP(ShiftRight, ShiftRight);
+          ASSEMBLE_BINOP(ShiftRight);
         }
       } else {
-        ASSEMBLE_BINOP(ShiftRight, ShiftRight);
+        ASSEMBLE_BINOP(ShiftRight);
       }
       __ LoadlW(i.OutputRegister(0), i.OutputRegister(0));
       break;
 #if V8_TARGET_ARCH_S390X
     case kS390_ShiftRight64:
-      ASSEMBLE_BINOP(srlg, srlg);
+      ASSEMBLE_BINOP(srlg);
       break;
 #endif
     case kS390_ShiftRightArith32:
       if (HasRegisterInput(instr, 1)) {
         if (i.OutputRegister().is(i.InputRegister(1)) &&
             !CpuFeatures::IsSupported(DISTINCT_OPS)) {
           __ LoadRR(kScratchReg, i.InputRegister(1));
           __ ShiftRightArith(i.OutputRegister(), i.InputRegister(0),
                              kScratchReg);
         } else {
-          ASSEMBLE_BINOP(ShiftRightArith, ShiftRightArith);
+          ASSEMBLE_BINOP(ShiftRightArith);
         }
       } else {
-        ASSEMBLE_BINOP(ShiftRightArith, ShiftRightArith);
+        ASSEMBLE_BINOP(ShiftRightArith);
       }
       __ LoadlW(i.OutputRegister(), i.OutputRegister());
       break;
 #if V8_TARGET_ARCH_S390X
     case kS390_ShiftRightArith64:
-      ASSEMBLE_BINOP(srag, srag);
+      ASSEMBLE_BINOP(srag);
       break;
 #endif
 #if !V8_TARGET_ARCH_S390X
     case kS390_AddPair:
       // i.InputRegister(0) ... left low word.
       // i.InputRegister(1) ... left high word.
       // i.InputRegister(2) ... right low word.
       // i.InputRegister(3) ... right high word.
       __ AddLogical32(i.OutputRegister(0), i.InputRegister(0),
                       i.InputRegister(2));
@@ skipping 70 matching lines @@
     case kS390_RotRight64:
       if (HasRegisterInput(instr, 1)) {
         __ LoadComplementRR(kScratchReg, i.InputRegister(1));
         __ rllg(i.OutputRegister(), i.InputRegister(0), kScratchReg);
       } else {
         __ rllg(i.OutputRegister(), i.InputRegister(0),
                 Operand(64 - i.InputInt32(1)));
       }
       break;
 #endif
-    case kS390_Not:
-      __ LoadRR(i.OutputRegister(), i.InputRegister(0));
-      __ NotP(i.OutputRegister());
+    case kS390_Not32:
+      __ Not32(i.OutputRegister(), i.InputRegister(0));
+      break;
+    case kS390_Not64:
+      __ Not64(i.OutputRegister(), i.InputRegister(0));
       break;
     case kS390_RotLeftAndMask32:
       if (CpuFeatures::IsSupported(GENERAL_INSTR_EXT)) {
         int shiftAmount = i.InputInt32(1);
         int endBit = 63 - i.InputInt32(3);
         int startBit = 63 - i.InputInt32(2);
         __ rll(i.OutputRegister(), i.InputRegister(0), Operand(shiftAmount));
         __ risbg(i.OutputRegister(), i.OutputRegister(), Operand(startBit),
                  Operand(endBit), Operand::Zero(), true);
       } else {
@@ skipping 41 matching lines @@
         __ sllg(i.OutputRegister(), i.OutputRegister(), Operand(clearBit));
       }
       break;
 #endif
     case kS390_Add:
 #if V8_TARGET_ARCH_S390X
       if (FlagsModeField::decode(instr->opcode()) != kFlags_none) {
         ASSEMBLE_ADD_WITH_OVERFLOW();
       } else {
 #endif
-        ASSEMBLE_BINOP(AddP, AddP);
+        ASSEMBLE_BINOP(AddP);
 #if V8_TARGET_ARCH_S390X
       }
 #endif
       break;
     case kS390_AddWithOverflow32:
       ASSEMBLE_ADD_WITH_OVERFLOW32();
       break;
     case kS390_AddFloat:
       // Ensure we don't clobber right/InputReg(1)
       if (i.OutputDoubleRegister().is(i.InputDoubleRegister(1))) {
@@ skipping 13 matching lines @@
           __ ldr(i.OutputDoubleRegister(), i.InputDoubleRegister(0));
         __ adbr(i.OutputDoubleRegister(), i.InputDoubleRegister(1));
       }
       break;
     case kS390_Sub:
 #if V8_TARGET_ARCH_S390X
       if (FlagsModeField::decode(instr->opcode()) != kFlags_none) {
         ASSEMBLE_SUB_WITH_OVERFLOW();
       } else {
 #endif
-        ASSEMBLE_BINOP(SubP, SubP);
+        ASSEMBLE_BINOP(SubP);
 #if V8_TARGET_ARCH_S390X
       }
 #endif
       break;
     case kS390_SubWithOverflow32:
       ASSEMBLE_SUB_WITH_OVERFLOW32();
       break;
     case kS390_SubFloat:
       // OutputDoubleReg() = i.InputDoubleRegister(0) - i.InputDoubleRegister(1)
       if (i.OutputDoubleRegister().is(i.InputDoubleRegister(1))) {
@@ skipping 1197 matching lines @@
       padding_size -= 2;
     }
   }
 }
 
 #undef __
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8