Skip to content

[X86] X86FixupVectorConstantsPass - use VPMOVSX/ZX extensions for PS/PD domain moves #122601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 12, 2025
Merged

[X86] X86FixupVectorConstantsPass - use VPMOVSX/ZX extensions for PS/PD domain moves #122601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
119 changes: 90 additions & 29 deletions llvm/lib/Target/X86/X86FixupVectorConstants.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ bool X86FixupVectorConstantsPass::processInstruction(MachineFunction &MF,
bool HasDQI = ST->hasDQI();
bool HasBWI = ST->hasBWI();
bool HasVLX = ST->hasVLX();
bool MultiDomain = ST->hasAVX512() || ST->hasNoDomainDelayMov();

struct FixupEntry {
int Op;
Expand Down Expand Up @@ -401,47 +402,107 @@ bool X86FixupVectorConstantsPass::processInstruction(MachineFunction &MF,
case X86::VMOVAPDrm:
case X86::VMOVAPSrm:
case X86::VMOVUPDrm:
case X86::VMOVUPSrm:
return FixupConstant({{X86::VMOVSSrm, 1, 32, rebuildZeroUpperCst},
{X86::VBROADCASTSSrm, 1, 32, rebuildSplatCst},
{X86::VMOVSDrm, 1, 64, rebuildZeroUpperCst},
{X86::VMOVDDUPrm, 1, 64, rebuildSplatCst}},
128, 1);
case X86::VMOVUPSrm: {
FixupEntry Fixups[] = {
{MultiDomain ? X86::VPMOVSXBQrm : 0, 2, 8, rebuildSExtCst},
{MultiDomain ? X86::VPMOVZXBQrm : 0, 2, 8, rebuildZExtCst},
{X86::VMOVSSrm, 1, 32, rebuildZeroUpperCst},
{X86::VBROADCASTSSrm, 1, 32, rebuildSplatCst},
{MultiDomain ? X86::VPMOVSXBDrm : 0, 4, 8, rebuildSExtCst},
{MultiDomain ? X86::VPMOVZXBDrm : 0, 4, 8, rebuildZExtCst},
{MultiDomain ? X86::VPMOVSXWQrm : 0, 2, 16, rebuildSExtCst},
{MultiDomain ? X86::VPMOVZXWQrm : 0, 2, 16, rebuildZExtCst},
{X86::VMOVSDrm, 1, 64, rebuildZeroUpperCst},
{X86::VMOVDDUPrm, 1, 64, rebuildSplatCst},
{MultiDomain ? X86::VPMOVSXWDrm : 0, 4, 16, rebuildSExtCst},
{MultiDomain ? X86::VPMOVZXWDrm : 0, 4, 16, rebuildZExtCst},
{MultiDomain ? X86::VPMOVSXDQrm : 0, 2, 32, rebuildSExtCst},
{MultiDomain ? X86::VPMOVZXDQrm : 0, 2, 32, rebuildZExtCst}};
return FixupConstant(Fixups, 128, 1);
}
case X86::VMOVAPDYrm:
case X86::VMOVAPSYrm:
case X86::VMOVUPDYrm:
case X86::VMOVUPSYrm:
return FixupConstant({{X86::VBROADCASTSSYrm, 1, 32, rebuildSplatCst},
{X86::VBROADCASTSDYrm, 1, 64, rebuildSplatCst},
{X86::VBROADCASTF128rm, 1, 128, rebuildSplatCst}},
256, 1);
case X86::VMOVUPSYrm: {
FixupEntry Fixups[] = {
{X86::VBROADCASTSSYrm, 1, 32, rebuildSplatCst},
{HasAVX2 && MultiDomain ? X86::VPMOVSXBQYrm : 0, 4, 8, rebuildSExtCst},
{HasAVX2 && MultiDomain ? X86::VPMOVZXBQYrm : 0, 4, 8, rebuildZExtCst},
{X86::VBROADCASTSDYrm, 1, 64, rebuildSplatCst},
{HasAVX2 && MultiDomain ? X86::VPMOVSXBDYrm : 0, 8, 8, rebuildSExtCst},
{HasAVX2 && MultiDomain ? X86::VPMOVZXBDYrm : 0, 8, 8, rebuildZExtCst},
{HasAVX2 && MultiDomain ? X86::VPMOVSXWQYrm : 0, 4, 16, rebuildSExtCst},
{HasAVX2 && MultiDomain ? X86::VPMOVZXWQYrm : 0, 4, 16, rebuildZExtCst},
{X86::VBROADCASTF128rm, 1, 128, rebuildSplatCst},
{HasAVX2 && MultiDomain ? X86::VPMOVSXWDYrm : 0, 8, 16, rebuildSExtCst},
{HasAVX2 && MultiDomain ? X86::VPMOVZXWDYrm : 0, 8, 16, rebuildZExtCst},
{HasAVX2 && MultiDomain ? X86::VPMOVSXDQYrm : 0, 4, 32, rebuildSExtCst},
{HasAVX2 && MultiDomain ? X86::VPMOVZXDQYrm : 0, 4, 32,
rebuildZExtCst}};
return FixupConstant(Fixups, 256, 1);
}
case X86::VMOVAPDZ128rm:
case X86::VMOVAPSZ128rm:
case X86::VMOVUPDZ128rm:
case X86::VMOVUPSZ128rm:
return FixupConstant({{X86::VMOVSSZrm, 1, 32, rebuildZeroUpperCst},
{X86::VBROADCASTSSZ128rm, 1, 32, rebuildSplatCst},
{X86::VMOVSDZrm, 1, 64, rebuildZeroUpperCst},
{X86::VMOVDDUPZ128rm, 1, 64, rebuildSplatCst}},
128, 1);
case X86::VMOVUPSZ128rm: {
FixupEntry Fixups[] = {
{MultiDomain ? X86::VPMOVSXBQZ128rm : 0, 2, 8, rebuildSExtCst},
{MultiDomain ? X86::VPMOVZXBQZ128rm : 0, 2, 8, rebuildZExtCst},
{X86::VMOVSSZrm, 1, 32, rebuildZeroUpperCst},
{X86::VBROADCASTSSZ128rm, 1, 32, rebuildSplatCst},
{MultiDomain ? X86::VPMOVSXBDZ128rm : 0, 4, 8, rebuildSExtCst},
{MultiDomain ? X86::VPMOVZXBDZ128rm : 0, 4, 8, rebuildZExtCst},
{MultiDomain ? X86::VPMOVSXWQZ128rm : 0, 2, 16, rebuildSExtCst},
{MultiDomain ? X86::VPMOVZXWQZ128rm : 0, 2, 16, rebuildZExtCst},
{X86::VMOVSDZrm, 1, 64, rebuildZeroUpperCst},
{X86::VMOVDDUPZ128rm, 1, 64, rebuildSplatCst},
{MultiDomain ? X86::VPMOVSXWDZ128rm : 0, 4, 16, rebuildSExtCst},
{MultiDomain ? X86::VPMOVZXWDZ128rm : 0, 4, 16, rebuildZExtCst},
{MultiDomain ? X86::VPMOVSXDQZ128rm : 0, 2, 32, rebuildSExtCst},
{MultiDomain ? X86::VPMOVZXDQZ128rm : 0, 2, 32, rebuildZExtCst}};
return FixupConstant(Fixups, 128, 1);
}
case X86::VMOVAPDZ256rm:
case X86::VMOVAPSZ256rm:
case X86::VMOVUPDZ256rm:
case X86::VMOVUPSZ256rm:
return FixupConstant(
{{X86::VBROADCASTSSZ256rm, 1, 32, rebuildSplatCst},
{X86::VBROADCASTSDZ256rm, 1, 64, rebuildSplatCst},
{X86::VBROADCASTF32X4Z256rm, 1, 128, rebuildSplatCst}},
256, 1);
case X86::VMOVUPSZ256rm: {
FixupEntry Fixups[] = {
{X86::VBROADCASTSSZ256rm, 1, 32, rebuildSplatCst},
{MultiDomain ? X86::VPMOVSXBQZ256rm : 0, 4, 8, rebuildSExtCst},
{MultiDomain ? X86::VPMOVZXBQZ256rm : 0, 4, 8, rebuildZExtCst},
{X86::VBROADCASTSDZ256rm, 1, 64, rebuildSplatCst},
{MultiDomain ? X86::VPMOVSXBDZ256rm : 0, 8, 8, rebuildSExtCst},
{MultiDomain ? X86::VPMOVZXBDZ256rm : 0, 8, 8, rebuildZExtCst},
{MultiDomain ? X86::VPMOVSXWQZ256rm : 0, 4, 16, rebuildSExtCst},
{MultiDomain ? X86::VPMOVZXWQZ256rm : 0, 4, 16, rebuildZExtCst},
{X86::VBROADCASTF32X4Z256rm, 1, 128, rebuildSplatCst},
{MultiDomain ? X86::VPMOVSXWDZ256rm : 0, 8, 16, rebuildSExtCst},
{MultiDomain ? X86::VPMOVZXWDZ256rm : 0, 8, 16, rebuildZExtCst},
{MultiDomain ? X86::VPMOVSXDQZ256rm : 0, 4, 32, rebuildSExtCst},
{MultiDomain ? X86::VPMOVZXDQZ256rm : 0, 4, 32, rebuildZExtCst}};
return FixupConstant(Fixups, 256, 1);
}
case X86::VMOVAPDZrm:
case X86::VMOVAPSZrm:
case X86::VMOVUPDZrm:
case X86::VMOVUPSZrm:
return FixupConstant({{X86::VBROADCASTSSZrm, 1, 32, rebuildSplatCst},
{X86::VBROADCASTSDZrm, 1, 64, rebuildSplatCst},
{X86::VBROADCASTF32X4Zrm, 1, 128, rebuildSplatCst},
{X86::VBROADCASTF64X4Zrm, 1, 256, rebuildSplatCst}},
512, 1);
case X86::VMOVUPSZrm: {
FixupEntry Fixups[] = {
{X86::VBROADCASTSSZrm, 1, 32, rebuildSplatCst},
{X86::VBROADCASTSDZrm, 1, 64, rebuildSplatCst},
{MultiDomain ? X86::VPMOVSXBQZrm : 0, 8, 8, rebuildSExtCst},
{MultiDomain ? X86::VPMOVZXBQZrm : 0, 8, 8, rebuildZExtCst},
{X86::VBROADCASTF32X4Zrm, 1, 128, rebuildSplatCst},
{MultiDomain ? X86::VPMOVSXBDZrm : 0, 16, 8, rebuildSExtCst},
{MultiDomain ? X86::VPMOVZXBDZrm : 0, 16, 8, rebuildZExtCst},
{MultiDomain ? X86::VPMOVSXWQZrm : 0, 8, 16, rebuildSExtCst},
{MultiDomain ? X86::VPMOVZXWQZrm : 0, 8, 16, rebuildZExtCst},
{X86::VBROADCASTF64X4Zrm, 1, 256, rebuildSplatCst},
{MultiDomain ? X86::VPMOVSXWDZrm : 0, 16, 16, rebuildSExtCst},
{MultiDomain ? X86::VPMOVZXWDZrm : 0, 16, 16, rebuildZExtCst},
{MultiDomain ? X86::VPMOVSXDQZrm : 0, 8, 32, rebuildSExtCst},
{MultiDomain ? X86::VPMOVZXDQZrm : 0, 8, 32, rebuildZExtCst}};
return FixupConstant(Fixups, 512, 1);
}
/* Integer Loads */
case X86::MOVDQArm:
case X86::MOVDQUrm: {
Expand Down
2 changes: 1 addition & 1 deletion llvm/test/CodeGen/X86/avx512-build-vector.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ define <16 x float> @test3(<4 x float> %a) {
; CHECK-LABEL: test3:
; CHECK: ## %bb.0:
; CHECK-NEXT: ## kill: def $xmm0 killed $xmm0 def $zmm0
; CHECK-NEXT: vmovaps {{.*#+}} zmm2 = [0,1,2,3,4,18,16,7,8,9,10,11,12,13,14,15]
; CHECK-NEXT: vpmovsxbd {{.*#+}} zmm2 = [0,1,2,3,4,18,16,7,8,9,10,11,12,13,14,15]
; CHECK-NEXT: vxorps %xmm1, %xmm1, %xmm1
; CHECK-NEXT: vpermt2ps %zmm0, %zmm2, %zmm1
; CHECK-NEXT: vmovaps %zmm1, %zmm0
Expand Down
4 changes: 2 additions & 2 deletions llvm/test/CodeGen/X86/avx512-mask-op.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1060,12 +1060,12 @@ define i32 @test13_crash(i32 %x, i32 %y) {
define <4 x i1> @test14() {
; CHECK-LABEL: test14:
; CHECK: ## %bb.0:
; CHECK-NEXT: vmovaps {{.*#+}} xmm0 = [1,1,0,1]
; CHECK-NEXT: vpmovsxbd {{.*#+}} xmm0 = [1,1,0,1]
; CHECK-NEXT: retq
;
; X86-LABEL: test14:
; X86: ## %bb.0:
; X86-NEXT: vmovaps {{.*#+}} xmm0 = [1,1,0,1]
; X86-NEXT: vpmovsxbd {{.*#+}} xmm0 = [1,1,0,1]
; X86-NEXT: retl
%a = bitcast i16 21845 to <16 x i1>
%b = extractelement <16 x i1> %a, i32 2
Expand Down
Loading
Loading