This is an archive of the discontinued LLVM Phabricator instance.

Differential D106738

[RISCV] Use getNaturalPointeeTypeAlignment to get alignment for stores created for vector builtins.
ClosedPublic

Authored by craig.topper on Jul 23 2021, 9:43 PM.

Details

Reviewers
HsiangKai
evandro
khchen
arcbbb
Commits
rG6171f84942ce: [RISCV] Use getNaturalPointeeTypeAlignment to get alignment for stores created…
Summary

Instead of using scalar size divided by 8 for segment loads, get
the alignment from clang's type system.

Make vleff match for consistency.

Also replace uses of getPointerElementType() which will be removed as part of the OpaquePtr changes.

Diff Detail

Event Timeline

craig.topper created this revision.Jul 23 2021, 9:43 PM
Herald added subscribers: StephenFan, vkmr, frasercrmck and 24 others. · View Herald TranscriptJul 23 2021, 9:43 PM
craig.topper requested review of this revision.Jul 23 2021, 9:43 PM
Herald added a project: Restricted Project. · View Herald TranscriptJul 23 2021, 9:43 PM
Harbormaster completed remote builds in B115999: Diff 361412.Jul 23 2021, 10:17 PM
craig.topper updated this revision to Diff 361899.Jul 26 2021, 9:43 PM

Also remove calls to getPointerElementType which will be removed eventually.

craig.topper edited the summary of this revision. (Show Details)Jul 26 2021, 9:43 PM
Harbormaster completed remote builds in B116342: Diff 361899.Jul 26 2021, 10:20 PM
craig.topper added a comment.Aug 4 2021, 11:47 AM

Ping

HsiangKai accepted this revision.Aug 11 2021, 11:54 PM

LGTM.

This revision is now accepted and ready to land.Aug 11 2021, 11:54 PM
This revision was landed with ongoing or failed builds.Aug 12 2021, 10:05 AM
Closed by commit rG6171f84942ce: [RISCV] Use getNaturalPointeeTypeAlignment to get alignment for stores created… (authored by craig.topper). · Explain Why
This revision was automatically updated to reflect the committed changes.
craig.topper added a commit: rG6171f84942ce: [RISCV] Use getNaturalPointeeTypeAlignment to get alignment for stores created….

Revision Contents

PathSize
clang/
include/
clang/
Basic/
52 lines

Diff 366024

clang/include/clang/Basic/riscv_vector.td

