Skip to content

Commit

Permalink
Remove the rest of the SimdAsHWIntrinsic support (#106594)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tannergooding
tannergooding authored Oct 31, 2024
1 parent f26a19a commit 54b86f1
Show file tree
Hide file tree
Showing 11 changed files with 143 additions and 2,140 deletions.
6 changes: 0 additions & 6 deletions src/coreclr/jit/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@ set( JIT_AMD64_SOURCES
lowerxarch.cpp
lsraxarch.cpp
simd.cpp
simdashwintrinsic.cpp
simdcodegenxarch.cpp
targetamd64.cpp
unwindamd64.cpp
Expand All @@ -227,7 +226,6 @@ set( JIT_I386_SOURCES
lowerxarch.cpp
lsraxarch.cpp
simd.cpp
simdashwintrinsic.cpp
simdcodegenxarch.cpp
targetx86.cpp
unwindx86.cpp
Expand All @@ -245,7 +243,6 @@ set( JIT_ARM64_SOURCES
lsraarmarch.cpp
lsraarm64.cpp
simd.cpp
simdashwintrinsic.cpp
targetarm64.cpp
unwindarmarch.cpp
unwindarm64.cpp
Expand Down Expand Up @@ -372,7 +369,6 @@ set( JIT_HEADERS
scev.h
sideeffects.h
simd.h
simdashwintrinsic.h
sm.h
smallhash.h
smcommon.h
Expand Down Expand Up @@ -406,7 +402,6 @@ set( JIT_AMD64_HEADERS
hwintrinsiclistxarch.h
hwintrinsic.h
instrsxarch.h
simdashwintrinsiclistxarch.h
)

set( JIT_I386_HEADERS ${JIT_AMD64_HEADERS} )
Expand All @@ -420,7 +415,6 @@ set( JIT_ARM64_HEADERS
instrsarm64.h
instrsarm64sve.h
registerarm64.h
simdashwintrinsiclistarm64.h
)

set( JIT_ARM_HEADERS
Expand Down
50 changes: 0 additions & 50 deletions src/coreclr/jit/compiler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ inline var_types genActualType(T value);

#include "hwintrinsic.h"
#include "simd.h"
#include "simdashwintrinsic.h"

#include "jitmetadata.h"

Expand Down Expand Up @@ -2607,7 +2606,6 @@ class Compiler
#ifdef FEATURE_HW_INTRINSICS
friend struct GenTreeHWIntrinsic;
friend struct HWIntrinsicInfo;
friend struct SimdAsHWIntrinsicInfo;
#endif // FEATURE_HW_INTRINSICS

#ifndef TARGET_64BIT
Expand Down Expand Up @@ -3160,41 +3158,6 @@ class Compiler
CorInfoType simdBaseJitType,
unsigned simdSize);

GenTreeHWIntrinsic* gtNewSimdAsHWIntrinsicNode(var_types type,
NamedIntrinsic hwIntrinsicID,
CorInfoType simdBaseJitType,
unsigned simdSize)
{
return gtNewSimdHWIntrinsicNode(type, hwIntrinsicID, simdBaseJitType, simdSize);
}

GenTreeHWIntrinsic* gtNewSimdAsHWIntrinsicNode(
var_types type, GenTree* op1, NamedIntrinsic hwIntrinsicID, CorInfoType simdBaseJitType, unsigned simdSize)
{
return gtNewSimdHWIntrinsicNode(type, op1, hwIntrinsicID, simdBaseJitType, simdSize);
}

GenTreeHWIntrinsic* gtNewSimdAsHWIntrinsicNode(var_types type,
GenTree* op1,
GenTree* op2,
NamedIntrinsic hwIntrinsicID,
CorInfoType simdBaseJitType,
unsigned simdSize)
{
return gtNewSimdHWIntrinsicNode(type, op1, op2, hwIntrinsicID, simdBaseJitType, simdSize);
}

GenTreeHWIntrinsic* gtNewSimdAsHWIntrinsicNode(var_types type,
GenTree* op1,
GenTree* op2,
GenTree* op3,
NamedIntrinsic hwIntrinsicID,
CorInfoType simdBaseJitType,
unsigned simdSize)
{
return gtNewSimdHWIntrinsicNode(type, op1, op2, op3, hwIntrinsicID, simdBaseJitType, simdSize);
}

GenTree* gtNewSimdAbsNode(
var_types type, GenTree* op1, CorInfoType simdBaseJitType, unsigned simdSize);

Expand Down Expand Up @@ -4685,23 +4648,10 @@ class Compiler
CORINFO_SIG_INFO* sig
R2RARG(CORINFO_CONST_LOOKUP* entryPoint),
bool mustExpand);
GenTree* impSimdAsHWIntrinsic(NamedIntrinsic intrinsic,
CORINFO_CLASS_HANDLE clsHnd,
CORINFO_METHOD_HANDLE method,
CORINFO_SIG_INFO* sig,
bool mustExpand);

protected:
bool compSupportsHWIntrinsic(CORINFO_InstructionSet isa);

GenTree* impSimdAsHWIntrinsicSpecial(NamedIntrinsic intrinsic,
CORINFO_CLASS_HANDLE clsHnd,
CORINFO_SIG_INFO* sig,
var_types retType,
CorInfoType simdBaseJitType,
unsigned simdSize,
bool mustExpand);

GenTree* impSpecialIntrinsic(NamedIntrinsic intrinsic,
CORINFO_CLASS_HANDLE clsHnd,
CORINFO_METHOD_HANDLE method,
Expand Down
19 changes: 0 additions & 19 deletions src/coreclr/jit/fgbasic.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1246,7 +1246,6 @@ void Compiler::fgFindJumpTargets(const BYTE* codeAddr, IL_OFFSET codeSize, Fixed
case NI_Vector128_Create:
case NI_Vector128_CreateScalar:
case NI_Vector128_CreateScalarUnsafe:
case NI_VectorT_Create:
#if defined(TARGET_XARCH)
case NI_BMI1_TrailingZeroCount:
case NI_BMI1_X64_TrailingZeroCount:
Expand Down Expand Up @@ -1501,21 +1500,6 @@ void Compiler::fgFindJumpTargets(const BYTE* codeAddr, IL_OFFSET codeSize, Fixed
case NI_Vector128_AsUInt64:
case NI_Vector128_AsVector4:
case NI_Vector128_op_UnaryPlus:
case NI_VectorT_As:
case NI_VectorT_AsVectorByte:
case NI_VectorT_AsVectorDouble:
case NI_VectorT_AsVectorInt16:
case NI_VectorT_AsVectorInt32:
case NI_VectorT_AsVectorInt64:
case NI_VectorT_AsVectorNInt:
case NI_VectorT_AsVectorNUInt:
case NI_VectorT_AsVectorSByte:
case NI_VectorT_AsVectorSingle:
case NI_VectorT_AsVectorUInt16:
case NI_VectorT_AsVectorUInt32:
case NI_VectorT_AsVectorUInt64:
case NI_VectorT_op_Explicit:
case NI_VectorT_op_UnaryPlus:
#if defined(TARGET_XARCH)
case NI_Vector256_As:
case NI_Vector256_AsByte:
Expand Down Expand Up @@ -1570,9 +1554,6 @@ void Compiler::fgFindJumpTargets(const BYTE* codeAddr, IL_OFFSET codeSize, Fixed
case NI_Vector128_get_AllBitsSet:
case NI_Vector128_get_One:
case NI_Vector128_get_Zero:
case NI_VectorT_get_AllBitsSet:
case NI_VectorT_get_One:
case NI_VectorT_get_Zero:
#if defined(TARGET_XARCH)
case NI_Vector256_get_AllBitsSet:
case NI_Vector256_get_One:
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/jit/hwintrinsicarm64.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1264,7 +1264,7 @@ GenTree* Compiler::impSpecialIntrinsic(NamedIntrinsic intrinsic,
}

impSpillSideEffect(true, verCurrentState.esStackDepth -
2 DEBUGARG("Spilling op1 side effects for SimdAsHWIntrinsic"));
2 DEBUGARG("Spilling op1 side effects for vector CreateSequence"));

op2 = impPopStack().val;
op1 = impPopStack().val;
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/jit/hwintrinsicxarch.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2361,7 +2361,7 @@ GenTree* Compiler::impSpecialIntrinsic(NamedIntrinsic intrinsic,
}

impSpillSideEffect(true, verCurrentState.esStackDepth -
2 DEBUGARG("Spilling op1 side effects for SimdAsHWIntrinsic"));
2 DEBUGARG("Spilling op1 side effects for vector CreateSequence"));

op2 = impPopStack().val;
op1 = impPopStack().val;
Expand Down
Loading

0 comments on commit 54b86f1

Please sign in to comment.