[llvm] [X86] Tidyup up AVX512 FPCLASS instruction naming (PR #116661)
Simon Pilgrim via llvm-commits
llvm-commits at lists.llvm.org
Tue Nov 19 02:03:19 PST 2024
https://github.com/RKSimon updated https://github.com/llvm/llvm-project/pull/116661
>From 3ac2ce1310581c1ad52c0d5a6bb6a2def6cbbd21 Mon Sep 17 00:00:00 2001
From: Simon Pilgrim <llvm-dev at redking.me.uk>
Date: Mon, 18 Nov 2024 17:23:22 +0000
Subject: [PATCH 1/2] [X86] Tidyup up AVX512 FPCLASS instruction naming
FPCLASS is a unary instruction with a immediate operand - update the naming to match similar instructions (e.g. VPSHUFD) by only using the source reg/mem and immediate in the instruction name
---
.../X86/MCTargetDesc/X86InstComments.cpp | 12 ++++----
llvm/lib/Target/X86/X86InstrAVX512.td | 28 +++++++++----------
llvm/lib/Target/X86/X86InstrInfo.cpp | 8 +++---
llvm/lib/Target/X86/X86SchedIceLake.td | 16 +++++------
llvm/lib/Target/X86/X86SchedSapphireRapids.td | 22 +++++++--------
llvm/lib/Target/X86/X86SchedSkylakeServer.td | 16 +++++------
6 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86InstComments.cpp b/llvm/lib/Target/X86/MCTargetDesc/X86InstComments.cpp
index 49e8bab4c0363d..70c71273d270f9 100644
--- a/llvm/lib/Target/X86/MCTargetDesc/X86InstComments.cpp
+++ b/llvm/lib/Target/X86/MCTargetDesc/X86InstComments.cpp
@@ -41,18 +41,18 @@ using namespace llvm;
CASE_MASKZ_INS_COMMON(Inst, Suffix, src)
#define CASE_FPCLASS_PACKED(Inst, src) \
- CASE_AVX_INS_COMMON(Inst, Z, r##src) \
- CASE_AVX_INS_COMMON(Inst, Z256, r##src) \
- CASE_AVX_INS_COMMON(Inst, Z128, r##src) \
- CASE_MASK_INS_COMMON(Inst, Z, r##src)
+ CASE_AVX_INS_COMMON(Inst, Z, src##i) \
+ CASE_AVX_INS_COMMON(Inst, Z256, src##i) \
+ CASE_AVX_INS_COMMON(Inst, Z128, src##i) \
+ CASE_MASK_INS_COMMON(Inst, Z, src##i)
#define CASE_FPCLASS_PACKED_MEM(Inst) \
CASE_FPCLASS_PACKED(Inst, m) \
CASE_FPCLASS_PACKED(Inst, mb)
#define CASE_FPCLASS_SCALAR(Inst, src) \
- CASE_AVX_INS_COMMON(Inst, Z, r##src) \
- CASE_MASK_INS_COMMON(Inst, Z, r##src)
+ CASE_AVX_INS_COMMON(Inst, Z, src##i) \
+ CASE_MASK_INS_COMMON(Inst, Z, src##i)
#define CASE_PTERNLOG(Inst, src) \
CASE_AVX512_INS_COMMON(Inst, Z, r##src##i) \
diff --git a/llvm/lib/Target/X86/X86InstrAVX512.td b/llvm/lib/Target/X86/X86InstrAVX512.td
index e54bc5a5694226..7adc72f8bc7d06 100644
--- a/llvm/lib/Target/X86/X86InstrAVX512.td
+++ b/llvm/lib/Target/X86/X86InstrAVX512.td
@@ -2457,13 +2457,13 @@ multiclass avx512_scalar_fpclass<bits<8> opc, string OpcodeStr,
X86FoldableSchedWrite sched, X86VectorVTInfo _,
Predicate prd> {
let Predicates = [prd], ExeDomain = _.ExeDomain, Uses = [MXCSR] in {
- def rr : AVX512<opc, MRMSrcReg, (outs _.KRC:$dst),
+ def ri : AVX512<opc, MRMSrcReg, (outs _.KRC:$dst),
(ins _.RC:$src1, i32u8imm:$src2),
OpcodeStr#_.Suffix#"\t{$src2, $src1, $dst|$dst, $src1, $src2}",
[(set _.KRC:$dst,(X86Vfpclasss (_.VT _.RC:$src1),
(i32 timm:$src2)))]>,
Sched<[sched]>;
- def rrk : AVX512<opc, MRMSrcReg, (outs _.KRC:$dst),
+ def rik : AVX512<opc, MRMSrcReg, (outs _.KRC:$dst),
(ins _.KRCWM:$mask, _.RC:$src1, i32u8imm:$src2),
OpcodeStr#_.Suffix#
"\t{$src2, $src1, $dst {${mask}}|$dst {${mask}}, $src1, $src2}",
@@ -2471,7 +2471,7 @@ multiclass avx512_scalar_fpclass<bits<8> opc, string OpcodeStr,
(X86Vfpclasss_su (_.VT _.RC:$src1),
(i32 timm:$src2))))]>,
EVEX_K, Sched<[sched]>;
- def rm : AVX512<opc, MRMSrcMem, (outs _.KRC:$dst),
+ def mi : AVX512<opc, MRMSrcMem, (outs _.KRC:$dst),
(ins _.IntScalarMemOp:$src1, i32u8imm:$src2),
OpcodeStr#_.Suffix#
"\t{$src2, $src1, $dst|$dst, $src1, $src2}",
@@ -2479,7 +2479,7 @@ multiclass avx512_scalar_fpclass<bits<8> opc, string OpcodeStr,
(X86Vfpclasss (_.ScalarIntMemFrags addr:$src1),
(i32 timm:$src2)))]>,
Sched<[sched.Folded, sched.ReadAfterFold]>;
- def rmk : AVX512<opc, MRMSrcMem, (outs _.KRC:$dst),
+ def mik : AVX512<opc, MRMSrcMem, (outs _.KRC:$dst),
(ins _.KRCWM:$mask, _.IntScalarMemOp:$src1, i32u8imm:$src2),
OpcodeStr#_.Suffix#
"\t{$src2, $src1, $dst {${mask}}|$dst {${mask}}, $src1, $src2}",
@@ -2497,13 +2497,13 @@ multiclass avx512_vector_fpclass<bits<8> opc, string OpcodeStr,
X86FoldableSchedWrite sched, X86VectorVTInfo _,
string mem, list<Register> _Uses = [MXCSR]>{
let ExeDomain = _.ExeDomain, Uses = _Uses in {
- def rr : AVX512<opc, MRMSrcReg, (outs _.KRC:$dst),
+ def ri : AVX512<opc, MRMSrcReg, (outs _.KRC:$dst),
(ins _.RC:$src1, i32u8imm:$src2),
OpcodeStr#_.Suffix#"\t{$src2, $src1, $dst|$dst, $src1, $src2}",
[(set _.KRC:$dst,(X86Vfpclass (_.VT _.RC:$src1),
(i32 timm:$src2)))]>,
Sched<[sched]>;
- def rrk : AVX512<opc, MRMSrcReg, (outs _.KRC:$dst),
+ def rik : AVX512<opc, MRMSrcReg, (outs _.KRC:$dst),
(ins _.KRCWM:$mask, _.RC:$src1, i32u8imm:$src2),
OpcodeStr#_.Suffix#
"\t{$src2, $src1, $dst {${mask}}|$dst {${mask}}, $src1, $src2}",
@@ -2511,7 +2511,7 @@ multiclass avx512_vector_fpclass<bits<8> opc, string OpcodeStr,
(X86Vfpclass_su (_.VT _.RC:$src1),
(i32 timm:$src2))))]>,
EVEX_K, Sched<[sched]>;
- def rm : AVX512<opc, MRMSrcMem, (outs _.KRC:$dst),
+ def mi : AVX512<opc, MRMSrcMem, (outs _.KRC:$dst),
(ins _.MemOp:$src1, i32u8imm:$src2),
OpcodeStr#_.Suffix#"{"#mem#"}"#
"\t{$src2, $src1, $dst|$dst, $src1, $src2}",
@@ -2519,7 +2519,7 @@ multiclass avx512_vector_fpclass<bits<8> opc, string OpcodeStr,
(_.VT (_.LdFrag addr:$src1)),
(i32 timm:$src2)))]>,
Sched<[sched.Folded, sched.ReadAfterFold]>;
- def rmk : AVX512<opc, MRMSrcMem, (outs _.KRC:$dst),
+ def mik : AVX512<opc, MRMSrcMem, (outs _.KRC:$dst),
(ins _.KRCWM:$mask, _.MemOp:$src1, i32u8imm:$src2),
OpcodeStr#_.Suffix#"{"#mem#"}"#
"\t{$src2, $src1, $dst {${mask}}|$dst {${mask}}, $src1, $src2}",
@@ -2527,7 +2527,7 @@ multiclass avx512_vector_fpclass<bits<8> opc, string OpcodeStr,
(_.VT (_.LdFrag addr:$src1)),
(i32 timm:$src2))))]>,
EVEX_K, Sched<[sched.Folded, sched.ReadAfterFold]>;
- def rmb : AVX512<opc, MRMSrcMem, (outs _.KRC:$dst),
+ def mbi : AVX512<opc, MRMSrcMem, (outs _.KRC:$dst),
(ins _.ScalarMemOp:$src1, i32u8imm:$src2),
OpcodeStr#_.Suffix#"\t{$src2, ${src1}"#
_.BroadcastStr#", $dst|$dst, ${src1}"
@@ -2536,7 +2536,7 @@ multiclass avx512_vector_fpclass<bits<8> opc, string OpcodeStr,
(_.VT (_.BroadcastLdFrag addr:$src1)),
(i32 timm:$src2)))]>,
EVEX_B, Sched<[sched.Folded, sched.ReadAfterFold]>;
- def rmbk : AVX512<opc, MRMSrcMem, (outs _.KRC:$dst),
+ def mbik : AVX512<opc, MRMSrcMem, (outs _.KRC:$dst),
(ins _.KRCWM:$mask, _.ScalarMemOp:$src1, i32u8imm:$src2),
OpcodeStr#_.Suffix#"\t{$src2, ${src1}"#
_.BroadcastStr#", $dst {${mask}}|$dst {${mask}}, ${src1}"#
@@ -2551,21 +2551,21 @@ multiclass avx512_vector_fpclass<bits<8> opc, string OpcodeStr,
// the memory form.
def : InstAlias<OpcodeStr#_.Suffix#mem#
"\t{$src2, $src1, $dst|$dst, $src1, $src2}",
- (!cast<Instruction>(NAME#"rr")
+ (!cast<Instruction>(NAME#"ri")
_.KRC:$dst, _.RC:$src1, i32u8imm:$src2), 0, "att">;
def : InstAlias<OpcodeStr#_.Suffix#mem#
"\t{$src2, $src1, $dst {${mask}}|$dst {${mask}}, $src1, $src2}",
- (!cast<Instruction>(NAME#"rrk")
+ (!cast<Instruction>(NAME#"rik")
_.KRC:$dst, _.KRCWM:$mask, _.RC:$src1, i32u8imm:$src2), 0, "att">;
def : InstAlias<OpcodeStr#_.Suffix#mem#
"\t{$src2, ${src1}"#_.BroadcastStr#", $dst|$dst, ${src1}"#
_.BroadcastStr#", $src2}",
- (!cast<Instruction>(NAME#"rmb")
+ (!cast<Instruction>(NAME#"mbi")
_.KRC:$dst, _.ScalarMemOp:$src1, i32u8imm:$src2), 0, "att">;
def : InstAlias<OpcodeStr#_.Suffix#mem#
"\t{$src2, ${src1}"#_.BroadcastStr#", $dst {${mask}}|"
"$dst {${mask}}, ${src1}"#_.BroadcastStr#", $src2}",
- (!cast<Instruction>(NAME#"rmbk")
+ (!cast<Instruction>(NAME#"mbik")
_.KRC:$dst, _.KRCWM:$mask, _.ScalarMemOp:$src1, i32u8imm:$src2), 0, "att">;
}
diff --git a/llvm/lib/Target/X86/X86InstrInfo.cpp b/llvm/lib/Target/X86/X86InstrInfo.cpp
index 3af3aa838159d1..8551531b1b2671 100644
--- a/llvm/lib/Target/X86/X86InstrInfo.cpp
+++ b/llvm/lib/Target/X86/X86InstrInfo.cpp
@@ -7797,8 +7797,8 @@ static bool isNonFoldablePartialRegisterLoad(const MachineInstr &LoadMI,
case X86::VFIXUPIMMSSZrri:
case X86::VFIXUPIMMSSZrrik:
case X86::VFIXUPIMMSSZrrikz:
- case X86::VFPCLASSSSZrr:
- case X86::VFPCLASSSSZrrk:
+ case X86::VFPCLASSSSZri:
+ case X86::VFPCLASSSSZrik:
case X86::VGETEXPSSZr:
case X86::VGETEXPSSZrk:
case X86::VGETEXPSSZrkz:
@@ -7966,8 +7966,8 @@ static bool isNonFoldablePartialRegisterLoad(const MachineInstr &LoadMI,
case X86::VFIXUPIMMSDZrri:
case X86::VFIXUPIMMSDZrrik:
case X86::VFIXUPIMMSDZrrikz:
- case X86::VFPCLASSSDZrr:
- case X86::VFPCLASSSDZrrk:
+ case X86::VFPCLASSSDZri:
+ case X86::VFPCLASSSDZrik:
case X86::VGETEXPSDZr:
case X86::VGETEXPSDZrk:
case X86::VGETEXPSDZrkz:
diff --git a/llvm/lib/Target/X86/X86SchedIceLake.td b/llvm/lib/Target/X86/X86SchedIceLake.td
index 1779c63e94d0bc..8910b88d4cbd53 100644
--- a/llvm/lib/Target/X86/X86SchedIceLake.td
+++ b/llvm/lib/Target/X86/X86SchedIceLake.td
@@ -861,8 +861,8 @@ def: InstRW<[ICXWriteResGroup33], (instregex "KADD(B|D|Q|W)kk",
"VCMPPD(Z|Z128|Z256)rri",
"VCMPPS(Z|Z128|Z256)rri",
"VCMP(SD|SS)Zrr",
- "VFPCLASS(PD|PS)(Z|Z128|Z256)rr",
- "VFPCLASS(SD|SS)Zrr",
+ "VFPCLASS(PD|PS)(Z|Z128|Z256)ri",
+ "VFPCLASS(SD|SS)Zri",
"VPCMPB(Z|Z128|Z256)rri",
"VPCMPD(Z|Z128|Z256)rri",
"VPCMPEQ(B|D|Q|W)(Z|Z128|Z256)rr",
@@ -1705,8 +1705,8 @@ def: InstRW<[ICXWriteResGroup136], (instrs VPMOVSXBWYrm,
VPMOVSXWDYrm,
VPMOVZXWDYrm)>;
def: InstRW<[ICXWriteResGroup136], (instregex "VALIGN(D|Q)Z128rm(b?)i",
- "VFPCLASSSDZrm(b?)",
- "VFPCLASSSSZrm(b?)",
+ "VFPCLASSSDZm(b?)i",
+ "VFPCLASSSSZm(b?)i",
"(V?)PCMPGTQrm",
"VPERMI2DZ128rm(b?)",
"VPERMI2PDZ128rm(b?)",
@@ -1728,8 +1728,8 @@ def ICXWriteResGroup136_2 : SchedWriteRes<[ICXPort5,ICXPort23]> {
}
def: InstRW<[ICXWriteResGroup136_2], (instregex "VCMP(PD|PS)Z128rm(b?)i",
"VCMP(SD|SS)Zrm",
- "VFPCLASSPDZ128rm(b?)",
- "VFPCLASSPSZ128rm(b?)",
+ "VFPCLASSPDZ128m(b?)i",
+ "VFPCLASSPSZ128m(b?)i",
"VPCMPBZ128rm(b?)i",
"VPCMPDZ128rm(b?)i",
"VPCMPEQ(B|D|Q|W)Z128rm(b?)",
@@ -1793,8 +1793,8 @@ def ICXWriteResGroup148_2 : SchedWriteRes<[ICXPort5,ICXPort23]> {
}
def: InstRW<[ICXWriteResGroup148_2], (instregex "VCMPPD(Z|Z256)rm(b?)i",
"VCMPPS(Z|Z256)rm(b?)i",
- "VFPCLASSPD(Z|Z256)rm(b?)",
- "VFPCLASSPS(Z|Z256)rm(b?)",
+ "VFPCLASSPD(Z|Z256)m(b?)i",
+ "VFPCLASSPS(Z|Z256)m(b?)i",
"VPCMPB(Z|Z256)rm(b?)i",
"VPCMPD(Z|Z256)rm(b?)i",
"VPCMPEQB(Z|Z256)rm(b?)",
diff --git a/llvm/lib/Target/X86/X86SchedSapphireRapids.td b/llvm/lib/Target/X86/X86SchedSapphireRapids.td
index 55da82325ef652..6f3130ee584797 100644
--- a/llvm/lib/Target/X86/X86SchedSapphireRapids.td
+++ b/llvm/lib/Target/X86/X86SchedSapphireRapids.td
@@ -632,14 +632,14 @@ def : InstRW<[SPRWriteResGroup10], (instregex "^ADD_F(32|64)m$",
"^VPOPCNT(D|Q)Z128rmbk(z?)$")>;
def : InstRW<[SPRWriteResGroup10, ReadAfterVecXLd], (instregex "^(V?)PACK(S|U)S(DW|WB)rm$",
"^(V?)PCMPGTQrm$",
- "^VFPCLASSP(D|H|S)Z128rmb$",
+ "^VFPCLASSP(D|H|S)Z128mbi$",
"^VPACK(S|U)S(DW|WB)Z128rm$",
"^VPACK(S|U)SDWZ128rmb$",
"^VPM(AX|IN)(S|U)QZ128rm((b|k|bk|kz)?)$",
"^VPM(AX|IN)(S|U)QZ128rmbkz$",
"^VPMULTISHIFTQBZ128rm(b?)$")>;
-def : InstRW<[SPRWriteResGroup10, ReadAfterVecXLd], (instrs VFPCLASSPHZ128rm)>;
-def : InstRW<[SPRWriteResGroup10, ReadAfterVecYLd], (instregex "^VFPCLASSP(D|H|S)Z((256)?)rm$",
+def : InstRW<[SPRWriteResGroup10, ReadAfterVecXLd], (instrs VFPCLASSPHZ128mi)>;
+def : InstRW<[SPRWriteResGroup10, ReadAfterVecYLd], (instregex "^VFPCLASSP(D|H|S)Z((256)?)mi$",
"^VPERM(I|T)2(D|Q|PS)Z128rm((b|k|bk|kz)?)$",
"^VPERM(I|T)2(D|Q|PS)Z128rmbkz$",
"^VPERM(I|T)2PDZ128rm((b|k|bk|kz)?)$",
@@ -670,8 +670,8 @@ def : InstRW<[SPRWriteResGroup12], (instregex "^ADD_F(P?)rST0$",
"^VCMPP(D|H|S)Z(128|256)rri(k?)$",
"^VCMPS(D|H|S)Zrri$",
"^VCMPS(D|H|S)Zrr(b?)i_Int(k?)$",
- "^VFPCLASSP(D|H|S)Z(128|256)rr(k?)$",
- "^VFPCLASSS(D|H|S)Zrr(k?)$",
+ "^VFPCLASSP(D|H|S)Z(128|256)ri(k?)$",
+ "^VFPCLASSS(D|H|S)Zri(k?)$",
"^VPACK(S|U)S(DW|WB)Yrr$",
"^VPACK(S|U)S(DW|WB)Z(128|256)rr$",
"^VPALIGNRZ(128|256)rrik(z?)$",
@@ -1697,8 +1697,8 @@ def : InstRW<[SPRWriteResGroup134], (instregex "^VPBROADCAST(BY|WZ)rm$",
"^VPBROADCAST(B|W)Z256rm$",
"^VPBROADCAST(BZ|WY)rm$")>;
def : InstRW<[SPRWriteResGroup134, ReadAfterLd], (instrs MMX_PINSRWrmi)>;
-def : InstRW<[SPRWriteResGroup134, ReadAfterVecXLd], (instregex "^VFPCLASSP(D|S)Z128rm$")>;
-def : InstRW<[SPRWriteResGroup134, ReadAfterVecLd], (instregex "^VFPCLASSS(D|H|S)Zrm$")>;
+def : InstRW<[SPRWriteResGroup134, ReadAfterVecXLd], (instregex "^VFPCLASSP(D|S)Z128mi$")>;
+def : InstRW<[SPRWriteResGroup134, ReadAfterVecLd], (instregex "^VFPCLASSS(D|H|S)Zmi$")>;
def : InstRW<[SPRWriteResGroup134, ReadAfterVecYLd], (instregex "^VPALIGNR(Y|Z256)rmi$")>;
def : InstRW<[SPRWriteResGroup134, ReadAfterVecYLd], (instrs VPSHUFBZrm)>;
@@ -2659,7 +2659,7 @@ def : InstRW<[SPRWriteResGroup258], (instregex "^VPBROADCAST(B|W)Z128rmk(z?)$",
def : InstRW<[SPRWriteResGroup258, ReadAfterVecYLd], (instregex "^VALIGN(D|Q)Z((256)?)rm(bi|ik)$",
"^VALIGN(D|Q)Z((256)?)rmbik(z?)$",
"^VALIGN(D|Q)Z((256)?)rmi((kz)?)$",
- "^VFPCLASSP(D|H|S)Z((256)?)rmb$",
+ "^VFPCLASSP(D|H|S)Z((256)?)mbi$",
"^VPACK(S|U)S(DW|WB)(Y|Z)rm$",
"^VPACK(S|U)S(DW|WB)Z256rm$",
"^VPACK(S|U)SDWZ((256)?)rmb$",
@@ -2724,7 +2724,7 @@ def SPRWriteResGroup263 : SchedWriteRes<[SPRPort02_03_11, SPRPort05]> {
}
def : InstRW<[SPRWriteResGroup263, ReadAfterVecXLd], (instregex "^VCMPP(D|H|S)Z128rm(bi|ik)$",
"^VCMPP(D|H|S)Z128rm(i|bik)$",
- "^VFPCLASSP(D|H|S)Z128rm(b?)k$",
+ "^VFPCLASSP(D|H|S)Z128m(b?)ik$",
"^VPCMP(B|D|Q|W|UD|UQ|UW)Z128rmi(k?)$",
"^VPCMP(D|Q|UQ)Z128rmbi(k?)$",
"^VPCMP(EQ|GT)(B|D|Q|W)Z128rm(k?)$",
@@ -2735,7 +2735,7 @@ def : InstRW<[SPRWriteResGroup263, ReadAfterVecXLd], (instregex "^VCMPP(D|H|S)Z1
"^VPTEST(N?)M(D|Q)Z128rmb(k?)$")>;
def : InstRW<[SPRWriteResGroup263, ReadAfterVecYLd], (instregex "^VCMPP(D|H|S)Z((256)?)rm(bi|ik)$",
"^VCMPP(D|H|S)Z((256)?)rm(i|bik)$",
- "^VFPCLASSP(D|H|S)Z((256)?)rm(b?)k$",
+ "^VFPCLASSP(D|H|S)Z((256)?)m(b?)ik$",
"^VPCMP(B|D|Q|W|UD|UQ|UW)Z((256)?)rmi(k?)$",
"^VPCMP(D|Q|UQ)Z((256)?)rmbi(k?)$",
"^VPCMP(EQ|GT)(B|D|Q|W)Z((256)?)rm(k?)$",
@@ -2746,7 +2746,7 @@ def : InstRW<[SPRWriteResGroup263, ReadAfterVecYLd], (instregex "^VCMPP(D|H|S)Z(
"^VPTEST(N?)M(D|Q)Z((256)?)rmb(k?)$")>;
def : InstRW<[SPRWriteResGroup263, ReadAfterVecLd], (instregex "^VCMPS(D|H|S)Zrmi$",
"^VCMPS(D|H|S)Zrmi_Int(k?)$",
- "^VFPCLASSS(D|H|S)Zrmk$")>;
+ "^VFPCLASSS(D|H|S)Zmik$")>;
def SPRWriteResGroup264 : SchedWriteRes<[SPRPort00, SPRPort02_03_11]> {
let Latency = 10;
diff --git a/llvm/lib/Target/X86/X86SchedSkylakeServer.td b/llvm/lib/Target/X86/X86SchedSkylakeServer.td
index 189226611f926f..7ec725680ca317 100644
--- a/llvm/lib/Target/X86/X86SchedSkylakeServer.td
+++ b/llvm/lib/Target/X86/X86SchedSkylakeServer.td
@@ -846,8 +846,8 @@ def: InstRW<[SKXWriteResGroup33], (instregex "KADD(B|D|Q|W)kk",
"VCMPPD(Z|Z128|Z256)rri",
"VCMPPS(Z|Z128|Z256)rri",
"VCMP(SD|SS)Zrr",
- "VFPCLASS(PD|PS)(Z|Z128|Z256)rr",
- "VFPCLASS(SD|SS)Zrr",
+ "VFPCLASS(PD|PS)(Z|Z128|Z256)ri",
+ "VFPCLASS(SD|SS)Zri",
"VPCMPB(Z|Z128|Z256)rri",
"VPCMPD(Z|Z128|Z256)rri",
"VPCMPEQ(B|D|Q|W)(Z|Z128|Z256)rr",
@@ -1676,8 +1676,8 @@ def: InstRW<[SKXWriteResGroup136], (instrs VPMOVSXBWYrm,
VPMOVSXWDYrm,
VPMOVZXWDYrm)>;
def: InstRW<[SKXWriteResGroup136], (instregex "VALIGN(D|Q)Z128rm(b?)i",
- "VFPCLASSSDZrm(b?)",
- "VFPCLASSSSZrm(b?)",
+ "VFPCLASSSDZm(b?)i",
+ "VFPCLASSSSZm(b?)i",
"(V?)PCMPGTQrm",
"VPERMI2DZ128rm(b?)",
"VPERMI2PDZ128rm(b?)",
@@ -1699,8 +1699,8 @@ def SKXWriteResGroup136_2 : SchedWriteRes<[SKXPort5,SKXPort23]> {
}
def: InstRW<[SKXWriteResGroup136_2], (instregex "VCMP(PD|PS)Z128rm(b?)i",
"VCMP(SD|SS)Zrm",
- "VFPCLASSPDZ128rm(b?)",
- "VFPCLASSPSZ128rm(b?)",
+ "VFPCLASSPDZ128m(b?)i",
+ "VFPCLASSPSZ128m(b?)i",
"VPCMPBZ128rm(b?)i",
"VPCMPDZ128rm(b?)i",
"VPCMPEQ(B|D|Q|W)Z128rm(b?)",
@@ -1763,8 +1763,8 @@ def SKXWriteResGroup148_2 : SchedWriteRes<[SKXPort5,SKXPort23]> {
}
def: InstRW<[SKXWriteResGroup148_2], (instregex "VCMPPD(Z|Z256)rm(b?)i",
"VCMPPS(Z|Z256)rm(b?)i",
- "VFPCLASSPD(Z|Z256)rm(b?)",
- "VFPCLASSPS(Z|Z256)rm(b?)",
+ "VFPCLASSPD(Z|Z256)m(b?)i",
+ "VFPCLASSPS(Z|Z256)m(b?)i",
"VPCMPB(Z|Z256)rm(b?)i",
"VPCMPD(Z|Z256)rm(b?)i",
"VPCMPEQB(Z|Z256)rm(b?)",
>From 830fe9632f71be1e88ce8a76a72810ca4496e11b Mon Sep 17 00:00:00 2001
From: Simon Pilgrim <llvm-dev at redking.me.uk>
Date: Tue, 19 Nov 2024 09:21:24 +0000
Subject: [PATCH 2/2] Fix x86-fold-tables.inc tests
---
llvm/test/TableGen/x86-fold-tables.inc | 108 ++++++++++++-------------
1 file changed, 54 insertions(+), 54 deletions(-)
diff --git a/llvm/test/TableGen/x86-fold-tables.inc b/llvm/test/TableGen/x86-fold-tables.inc
index 578e6c511f0d7d..c7fc7834b401ae 100644
--- a/llvm/test/TableGen/x86-fold-tables.inc
+++ b/llvm/test/TableGen/x86-fold-tables.inc
@@ -1506,21 +1506,21 @@ static const X86FoldTableEntry Table1[] = {
{X86::VEXPANDPSZ128rr, X86::VEXPANDPSZ128rm, TB_NO_REVERSE},
{X86::VEXPANDPSZ256rr, X86::VEXPANDPSZ256rm, TB_NO_REVERSE},
{X86::VEXPANDPSZrr, X86::VEXPANDPSZrm, TB_NO_REVERSE},
- {X86::VFPCLASSPBF16Z128rr, X86::VFPCLASSPBF16Z128rm, 0},
- {X86::VFPCLASSPBF16Z256rr, X86::VFPCLASSPBF16Z256rm, 0},
- {X86::VFPCLASSPBF16Zrr, X86::VFPCLASSPBF16Zrm, 0},
- {X86::VFPCLASSPDZ128rr, X86::VFPCLASSPDZ128rm, 0},
- {X86::VFPCLASSPDZ256rr, X86::VFPCLASSPDZ256rm, 0},
- {X86::VFPCLASSPDZrr, X86::VFPCLASSPDZrm, 0},
- {X86::VFPCLASSPHZ128rr, X86::VFPCLASSPHZ128rm, 0},
- {X86::VFPCLASSPHZ256rr, X86::VFPCLASSPHZ256rm, 0},
- {X86::VFPCLASSPHZrr, X86::VFPCLASSPHZrm, 0},
- {X86::VFPCLASSPSZ128rr, X86::VFPCLASSPSZ128rm, 0},
- {X86::VFPCLASSPSZ256rr, X86::VFPCLASSPSZ256rm, 0},
- {X86::VFPCLASSPSZrr, X86::VFPCLASSPSZrm, 0},
- {X86::VFPCLASSSDZrr, X86::VFPCLASSSDZrm, TB_NO_REVERSE},
- {X86::VFPCLASSSHZrr, X86::VFPCLASSSHZrm, TB_NO_REVERSE},
- {X86::VFPCLASSSSZrr, X86::VFPCLASSSSZrm, TB_NO_REVERSE},
+ {X86::VFPCLASSPBF16Z128ri, X86::VFPCLASSPBF16Z128mi, 0},
+ {X86::VFPCLASSPBF16Z256ri, X86::VFPCLASSPBF16Z256mi, 0},
+ {X86::VFPCLASSPBF16Zri, X86::VFPCLASSPBF16Zmi, 0},
+ {X86::VFPCLASSPDZ128ri, X86::VFPCLASSPDZ128mi, 0},
+ {X86::VFPCLASSPDZ256ri, X86::VFPCLASSPDZ256mi, 0},
+ {X86::VFPCLASSPDZri, X86::VFPCLASSPDZmi, 0},
+ {X86::VFPCLASSPHZ128ri, X86::VFPCLASSPHZ128mi, 0},
+ {X86::VFPCLASSPHZ256ri, X86::VFPCLASSPHZ256mi, 0},
+ {X86::VFPCLASSPHZri, X86::VFPCLASSPHZmi, 0},
+ {X86::VFPCLASSPSZ128ri, X86::VFPCLASSPSZ128mi, 0},
+ {X86::VFPCLASSPSZ256ri, X86::VFPCLASSPSZ256mi, 0},
+ {X86::VFPCLASSPSZri, X86::VFPCLASSPSZmi, 0},
+ {X86::VFPCLASSSDZri, X86::VFPCLASSSDZmi, TB_NO_REVERSE},
+ {X86::VFPCLASSSHZri, X86::VFPCLASSSHZmi, TB_NO_REVERSE},
+ {X86::VFPCLASSSSZri, X86::VFPCLASSSSZmi, TB_NO_REVERSE},
{X86::VFRCZPDYrr, X86::VFRCZPDYrm, 0},
{X86::VFRCZPDrr, X86::VFRCZPDrm, 0},
{X86::VFRCZPSYrr, X86::VFRCZPSYrm, 0},
@@ -2929,21 +2929,21 @@ static const X86FoldTableEntry Table2[] = {
{X86::VFNMSUBSD4rr_Int, X86::VFNMSUBSD4mr_Int, TB_NO_REVERSE},
{X86::VFNMSUBSS4rr, X86::VFNMSUBSS4mr, 0},
{X86::VFNMSUBSS4rr_Int, X86::VFNMSUBSS4mr_Int, TB_NO_REVERSE},
- {X86::VFPCLASSPBF16Z128rrk, X86::VFPCLASSPBF16Z128rmk, 0},
- {X86::VFPCLASSPBF16Z256rrk, X86::VFPCLASSPBF16Z256rmk, 0},
- {X86::VFPCLASSPBF16Zrrk, X86::VFPCLASSPBF16Zrmk, 0},
- {X86::VFPCLASSPDZ128rrk, X86::VFPCLASSPDZ128rmk, 0},
- {X86::VFPCLASSPDZ256rrk, X86::VFPCLASSPDZ256rmk, 0},
- {X86::VFPCLASSPDZrrk, X86::VFPCLASSPDZrmk, 0},
- {X86::VFPCLASSPHZ128rrk, X86::VFPCLASSPHZ128rmk, 0},
- {X86::VFPCLASSPHZ256rrk, X86::VFPCLASSPHZ256rmk, 0},
- {X86::VFPCLASSPHZrrk, X86::VFPCLASSPHZrmk, 0},
- {X86::VFPCLASSPSZ128rrk, X86::VFPCLASSPSZ128rmk, 0},
- {X86::VFPCLASSPSZ256rrk, X86::VFPCLASSPSZ256rmk, 0},
- {X86::VFPCLASSPSZrrk, X86::VFPCLASSPSZrmk, 0},
- {X86::VFPCLASSSDZrrk, X86::VFPCLASSSDZrmk, TB_NO_REVERSE},
- {X86::VFPCLASSSHZrrk, X86::VFPCLASSSHZrmk, TB_NO_REVERSE},
- {X86::VFPCLASSSSZrrk, X86::VFPCLASSSSZrmk, TB_NO_REVERSE},
+ {X86::VFPCLASSPBF16Z128rik, X86::VFPCLASSPBF16Z128mik, 0},
+ {X86::VFPCLASSPBF16Z256rik, X86::VFPCLASSPBF16Z256mik, 0},
+ {X86::VFPCLASSPBF16Zrik, X86::VFPCLASSPBF16Zmik, 0},
+ {X86::VFPCLASSPDZ128rik, X86::VFPCLASSPDZ128mik, 0},
+ {X86::VFPCLASSPDZ256rik, X86::VFPCLASSPDZ256mik, 0},
+ {X86::VFPCLASSPDZrik, X86::VFPCLASSPDZmik, 0},
+ {X86::VFPCLASSPHZ128rik, X86::VFPCLASSPHZ128mik, 0},
+ {X86::VFPCLASSPHZ256rik, X86::VFPCLASSPHZ256mik, 0},
+ {X86::VFPCLASSPHZrik, X86::VFPCLASSPHZmik, 0},
+ {X86::VFPCLASSPSZ128rik, X86::VFPCLASSPSZ128mik, 0},
+ {X86::VFPCLASSPSZ256rik, X86::VFPCLASSPSZ256mik, 0},
+ {X86::VFPCLASSPSZrik, X86::VFPCLASSPSZmik, 0},
+ {X86::VFPCLASSSDZrik, X86::VFPCLASSSDZmik, TB_NO_REVERSE},
+ {X86::VFPCLASSSHZrik, X86::VFPCLASSSHZmik, TB_NO_REVERSE},
+ {X86::VFPCLASSSSZrik, X86::VFPCLASSSSZmik, TB_NO_REVERSE},
{X86::VGETEXPPBF16Z128rkz, X86::VGETEXPPBF16Z128mkz, 0},
{X86::VGETEXPPBF16Z256rkz, X86::VGETEXPPBF16Z256mkz, 0},
{X86::VGETEXPPBF16Zrkz, X86::VGETEXPPBF16Zmkz, 0},
@@ -7641,18 +7641,18 @@ static const X86FoldTableEntry BroadcastTable1[] = {
{X86::VCVTW2PHZrr, X86::VCVTW2PHZrmb, TB_BCAST_W},
{X86::VEXP2PDZr, X86::VEXP2PDZmb, TB_BCAST_SD},
{X86::VEXP2PSZr, X86::VEXP2PSZmb, TB_BCAST_SS},
- {X86::VFPCLASSPBF16Z128rr, X86::VFPCLASSPBF16Z128rmb, TB_BCAST_SH},
- {X86::VFPCLASSPBF16Z256rr, X86::VFPCLASSPBF16Z256rmb, TB_BCAST_SH},
- {X86::VFPCLASSPBF16Zrr, X86::VFPCLASSPBF16Zrmb, TB_BCAST_SH},
- {X86::VFPCLASSPDZ128rr, X86::VFPCLASSPDZ128rmb, TB_BCAST_SD},
- {X86::VFPCLASSPDZ256rr, X86::VFPCLASSPDZ256rmb, TB_BCAST_SD},
- {X86::VFPCLASSPDZrr, X86::VFPCLASSPDZrmb, TB_BCAST_SD},
- {X86::VFPCLASSPHZ128rr, X86::VFPCLASSPHZ128rmb, TB_BCAST_SH},
- {X86::VFPCLASSPHZ256rr, X86::VFPCLASSPHZ256rmb, TB_BCAST_SH},
- {X86::VFPCLASSPHZrr, X86::VFPCLASSPHZrmb, TB_BCAST_SH},
- {X86::VFPCLASSPSZ128rr, X86::VFPCLASSPSZ128rmb, TB_BCAST_SS},
- {X86::VFPCLASSPSZ256rr, X86::VFPCLASSPSZ256rmb, TB_BCAST_SS},
- {X86::VFPCLASSPSZrr, X86::VFPCLASSPSZrmb, TB_BCAST_SS},
+ {X86::VFPCLASSPBF16Z128ri, X86::VFPCLASSPBF16Z128mbi, TB_BCAST_SH},
+ {X86::VFPCLASSPBF16Z256ri, X86::VFPCLASSPBF16Z256mbi, TB_BCAST_SH},
+ {X86::VFPCLASSPBF16Zri, X86::VFPCLASSPBF16Zmbi, TB_BCAST_SH},
+ {X86::VFPCLASSPDZ128ri, X86::VFPCLASSPDZ128mbi, TB_BCAST_SD},
+ {X86::VFPCLASSPDZ256ri, X86::VFPCLASSPDZ256mbi, TB_BCAST_SD},
+ {X86::VFPCLASSPDZri, X86::VFPCLASSPDZmbi, TB_BCAST_SD},
+ {X86::VFPCLASSPHZ128ri, X86::VFPCLASSPHZ128mbi, TB_BCAST_SH},
+ {X86::VFPCLASSPHZ256ri, X86::VFPCLASSPHZ256mbi, TB_BCAST_SH},
+ {X86::VFPCLASSPHZri, X86::VFPCLASSPHZmbi, TB_BCAST_SH},
+ {X86::VFPCLASSPSZ128ri, X86::VFPCLASSPSZ128mbi, TB_BCAST_SS},
+ {X86::VFPCLASSPSZ256ri, X86::VFPCLASSPSZ256mbi, TB_BCAST_SS},
+ {X86::VFPCLASSPSZri, X86::VFPCLASSPSZmbi, TB_BCAST_SS},
{X86::VGETEXPPBF16Z128r, X86::VGETEXPPBF16Z128mb, TB_BCAST_SH},
{X86::VGETEXPPBF16Z256r, X86::VGETEXPPBF16Z256mb, TB_BCAST_SH},
{X86::VGETEXPPBF16Zr, X86::VGETEXPPBF16Zmb, TB_BCAST_SH},
@@ -8128,18 +8128,18 @@ static const X86FoldTableEntry BroadcastTable2[] = {
{X86::VFMULCPHZ128rr, X86::VFMULCPHZ128rmb, TB_BCAST_SS},
{X86::VFMULCPHZ256rr, X86::VFMULCPHZ256rmb, TB_BCAST_SS},
{X86::VFMULCPHZrr, X86::VFMULCPHZrmb, TB_BCAST_SS},
- {X86::VFPCLASSPBF16Z128rrk, X86::VFPCLASSPBF16Z128rmbk, TB_BCAST_SH},
- {X86::VFPCLASSPBF16Z256rrk, X86::VFPCLASSPBF16Z256rmbk, TB_BCAST_SH},
- {X86::VFPCLASSPBF16Zrrk, X86::VFPCLASSPBF16Zrmbk, TB_BCAST_SH},
- {X86::VFPCLASSPDZ128rrk, X86::VFPCLASSPDZ128rmbk, TB_BCAST_SD},
- {X86::VFPCLASSPDZ256rrk, X86::VFPCLASSPDZ256rmbk, TB_BCAST_SD},
- {X86::VFPCLASSPDZrrk, X86::VFPCLASSPDZrmbk, TB_BCAST_SD},
- {X86::VFPCLASSPHZ128rrk, X86::VFPCLASSPHZ128rmbk, TB_BCAST_SH},
- {X86::VFPCLASSPHZ256rrk, X86::VFPCLASSPHZ256rmbk, TB_BCAST_SH},
- {X86::VFPCLASSPHZrrk, X86::VFPCLASSPHZrmbk, TB_BCAST_SH},
- {X86::VFPCLASSPSZ128rrk, X86::VFPCLASSPSZ128rmbk, TB_BCAST_SS},
- {X86::VFPCLASSPSZ256rrk, X86::VFPCLASSPSZ256rmbk, TB_BCAST_SS},
- {X86::VFPCLASSPSZrrk, X86::VFPCLASSPSZrmbk, TB_BCAST_SS},
+ {X86::VFPCLASSPBF16Z128rik, X86::VFPCLASSPBF16Z128mbik, TB_BCAST_SH},
+ {X86::VFPCLASSPBF16Z256rik, X86::VFPCLASSPBF16Z256mbik, TB_BCAST_SH},
+ {X86::VFPCLASSPBF16Zrik, X86::VFPCLASSPBF16Zmbik, TB_BCAST_SH},
+ {X86::VFPCLASSPDZ128rik, X86::VFPCLASSPDZ128mbik, TB_BCAST_SD},
+ {X86::VFPCLASSPDZ256rik, X86::VFPCLASSPDZ256mbik, TB_BCAST_SD},
+ {X86::VFPCLASSPDZrik, X86::VFPCLASSPDZmbik, TB_BCAST_SD},
+ {X86::VFPCLASSPHZ128rik, X86::VFPCLASSPHZ128mbik, TB_BCAST_SH},
+ {X86::VFPCLASSPHZ256rik, X86::VFPCLASSPHZ256mbik, TB_BCAST_SH},
+ {X86::VFPCLASSPHZrik, X86::VFPCLASSPHZmbik, TB_BCAST_SH},
+ {X86::VFPCLASSPSZ128rik, X86::VFPCLASSPSZ128mbik, TB_BCAST_SS},
+ {X86::VFPCLASSPSZ256rik, X86::VFPCLASSPSZ256mbik, TB_BCAST_SS},
+ {X86::VFPCLASSPSZrik, X86::VFPCLASSPSZmbik, TB_BCAST_SS},
{X86::VGETEXPPBF16Z128rkz, X86::VGETEXPPBF16Z128mbkz, TB_BCAST_SH},
{X86::VGETEXPPBF16Z256rkz, X86::VGETEXPPBF16Z256mbkz, TB_BCAST_SH},
{X86::VGETEXPPBF16Zrkz, X86::VGETEXPPBF16Zmbkz, TB_BCAST_SH},
More information about the llvm-commits
mailing list