Move x64 sign extension opcodes out of general

Summary: These three sign-extension opcodes are specific to x86-64 and are entirely skipped in aarch64. They're a good candidate as the first set of things to be target-specific. This diff makes them only visible on x86-64, changes their name to be target-specific, and gets to not worry about them on aarch64.

Reviewed By: DinoV

Differential Revision: D107693080

fbshipit-source-id: 0405e8a4cb7f9bea30b3e13c9d313b6b0868976f

Author: kddnewton

cinderx/Jit/codegen/autogen.cpp

@@ -2567,21 +2567,21 @@ void AutoTranslator::translateInstr(Environ* env, const Instruction* instr)
       }
       return;
     }
-    case Instruction::kCdq: {
+    case Instruction::kX64Cdq: {
       auto* output = instr->output();
       auto* input = instr->getInput(0);
 
       env->as->cdq(getReg(instr, output), getReg(instr, input));
       return;
     }
-    case Instruction::kCwd: {
+    case Instruction::kX64Cwd: {
       auto* output = instr->output();
       auto* input = instr->getInput(0);
 
       env->as->cwd(getReg(instr, output), getReg(instr, input));
       return;
     }
-    case Instruction::kCqo: {
+    case Instruction::kX64Cqo: {
       auto* output = instr->output();
       auto* input = instr->getInput(0);
 
@@ -3337,9 +3337,6 @@ void AutoTranslator::translateInstr(Environ* env, const Instruction* instr)
     case Instruction::kVarArgCall:
     case Instruction::kSext:
     case Instruction::kZext:
-    case Instruction::kCdq:
-    case Instruction::kCwd:
-    case Instruction::kCqo:
     case Instruction::kLoadArg:
     case Instruction::kLoadSecondCallResult:
     case Instruction::kCondBranch:

cinderx/Jit/lir/instruction.h

@@ -106,9 +106,6 @@ enum OperandSizeType {
   X(MovConstPool, false, FlagEffects::kNone, kOut)                            \
   X(Push, false, FlagEffects::kNone, kDefault, 1, {}, 1)                      \
   X(Pop, false, FlagEffects::kNone, kDefault, 0, {}, 1)                       \
-  X(Cdq, false, FlagEffects::kNone, kDefault, 1, {}, 1)                       \
-  X(Cwd, false, FlagEffects::kNone, kDefault, 1, {}, 1)                       \
-  X(Cqo, false, FlagEffects::kNone, kDefault, 1, {}, 1)                       \
   X(Branch)                                                                   \
   X(BranchNZ)                                                                 \
   X(BranchZ)                                                                  \
@@ -196,7 +193,11 @@ enum OperandSizeType {
  *   do?).
  */
 #if defined(CINDER_X86_64)
-#define FOREACH_INSTR_TYPE(X) FOREACH_COMMON_INSTR_TYPE(X)
+#define FOREACH_INSTR_TYPE(X)                              \
+  FOREACH_COMMON_INSTR_TYPE(X)                             \
+  X(X64Cdq, false, FlagEffects::kNone, kDefault, 1, {}, 1) \
+  X(X64Cwd, false, FlagEffects::kNone, kDefault, 1, {}, 1) \
+  X(X64Cqo, false, FlagEffects::kNone, kDefault, 1, {}, 1)
 #elif defined(CINDER_AARCH64)
 #define FOREACH_INSTR_TYPE(X) FOREACH_COMMON_INSTR_TYPE(X)
 #else

cinderx/Jit/lir/postalloc.cpp

@@ -1054,9 +1054,6 @@ RewriteResult rewriteMemoryInputsToReg(instr_iter_t instr_iter) {
     case Instruction::kMovConstPool:
     case Instruction::kPush:
     case Instruction::kPop:
-    case Instruction::kCdq:
-    case Instruction::kCwd:
-    case Instruction::kCqo:
     case Instruction::kBranch:
     case Instruction::kBranchNZ:
     case Instruction::kBranchZ:
@@ -1099,6 +1096,12 @@ RewriteResult rewriteMemoryInputsToReg(instr_iter_t instr_iter) {
     case Instruction::kCmpBranchNonZero:
     case Instruction::kCallSiteLiveValues:
       return kUnchanged;
+#if defined(CINDER_X86_64)
+    case Instruction::kX64Cdq:
+    case Instruction::kX64Cwd:
+    case Instruction::kX64Cqo:
+      return kUnchanged;
+#endif
   }
 
   auto block = instr->basicblock();
@@ -1357,13 +1360,13 @@ RewriteResult rewriteDivide(instr_iter_t instr_iter) {
         Instruction::Opcode extend;
         switch (dividend_lower->sizeInBits()) {
           case 16:
-            extend = Instruction::kCwd;
+            extend = Instruction::kX64Cwd;
             break;
           case 32:
-            extend = Instruction::kCdq;
+            extend = Instruction::kX64Cdq;
             break;
           case 64:
-            extend = Instruction::kCqo;
+            extend = Instruction::kX64Cqo;
             break;
           default:
             Py_UNREACHABLE();

cinderx/RuntimeTests/lir_abi_test.cpp

@@ -898,19 +898,19 @@ TEST_F(LIRABITest, TestkPop_Mem) {
 }
 
 #if defined(CINDER_X86_64)
-// kCdq R r
+// kX64Cdq R r
 TEST_F(LIRABITest, TestkCdq_OutPhyReg_PhyReg) {
-  translateInstr(Instruction::kCdq, makeOutPhyReg(), makePhyReg());
+  translateInstr(Instruction::kX64Cdq, makeOutPhyReg(), makePhyReg());
 }
 
-// kCwd R r
+// kX64Cwd R r
 TEST_F(LIRABITest, TestkCwd_OutPhyReg_PhyReg) {
-  translateInstr(Instruction::kCwd, makeOutPhyReg(), makePhyReg());
+  translateInstr(Instruction::kX64Cwd, makeOutPhyReg(), makePhyReg());
 }
 
-// kCqo R r
+// kX64Cqo R r
 TEST_F(LIRABITest, TestkCqo_OutPhyReg_PhyReg) {
-  translateInstr(Instruction::kCqo, makeOutPhyReg(), makePhyReg());
+  translateInstr(Instruction::kX64Cqo, makeOutPhyReg(), makePhyReg());
 }
 #endif