Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 79a08ff

Browse files
BruceForstallBruceForstall
committed
Fix desktop build
1. Fix `LEGACY_BACKEND` 2. `#if FEATURE_HW_INTRINSICS` => `#ifdef FEATURE_HW_INTRINSICS` [tfs-changeset: 1686599]
1 parent 9afce33 commit 79a08ff

File tree

16 files changed

+60
-50
lines changed

16 files changed

+60
-50
lines changed

‎src/jit/codegenlinear.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ void genPutArgStkSIMD12(GenTree* treeNode);
114114
#endif // _TARGET_X86_
115115
#endif // FEATURE_SIMD
116116

117-
#if FEATURE_HW_INTRINSICS && defined(_TARGET_XARCH_)
117+
#if defined(FEATURE_HW_INTRINSICS) && defined(_TARGET_XARCH_)
118118
void genHWIntrinsic(GenTreeHWIntrinsic* node);
119119
void genHWIntrinsic_R_R_RM(GenTreeHWIntrinsic* node, instruction ins);
120120
void genHWIntrinsic_R_R_RM_I(GenTreeHWIntrinsic* node, instruction ins);
@@ -133,7 +133,7 @@ void genFMAIntrinsic(GenTreeHWIntrinsic* node);
133133
void genLZCNTIntrinsic(GenTreeHWIntrinsic* node);
134134
void genPCLMULQDQIntrinsic(GenTreeHWIntrinsic* node);
135135
void genPOPCNTIntrinsic(GenTreeHWIntrinsic* node);
136-
#endif // FEATURE_HW_INTRINSICS
136+
#endif // defined(FEATURE_HW_INTRINSICS) && defined(_TARGET_XARCH_)
137137

138138
#if !defined(_TARGET_64BIT_)
139139

‎src/jit/codegenxarch.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1860,7 +1860,7 @@ void CodeGen::genCodeForTreeNode(GenTreePtr treeNode)
18601860
break;
18611861
#endif // FEATURE_SIMD
18621862

1863-
#if FEATURE_HW_INTRINSICS
1863+
#ifdef FEATURE_HW_INTRINSICS
18641864
case GT_HWIntrinsic:
18651865
genHWIntrinsic(treeNode->AsHWIntrinsic());
18661866
break;

‎src/jit/compiler.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2116,7 +2116,7 @@ void Compiler::compInit(ArenaAllocator* pAlloc, InlineInfo* inlineInfo)
21162116
SIMDVector3Handle = nullptr;
21172117
SIMDVector4Handle = nullptr;
21182118
SIMDVectorHandle = nullptr;
2119-
#if FEATURE_HW_INTRINSICS
2119+
#ifdef FEATURE_HW_INTRINSICS
21202120
#if defined(_TARGET_ARM64_)
21212121
Vector64FloatHandle = nullptr;
21222122
Vector64DoubleHandle = nullptr;

‎src/jit/compiler.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2056,7 +2056,7 @@ class Compiler
20562056
void SetOpLclRelatedToSIMDIntrinsic(GenTreePtr op);
20572057
#endif
20582058

2059-
#if FEATURE_HW_INTRINSICS
2059+
#ifdef FEATURE_HW_INTRINSICS
20602060
GenTreeHWIntrinsic* gtNewSimdHWIntrinsicNode(var_types type,
20612061
NamedIntrinsic hwIntrinsicID,
20622062
var_types baseType,
@@ -3041,7 +3041,7 @@ class Compiler
30413041
bool tailCall);
30423042
NamedIntrinsic lookupNamedIntrinsic(CORINFO_METHOD_HANDLE method);
30433043

3044-
#if FEATURE_HW_INTRINSICS
3044+
#ifdef FEATURE_HW_INTRINSICS
30453045
static InstructionSet lookupHWIntrinsicISA(const char* className);
30463046
static NamedIntrinsic lookupHWIntrinsic(const char* methodName, InstructionSet isa);
30473047
static InstructionSet isaOfHWIntrinsic(NamedIntrinsic intrinsic);
@@ -7479,7 +7479,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
74797479
CORINFO_CLASS_HANDLE SIMDVector4Handle;
74807480
CORINFO_CLASS_HANDLE SIMDVectorHandle;
74817481

