[llvm] [SelectionDAG] Rename OPC_EmitInteger8->OPC_EmitIntegerI8. NFC (PR #173832)

[via llvm-commits]

llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-tablegen

Author: Craig Topper (topperc)

<details>
<summary>Changes</summary>

Same for OPC_EmitInteger16/32/64 and OPC_EmitStringInteger32.

This matches OPC_CheckTypeI32, OPC_EmitRegisterI32, etc.

---
Full diff: https://github.com/llvm/llvm-project/pull/173832.diff


3 Files Affected:

- (modified) llvm/include/llvm/CodeGen/SelectionDAGISel.h (+5-5) 
- (modified) llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (+11-11) 
- (modified) llvm/utils/TableGen/DAGISelMatcherEmitter.cpp (+2-2) 


``````````diff
diff --git a/llvm/include/llvm/CodeGen/SelectionDAGISel.h b/llvm/include/llvm/CodeGen/SelectionDAGISel.h
index 7add717227963..147e780dfc191 100644
--- a/llvm/include/llvm/CodeGen/SelectionDAGISel.h
+++ b/llvm/include/llvm/CodeGen/SelectionDAGISel.h
@@ -257,13 +257,13 @@ class SelectionDAGISel {
 
     OPC_EmitInteger,
     // Space-optimized forms that implicitly encode integer VT.
-    OPC_EmitInteger8,
-    OPC_EmitInteger16,
-    OPC_EmitInteger32,
-    OPC_EmitInteger64,
+    OPC_EmitIntegerI8,
+    OPC_EmitIntegerI16,
+    OPC_EmitIntegerI32,
+    OPC_EmitIntegerI64,
     OPC_EmitStringInteger,
     // Space-optimized forms that implicitly encode integer VT.
-    OPC_EmitStringInteger32,
+    OPC_EmitStringIntegerI32,
     OPC_EmitRegister,
     OPC_EmitRegisterI32,
     OPC_EmitRegisterI64,
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index eca8b6d7c3abd..dc340f3743da2 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -3888,25 +3888,25 @@ void SelectionDAGISel::SelectCodeCommon(SDNode *NodeToMatch,
       continue;
     }
     case OPC_EmitInteger:
-    case OPC_EmitInteger8:
-    case OPC_EmitInteger16:
-    case OPC_EmitInteger32:
-    case OPC_EmitInteger64:
+    case OPC_EmitIntegerI8:
+    case OPC_EmitIntegerI16:
+    case OPC_EmitIntegerI32:
+    case OPC_EmitIntegerI64:
     case OPC_EmitStringInteger:
-    case OPC_EmitStringInteger32: {
+    case OPC_EmitStringIntegerI32: {
       MVT::SimpleValueType VT;
       switch (Opcode) {
-      case OPC_EmitInteger8:
+      case OPC_EmitIntegerI8:
         VT = MVT::i8;
         break;
-      case OPC_EmitInteger16:
+      case OPC_EmitIntegerI16:
         VT = MVT::i16;
         break;
-      case OPC_EmitInteger32:
-      case OPC_EmitStringInteger32:
+      case OPC_EmitIntegerI32:
+      case OPC_EmitStringIntegerI32:
         VT = MVT::i32;
         break;
-      case OPC_EmitInteger64:
+      case OPC_EmitIntegerI64:
         VT = MVT::i64;
         break;
       default:
@@ -3916,7 +3916,7 @@ void SelectionDAGISel::SelectCodeCommon(SDNode *NodeToMatch,
       int64_t Val = MatcherTable[MatcherIndex++];
       if (Val & 128)
         Val = GetVBR(Val, MatcherTable, MatcherIndex);
-      if (Opcode >= OPC_EmitInteger && Opcode <= OPC_EmitInteger64)
+      if (Opcode >= OPC_EmitInteger && Opcode <= OPC_EmitIntegerI64)
         Val = decodeSignRotatedValue(Val);
       RecordedNodes.push_back(std::pair<SDValue, SDNode *>(
           CurDAG->getSignedConstant(Val, SDLoc(NodeToMatch), VT,
diff --git a/llvm/utils/TableGen/DAGISelMatcherEmitter.cpp b/llvm/utils/TableGen/DAGISelMatcherEmitter.cpp
index f89187a8d8f2a..f8367b09423b9 100644
--- a/llvm/utils/TableGen/DAGISelMatcherEmitter.cpp
+++ b/llvm/utils/TableGen/DAGISelMatcherEmitter.cpp
@@ -795,7 +795,7 @@ unsigned MatcherTableEmitter::EmitMatcher(const Matcher *N,
     case MVT::i32:
     case MVT::i64:
       OpBytes = 1;
-      OS << "OPC_EmitInteger" << VT.getSizeInBits() << ", ";
+      OS << "OPC_EmitIntegerI" << VT.getSizeInBits() << ", ";
       break;
     default:
       OS << "OPC_EmitInteger, ";
@@ -818,7 +818,7 @@ unsigned MatcherTableEmitter::EmitMatcher(const Matcher *N,
     switch (VT.SimpleTy) {
     case MVT::i32:
       OpBytes = 1;
-      OS << "OPC_EmitStringInteger" << VT.getSizeInBits() << ", ";
+      OS << "OPC_EmitStringIntegerI" << VT.getSizeInBits() << ", ";
       break;
     default:
       OS << "OPC_EmitStringInteger, ";

``````````

</details>


https://github.com/llvm/llvm-project/pull/173832