Revert of [x64] Generate test reg,reg instead of cmp reg,0.

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

 // Copyright 2013 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/compiler/code-generator-impl.h"
 #include "src/compiler/gap-resolver.h"
 #include "src/compiler/node-matchers.h"
 #include "src/scopes.h"
@@ skipping 192 matching lines @@
     } else {                                                   \
       if (instr->InputAt(1)->IsRegister()) {                   \
         __ asm_instr(i.InputRegister(0), i.InputRegister(1));  \
       } else {                                                 \
         __ asm_instr(i.InputRegister(0), i.InputOperand(1));   \
       }                                                        \
     }                                                          \
   } while (0)
 
 
-#define ASSEMBLE_CMP(cmp_instr, test_instr)                      \
-  do {                                                           \
-    if (HasImmediateInput(instr, 1)) {                           \
-      if (instr->InputAt(0)->IsRegister()) {                     \
-        if (i.InputInt32(1) == 0) {                              \
-          __ test_instr(i.InputRegister(0), i.InputRegister(0)); \
-        } else {                                                 \
-          __ cmp_instr(i.InputRegister(0), i.InputImmediate(1)); \
-        }                                                        \
-      } else {                                                   \
-        __ cmp_instr(i.InputOperand(0), i.InputImmediate(1));    \
-      }                                                          \
-    } else {                                                     \
-      if (instr->InputAt(1)->IsRegister()) {                     \
-        __ cmp_instr(i.InputRegister(0), i.InputRegister(1));    \
-      } else {                                                   \
-        __ cmp_instr(i.InputRegister(0), i.InputOperand(1));     \
-      }                                                          \
-    }                                                            \
-  } while (0)
-
 #define ASSEMBLE_MULT(asm_instr)                              \
   do {                                                        \
     if (HasImmediateInput(instr, 1)) {                        \
       if (instr->InputAt(0)->IsRegister()) {                  \
         __ asm_instr(i.OutputRegister(), i.InputRegister(0),  \
                      i.InputImmediate(1));                    \
       } else {                                                \
         __ asm_instr(i.OutputRegister(), i.InputOperand(0),   \
                      i.InputImmediate(1));                    \
       }                                                       \
@@ skipping 358 matching lines @@
     case kX64Sub:
       ASSEMBLE_BINOP(subq);
       break;
     case kX64And32:
       ASSEMBLE_BINOP(andl);
       break;
     case kX64And:
       ASSEMBLE_BINOP(andq);
       break;
     case kX64Cmp32:
-      ASSEMBLE_CMP(cmpl, testl);
+      ASSEMBLE_BINOP(cmpl);
       break;
     case kX64Cmp:
-      ASSEMBLE_CMP(cmpq, testq);
+      ASSEMBLE_BINOP(cmpq);
       break;
     case kX64Test32:
       ASSEMBLE_BINOP(testl);
       break;
     case kX64Test:
       ASSEMBLE_BINOP(testq);
       break;
     case kX64Imul32:
       ASSEMBLE_MULT(imull);
       break;
@@ skipping 828 matching lines @@
     }
   }
   MarkLazyDeoptSite();
 }
 
 #undef __
 
 }  // namespace internal
 }  // namespace compiler
 }  // namespace v8