7482-
#if FEATURE_HW_INTRINSICS
7482+
#ifdef FEATURE_HW_INTRINSICS
74837483
#if defined(_TARGET_ARM64_)
74847484
CORINFO_CLASS_HANDLE Vector64FloatHandle;
74857485
CORINFO_CLASS_HANDLE Vector64DoubleHandle;
@@ -7830,7 +7830,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
78307830
// AVX2: 32-byte Vector<T> and Vector256<T>
78317831
unsigned int maxSIMDStructBytes()
78327832
{
7833-
#if FEATURE_HW_INTRINSICS && defined(_TARGET_XARCH_)
7833+
#if defined(FEATURE_HW_INTRINSICS) && defined(_TARGET_XARCH_)
78347834
if (compSupports(InstructionSet_AVX))
78357835
{
78367836
return YMM_REGSIZE_BYTES;

‎src/jit/compiler.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4891,7 +4891,7 @@ void GenTree::VisitOperands(TVisitor visitor)
48914891
return;
48924892
#endif // FEATURE_SIMD
48934893

4894-
#if FEATURE_HW_INTRINSICS
4894+
#ifdef FEATURE_HW_INTRINSICS
48954895
case GT_HWIntrinsic:
48964896
if ((this->AsHWIntrinsic()->gtOp1 != nullptr) && this->AsHWIntrinsic()->gtOp1->OperIsList())
48974897
{

‎src/jit/emitxarch.cpp‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1599,7 +1599,7 @@ bool emitter::emitVerifyEncodable(instruction ins, emitAttr size, regNumber reg1
15991599

16001600
if ((ins != INS_movsx) && // These three instructions support high register
16011601
(ins != INS_movzx) // encodings for reg1
1602-
#if FEATURE_HW_INTRINSICS
1602+
#ifdef FEATURE_HW_INTRINSICS
16031603
&& (ins != INS_crc32)
16041604
#endif
16051605
)
@@ -4274,17 +4274,7 @@ void emitter::emitIns_R_R_S_I(
42744274
emitCurIGsize += sz;
42754275
}
42764276

4277-
#ifdef DEBUG
4278-
static bool isAvxBlendv(instruction ins)
4279-
{
4280-
return ins == INS_vblendvps || ins == INS_vblendvpd || ins == INS_vpblendvb;
4281-
}
4282-
4283-
static bool isSse41Blendv(instruction ins)
4284-
{
4285-
return ins == INS_blendvps || ins == INS_blendvpd || ins == INS_pblendvb;
4286-
}
4287-
#endif
4277+
#ifndef LEGACY_BACKEND
42884278

42894279
void emitter::emitIns_R_R_R_R(
42904280
instruction ins, emitAttr attr, regNumber targetReg, regNumber reg1, regNumber reg2, regNumber reg3)
@@ -4313,6 +4303,8 @@ void emitter::emitIns_R_R_R_R(
43134303
emitCurIGsize += sz;
43144304
}
43154305

4306+
#endif // !LEGACY_BACKEND
4307+
43164308
/*****************************************************************************
43174309
*
43184310
* Add an instruction with a register + static member operands.
@@ -5251,7 +5243,7 @@ void emitter::emitIns_AX_R(instruction ins, emitAttr attr, regNumber ireg, regNu
52515243
emitAdjustStackDepthPushPop(ins);
52525244
}
52535245

5254-
#if FEATURE_HW_INTRINSICS
5246+
#ifdef FEATURE_HW_INTRINSICS
52555247
void emitter::emitIns_SIMD_R_R_A(instruction ins, emitAttr attr, regNumber reg, regNumber reg1, GenTreeIndir* indir)
52565248
{
52575249
if (UseVEXEncoding())
@@ -7738,7 +7730,7 @@ void emitter::emitDispIns(
77387730
// INS_bt operands are reversed. Display them in the normal order.
77397731
printf("%s, %s", emitRegName(id->idReg2(), attr), emitRegName(id->idReg1(), attr));
77407732
}
7741-
#if FEATURE_HW_INTRINSICS
7733+
#ifdef FEATURE_HW_INTRINSICS
77427734
else if (ins == INS_crc32 && attr != EA_8BYTE)
77437735
{
77447736
printf("%s, %s", emitRegName(id->idReg1(), EA_4BYTE), emitRegName(id->idReg2(), attr));
@@ -10108,7 +10100,7 @@ BYTE* emitter::emitOutputRR(BYTE* dst, instrDesc* id)
1010810100

1010910101
#endif // _TARGET_AMD64_
1011010102
}
10111-
#if FEATURE_HW_INTRINSICS
10103+
#ifdef FEATURE_HW_INTRINSICS
1011210104
else if ((ins == INS_crc32) || (ins == INS_lzcnt) || (ins == INS_popcnt))
1011310105
{
1011410106
code = insEncodeRMreg(ins, code);

‎src/jit/emitxarch.h‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,14 @@ bool IsThreeOperandAVXInstruction(instruction ins)
184184
return (IsDstDstSrcAVXInstruction(ins) || IsDstSrcSrcAVXInstruction(ins));
185185
}
186186
bool Is4ByteAVXInstruction(instruction ins);
187+
bool isAvxBlendv(instruction ins)
188+
{
189+
return ins == INS_vblendvps || ins == INS_vblendvpd || ins == INS_vpblendvb;
190+
}
191+
bool isSse41Blendv(instruction ins)
192+
{
193+
return ins == INS_blendvps || ins == INS_blendvpd || ins == INS_pblendvb;
194+
}
187195
#else // LEGACY_BACKEND
188196
bool UseVEXEncoding()
189197
{
@@ -226,6 +234,14 @@ bool Is4ByteAVXInstruction(instruction ins)
226234
{
227235
return false;
228236
}
237+
bool isAvxBlendv(instruction ins)
238+
{
239+
return false;
240+
}
241+
bool isSse41Blendv(instruction ins)
242+
{
243+
return false;
244+
}
229245
bool TakesVexPrefix(instruction ins)
230246
{
231247
return false;
@@ -398,7 +414,9 @@ void emitIns_R_R_R_I(instruction ins, emitAttr attr, regNumber reg1, regNumber r
398414

399415
void emitIns_R_R_S_I(instruction ins, emitAttr attr, regNumber reg1, regNumber reg2, int varx, int offs, int ival);
400416

417+
#ifndef LEGACY_BACKEND
401418
void emitIns_R_R_R_R(instruction ins, emitAttr attr, regNumber reg1, regNumber reg2, regNumber reg3, regNumber reg4);
419+
#endif // !LEGACY_BACKEND
402420

403421
void emitIns_S(instruction ins, emitAttr attr, int varx, int offs);
404422

@@ -454,7 +472,7 @@ void emitIns_R_AX(instruction ins, emitAttr attr, regNumber ireg, regNumber reg,
454472

455473
void emitIns_AX_R(instruction ins, emitAttr attr, regNumber ireg, regNumber reg, unsigned mul, int disp);
456474

457-
#if FEATURE_HW_INTRINSICS
475+
#ifdef FEATURE_HW_INTRINSICS
458476
void emitIns_SIMD_R_R_AR(instruction ins, emitAttr attr, regNumber reg, regNumber reg1, regNumber base);
459477
void emitIns_SIMD_R_R_A_I(instruction ins, emitAttr attr, regNumber reg, regNumber reg1, GenTreeIndir* indir, int ival);
460478
void emitIns_SIMD_R_R_C_I(
@@ -468,7 +486,7 @@ void emitIns_SIMD_R_R_S(instruction ins, emitAttr attr, regNumber reg, regNumber
468486
void emitIns_SIMD_R_R_R(instruction ins, emitAttr attr, regNumber reg, regNumber reg1, regNumber reg2);
469487
void emitIns_SIMD_R_R_R_R(
470488
instruction ins, emitAttr attr, regNumber reg, regNumber reg1, regNumber reg2, regNumber reg3);
471-
#endif
489+
#endif // FEATURE_HW_INTRINSICS
472490

473491
#if FEATURE_STACK_FP_X87
474492
void emitIns_F_F0(instruction ins, unsigned fpreg);

‎src/jit/gentree.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1425,7 +1425,7 @@ bool GenTree::Compare(GenTreePtr op1, GenTreePtr op2, bool swapOK)
14251425
break;
14261426
#endif // FEATURE_SIMD
14271427

1428-
#if FEATURE_HW_INTRINSICS
1428+
#ifdef FEATURE_HW_INTRINSICS
14291429
case GT_HWIntrinsic:
14301430
if ((op1->AsHWIntrinsic()->gtHWIntrinsicId != op2->AsHWIntrinsic()->gtHWIntrinsicId) ||
14311431
(op1->AsHWIntrinsic()->gtSIMDBaseType != op2->AsHWIntrinsic()->gtSIMDBaseType) ||
@@ -2110,7 +2110,7 @@ unsigned Compiler::gtHashValue(GenTree* tree)
21102110
break;
21112111
#endif // FEATURE_SIMD
21122112

2113-
#if FEATURE_HW_INTRINSICS
2113+
#ifdef FEATURE_HW_INTRINSICS
21142114
case GT_HWIntrinsic:
21152115
hash += tree->gtHWIntrinsic.gtHWIntrinsicId;
21162116
hash += tree->gtHWIntrinsic.gtSIMDBaseType;
@@ -7929,7 +7929,7 @@ GenTreePtr Compiler::gtCloneExpr(
79297929
break;
79307930
#endif
79317931

7932-
#if FEATURE_HW_INTRINSICS
7932+
#ifdef FEATURE_HW_INTRINSICS
79337933
case GT_HWIntrinsic:
79347934
{
79357935
GenTreeHWIntrinsic* hwintrinsicOp = tree->AsHWIntrinsic();
@@ -9235,7 +9235,7 @@ GenTreeUseEdgeIterator::GenTreeUseEdgeIterator(GenTree* node)
92359235
return;
92369236
#endif // FEATURE_SIMD
92379237

9238-
#if FEATURE_HW_INTRINSICS
9238+
#ifdef FEATURE_HW_INTRINSICS
92399239
case GT_HWIntrinsic:
92409240
if (m_node->AsHWIntrinsic()->gtOp1 == nullptr)
92419241
{
@@ -11268,7 +11268,7 @@ extern const char* const simdIntrinsicNames[] = {
1126811268
};
1126911269
#endif // FEATURE_SIMD
1127011270

11271-
#if FEATURE_HW_INTRINSICS
11271+
#ifdef FEATURE_HW_INTRINSICS
1127211272
extern const char* getHWIntrinsicName(NamedIntrinsic intrinsic);
1127311273
#endif // FEATURE_HW_INTRINSICS
1127411274

@@ -11606,7 +11606,7 @@ void Compiler::gtDispTree(GenTreePtr tree,
1160611606
}
1160711607
#endif // FEATURE_SIMD
1160811608

11609-
#if FEATURE_HW_INTRINSICS
11609+
#ifdef FEATURE_HW_INTRINSICS
1161011610
if (tree->gtOper == GT_HWIntrinsic)
1161111611
{
1161211612
printf(" %s %s",
@@ -17102,7 +17102,7 @@ CORINFO_CLASS_HANDLE Compiler::gtGetStructHandleIfPresent(GenTree* tree)
1710217102
structHnd = gtGetStructHandleForSIMD(tree->gtType, tree->AsSIMD()->gtSIMDBaseType);
1710317103
break;
1710417104
#endif // FEATURE_SIMD
17105-
#if FEATURE_HW_INTRINSICS
17105+
#ifdef FEATURE_HW_INTRINSICS
1710617106
case GT_HWIntrinsic:
1710717107
structHnd = gtGetStructHandleForHWSIMD(tree->gtType, tree->AsHWIntrinsic()->gtSIMDBaseType);
1710817108
break;
@@ -17904,7 +17904,7 @@ bool GenTree::isCommutativeSIMDIntrinsic()
1790417904
}
1790517905
#endif // FEATURE_SIMD
1790617906

17907-
#if FEATURE_HW_INTRINSICS
17907+
#ifdef FEATURE_HW_INTRINSICS
1790817908
GenTreeHWIntrinsic* Compiler::gtNewSimdHWIntrinsicNode(var_types type,
1790917909
NamedIntrinsic hwIntrinsicID,
1791017910
var_types baseType,

‎src/jit/gentree.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1593,7 +1593,7 @@ struct GenTree
15931593
return OperIsSIMD(gtOper);
15941594
}
15951595

1596-
#if FEATURE_HW_INTRINSICS
1596+
#ifdef FEATURE_HW_INTRINSICS
15971597
inline bool OperIsSimdHWIntrinsic() const;
15981598
#else
15991599
inline bool OperIsSimdHWIntrinsic() const
@@ -1663,7 +1663,7 @@ struct GenTree
16631663
case GT_LEA:
16641664
case GT_RETFILT:
16651665
case GT_NOP:
1666-
#if FEATURE_HW_INTRINSICS
1666+
#ifdef FEATURE_HW_INTRINSICS
16671667
case GT_HWIntrinsic:
16681668
#endif // FEATURE_HW_INTRINSICS
16691669
return true;
@@ -1691,7 +1691,7 @@ struct GenTree
16911691
case GT_SIMD:
16921692
#endif // !FEATURE_SIMD
16931693

1694-
#if FEATURE_HW_INTRINSICS
1694+
#ifdef FEATURE_HW_INTRINSICS
16951695
case GT_HWIntrinsic:
16961696
#endif // FEATURE_HW_INTRINSICS
16971697

@@ -4223,7 +4223,7 @@ struct GenTreeSIMD : public GenTreeJitIntrinsic
42234223
};
42244224
#endif // FEATURE_SIMD
42254225

4226-
#if FEATURE_HW_INTRINSICS
4226+
#ifdef FEATURE_HW_INTRINSICS
42274227
struct GenTreeHWIntrinsic : public GenTreeJitIntrinsic
42284228
{
42294229
NamedIntrinsic gtHWIntrinsicId;

‎src/jit/gtlist.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ GTNODE(RSH_LO , GenTreeOp ,0,GTK_BINOP)
224224
GTNODE(SIMD , GenTreeSIMD ,0,GTK_BINOP|GTK_EXOP) // SIMD functions/operators/intrinsics
225225
#endif // FEATURE_SIMD
226226

227-
#if FEATURE_HW_INTRINSICS
227+
#ifdef FEATURE_HW_INTRINSICS
228228
GTNODE(HWIntrinsic , GenTreeHWIntrinsic ,0,GTK_BINOP|GTK_EXOP) // hardware intrinsics
229229
#endif // FEATURE_HW_INTRINSICS
230230

0 commit comments

Comments
 (0)