Show First 20 Lines • Show All 596 Lines • ▼ Show 20 Lines let Name = NAME # "_v",
Ops[0] = Builder.CreateBitCast(Ops[0], ResultType->getPointerTo()); Ops[0] = Builder.CreateBitCast(Ops[0], ResultType->getPointerTo());
Value *NewVL = Ops[1]; Value *NewVL = Ops[1];
Ops.erase(Ops.begin() + 1); Ops.erase(Ops.begin() + 1);
llvm::Function *F = CGM.getIntrinsic(ID, IntrinsicTypes); llvm::Function *F = CGM.getIntrinsic(ID, IntrinsicTypes);
llvm::Value *LoadValue = Builder.CreateCall(F, Ops, ""); llvm::Value *LoadValue = Builder.CreateCall(F, Ops, "");
llvm::Value *V = Builder.CreateExtractValue(LoadValue, {0}); llvm::Value *V = Builder.CreateExtractValue(LoadValue, {0});
// Store new_vl. // Store new_vl.
clang::CharUnits Align = clang::CharUnits Align =
CGM.getNaturalTypeAlignment(getContext().getSizeType()); CGM.getNaturalPointeeTypeAlignment(E->getArg(1)->getType());
Builder.CreateStore(Builder.CreateExtractValue(LoadValue, {1}), Builder.CreateStore(Builder.CreateExtractValue(LoadValue, {1}),
Address(NewVL, Align)); Address(NewVL, Align));
return V; return V;
} }
}], }],
ManualCodegenMask = [{ ManualCodegenMask = [{
{ {
// Move mask to right before vl. // Move mask to right before vl.
std::rotate(Ops.begin(), Ops.begin() + 1, Ops.end() - 1); std::rotate(Ops.begin(), Ops.begin() + 1, Ops.end() - 1);
IntrinsicTypes = {ResultType, Ops[4]->getType()}; IntrinsicTypes = {ResultType, Ops[4]->getType()};
Ops[1] = Builder.CreateBitCast(Ops[1], ResultType->getPointerTo()); Ops[1] = Builder.CreateBitCast(Ops[1], ResultType->getPointerTo());
Value *NewVL = Ops[2]; Value *NewVL = Ops[2];
Ops.erase(Ops.begin() + 2); Ops.erase(Ops.begin() + 2);
llvm::Function *F = CGM.getIntrinsic(ID, IntrinsicTypes); llvm::Function *F = CGM.getIntrinsic(ID, IntrinsicTypes);
llvm::Value *LoadValue = Builder.CreateCall(F, Ops, ""); llvm::Value *LoadValue = Builder.CreateCall(F, Ops, "");
llvm::Value *V = Builder.CreateExtractValue(LoadValue, {0}); llvm::Value *V = Builder.CreateExtractValue(LoadValue, {0});
// Store new_vl. // Store new_vl.
clang::CharUnits Align = clang::CharUnits Align =
CGM.getNaturalTypeAlignment(getContext().getSizeType()); CGM.getNaturalPointeeTypeAlignment(E->getArg(3)->getType());
Builder.CreateStore(Builder.CreateExtractValue(LoadValue, {1}), Builder.CreateStore(Builder.CreateExtractValue(LoadValue, {1}),
Address(NewVL, Align)); Address(NewVL, Align));
return V; return V;
} }
}] in { }] in {
foreach type = types in { foreach type = types in {
def : RVVBuiltin<"v", "vPCePz", type>; def : RVVBuiltin<"v", "vPCePz", type>;
// Skip floating types for unsigned versions. // Skip floating types for unsigned versions.
▲ Show 20 Lines • Show All 167 Lines • ▼ Show 20 Lines defvar eew = !cond(!eq(type, "c") : "8",
let Name = op # nf # "e" # eew # "_v", let Name = op # nf # "e" # eew # "_v",
IRName = op # nf, IRName = op # nf,
IRNameMask = op # nf # "_mask", IRNameMask = op # nf # "_mask",
NF = nf, NF = nf,
HasNoMaskedOverloaded = false, HasNoMaskedOverloaded = false,
ManualCodegen = [{ ManualCodegen = [{
{ {
// builtin: (val0 address, val1 address, ..., ptr, vl) // builtin: (val0 address, val1 address, ..., ptr, vl)
IntrinsicTypes = {Ops[0]->getType()->getPointerElementType(), IntrinsicTypes = {ConvertType(E->getArg(0)->getType()->getPointeeType()),
Ops[NF + 1]->getType()}; Ops[NF + 1]->getType()};
// intrinsic: (ptr, vl) // intrinsic: (ptr, vl)
llvm::Value *Operands[] = {Ops[NF], Ops[NF + 1]}; llvm::Value *Operands[] = {Ops[NF], Ops[NF + 1]};
llvm::Function *F = CGM.getIntrinsic(ID, IntrinsicTypes); llvm::Function *F = CGM.getIntrinsic(ID, IntrinsicTypes);
llvm::Value *LoadValue = Builder.CreateCall(F, Operands, ""); llvm::Value *LoadValue = Builder.CreateCall(F, Operands, "");
clang::CharUnits Align = CharUnits::fromQuantity( clang::CharUnits Align =
IntrinsicTypes[0]->getScalarSizeInBits() / 8); CGM.getNaturalPointeeTypeAlignment(E->getArg(0)->getType());
llvm::Value *V; llvm::Value *V;
for (unsigned I = 0; I < NF; ++I) { for (unsigned I = 0; I < NF; ++I) {
V = Builder.CreateStore(Builder.CreateExtractValue(LoadValue, {I}), V = Builder.CreateStore(Builder.CreateExtractValue(LoadValue, {I}),
Address(Ops[I], Align)); Address(Ops[I], Align));
} }
return V; return V;
} }
}], }],
ManualCodegenMask = [{ ManualCodegenMask = [{
{ {
// builtin: (val0 address, ..., mask, maskedoff0, ..., ptr, vl) // builtin: (val0 address, ..., mask, maskedoff0, ..., ptr, vl)
// intrinsic: (maskedoff0, ..., ptr, mask, vl) // intrinsic: (maskedoff0, ..., ptr, mask, vl)
IntrinsicTypes = {Ops[0]->getType()->getPointerElementType(), IntrinsicTypes = {ConvertType(E->getArg(0)->getType()->getPointeeType()),
Ops[2 * NF + 2]->getType()}; Ops[2 * NF + 2]->getType()};
SmallVector<llvm::Value*, 12> Operands; SmallVector<llvm::Value*, 12> Operands;
for (unsigned I = 0; I < NF; ++I) for (unsigned I = 0; I < NF; ++I)
Operands.push_back(Ops[NF + I + 1]); Operands.push_back(Ops[NF + I + 1]);
Operands.push_back(Ops[2 * NF + 1]); Operands.push_back(Ops[2 * NF + 1]);
Operands.push_back(Ops[NF]); Operands.push_back(Ops[NF]);
Operands.push_back(Ops[2 * NF + 2]); Operands.push_back(Ops[2 * NF + 2]);
assert(Operands.size() == NF + 3); assert(Operands.size() == NF + 3);
llvm::Function *F = CGM.getIntrinsic(ID, IntrinsicTypes); llvm::Function *F = CGM.getIntrinsic(ID, IntrinsicTypes);
llvm::Value *LoadValue = Builder.CreateCall(F, Operands, ""); llvm::Value *LoadValue = Builder.CreateCall(F, Operands, "");
clang::CharUnits Align = CharUnits::fromQuantity( clang::CharUnits Align =
IntrinsicTypes[0]->getScalarSizeInBits() / 8); CGM.getNaturalPointeeTypeAlignment(E->getArg(0)->getType());
llvm::Value *V; llvm::Value *V;
for (unsigned I = 0; I < NF; ++I) { for (unsigned I = 0; I < NF; ++I) {
V = Builder.CreateStore(Builder.CreateExtractValue(LoadValue, {I}), V = Builder.CreateStore(Builder.CreateExtractValue(LoadValue, {I}),
Address(Ops[I], Align)); Address(Ops[I], Align));
} }
return V; return V;
} }
}] in { }] in {
Show All 21 Lines defvar eew = !cond(!eq(type, "c") : "8",
let Name = op # nf # "e" # eew # "ff_v", let Name = op # nf # "e" # eew # "ff_v",
IRName = op # nf # "ff", IRName = op # nf # "ff",
IRNameMask = op # nf # "ff_mask", IRNameMask = op # nf # "ff_mask",
NF = nf, NF = nf,
HasNoMaskedOverloaded = false, HasNoMaskedOverloaded = false,
ManualCodegen = [{ ManualCodegen = [{
{ {
// builtin: (val0 address, val1 address, ..., ptr, new_vl, vl) // builtin: (val0 address, val1 address, ..., ptr, new_vl, vl)
IntrinsicTypes = {Ops[0]->getType()->getPointerElementType(), IntrinsicTypes = {ConvertType(E->getArg(0)->getType()->getPointeeType()),
Ops[NF + 2]->getType()}; Ops[NF + 2]->getType()};
// intrinsic: (ptr, vl) // intrinsic: (ptr, vl)
llvm::Value *Operands[] = {Ops[NF], Ops[NF + 2]}; llvm::Value *Operands[] = {Ops[NF], Ops[NF + 2]};
Value *NewVL = Ops[NF + 1]; Value *NewVL = Ops[NF + 1];
llvm::Function *F = CGM.getIntrinsic(ID, IntrinsicTypes); llvm::Function *F = CGM.getIntrinsic(ID, IntrinsicTypes);
llvm::Value *LoadValue = Builder.CreateCall(F, Operands, ""); llvm::Value *LoadValue = Builder.CreateCall(F, Operands, "");
clang::CharUnits Align = CharUnits::fromQuantity( clang::CharUnits Align =
IntrinsicTypes[0]->getScalarSizeInBits() / 8); CGM.getNaturalPointeeTypeAlignment(E->getArg(0)->getType());
for (unsigned I = 0; I < NF; ++I) { for (unsigned I = 0; I < NF; ++I) {
Builder.CreateStore(Builder.CreateExtractValue(LoadValue, {I}), Builder.CreateStore(Builder.CreateExtractValue(LoadValue, {I}),
Address(Ops[I], Align)); Address(Ops[I], Align));
} }
// Store new_vl. // Store new_vl.
return Builder.CreateStore(Builder.CreateExtractValue(LoadValue, {NF}), return Builder.CreateStore(Builder.CreateExtractValue(LoadValue, {NF}),
Address(NewVL, Align)); Address(NewVL, Align));
} }
}], }],
ManualCodegenMask = [{ ManualCodegenMask = [{
{ {
// builtin: (val0 address, ..., mask, maskedoff0, ..., ptr, new_vl, vl) // builtin: (val0 address, ..., mask, maskedoff0, ..., ptr, new_vl, vl)
// intrinsic: (maskedoff0, ..., ptr, mask, vl) // intrinsic: (maskedoff0, ..., ptr, mask, vl)
IntrinsicTypes = {Ops[0]->getType()->getPointerElementType(), IntrinsicTypes = {ConvertType(E->getArg(0)->getType()->getPointeeType()),
Ops[2 * NF + 3]->getType()}; Ops[2 * NF + 3]->getType()};
SmallVector<llvm::Value*, 12> Operands; SmallVector<llvm::Value*, 12> Operands;
for (unsigned I = 0; I < NF; ++I) for (unsigned I = 0; I < NF; ++I)
Operands.push_back(Ops[NF + I + 1]); Operands.push_back(Ops[NF + I + 1]);
Operands.push_back(Ops[2 * NF + 1]); Operands.push_back(Ops[2 * NF + 1]);
Operands.push_back(Ops[NF]); Operands.push_back(Ops[NF]);
Operands.push_back(Ops[2 * NF + 3]); Operands.push_back(Ops[2 * NF + 3]);
Value *NewVL = Ops[2 * NF + 2]; Value *NewVL = Ops[2 * NF + 2];
assert(Operands.size() == NF + 3); assert(Operands.size() == NF + 3);
llvm::Function *F = CGM.getIntrinsic(ID, IntrinsicTypes); llvm::Function *F = CGM.getIntrinsic(ID, IntrinsicTypes);
llvm::Value *LoadValue = Builder.CreateCall(F, Operands, ""); llvm::Value *LoadValue = Builder.CreateCall(F, Operands, "");
clang::CharUnits Align = CharUnits::fromQuantity( clang::CharUnits Align =
IntrinsicTypes[0]->getScalarSizeInBits() / 8); CGM.getNaturalPointeeTypeAlignment(E->getArg(0)->getType());
for (unsigned I = 0; I < NF; ++I) { for (unsigned I = 0; I < NF; ++I) {
Builder.CreateStore(Builder.CreateExtractValue(LoadValue, {I}), Builder.CreateStore(Builder.CreateExtractValue(LoadValue, {I}),
Address(Ops[I], Align)); Address(Ops[I], Align));
} }
// Store new_vl. // Store new_vl.
return Builder.CreateStore(Builder.CreateExtractValue(LoadValue, {NF}), return Builder.CreateStore(Builder.CreateExtractValue(LoadValue, {NF}),
Address(NewVL, Align)); Address(NewVL, Align));
} }
Show All 22 Lines defvar eew = !cond(!eq(type, "c") : "8",
let Name = op # nf # "e" # eew # "_v", let Name = op # nf # "e" # eew # "_v",
IRName = op # nf, IRName = op # nf,
IRNameMask = op # nf # "_mask", IRNameMask = op # nf # "_mask",
NF = nf, NF = nf,
HasNoMaskedOverloaded = false, HasNoMaskedOverloaded = false,
ManualCodegen = [{ ManualCodegen = [{
{ {
// builtin: (val0 address, val1 address, ..., ptr, stride, vl) // builtin: (val0 address, val1 address, ..., ptr, stride, vl)
IntrinsicTypes = {Ops[0]->getType()->getPointerElementType(), IntrinsicTypes = {ConvertType(E->getArg(0)->getType()->getPointeeType()),
Ops[NF + 2]->getType()}; Ops[NF + 2]->getType()};
// intrinsic: (ptr, stride, vl) // intrinsic: (ptr, stride, vl)
llvm::Value *Operands[] = {Ops[NF], Ops[NF + 1], Ops[NF + 2]}; llvm::Value *Operands[] = {Ops[NF], Ops[NF + 1], Ops[NF + 2]};
llvm::Function *F = CGM.getIntrinsic(ID, IntrinsicTypes); llvm::Function *F = CGM.getIntrinsic(ID, IntrinsicTypes);
llvm::Value *LoadValue = Builder.CreateCall(F, Operands, ""); llvm::Value *LoadValue = Builder.CreateCall(F, Operands, "");
clang::CharUnits Align = CharUnits::fromQuantity( clang::CharUnits Align =
IntrinsicTypes[0]->getScalarSizeInBits() / 8); CGM.getNaturalPointeeTypeAlignment(E->getArg(0)->getType());
llvm::Value *V; llvm::Value *V;
for (unsigned I = 0; I < NF; ++I) { for (unsigned I = 0; I < NF; ++I) {
V = Builder.CreateStore(Builder.CreateExtractValue(LoadValue, {I}), V = Builder.CreateStore(Builder.CreateExtractValue(LoadValue, {I}),
Address(Ops[I], Align)); Address(Ops[I], Align));
} }
return V; return V;
} }
}], }],
ManualCodegenMask = [{ ManualCodegenMask = [{
{ {
// builtin: (val0 address, ..., mask, maskedoff0, ..., ptr, stride, vl) // builtin: (val0 address, ..., mask, maskedoff0, ..., ptr, stride, vl)
// intrinsic: (maskedoff0, ..., ptr, stride, mask, vl) // intrinsic: (maskedoff0, ..., ptr, stride, mask, vl)
IntrinsicTypes = {Ops[0]->getType()->getPointerElementType(), IntrinsicTypes = {ConvertType(E->getArg(0)->getType()->getPointeeType()),
Ops[2 * NF + 3]->getType()}; Ops[2 * NF + 3]->getType()};
SmallVector<llvm::Value*, 12> Operands; SmallVector<llvm::Value*, 12> Operands;
for (unsigned I = 0; I < NF; ++I) for (unsigned I = 0; I < NF; ++I)
Operands.push_back(Ops[NF + I + 1]); Operands.push_back(Ops[NF + I + 1]);
Operands.push_back(Ops[2 * NF + 1]); Operands.push_back(Ops[2 * NF + 1]);
Operands.push_back(Ops[2 * NF + 2]); Operands.push_back(Ops[2 * NF + 2]);
Operands.push_back(Ops[NF]); Operands.push_back(Ops[NF]);
Operands.push_back(Ops[2 * NF + 3]); Operands.push_back(Ops[2 * NF + 3]);
assert(Operands.size() == NF + 4); assert(Operands.size() == NF + 4);
llvm::Function *F = CGM.getIntrinsic(ID, IntrinsicTypes); llvm::Function *F = CGM.getIntrinsic(ID, IntrinsicTypes);
llvm::Value *LoadValue = Builder.CreateCall(F, Operands, ""); llvm::Value *LoadValue = Builder.CreateCall(F, Operands, "");
clang::CharUnits Align = CharUnits::fromQuantity( clang::CharUnits Align =
IntrinsicTypes[0]->getScalarSizeInBits() / 8); CGM.getNaturalPointeeTypeAlignment(E->getArg(0)->getType());
llvm::Value *V; llvm::Value *V;
for (unsigned I = 0; I < NF; ++I) { for (unsigned I = 0; I < NF; ++I) {
V = Builder.CreateStore(Builder.CreateExtractValue(LoadValue, {I}), V = Builder.CreateStore(Builder.CreateExtractValue(LoadValue, {I}),
Address(Ops[I], Align)); Address(Ops[I], Align));
} }
return V; return V;
} }
}] in { }] in {
Show All 16 Lines foreach eew_info = EEWList in {
foreach nf = NFList in { foreach nf = NFList in {
let Name = op # nf # "ei" # eew # "_v", let Name = op # nf # "ei" # eew # "_v",
IRName = op # nf, IRName = op # nf,
IRNameMask = op # nf # "_mask", IRNameMask = op # nf # "_mask",
NF = nf, NF = nf,
ManualCodegen = [{ ManualCodegen = [{
{ {
// builtin: (val0 address, val1 address, ..., ptr, index, vl) // builtin: (val0 address, val1 address, ..., ptr, index, vl)
IntrinsicTypes = {Ops[0]->getType()->getPointerElementType(), IntrinsicTypes = {ConvertType(E->getArg(0)->getType()->getPointeeType()),
Ops[NF + 1]->getType(), Ops[NF + 2]->getType()}; Ops[NF + 1]->getType(), Ops[NF + 2]->getType()};
// intrinsic: (ptr, index, vl) // intrinsic: (ptr, index, vl)
llvm::Value *Operands[] = {Ops[NF], Ops[NF + 1], Ops[NF + 2]}; llvm::Value *Operands[] = {Ops[NF], Ops[NF + 1], Ops[NF + 2]};
llvm::Function *F = CGM.getIntrinsic(ID, IntrinsicTypes); llvm::Function *F = CGM.getIntrinsic(ID, IntrinsicTypes);
llvm::Value *LoadValue = Builder.CreateCall(F, Operands, ""); llvm::Value *LoadValue = Builder.CreateCall(F, Operands, "");
clang::CharUnits Align = CharUnits::fromQuantity( clang::CharUnits Align =
IntrinsicTypes[0]->getScalarSizeInBits() / 8); CGM.getNaturalPointeeTypeAlignment(E->getArg(0)->getType());
llvm::Value *V; llvm::Value *V;
for (unsigned I = 0; I < NF; ++I) { for (unsigned I = 0; I < NF; ++I) {
V = Builder.CreateStore(Builder.CreateExtractValue(LoadValue, {I}), V = Builder.CreateStore(Builder.CreateExtractValue(LoadValue, {I}),
Address(Ops[I], Align)); Address(Ops[I], Align));
} }
return V; return V;
} }
}], }],
ManualCodegenMask = [{ ManualCodegenMask = [{
{ {
// builtin: (val0 address, ..., mask, maskedoff0, ..., ptr, index, vl) // builtin: (val0 address, ..., mask, maskedoff0, ..., ptr, index, vl)
IntrinsicTypes = {Ops[0]->getType()->getPointerElementType(), IntrinsicTypes = {ConvertType(E->getArg(0)->getType()->getPointeeType()),
Ops[2 * NF + 2]->getType(), Ops[2 * NF + 3]->getType()}; Ops[2 * NF + 2]->getType(), Ops[2 * NF + 3]->getType()};
// intrinsic: (maskedoff0, ..., ptr, index, mask, vl) // intrinsic: (maskedoff0, ..., ptr, index, mask, vl)
SmallVector<llvm::Value*, 12> Operands; SmallVector<llvm::Value*, 12> Operands;
for (unsigned I = 0; I < NF; ++I) for (unsigned I = 0; I < NF; ++I)
Operands.push_back(Ops[NF + I + 1]); Operands.push_back(Ops[NF + I + 1]);
Operands.push_back(Ops[2 * NF + 1]); Operands.push_back(Ops[2 * NF + 1]);
Operands.push_back(Ops[2 * NF + 2]); Operands.push_back(Ops[2 * NF + 2]);
Operands.push_back(Ops[NF]); Operands.push_back(Ops[NF]);
Operands.push_back(Ops[2 * NF + 3]); Operands.push_back(Ops[2 * NF + 3]);
assert(Operands.size() == NF + 4); assert(Operands.size() == NF + 4);
llvm::Function *F = CGM.getIntrinsic(ID, IntrinsicTypes); llvm::Function *F = CGM.getIntrinsic(ID, IntrinsicTypes);
llvm::Value *LoadValue = Builder.CreateCall(F, Operands, ""); llvm::Value *LoadValue = Builder.CreateCall(F, Operands, "");
clang::CharUnits Align = CharUnits::fromQuantity( clang::CharUnits Align =
IntrinsicTypes[0]->getScalarSizeInBits() / 8); CGM.getNaturalPointeeTypeAlignment(E->getArg(0)->getType());
llvm::Value *V; llvm::Value *V;
for (unsigned I = 0; I < NF; ++I) { for (unsigned I = 0; I < NF; ++I) {
V = Builder.CreateStore(Builder.CreateExtractValue(LoadValue, {I}), V = Builder.CreateStore(Builder.CreateExtractValue(LoadValue, {I}),
Address(Ops[I], Align)); Address(Ops[I], Align));
} }
return V; return V;
} }
}] in { }] in {
▲ Show 20 Lines • Show All 1,053 Lines • Show Last 20 Lines