Fixing the casing of GT_HWIntrinsic to GT_HWINTRINSIC (dotnet#27583)

Author: tannergooding

Documentation/design-docs/first-class-structs.md

@@ -120,7 +120,7 @@ Structs only appear as rvalues in the following contexts:
 
 * As an operand to a hardware or SIMD intrinsic (for `TYP_SIMD*` only)
   * In this case the struct handle is generally assumed to be unneeded, as it is captured (directly or
-    indirectly) in the `GT_SIMD` or `GT_HWIntrinsic` node.
+    indirectly) in the `GT_SIMD` or `GT_HWINTRINSIC` node.
 
 After morph, a struct-typed value on the RHS of assignment is one of:
 * `GT_IND`: in this case the LHS is expected to provide the struct handle

Documentation/design-docs/hw-intrinsics.md

@@ -81,7 +81,7 @@ Note that the x86/x64 implementation is shared, while currently the Arm64 intrin
 
 ### IR
 
-The hardware intrinsics nodes are generally imported as `GenTreeHWIntrinsic` nodes, with the `GT_HWIntrinsic` operator. On these nodes:
+The hardware intrinsics nodes are generally imported as `GenTreeHWIntrinsic` nodes, with the `GT_HWINTRINSIC` operator. On these nodes:
 * The `gtHWIntrinsicId` field contains the intrinsic ID, as declared in the hardware intrinsics table
 * The `gtSIMDBaseType` field indicates the "base type" (generic type argument).
 * The `gtSIMDSize` field indicates the full byte width of the vector (e.g. 16 bytes for `Vector128<T>`).

src/jit/codegenarmarch.cpp

@@ -352,7 +352,7 @@ void CodeGen::genCodeForTreeNode(GenTree* treeNode)
 #endif // FEATURE_SIMD
 
 #ifdef FEATURE_HW_INTRINSICS
-        case GT_HWIntrinsic:
+        case GT_HWINTRINSIC:
             genHWIntrinsic(treeNode->AsHWIntrinsic());
             break;
 #endif // FEATURE_HW_INTRINSICS

src/jit/codegenlinear.cpp

@@ -1394,7 +1394,7 @@ void CodeGen::genConsumeRegs(GenTree* tree)
             genUpdateLife(tree);
         }
 #ifdef FEATURE_HW_INTRINSICS
