Move mapTypeToRegTypeIndex() and mapRegNumtoRegTypeIndex() in compile…

…r.hpp
dotnet · May 30, 2024 · 3741ac6 · 3741ac6
1 parent 687ed43
commit 3741ac6
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 30 deletions.
diff --git a/src/coreclr/jit/compiler.hpp b/src/coreclr/jit/compiler.hpp
@@ -1016,6 +1016,52 @@ inline regNumber genFirstRegNumFromMaskAndToggle(SingleTypeRegSet& mask)
     return regNum;
 }
 
+//------------------------------------------------------------------------------
+// mapTypeToRegTypeIndex : Maps the type to the index used to store relevant mask
+//          in regMaskTP. 0= IntRegisterType, 1= FloatRegisterType, 2= PredicateRegisterType
+// Arguments:
+//    vt               - the register type
+//
+// Return Value:
+//    The index depending on the register type.
+//
+
+/* static */ int regMaskTP::mapTypeToRegTypeIndex(var_types vt)
+{
+    int type = varTypeRegister[TypeGet(vt)];
+#ifdef HAS_MORE_THAN_64_REGISTERS
+    assert(type <= 3);
+#endif
+
+#ifndef FEATURE_MASKED_HW_INTRINSICS
+    assert(type != VTR_MASK);
+#endif
+    return (type - 1);
+}
+
+//------------------------------------------------------------------------------
+// mapTypeToRegTypeIndex : Maps the regNumber to the index used to store relevant mask
+//          in regMaskTP.
+// Arguments:
+//    reg               - the register number
+//
+// Return Value:
+//    The index depending on the register type.
+//
+/* static */ int regMaskTP::mapRegNumToRegTypeIndex(regNumber reg)
+{
+    static const BYTE _registerTypeIndex[] = {
+#ifdef TARGET_ARM64
+#define REGDEF(name, rnum, mask, xname, wname, regTypeTag) regTypeTag,
+#else
+#define REGDEF(name, rnum, mask, sname, regTypeTag) regTypeTag,
+#endif
+#include "register.h"
+    };
+
+    return _registerTypeIndex[reg];
+}
+
 /*****************************************************************************
  *
  *  Return the size in bytes of the given type.

diff --git a/src/coreclr/jit/regMaskTPOps.cpp b/src/coreclr/jit/regMaskTPOps.cpp
@@ -214,34 +214,6 @@ void regMaskTP::RemoveRegsetForType(SingleTypeRegSet regsToRemove, var_types typ
 #endif
 }
 
-template <class T>
-/* static */ int regMaskTP::mapTypeToRegTypeIndex(T vt)
-{
-    int type = varTypeRegister[TypeGet(vt)];
-#ifdef HAS_MORE_THAN_64_REGISTERS
-    assert(type <= 3);
-#endif
-
-#ifndef FEATURE_MASKED_HW_INTRINSICS
-    assert(type != VTR_MASK);
-#endif
-    return (type - 1);
-}
-
-/* static */ int regMaskTP::mapRegNumToRegTypeIndex(regNumber reg)
-{
-    static const BYTE _registerTypeIndex[] = {
-#ifdef TARGET_ARM64
-#define REGDEF(name, rnum, mask, xname, wname, regTypeTag) regTypeTag,
-#else
-#define REGDEF(name, rnum, mask, sname, regTypeTag) regTypeTag,
-#endif
-#include "register.h"
-    };
-
-    return _registerTypeIndex[reg];
-}
-
 void regMaskTP::operator|=(const regNumber reg)
 {
     SingleTypeRegSet value = genSingleTypeRegMask(reg);

diff --git a/src/coreclr/jit/target.h b/src/coreclr/jit/target.h
@@ -270,13 +270,13 @@ struct regMaskTP
 #endif
 
     FORCEINLINE static int mapRegNumToRegTypeIndex(regNumber reg);
-    template <class T>
-    FORCEINLINE static int          mapTypeToRegTypeIndex(T type);
     FORCEINLINE static RegSet32     encodeForRegisterIndex(int index, regMaskSmall value);
     FORCEINLINE static regMaskSmall decodeForRegisterIndex(int index, RegSet32 value);
 
 public:
 
+    FORCEINLINE static int mapTypeToRegTypeIndex(var_types type);
+
 #ifdef TARGET_ARM
     void AddRegNumInMask(regNumber reg, var_types type);
     void RemoveRegNumFromMask(regNumber reg, var_types type);