Skip to content

Commit e6ecfe8

Browse files
committed
AMDGPU/NFC: Purge VOPAsmPrefer32Bit from TSFlags
1 parent ab70251 commit e6ecfe8

File tree

5 files changed

+8
-16
lines changed

5 files changed

+8
-16
lines changed

llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3299,11 +3299,6 @@ unsigned AMDGPUAsmParser::checkTargetMatchPredicate(MCInst &Inst) {
32993299
(isForcedSDWA() && !(TSFlags & SIInstrFlags::SDWA)) )
33003300
return Match_InvalidOperand;
33013301

3302-
if ((TSFlags & SIInstrFlags::VOP3) &&
3303-
(TSFlags & SIInstrFlags::VOPAsmPrefer32Bit) &&
3304-
getForcedEncodingSize() != 64)
3305-
return Match_PreferE32;
3306-
33073302
if (Inst.getOpcode() == AMDGPU::V_MAC_F32_sdwa_vi ||
33083303
Inst.getOpcode() == AMDGPU::V_MAC_F16_sdwa_vi) {
33093304
// v_mac_f32/16 allow only dst_sel == DWORD;

llvm/lib/Target/AMDGPU/SIDefines.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,10 @@ enum : uint64_t {
108108
SOPK_ZEXT = UINT64_C(1) << 38,
109109
SCALAR_STORE = UINT64_C(1) << 39,
110110
FIXED_SIZE = UINT64_C(1) << 40,
111-
VOPAsmPrefer32Bit = UINT64_C(1) << 41,
111+
112+
// Reserved, must be 0.
113+
Reserved0 = UINT64_C(1) << 41,
114+
112115
VOP3_OPSEL = UINT64_C(1) << 42,
113116
maybeAtomic = UINT64_C(1) << 43,
114117
renamedInGFX9 = UINT64_C(1) << 44,

llvm/lib/Target/AMDGPU/SIInstrFormats.td

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,6 @@ class InstSI <dag outs, dag ins, string asm = "",
8282
// instruction size.
8383
field bit FixedSize = 0;
8484

85-
// This bit tells the assembler to use the 32-bit encoding in case it
86-
// is unable to infer the encoding from the operands.
87-
field bit VOPAsmPrefer32Bit = 0;
88-
8985
// This bit indicates that this is a VOP3 opcode which supports op_sel
9086
// modifier.
9187
field bit VOP3_OPSEL = 0;
@@ -212,7 +208,10 @@ class InstSI <dag outs, dag ins, string asm = "",
212208
let TSFlags{38} = SOPKZext;
213209
let TSFlags{39} = ScalarStore;
214210
let TSFlags{40} = FixedSize;
215-
let TSFlags{41} = VOPAsmPrefer32Bit;
211+
212+
// Reserved, must be 0.
213+
let TSFlags{41} = 0;
214+
216215
let TSFlags{42} = VOP3_OPSEL;
217216

218217
let TSFlags{43} = maybeAtomic;

llvm/lib/Target/AMDGPU/VOP1Instructions.td

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,7 @@ def VOP_I16_F16_SPECIAL_OMOD_t16 : VOPProfile_Fake16<VOP_I16_F16> {
217217
// VOP1 Instructions
218218
//===----------------------------------------------------------------------===//
219219

220-
let VOPAsmPrefer32Bit = 1 in {
221220
defm V_NOP : VOP1Inst <"v_nop", VOP_NOP_PROFILE>;
222-
}
223221

224222
def VOPProfile_MOV : VOPProfile <[i32, i32, untyped, untyped]> {
225223
let InsVOPDX = (ins Src0RC32:$src0X);
@@ -368,9 +366,7 @@ defm V_FREXP_EXP_I32_F32 : VOP1Inst <"v_frexp_exp_i32_f32", VOP_I32_F32, int_amd
368366
defm V_FREXP_MANT_F32 : VOP1Inst <"v_frexp_mant_f32", VOP_F32_F32, int_amdgcn_frexp_mant>;
369367
} // End isReMaterializable = 1
370368

371-
let VOPAsmPrefer32Bit = 1 in {
372369
defm V_CLREXCP : VOP1Inst <"v_clrexcp", VOP_NO_EXT<VOP_NONE>>;
373-
}
374370

375371
// Restrict src0 to be VGPR
376372
def VOP_MOVRELS : VOPProfile<[i32, i32, untyped, untyped]> {

llvm/lib/Target/AMDGPU/VOPInstructions.td

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ class LetDummies {
1616
bit isMoveImm;
1717
bit isReMaterializable;
1818
bit isAsCheapAsAMove;
19-
bit VOPAsmPrefer32Bit;
2019
bit FPDPRounding;
2120
Predicate SubtargetPredicate;
2221
string Constraints;

0 commit comments

Comments
 (0)