Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 27 additions & 11 deletions llvm/lib/Target/X86/X86ScheduleZnver4.td
Original file line number Diff line number Diff line change
Expand Up @@ -1534,9 +1534,9 @@ def Zn4WriteVFIXUPIMMPDZrr_VRANGESDrr : SchedWriteRes<[Zn4FPFMisc01]> {
let NumMicroOps = 1;
}
def : InstRW<[Zn4WriteVFIXUPIMMPDZrr_VRANGESDrr], (instregex
"VFIXUPIMM(S|P)(S|D)(Z|Z128|Z256?)rrik", "VFIXUPIMM(S|P)(S|D)(Z?|Z128?|Z256?)rrikz",
"VFIXUPIMM(S|P)(S|D)(Z|Z128|Z256?)rrik", "VFIXUPIMM(S|P)(S|D)(Z?|Z128?|Z256?)rrikz",
"VFIXUPIMM(S|P)(S|D)(Z128|Z256?)rri", "VRANGE(S|P)(S|D)(Z?|Z128?|Z256?)rri(b?)",
"VRANGE(S|P)(S|D)(Z|Z128|Z256?)rri(b?)k","VRANGE(S|P)(S|D)(Z?|Z128?|Z256?)rri(b?)kz"
"VRANGE(S|P)(S|D)(Z|Z128|Z256?)rri(b?)k","VRANGE(S|P)(S|D)(Z?|Z128?|Z256?)rri(b?)kz"
)>;

// SCALE & REDUCE instructions
Expand Down Expand Up @@ -1567,7 +1567,7 @@ def Zn4WriteBUSDr_VPMADDr: SchedWriteRes<[Zn4FPFMisc01]> {
let NumMicroOps = 1;
}
def : InstRW<[Zn4WriteBUSDr_VPMADDr], (instregex
"VPDP(BU|WS)(S|P)(S|D|DS)(Z|Z128|Z256)(r|rk|rkz)",
"VPDP(BU|WS)(S|P)(S|D|DS)(Z|Z128|Z256)(r|rk|rkz)",
"VPMADD52(H|L)UQ(Z|Z128|Z256)(r|rk|rkz)"
)>;

Expand All @@ -1586,7 +1586,7 @@ def : InstRW<[Zn4WriteSHIFTrr], (instregex
"(V?)P(ROL|ROR)(D|Q|VD|VQ)(Z?|Z128?|Z256?)(rr|rrk|rrkz)",
"(V?)P(ROL|ROR)(D|Q|VD|VQ)(Z256?)(ri|rik|rikz)",
"(V?)P(ROL|ROR)(D|Q)(Z?|Z128?)(ri|rik|rikz)",
"VPSHUFBITQMBZ128rr", "VFMSUB231SSZrkz_Int"
"VPSHUFBITQMBZ128rr", "VFMSUB231SSZrkz_Int"
)>;

