Skip to content

Commit 54b86f1

Browse files
tannergoodingtannergooding
authored
Remove the rest of the SimdAsHWIntrinsic support (#106594)
1 parent f26a19a commit 54b86f1

11 files changed

+143
-2140
lines changed

‎src/coreclr/jit/CMakeLists.txt‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ set( JIT_AMD64_SOURCES
200200
lowerxarch.cpp
201201
lsraxarch.cpp
202202
simd.cpp
203-
simdashwintrinsic.cpp
204203
simdcodegenxarch.cpp
205204
targetamd64.cpp
206205
unwindamd64.cpp
@@ -227,7 +226,6 @@ set( JIT_I386_SOURCES
227226
lowerxarch.cpp
228227
lsraxarch.cpp
229228
simd.cpp
230-
simdashwintrinsic.cpp
231229
simdcodegenxarch.cpp
232230
targetx86.cpp
233231
unwindx86.cpp
@@ -245,7 +243,6 @@ set( JIT_ARM64_SOURCES
245243
lsraarmarch.cpp
246244
lsraarm64.cpp
247245
simd.cpp
248-
simdashwintrinsic.cpp
249246
targetarm64.cpp
250247
unwindarmarch.cpp
251248
unwindarm64.cpp
@@ -372,7 +369,6 @@ set( JIT_HEADERS
372369
scev.h
373370
sideeffects.h
374371
simd.h
375-
simdashwintrinsic.h
376372
sm.h
377373
smallhash.h
378374
smcommon.h
@@ -406,7 +402,6 @@ set( JIT_AMD64_HEADERS
406402
hwintrinsiclistxarch.h
407403
hwintrinsic.h
408404
instrsxarch.h
409-
simdashwintrinsiclistxarch.h
410405
)
411406

412407
set( JIT_I386_HEADERS ${JIT_AMD64_HEADERS} )
@@ -420,7 +415,6 @@ set( JIT_ARM64_HEADERS
420415
instrsarm64.h
421416
instrsarm64sve.h
422417
registerarm64.h
423-
simdashwintrinsiclistarm64.h
424418
)
425419

426420
set( JIT_ARM_HEADERS

‎src/coreclr/jit/compiler.h‎

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ inline var_types genActualType(T value);
6565

6666
#include "hwintrinsic.h"
6767
#include "simd.h"
68-
#include "simdashwintrinsic.h"
6968

7069
#include "jitmetadata.h"
7170

@@ -2607,7 +2606,6 @@ class Compiler
26072606
#ifdef FEATURE_HW_INTRINSICS
26082607
friend struct GenTreeHWIntrinsic;
26092608
friend struct HWIntrinsicInfo;
2610-
friend struct SimdAsHWIntrinsicInfo;
26112609
#endif // FEATURE_HW_INTRINSICS
26122610

26132611
#ifndef TARGET_64BIT
@@ -3160,41 +3158,6 @@ class Compiler
31603158
CorInfoType simdBaseJitType,
31613159
unsigned simdSize);
31623160

3163-
GenTreeHWIntrinsic* gtNewSimdAsHWIntrinsicNode(var_types type,
3164-
NamedIntrinsic hwIntrinsicID,
3165-
CorInfoType simdBaseJitType,
3166-
unsigned simdSize)
3167-
{
3168-
return gtNewSimdHWIntrinsicNode(type, hwIntrinsicID, simdBaseJitType, simdSize);
3169-
}
3170-
3171-
GenTreeHWIntrinsic* gtNewSimdAsHWIntrinsicNode(
3172-
var_types type, GenTree* op1, NamedIntrinsic hwIntrinsicID, CorInfoType simdBaseJitType, unsigned simdSize)
3173-
{
3174-
return gtNewSimdHWIntrinsicNode(type, op1, hwIntrinsicID, simdBaseJitType, simdSize);
3175-
}
3176-
3177-
GenTreeHWIntrinsic* gtNewSimdAsHWIntrinsicNode(var_types type,
3178-
GenTree* op1,
3179-
GenTree* op2,
3180-
NamedIntrinsic hwIntrinsicID,
3181-
CorInfoType simdBaseJitType,
3182-
unsigned simdSize)
3183-
{
3184-
return gtNewSimdHWIntrinsicNode(type, op1, op2, hwIntrinsicID, simdBaseJitType, simdSize);
3185-
}
3186-
3187-
GenTreeHWIntrinsic* gtNewSimdAsHWIntrinsicNode(var_types type,
3188-
GenTree* op1,
3189-
GenTree* op2,
3190-
GenTree* op3,
3191-
NamedIntrinsic hwIntrinsicID,
3192-
CorInfoType simdBaseJitType,
3193-
unsigned simdSize)
3194-
{
3195-
return gtNewSimdHWIntrinsicNode(type, op1, op2, op3, hwIntrinsicID, simdBaseJitType, simdSize);
3196-
}
3197-
31983161
GenTree* gtNewSimdAbsNode(
31993162
var_types type, GenTree* op1, CorInfoType simdBaseJitType, unsigned simdSize);
32003163

@@ -4685,23 +4648,10 @@ class Compiler
46854648
CORINFO_SIG_INFO* sig
46864649
R2RARG(CORINFO_CONST_LOOKUP* entryPoint),
46874650
bool mustExpand);
4688-
GenTree* impSimdAsHWIntrinsic(NamedIntrinsic intrinsic,
4689-
CORINFO_CLASS_HANDLE clsHnd,
4690-
CORINFO_METHOD_HANDLE method,
4691-
CORINFO_SIG_INFO* sig,
4692-
bool mustExpand);
46934651

46944652
protected:
46954653
bool compSupportsHWIntrinsic(CORINFO_InstructionSet isa);
46964654

4697-
GenTree* impSimdAsHWIntrinsicSpecial(NamedIntrinsic intrinsic,
4698-
CORINFO_CLASS_HANDLE clsHnd,
4699-
CORINFO_SIG_INFO* sig,
4700-
var_types retType,
4701-
CorInfoType simdBaseJitType,
4702-
unsigned simdSize,
4703-
bool mustExpand);
4704-
47054655
GenTree* impSpecialIntrinsic(NamedIntrinsic intrinsic,
47064656
CORINFO_CLASS_HANDLE clsHnd,
47074657
CORINFO_METHOD_HANDLE method,

‎src/coreclr/jit/fgbasic.cpp‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1246,7 +1246,6 @@ void Compiler::fgFindJumpTargets(const BYTE* codeAddr, IL_OFFSET codeSize, Fixed
12461246
case NI_Vector128_Create:
12471247
case NI_Vector128_CreateScalar:
12481248
case NI_Vector128_CreateScalarUnsafe:
1249-
case NI_VectorT_Create:
12501249
#if defined(TARGET_XARCH)
12511250
case NI_BMI1_TrailingZeroCount:
12521251
case NI_BMI1_X64_TrailingZeroCount:
@@ -1501,21 +1500,6 @@ void Compiler::fgFindJumpTargets(const BYTE* codeAddr, IL_OFFSET codeSize, Fixed
15011500
case NI_Vector128_AsUInt64:
15021501
case NI_Vector128_AsVector4:
15031502
case NI_Vector128_op_UnaryPlus:
1504-
case NI_VectorT_As:
1505-
case NI_VectorT_AsVectorByte:
1506-
case NI_VectorT_AsVectorDouble:
1507-
case NI_VectorT_AsVectorInt16:
1508-
case NI_VectorT_AsVectorInt32:
1509-
case NI_VectorT_AsVectorInt64:
1510-
case NI_VectorT_AsVectorNInt:
1511-
case NI_VectorT_AsVectorNUInt:
1512-
case NI_VectorT_AsVectorSByte:
1513-
case NI_VectorT_AsVectorSingle:
1514-
case NI_VectorT_AsVectorUInt16:
1515-
case NI_VectorT_AsVectorUInt32:
1516-
case NI_VectorT_AsVectorUInt64:
1517-
case NI_VectorT_op_Explicit:
1518-
case NI_VectorT_op_UnaryPlus:
15191503
#if defined(TARGET_XARCH)
15201504
case NI_Vector256_As:
15211505
case NI_Vector256_AsByte:
@@ -1570,9 +1554,6 @@ void Compiler::fgFindJumpTargets(const BYTE* codeAddr, IL_OFFSET codeSize, Fixed
15701554
case NI_Vector128_get_AllBitsSet:
15711555
case NI_Vector128_get_One:
15721556
case NI_Vector128_get_Zero:
1573-
case NI_VectorT_get_AllBitsSet:
1574-
case NI_VectorT_get_One:
1575-
case NI_VectorT_get_Zero:
15761557
#if defined(TARGET_XARCH)
15771558
case NI_Vector256_get_AllBitsSet:
15781559
case NI_Vector256_get_One:

‎src/coreclr/jit/hwintrinsicarm64.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1264,7 +1264,7 @@ GenTree* Compiler::impSpecialIntrinsic(NamedIntrinsic intrinsic,
12641264
}
12651265

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

12691269
op2 = impPopStack().val;
12701270
op1 = impPopStack().val;

‎src/coreclr/jit/hwintrinsicxarch.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2361,7 +2361,7 @@ GenTree* Compiler::impSpecialIntrinsic(NamedIntrinsic intrinsic,
23612361
}
23622362

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

23662366
op2 = impPopStack().val;
23672367
op1 = impPopStack().val;

0 commit comments

Comments
 (0)