-        else if (tree->OperIs(GT_HWIntrinsic))
+        else if (tree->OperIs(GT_HWINTRINSIC))
         {
             // Only load/store HW intrinsics can be contained (and the address may also be contained).
             HWIntrinsicCategory category = HWIntrinsicInfo::lookupCategory(tree->AsHWIntrinsic()->gtHWIntrinsicId);
@@ -1457,7 +1457,7 @@ void CodeGen::genConsumeOperands(GenTreeOp* tree)
 
 #ifdef FEATURE_HW_INTRINSICS
 //------------------------------------------------------------------------
-// genConsumeHWIntrinsicOperands: Do liveness update for the operands of a GT_HWIntrinsic node
+// genConsumeHWIntrinsicOperands: Do liveness update for the operands of a GT_HWINTRINSIC node
 //
 // Arguments:
 //    node - the GenTreeHWIntrinsic node whose operands will have their liveness updated.

src/jit/codegenxarch.cpp

@@ -1814,7 +1814,7 @@ void CodeGen::genCodeForTreeNode(GenTree* treeNode)
 #endif // FEATURE_SIMD
 
 #ifdef FEATURE_HW_INTRINSICS
-        case GT_HWIntrinsic:
+        case GT_HWINTRINSIC:
             genHWIntrinsic(treeNode->AsHWIntrinsic());
             break;
 #endif // FEATURE_HW_INTRINSICS

src/jit/compiler.hpp

@@ -4294,7 +4294,7 @@ void GenTree::VisitOperands(TVisitor visitor)
 #endif // FEATURE_SIMD
 
 #ifdef FEATURE_HW_INTRINSICS
-        case GT_HWIntrinsic:
+        case GT_HWINTRINSIC:
             if ((this->AsHWIntrinsic()->gtOp1 != nullptr) && this->AsHWIntrinsic()->gtOp1->OperIsList())
             {
                 this->AsHWIntrinsic()->gtOp1->VisitListOperands(visitor);

src/jit/gentree.cpp

@@ -1446,7 +1446,7 @@ bool GenTree::Compare(GenTree* op1, GenTree* op2, bool swapOK)
 #endif // FEATURE_SIMD
 
 #ifdef FEATURE_HW_INTRINSICS
-                case GT_HWIntrinsic:
+                case GT_HWINTRINSIC:
                     if ((op1->AsHWIntrinsic()->gtHWIntrinsicId != op2->AsHWIntrinsic()->gtHWIntrinsicId) ||
                         (op1->AsHWIntrinsic()->gtSIMDBaseType != op2->AsHWIntrinsic()->gtSIMDBaseType) ||
                         (op1->AsHWIntrinsic()->gtSIMDSize != op2->AsHWIntrinsic()->gtSIMDSize) ||
@@ -2116,7 +2116,7 @@ unsigned Compiler::gtHashValue(GenTree* tree)
 #endif // FEATURE_SIMD
 
 #ifdef FEATURE_HW_INTRINSICS
-                case GT_HWIntrinsic:
+                case GT_HWINTRINSIC:
                     hash += tree->AsHWIntrinsic()->gtHWIntrinsicId;
                     hash += tree->AsHWIntrinsic()->gtSIMDBaseType;
                     hash += tree->AsHWIntrinsic()->gtSIMDSize;
@@ -3645,7 +3645,7 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
                     break;
 
 #if defined(FEATURE_HW_INTRINSICS) && defined(_TARGET_XARCH_)
-                case GT_HWIntrinsic:
+                case GT_HWINTRINSIC:
                 {
                     if (tree->AsHWIntrinsic()->OperIsMemoryLoadOrStore())
                     {
@@ -4558,7 +4558,7 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
 DONE:
 
 #ifdef FEATURE_HW_INTRINSICS
-    if ((oper == GT_HWIntrinsic) && (tree->gtGetOp1() == nullptr))
+    if ((oper == GT_HWINTRINSIC) && (tree->gtGetOp1() == nullptr))
     {
         // We can have nullary HWIntrinsic nodes, and we must have non-zero cost.
         costEx = 1;
@@ -4981,7 +4981,7 @@ bool GenTree::TryGetUse(GenTree* def, GenTree*** use)
 #endif // FEATURE_SIMD
 
 #ifdef FEATURE_HW_INTRINSICS
-        case GT_HWIntrinsic:
+        case GT_HWINTRINSIC:
             if ((this->AsHWIntrinsic()->gtOp1 != nullptr) && this->AsHWIntrinsic()->gtOp1->OperIsList())
             {
                 return this->AsHWIntrinsic()->gtOp1->TryGetUseList(def, use);
@@ -5306,7 +5306,7 @@ bool GenTree::OperRequiresAsgFlag()
         return true;
     }
 #ifdef FEATURE_HW_INTRINSICS
-    if (gtOper == GT_HWIntrinsic)
+    if (gtOper == GT_HWINTRINSIC)
     {
         GenTreeHWIntrinsic* hwIntrinsicNode = this->AsHWIntrinsic();
         if (hwIntrinsicNode->OperIsMemoryStore())
@@ -5364,7 +5364,7 @@ bool GenTree::OperRequiresCallFlag(Compiler* comp)
 // Return Value:
 //    True if the given node contains an implicit indirection
 //
-// Note that for the GT_HWIntrinsic node we have to examine the
+// Note that for the GT_HWINTRINSIC node we have to examine the
 // details of the node to determine its result.
 //
 
@@ -5388,7 +5388,7 @@ bool GenTree::OperIsImplicitIndir() const
         case GT_ARR_OFFSET:
             return true;
 #ifdef FEATURE_HW_INTRINSICS
-        case GT_HWIntrinsic:
+        case GT_HWINTRINSIC:
         {
             GenTreeHWIntrinsic* hwIntrinsicNode = (const_cast<GenTree*>(this))->AsHWIntrinsic();
             return hwIntrinsicNode->OperIsMemoryLoadOrStore();
@@ -5487,7 +5487,7 @@ bool GenTree::OperMayThrow(Compiler* comp)
             return true;
 
 #ifdef FEATURE_HW_INTRINSICS
-        case GT_HWIntrinsic:
+        case GT_HWINTRINSIC:
         {
             GenTreeHWIntrinsic* hwIntrinsicNode = this->AsHWIntrinsic();
             assert(hwIntrinsicNode != nullptr);
@@ -6696,7 +6696,7 @@ void Compiler::gtBlockOpInit(GenTree* result, GenTree* dst, GenTree* srcOrFillVa
             src = src->AsIndir()->Addr()->gtGetOp1();
         }
 #ifdef FEATURE_HW_INTRINSICS
-        if ((src->OperGet() == GT_SIMD) || (src->OperGet() == GT_HWIntrinsic))
+        if ((src->OperGet() == GT_SIMD) || (src->OperGet() == GT_HWINTRINSIC))
 #else
         if (src->OperGet() == GT_SIMD)
 #endif // FEATURE_HW_INTRINSICS
@@ -7362,10 +7362,10 @@ GenTree* Compiler::gtCloneExpr(
 #endif
 
 #ifdef FEATURE_HW_INTRINSICS
-            case GT_HWIntrinsic:
+            case GT_HWINTRINSIC:
             {
                 GenTreeHWIntrinsic* hwintrinsicOp = tree->AsHWIntrinsic();
-                copy                              = new (this, GT_HWIntrinsic)
+                copy                              = new (this, GT_HWINTRINSIC)
                     GenTreeHWIntrinsic(hwintrinsicOp->TypeGet(), hwintrinsicOp->gtGetOp1(),
                                        hwintrinsicOp->gtGetOp2IfPresent(), hwintrinsicOp->gtHWIntrinsicId,
                                        hwintrinsicOp->gtSIMDBaseType, hwintrinsicOp->gtSIMDSize);
@@ -8282,8 +8282,8 @@ unsigned GenTree::NumChildren()
             return childCount;
         }
 #ifdef FEATURE_HW_INTRINSICS
-        // GT_HWIntrinsic require special handling
-        if (OperGet() == GT_HWIntrinsic)
+        // GT_HWINTRINSIC require special handling
+        if (OperGet() == GT_HWINTRINSIC)
         {
             if (AsOp()->gtOp1 == nullptr)
             {
@@ -8729,7 +8729,7 @@ GenTreeUseEdgeIterator::GenTreeUseEdgeIterator(GenTree* node)
 #endif // FEATURE_SIMD
 
 #ifdef FEATURE_HW_INTRINSICS
-        case GT_HWIntrinsic:
+        case GT_HWINTRINSIC:
             if (m_node->AsHWIntrinsic()->gtOp1 == nullptr)
             {
                 assert(m_node->NullOp1Legal());
@@ -11042,7 +11042,7 @@ void Compiler::gtDispTree(GenTree*     tree,
 #endif // FEATURE_SIMD
 
 #ifdef FEATURE_HW_INTRINSICS
-        if (tree->gtOper == GT_HWIntrinsic)
+        if (tree->gtOper == GT_HWINTRINSIC)
         {
             printf(" %s %s", tree->AsHWIntrinsic()->gtSIMDBaseType == TYP_UNKNOWN
                                  ? ""
@@ -13340,7 +13340,7 @@ GenTree* Compiler::gtFoldExprConst(GenTree* tree)
     }
 #endif // FEATURE_SIMD
 #ifdef FEATURE_HW_INTRINSICS
-    if (tree->OperGet() == GT_HWIntrinsic)
+    if (tree->OperGet() == GT_HWINTRINSIC)
     {
         return tree;
     }
@@ -16871,7 +16871,7 @@ CORINFO_CLASS_HANDLE Compiler::gtGetStructHandleIfPresent(GenTree* tree)
                 break;
 #endif // FEATURE_SIMD
 #ifdef FEATURE_HW_INTRINSICS
-            case GT_HWIntrinsic:
+            case GT_HWINTRINSIC:
                 structHnd = gtGetStructHandleForHWSIMD(tree->gtType, tree->AsHWIntrinsic()->gtSIMDBaseType);
                 break;
 #endif
@@ -18017,7 +18017,7 @@ bool GenTree::isCommutativeSIMDIntrinsic()
 #ifdef FEATURE_HW_INTRINSICS
 bool GenTree::isCommutativeHWIntrinsic() const
 {
-    assert(gtOper == GT_HWIntrinsic);
+    assert(gtOper == GT_HWINTRINSIC);
 
 #ifdef _TARGET_XARCH_
     return HWIntrinsicInfo::IsCommutative(AsHWIntrinsic()->gtHWIntrinsicId);
@@ -18028,7 +18028,7 @@ bool GenTree::isCommutativeHWIntrinsic() const
 
 bool GenTree::isContainableHWIntrinsic() const
 {
-    assert(gtOper == GT_HWIntrinsic);
+    assert(gtOper == GT_HWINTRINSIC);
 
 #ifdef _TARGET_XARCH_
     switch (AsHWIntrinsic()->gtHWIntrinsicId)
@@ -18059,7 +18059,7 @@ bool GenTree::isContainableHWIntrinsic() const
 
 bool GenTree::isRMWHWIntrinsic(Compiler* comp)
 {
-    assert(gtOper == GT_HWIntrinsic);
+    assert(gtOper == GT_HWINTRINSIC);
     assert(comp != nullptr);
 
 #ifdef _TARGET_XARCH_
@@ -18103,15 +18103,15 @@ GenTreeHWIntrinsic* Compiler::gtNewSimdHWIntrinsicNode(var_types      type,
                                                        var_types      baseType,
                                                        unsigned       size)
 {
-    return new (this, GT_HWIntrinsic) GenTreeHWIntrinsic(type, hwIntrinsicID, baseType, size);
+    return new (this, GT_HWINTRINSIC) GenTreeHWIntrinsic(type, hwIntrinsicID, baseType, size);
 }
 
 GenTreeHWIntrinsic* Compiler::gtNewSimdHWIntrinsicNode(
     var_types type, GenTree* op1, NamedIntrinsic hwIntrinsicID, var_types baseType, unsigned simdSize)
 {
     SetOpLclRelatedToSIMDIntrinsic(op1);
 
-    return new (this, GT_HWIntrinsic) GenTreeHWIntrinsic(type, op1, hwIntrinsicID, baseType, simdSize);
+    return new (this, GT_HWINTRINSIC) GenTreeHWIntrinsic(type, op1, hwIntrinsicID, baseType, simdSize);
 }
 
 GenTreeHWIntrinsic* Compiler::gtNewSimdHWIntrinsicNode(
@@ -18120,7 +18120,7 @@ GenTreeHWIntrinsic* Compiler::gtNewSimdHWIntrinsicNode(
     SetOpLclRelatedToSIMDIntrinsic(op1);
     SetOpLclRelatedToSIMDIntrinsic(op2);
 
-    return new (this, GT_HWIntrinsic) GenTreeHWIntrinsic(type, op1, op2, hwIntrinsicID, baseType, simdSize);
+    return new (this, GT_HWINTRINSIC) GenTreeHWIntrinsic(type, op1, op2, hwIntrinsicID, baseType, simdSize);
 }
 
 GenTreeHWIntrinsic* Compiler::gtNewSimdHWIntrinsicNode(var_types      type,
@@ -18135,7 +18135,7 @@ GenTreeHWIntrinsic* Compiler::gtNewSimdHWIntrinsicNode(var_types      type,
     SetOpLclRelatedToSIMDIntrinsic(op2);
     SetOpLclRelatedToSIMDIntrinsic(op3);
 
-    return new (this, GT_HWIntrinsic)
+    return new (this, GT_HWINTRINSIC)
         GenTreeHWIntrinsic(type, gtNewArgList(op1, op2, op3), hwIntrinsicID, baseType, size);
 }
 
@@ -18153,15 +18153,15 @@ GenTreeHWIntrinsic* Compiler::gtNewSimdHWIntrinsicNode(var_types      type,
     SetOpLclRelatedToSIMDIntrinsic(op3);
     SetOpLclRelatedToSIMDIntrinsic(op4);
 
-    return new (this, GT_HWIntrinsic)
+    return new (this, GT_HWINTRINSIC)
         GenTreeHWIntrinsic(type, gtNewArgList(op1, op2, op3, op4), hwIntrinsicID, baseType, size);
 }
 
 GenTreeHWIntrinsic* Compiler::gtNewScalarHWIntrinsicNode(var_types type, GenTree* op1, NamedIntrinsic hwIntrinsicID)
 {
     SetOpLclRelatedToSIMDIntrinsic(op1);
 
-    return new (this, GT_HWIntrinsic) GenTreeHWIntrinsic(type, op1, hwIntrinsicID, TYP_UNKNOWN, 0);
+    return new (this, GT_HWINTRINSIC) GenTreeHWIntrinsic(type, op1, hwIntrinsicID, TYP_UNKNOWN, 0);
 }
 
 GenTreeHWIntrinsic* Compiler::gtNewScalarHWIntrinsicNode(var_types      type,
@@ -18172,7 +18172,7 @@ GenTreeHWIntrinsic* Compiler::gtNewScalarHWIntrinsicNode(var_types      type,
     SetOpLclRelatedToSIMDIntrinsic(op1);
     SetOpLclRelatedToSIMDIntrinsic(op2);
 
-    return new (this, GT_HWIntrinsic) GenTreeHWIntrinsic(type, op1, op2, hwIntrinsicID, TYP_UNKNOWN, 0);
+    return new (this, GT_HWINTRINSIC) GenTreeHWIntrinsic(type, op1, op2, hwIntrinsicID, TYP_UNKNOWN, 0);
 }
 
 GenTreeHWIntrinsic* Compiler::gtNewScalarHWIntrinsicNode(
@@ -18182,7 +18182,7 @@ GenTreeHWIntrinsic* Compiler::gtNewScalarHWIntrinsicNode(
     SetOpLclRelatedToSIMDIntrinsic(op2);
     SetOpLclRelatedToSIMDIntrinsic(op3);
 
-    return new (this, GT_HWIntrinsic)
+    return new (this, GT_HWINTRINSIC)
         GenTreeHWIntrinsic(type, gtNewArgList(op1, op2, op3), hwIntrinsicID, TYP_UNKNOWN, 0);
 }
 

src/jit/gentree.h

@@ -1482,7 +1482,7 @@ struct GenTree
     static bool OperIsHWIntrinsic(genTreeOps gtOper)
     {
 #ifdef FEATURE_HW_INTRINSICS
-        return gtOper == GT_HWIntrinsic;
+        return gtOper == GT_HWINTRINSIC;
 #else
         return false;
 #endif // FEATURE_HW_INTRINSICS
@@ -1554,7 +1554,7 @@ struct GenTree
             case GT_RETFILT:
             case GT_NOP:
 #ifdef FEATURE_HW_INTRINSICS
-            case GT_HWIntrinsic:
+            case GT_HWINTRINSIC:
 #endif // FEATURE_HW_INTRINSICS
                 return true;
             case GT_RETURN:
@@ -1581,7 +1581,7 @@ struct GenTree
 #endif // !FEATURE_SIMD
 
 #ifdef FEATURE_HW_INTRINSICS
-            case GT_HWIntrinsic:
+            case GT_HWINTRINSIC:
 #endif // FEATURE_HW_INTRINSICS
 
 #if defined(_TARGET_ARM_)
@@ -4491,14 +4491,14 @@ struct GenTreeHWIntrinsic : public GenTreeJitIntrinsic
     var_types      gtIndexBaseType; // for AVX2 Gather* intrinsics
 
     GenTreeHWIntrinsic(var_types type, NamedIntrinsic hwIntrinsicID, var_types baseType, unsigned size)
-        : GenTreeJitIntrinsic(GT_HWIntrinsic, type, nullptr, nullptr, baseType, size)
+        : GenTreeJitIntrinsic(GT_HWINTRINSIC, type, nullptr, nullptr, baseType, size)
         , gtHWIntrinsicId(hwIntrinsicID)
         , gtIndexBaseType(TYP_UNKNOWN)
     {
     }
 
     GenTreeHWIntrinsic(var_types type, GenTree* op1, NamedIntrinsic hwIntrinsicID, var_types baseType, unsigned size)
-        : GenTreeJitIntrinsic(GT_HWIntrinsic, type, op1, nullptr, baseType, size)
+        : GenTreeJitIntrinsic(GT_HWINTRINSIC, type, op1, nullptr, baseType, size)
         , gtHWIntrinsicId(hwIntrinsicID)
         , gtIndexBaseType(TYP_UNKNOWN)
     {
@@ -4510,7 +4510,7 @@ struct GenTreeHWIntrinsic : public GenTreeJitIntrinsic
 
     GenTreeHWIntrinsic(
         var_types type, GenTree* op1, GenTree* op2, NamedIntrinsic hwIntrinsicID, var_types baseType, unsigned size)
-        : GenTreeJitIntrinsic(GT_HWIntrinsic, type, op1, op2, baseType, size)
+        : GenTreeJitIntrinsic(GT_HWINTRINSIC, type, op1, op2, baseType, size)
         , gtHWIntrinsicId(hwIntrinsicID)
         , gtIndexBaseType(TYP_UNKNOWN)
     {

src/jit/gtlist.h

@@ -207,7 +207,7 @@ GTNODE(SIMD             , GenTreeSIMD        ,0,(GTK_BINOP|GTK_EXOP))     // SIM
 #endif // FEATURE_SIMD
 
 #ifdef FEATURE_HW_INTRINSICS
-GTNODE(HWIntrinsic      , GenTreeHWIntrinsic ,0,(GTK_BINOP|GTK_EXOP))               // hardware intrinsics
+GTNODE(HWINTRINSIC      , GenTreeHWIntrinsic ,0,(GTK_BINOP|GTK_EXOP))               // hardware intrinsics
 #endif // FEATURE_HW_INTRINSICS
 
 //-----------------------------------------------------------------------------

src/jit/gtstructs.h

@@ -114,7 +114,7 @@ GTSTRUCT_1(PhysReg     , GT_PHYSREG)
 GTSTRUCT_1(SIMD        , GT_SIMD) 
 #endif // FEATURE_SIMD
 #ifdef FEATURE_HW_INTRINSICS
-GTSTRUCT_1(HWIntrinsic , GT_HWIntrinsic) 
+GTSTRUCT_1(HWIntrinsic , GT_HWINTRINSIC) 
 #endif // FEATURE_HW_INTRINSICS
 GTSTRUCT_1(AllocObj    , GT_ALLOCOBJ)
 GTSTRUCT_1(RuntimeLookup, GT_RUNTIMELOOKUP)