def Zn4WriteSHIFTri: SchedWriteRes<[Zn4FPFMisc01]> {
Expand All @@ -1598,24 +1598,40 @@ def : InstRW<[Zn4WriteSHIFTri], (instregex
"VP(SLL|SRL|SRA)(D|Q|W)(Z|Z128|Z256?)(ri|rik|rikz)"
)>;

// ALIGN Instructions
def Zn4WriteALIGN: SchedWriteRes<[Zn4FPFMisc12]> {
// ALIGNR Instructions
def Zn4WriteALIGNR: SchedWriteRes<[Zn4FPFMisc12]> {
let Latency = 2;
let ReleaseAtCycles = [1];
let NumMicroOps = 1;
}
def : InstRW<[Zn4WriteALIGNR], (instregex
"(V?)PALIGNR(Y?|Z128?|Z256?)(rri|rrik|rrikz)"
)>;
def Zn4WriteALIGNRZ: SchedWriteRes<[Zn4FPFMisc12]> {
let Latency = 2;
let ReleaseAtCycles = [2];
let NumMicroOps = 1;
}
def : InstRW<[Zn4WriteALIGN], (instregex
"(V?)PALIGNR(Z?|Z128?|Z256?)(rri|rrik|rrikz)"
def : InstRW<[Zn4WriteALIGNRZ], (instregex
"(V?)PALIGNRZ(rri|rrik|rrikz)"
)>;

//PACK Instructions
// PACK Instructions
def Zn4WritePACK: SchedWriteRes<[Zn4FPFMisc12]> {
let Latency = 2;
let ReleaseAtCycles = [2];
let ReleaseAtCycles = [1];
let NumMicroOps = 1;
}
def : InstRW<[Zn4WritePACK], (instregex
"(V?)PACK(SS|US)(DW|WB)(Z?|Z128?|Z256?)(rr|rrk|rrkz)"
"(V?)PACK(SS|US)(DW|WB)(Y?|Z128?|Z256?)(rr|rrk|rrkz)"
)>;
def Zn4WritePACKZ: SchedWriteRes<[Zn4FPFMisc12]> {
let Latency = 2;
let ReleaseAtCycles = [2];
let NumMicroOps = 1;
}
def : InstRW<[Zn4WritePACKZ], (instregex
"(V?)PACK(SS|US)(DW|WB)Z(rr|rrk|rrkz)"
)>;

// MAX and MIN Instructions
Expand Down
22 changes: 11 additions & 11 deletions llvm/test/tools/llvm-mca/X86/Znver4/resources-avx1.s
Original file line number Diff line number Diff line change
Expand Up @@ -1365,13 +1365,13 @@ vzeroupper
# CHECK-NEXT: 1 8 0.50 * vpabsd (%rax), %xmm2
# CHECK-NEXT: 1 2 1.00 vpabsw %xmm0, %xmm2
# CHECK-NEXT: 1 8 0.50 * vpabsw (%rax), %xmm2
# CHECK-NEXT: 1 2 1.00 vpackssdw %xmm0, %xmm1, %xmm2
# CHECK-NEXT: 1 2 0.50 vpackssdw %xmm0, %xmm1, %xmm2
# CHECK-NEXT: 1 8 0.50 * vpackssdw (%rax), %xmm1, %xmm2
# CHECK-NEXT: 1 2 1.00 vpacksswb %xmm0, %xmm1, %xmm2
# CHECK-NEXT: 1 2 0.50 vpacksswb %xmm0, %xmm1, %xmm2
# CHECK-NEXT: 1 8 0.50 * vpacksswb (%rax), %xmm1, %xmm2
# CHECK-NEXT: 1 2 1.00 vpackusdw %xmm0, %xmm1, %xmm2
# CHECK-NEXT: 1 2 0.50 vpackusdw %xmm0, %xmm1, %xmm2
# CHECK-NEXT: 1 8 0.50 * vpackusdw (%rax), %xmm1, %xmm2
# CHECK-NEXT: 1 2 1.00 vpackuswb %xmm0, %xmm1, %xmm2
# CHECK-NEXT: 1 2 0.50 vpackuswb %xmm0, %xmm1, %xmm2
# CHECK-NEXT: 1 8 0.50 * vpackuswb (%rax), %xmm1, %xmm2
# CHECK-NEXT: 1 1 0.25 vpaddb %xmm0, %xmm1, %xmm2
# CHECK-NEXT: 1 8 0.50 * vpaddb (%rax), %xmm1, %xmm2
Expand All @@ -1389,7 +1389,7 @@ vzeroupper
# CHECK-NEXT: 1 8 0.50 * vpaddusw (%rax), %xmm1, %xmm2
# CHECK-NEXT: 1 1 0.25 vpaddw %xmm0, %xmm1, %xmm2
# CHECK-NEXT: 1 8 0.50 * vpaddw (%rax), %xmm1, %xmm2
# CHECK-NEXT: 1 2 1.00 vpalignr $1, %xmm0, %xmm1, %xmm2
# CHECK-NEXT: 1 2 0.50 vpalignr $1, %xmm0, %xmm1, %xmm2
# CHECK-NEXT: 1 8 0.50 * vpalignr $1, (%rax), %xmm1, %xmm2
# CHECK-NEXT: 1 1 0.25 vpand %xmm0, %xmm1, %xmm2
# CHECK-NEXT: 1 8 0.50 * vpand (%rax), %xmm1, %xmm2
Expand Down Expand Up @@ -1749,7 +1749,7 @@ vzeroupper

# CHECK: Resource pressure per iteration:
# CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12.0] [12.1] [13] [14.0] [14.1] [14.2] [15.0] [15.1] [15.2] [16.0] [16.1]
# CHECK-NEXT: 1.33 1.33 1.33 16.50 16.50 16.50 16.50 - 205.25 396.08 270.58 158.08 208.50 208.50 65.00 119.67 119.67 119.67 107.00 107.00 107.00 19.00 19.00
# CHECK-NEXT: 1.33 1.33 1.33 16.50 16.50 16.50 16.50 - 205.25 393.58 268.08 158.08 208.50 208.50 65.00 119.67 119.67 119.67 107.00 107.00 107.00 19.00 19.00

# CHECK: Resource pressure by instruction:
# CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12.0] [12.1] [13] [14.0] [14.1] [14.2] [15.0] [15.1] [15.2] [16.0] [16.1] Instructions:
Expand Down Expand Up @@ -2088,13 +2088,13 @@ vzeroupper
# CHECK-NEXT: - - - - - - - - 0.25 0.25 0.25 0.25 0.50 0.50 - 0.33 0.33 0.33 0.33 0.33 0.33 - - vpabsd (%rax), %xmm2
# CHECK-NEXT: - - - - - - - - 1.00 1.00 - - - - - - - - - - - - - vpabsw %xmm0, %xmm2
# CHECK-NEXT: - - - - - - - - 0.25 0.25 0.25 0.25 0.50 0.50 - 0.33 0.33 0.33 0.33 0.33 0.33 - - vpabsw (%rax), %xmm2
# CHECK-NEXT: - - - - - - - - - 1.00 1.00 - - - - - - - - - - - - vpackssdw %xmm0, %xmm1, %xmm2
# CHECK-NEXT: - - - - - - - - - 0.50 0.50 - - - - - - - - - - - - vpackssdw %xmm0, %xmm1, %xmm2
# CHECK-NEXT: - - - - - - - - - 0.50 0.50 - 0.50 0.50 - 0.33 0.33 0.33 0.33 0.33 0.33 - - vpackssdw (%rax), %xmm1, %xmm2
# CHECK-NEXT: - - - - - - - - - 1.00 1.00 - - - - - - - - - - - - vpacksswb %xmm0, %xmm1, %xmm2
# CHECK-NEXT: - - - - - - - - - 0.50 0.50 - - - - - - - - - - - - vpacksswb %xmm0, %xmm1, %xmm2
# CHECK-NEXT: - - - - - - - - - 0.50 0.50 - 0.50 0.50 - 0.33 0.33 0.33 0.33 0.33 0.33 - - vpacksswb (%rax), %xmm1, %xmm2
# CHECK-NEXT: - - - - - - - - - 1.00 1.00 - - - - - - - - - - - - vpackusdw %xmm0, %xmm1, %xmm2
# CHECK-NEXT: - - - - - - - - - 0.50 0.50 - - - - - - - - - - - - vpackusdw %xmm0, %xmm1, %xmm2
# CHECK-NEXT: - - - - - - - - - 0.50 0.50 - 0.50 0.50 - 0.33 0.33 0.33 0.33 0.33 0.33 - - vpackusdw (%rax), %xmm1, %xmm2
# CHECK-NEXT: - - - - - - - - - 1.00 1.00 - - - - - - - - - - - - vpackuswb %xmm0, %xmm1, %xmm2
# CHECK-NEXT: - - - - - - - - - 0.50 0.50 - - - - - - - - - - - - vpackuswb %xmm0, %xmm1, %xmm2
# CHECK-NEXT: - - - - - - - - - 0.50 0.50 - 0.50 0.50 - 0.33 0.33 0.33 0.33 0.33 0.33 - - vpackuswb (%rax), %xmm1, %xmm2
# CHECK-NEXT: - - - - - - - - 0.25 0.25 0.25 0.25 - - - - - - - - - - - vpaddb %xmm0, %xmm1, %xmm2
# CHECK-NEXT: - - - - - - - - 0.25 0.25 0.25 0.25 0.50 0.50 - 0.33 0.33 0.33 0.33 0.33 0.33 - - vpaddb (%rax), %xmm1, %xmm2
Expand All @@ -2112,7 +2112,7 @@ vzeroupper
# CHECK-NEXT: - - - - - - - - 0.25 0.25 0.25 0.25 0.50 0.50 - 0.33 0.33 0.33 0.33 0.33 0.33 - - vpaddusw (%rax), %xmm1, %xmm2
# CHECK-NEXT: - - - - - - - - 0.25 0.25 0.25 0.25 - - - - - - - - - - - vpaddw %xmm0, %xmm1, %xmm2
# CHECK-NEXT: - - - - - - - - 0.25 0.25 0.25 0.25 0.50 0.50 - 0.33 0.33 0.33 0.33 0.33 0.33 - - vpaddw (%rax), %xmm1, %xmm2
# CHECK-NEXT: - - - - - - - - - 1.00 1.00 - - - - - - - - - - - - vpalignr $1, %xmm0, %xmm1, %xmm2
# CHECK-NEXT: - - - - - - - - - 0.50 0.50 - - - - - - - - - - - - vpalignr $1, %xmm0, %xmm1, %xmm2
# CHECK-NEXT: - - - - - - - - - 0.50 0.50 - 0.50 0.50 - 0.33 0.33 0.33 0.33 0.33 0.33 - - vpalignr $1, (%rax), %xmm1, %xmm2
# CHECK-NEXT: - - - - - - - - 0.25 0.25 0.25 0.25 - - - - - - - - - - - vpand %xmm0, %xmm1, %xmm2
# CHECK-NEXT: - - - - - - - - 0.25 0.25 0.25 0.25 0.50 0.50 - 0.33 0.33 0.33 0.33 0.33 0.33 - - vpand (%rax), %xmm1, %xmm2
Expand Down
10 changes: 5 additions & 5 deletions llvm/test/tools/llvm-mca/X86/Znver4/resources-avx2.s
Original file line number Diff line number Diff line change
Expand Up @@ -484,13 +484,13 @@ vpxor (%rax), %ymm1, %ymm2
# CHECK-NEXT: 1 8 0.50 * vpabsd (%rax), %ymm2
# CHECK-NEXT: 1 1 0.50 vpabsw %ymm0, %ymm2
# CHECK-NEXT: 1 8 0.50 * vpabsw (%rax), %ymm2
# CHECK-NEXT: 1 1 0.50 vpackssdw %ymm0, %ymm1, %ymm2
# CHECK-NEXT: 1 2 0.50 vpackssdw %ymm0, %ymm1, %ymm2
# CHECK-NEXT: 1 8 0.50 * vpackssdw (%rax), %ymm1, %ymm2
# CHECK-NEXT: 1 1 0.50 vpacksswb %ymm0, %ymm1, %ymm2
# CHECK-NEXT: 1 2 0.50 vpacksswb %ymm0, %ymm1, %ymm2
# CHECK-NEXT: 1 8 0.50 * vpacksswb (%rax), %ymm1, %ymm2
# CHECK-NEXT: 1 1 0.50 vpackusdw %ymm0, %ymm1, %ymm2
# CHECK-NEXT: 1 2 0.50 vpackusdw %ymm0, %ymm1, %ymm2
# CHECK-NEXT: 1 8 0.50 * vpackusdw (%rax), %ymm1, %ymm2
# CHECK-NEXT: 1 1 0.50 vpackuswb %ymm0, %ymm1, %ymm2
# CHECK-NEXT: 1 2 0.50 vpackuswb %ymm0, %ymm1, %ymm2
# CHECK-NEXT: 1 8 0.50 * vpackuswb (%rax), %ymm1, %ymm2
# CHECK-NEXT: 1 1 0.25 vpaddb %ymm0, %ymm1, %ymm2
# CHECK-NEXT: 1 8 0.50 * vpaddb (%rax), %ymm1, %ymm2
Expand All @@ -508,7 +508,7 @@ vpxor (%rax), %ymm1, %ymm2
# CHECK-NEXT: 1 8 0.50 * vpaddusw (%rax), %ymm1, %ymm2
# CHECK-NEXT: 1 1 0.25 vpaddw %ymm0, %ymm1, %ymm2
# CHECK-NEXT: 1 8 0.50 * vpaddw (%rax), %ymm1, %ymm2
# CHECK-NEXT: 1 1 0.50 vpalignr $1, %ymm0, %ymm1, %ymm2
# CHECK-NEXT: 1 2 0.50 vpalignr $1, %ymm0, %ymm1, %ymm2
# CHECK-NEXT: 1 8 0.50 * vpalignr $1, (%rax), %ymm1, %ymm2
# CHECK-NEXT: 1 1 0.25 vpand %ymm0, %ymm1, %ymm2
# CHECK-NEXT: 1 8 0.50 * vpand (%rax), %ymm1, %ymm2
Expand Down
Loading