This is an archive of the discontinued LLVM Phabricator instance.

Differential D140661

[NFC][Clang][RISCV] Reduce for-loop with SmallVector utility
ClosedPublic

Authored by eopXD on Dec 25 2022, 7:38 AM.

Details

Reviewers
kito-cheng
craig.topper
khchen
Commits
rG904a79f99153: [NFC][Clang][RISCV] Reduce for-loop with SmallVector utility
Summary

As topic, this commit reduces the for-loops with utilities of SmallVector.

Diff Detail

Event Timeline

eopXD created this revision.Dec 25 2022, 7:38 AM
Herald added a project: Restricted Project. · View Herald TranscriptDec 25 2022, 7:38 AM
Herald added subscribers: frasercrmck, luismarques, apazos and 18 others. · View Herald Transcript
eopXD requested review of this revision.Dec 25 2022, 7:38 AM
Herald added a project: Restricted Project. · View Herald TranscriptDec 25 2022, 7:38 AM
Herald added subscribers: cfe-commits, • pcwang-thead, MaskRay. · View Herald Transcript
eopXD retitled this revision from [NFC][Clang] Reduce for-loop with SmallVectorUtility to [NFC][Clang] Reduce for-loop with SmallVector utility.Dec 25 2022, 7:39 AM
eopXD added reviewers: kito-cheng, craig.topper, khchen.
Herald added a subscriber: StephenFan. · View Herald TranscriptDec 25 2022, 7:39 AM
Harbormaster completed remote builds in B204872: Diff 485230.Dec 25 2022, 9:09 AM
eopXD added a child revision: D140662: [NFC][Clang][RISCV] Reduce boilerplate when determining prototype for segment loads.Dec 25 2022, 9:30 AM
craig.topper added a comment.Dec 25 2022, 10:42 PM

Please add [RISCV] to title

eopXD retitled this revision from [NFC][Clang] Reduce for-loop with SmallVector utility to [NFC][Clang][RISCV] Reduce for-loop with SmallVector utility.Dec 25 2022, 10:42 PM
Herald added subscribers: sunshaoce, VincentWu, vkmr and 5 others. · View Herald TranscriptDec 25 2022, 10:42 PM
craig.topper accepted this revision.Dec 25 2022, 10:43 PM

LGTM

This revision is now accepted and ready to land.Dec 25 2022, 10:43 PM
Closed by commit rG904a79f99153: [NFC][Clang][RISCV] Reduce for-loop with SmallVector utility (authored by eopXD). · Explain WhyDec 25 2022, 10:57 PM
This revision was automatically updated to reflect the committed changes.
eopXD added a commit: rG904a79f99153: [NFC][Clang][RISCV] Reduce for-loop with SmallVector utility.

Revision Contents

PathSize
clang/
include/
clang/
Basic/
24 lines
lib/
Support/
6 lines

Diff 485268

clang/include/clang/Basic/riscv_vector.td

Show First 20 Lines • Show All 842 Lines • ▼ Show 20 Lines defvar eew = !cond(!eq(type, "c") : "8",
ResultType = ConvertType(E->getArg(0)->getType()->getPointeeType()); ResultType = ConvertType(E->getArg(0)->getType()->getPointeeType());
IntrinsicTypes = {ResultType, Ops.back()->getType()}; IntrinsicTypes = {ResultType, Ops.back()->getType()};
SmallVector<llvm::Value*, 10> Operands; SmallVector<llvm::Value*, 10> Operands;
if (IsMasked) { if (IsMasked) {
// TAMA builtin: (val0 address, ..., mask, ptr, vl) // TAMA builtin: (val0 address, ..., mask, ptr, vl)
// builtin: (val0 address, ..., mask, maskedoff0, ..., ptr, vl) // builtin: (val0 address, ..., mask, maskedoff0, ..., ptr, vl)
// intrinsic: (maskedoff0, ..., ptr, mask, vl) // intrinsic: (maskedoff0, ..., ptr, mask, vl)
if (DefaultPolicy == TAIL_AGNOSTIC_MASK_AGNOSTIC) { if (DefaultPolicy == TAIL_AGNOSTIC_MASK_AGNOSTIC) {
for (unsigned I = 0; I < NF; ++I) Operands.append(NF, llvm::PoisonValue::get(ResultType));
Operands.push_back(llvm::PoisonValue::get(ResultType));
Operands.push_back(Ops[NF + 1]); Operands.push_back(Ops[NF + 1]);
Operands.push_back(Ops[NF]); Operands.push_back(Ops[NF]);
Operands.push_back(Ops[NF + 2]); Operands.push_back(Ops[NF + 2]);
} else { } else {
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]);
} }
Operands.push_back(ConstantInt::get(Ops.back()->getType(), DefaultPolicy)); Operands.push_back(ConstantInt::get(Ops.back()->getType(), DefaultPolicy));
assert(Operands.size() == NF + 4); assert(Operands.size() == NF + 4);
} else { } else {
// TA builtin: (val0 address, val1 address, ..., ptr, vl) // TA builtin: (val0 address, val1 address, ..., ptr, vl)
// TU builtin: (val0 address, ..., passthru0, ..., ptr, vl) // TU builtin: (val0 address, ..., passthru0, ..., ptr, vl)
// intrinsic: (passthru0, passthru1, ..., ptr, vl) // intrinsic: (passthru0, passthru1, ..., ptr, vl)
if (DefaultPolicy == TAIL_AGNOSTIC) { if (DefaultPolicy == TAIL_AGNOSTIC) {
for (unsigned I = 0; I < NF; ++I) Operands.append(NF, llvm::PoisonValue::get(ResultType));
Operands.push_back(llvm::PoisonValue::get(ResultType));
Operands.push_back(Ops[NF]); Operands.push_back(Ops[NF]);
Operands.push_back(Ops[NF + 1]); Operands.push_back(Ops[NF + 1]);
} else { } else {
for (unsigned I = 0; I < NF; ++I) for (unsigned I = 0; I < NF; ++I)
Operands.push_back(Ops[NF + I]); Operands.push_back(Ops[NF + I]);
Operands.push_back(Ops[2 * NF]); Operands.push_back(Ops[2 * NF]);
Operands.push_back(Ops[2 * NF + 1]); Operands.push_back(Ops[2 * NF + 1]);
} }
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines defvar eew = !cond(!eq(type, "c") : "8",
SmallVector<llvm::Value*, 12> Operands; SmallVector<llvm::Value*, 12> Operands;
Value *NewVL; Value *NewVL;
if (IsMasked) { if (IsMasked) {
// TAMA builtin: (val0 address, ..., mask, ptr, new_vl, vl) // TAMA builtin: (val0 address, ..., mask, ptr, new_vl, vl)
// 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)
if (DefaultPolicy == TAIL_AGNOSTIC_MASK_AGNOSTIC) { if (DefaultPolicy == TAIL_AGNOSTIC_MASK_AGNOSTIC) {
for (unsigned I = 0; I < NF; ++I) Operands.append(NF, llvm::PoisonValue::get(ResultType));
Operands.push_back(llvm::PoisonValue::get(ResultType));
Operands.push_back(Ops[NF + 1]); Operands.push_back(Ops[NF + 1]);
Operands.push_back(Ops[NF]); Operands.push_back(Ops[NF]);
Operands.push_back(Ops[NF + 3]); Operands.push_back(Ops[NF + 3]);
NewVL = Ops[NF + 2]; NewVL = Ops[NF + 2];
} else { } else {
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]);
NewVL = Ops[2 * NF + 2]; NewVL = Ops[2 * NF + 2];
} }
Operands.push_back(ConstantInt::get(Ops.back()->getType(), DefaultPolicy)); Operands.push_back(ConstantInt::get(Ops.back()->getType(), DefaultPolicy));
assert(Operands.size() == NF + 4); assert(Operands.size() == NF + 4);
} else { } else {
// TA builtin: (val0 address, val1 address, ..., ptr, new_vl, vl) // TA builtin: (val0 address, val1 address, ..., ptr, new_vl, vl)
// TU builtin: (val0 address, ..., passthru0, ..., ptr, new_vl, vl) // TU builtin: (val0 address, ..., passthru0, ..., ptr, new_vl, vl)
// intrinsic: (passthru0, passthru1, ..., ptr, vl) // intrinsic: (passthru0, passthru1, ..., ptr, vl)
if (DefaultPolicy == TAIL_AGNOSTIC) { if (DefaultPolicy == TAIL_AGNOSTIC) {
for (unsigned I = 0; I < NF; ++I) Operands.append(NF, llvm::PoisonValue::get(ResultType));
Operands.push_back(llvm::PoisonValue::get(ResultType));
Operands.push_back(Ops[NF]); Operands.push_back(Ops[NF]);
Operands.push_back(Ops[NF + 2]); Operands.push_back(Ops[NF + 2]);
NewVL = Ops[NF + 1]; NewVL = Ops[NF + 1];
} else { } else {
for (unsigned I = 0; I < NF; ++I) for (unsigned I = 0; I < NF; ++I)
Operands.push_back(Ops[NF + I]); Operands.push_back(Ops[NF + I]);
Operands.push_back(Ops[2 * NF]); Operands.push_back(Ops[2 * NF]);
Operands.push_back(Ops[2 * NF + 2]); Operands.push_back(Ops[2 * NF + 2]);
▲ Show 20 Lines • Show All 44 Lines • ▼ Show 20 Lines defvar eew = !cond(!eq(type, "c") : "8",
IntrinsicTypes = {ResultType, Ops.back()->getType()}; IntrinsicTypes = {ResultType, Ops.back()->getType()};
SmallVector<llvm::Value*, 12> Operands; SmallVector<llvm::Value*, 12> Operands;
if (IsMasked) { if (IsMasked) {
// TAMA builtin: (val0 address, ..., mask, ptr, stride, vl) // TAMA builtin: (val0 address, ..., mask, ptr, stride, vl)
// 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)
if (DefaultPolicy == TAIL_AGNOSTIC_MASK_AGNOSTIC) { if (DefaultPolicy == TAIL_AGNOSTIC_MASK_AGNOSTIC) {
for (unsigned I = 0; I < NF; ++I) Operands.append(NF, llvm::PoisonValue::get(ResultType));
Operands.push_back(llvm::PoisonValue::get(ResultType));
Operands.push_back(Ops[NF + 1]); Operands.push_back(Ops[NF + 1]);
Operands.push_back(Ops[NF + 2]); Operands.push_back(Ops[NF + 2]);
Operands.push_back(Ops[NF]); Operands.push_back(Ops[NF]);
Operands.push_back(Ops[NF + 3]); Operands.push_back(Ops[NF + 3]);
} else { } else {
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]);
} }
Operands.push_back(ConstantInt::get(Ops.back()->getType(), DefaultPolicy)); Operands.push_back(ConstantInt::get(Ops.back()->getType(), DefaultPolicy));
assert(Operands.size() == NF + 5); assert(Operands.size() == NF + 5);
} else { } else {
// TA builtin: (val0 address, val1 address, ..., ptr, stride, vl) // TA builtin: (val0 address, val1 address, ..., ptr, stride, vl)
// TU builtin: (val0 address, ..., passthru0, ..., ptr, stride, vl) // TU builtin: (val0 address, ..., passthru0, ..., ptr, stride, vl)
// intrinsic: (passthru0, passthru1, ..., ptr, stride, vl) // intrinsic: (passthru0, passthru1, ..., ptr, stride, vl)
if (DefaultPolicy == TAIL_AGNOSTIC) { if (DefaultPolicy == TAIL_AGNOSTIC) {
for (unsigned I = 0; I < NF; ++I) Operands.append(NF, llvm::PoisonValue::get(ResultType));
Operands.push_back(llvm::PoisonValue::get(ResultType));
Operands.push_back(Ops[NF]); Operands.push_back(Ops[NF]);
Operands.push_back(Ops[NF + 1]); Operands.push_back(Ops[NF + 1]);
Operands.push_back(Ops[NF + 2]); Operands.push_back(Ops[NF + 2]);
} else { } else {
for (unsigned I = 0; I < NF; ++I) for (unsigned I = 0; I < NF; ++I)
Operands.push_back(Ops[NF + I]); Operands.push_back(Ops[NF + I]);
Operands.push_back(Ops[2 * NF]); Operands.push_back(Ops[2 * NF]);
Operands.push_back(Ops[2 * NF + 1]); Operands.push_back(Ops[2 * NF + 1]);
Show All 37 Lines foreach type = TypeList in {
{ {
ResultType = ConvertType(E->getArg(0)->getType()->getPointeeType()); ResultType = ConvertType(E->getArg(0)->getType()->getPointeeType());
SmallVector<llvm::Value*, 12> Operands; SmallVector<llvm::Value*, 12> Operands;
if (IsMasked) { if (IsMasked) {
// TAMA builtin: (val0 address, ..., mask, ptr, index, vl) // TAMA builtin: (val0 address, ..., mask, ptr, index, vl)
// builtin: (val0 address, ..., mask, maskedoff0, ..., ptr, index, vl) // builtin: (val0 address, ..., mask, maskedoff0, ..., ptr, index, vl)
// intrinsic: (maskedoff0, ..., ptr, index, mask, vl) // intrinsic: (maskedoff0, ..., ptr, index, mask, vl)
if (DefaultPolicy == TAIL_AGNOSTIC_MASK_AGNOSTIC) { if (DefaultPolicy == TAIL_AGNOSTIC_MASK_AGNOSTIC) {
for (unsigned I = 0; I < NF; ++I) Operands.append(NF, llvm::PoisonValue::get(ResultType));
Operands.push_back(llvm::PoisonValue::get(ResultType));
Operands.push_back(Ops[NF + 1]); Operands.push_back(Ops[NF + 1]);
Operands.push_back(Ops[NF + 2]); Operands.push_back(Ops[NF + 2]);
Operands.push_back(Ops[NF]); Operands.push_back(Ops[NF]);
Operands.push_back(Ops[NF + 3]); Operands.push_back(Ops[NF + 3]);
IntrinsicTypes = {ResultType, Ops[NF + 2]->getType(), Ops.back()->getType()}; IntrinsicTypes = {ResultType, Ops[NF + 2]->getType(), Ops.back()->getType()};
} else { } else {
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]);
IntrinsicTypes = {ResultType, Ops[2 * NF + 2]->getType(), Ops.back()->getType()}; IntrinsicTypes = {ResultType, Ops[2 * NF + 2]->getType(), Ops.back()->getType()};
} }
Operands.push_back(ConstantInt::get(Ops.back()->getType(), DefaultPolicy)); Operands.push_back(ConstantInt::get(Ops.back()->getType(), DefaultPolicy));
assert(Operands.size() == NF + 5); assert(Operands.size() == NF + 5);
} else { } else {
// TA builtin: (val0 address, val1 address, ..., ptr, index, vl) // TA builtin: (val0 address, val1 address, ..., ptr, index, vl)
// TU builtin: (val0 address, ..., passthru0, ..., ptr, index, vl) // TU builtin: (val0 address, ..., passthru0, ..., ptr, index, vl)
// intrinsic: (passthru0, passthru1, ..., ptr, index, vl) // intrinsic: (passthru0, passthru1, ..., ptr, index, vl)
if (DefaultPolicy == TAIL_AGNOSTIC) { if (DefaultPolicy == TAIL_AGNOSTIC) {
for (unsigned I = 0; I < NF; ++I) Operands.append(NF, llvm::PoisonValue::get(ResultType));
Operands.push_back(llvm::PoisonValue::get(ResultType));
Operands.push_back(Ops[NF]); Operands.push_back(Ops[NF]);
Operands.push_back(Ops[NF + 1]); Operands.push_back(Ops[NF + 1]);
Operands.push_back(Ops[NF + 2]); Operands.push_back(Ops[NF + 2]);
IntrinsicTypes = {ResultType, Ops[NF + 1]->getType(), Ops.back()->getType()}; IntrinsicTypes = {ResultType, Ops[NF + 1]->getType(), Ops.back()->getType()};
} else { } else {
for (unsigned I = 0; I < NF; ++I) for (unsigned I = 0; I < NF; ++I)
Operands.push_back(Ops[NF + I]); Operands.push_back(Ops[NF + I]);
Operands.push_back(Ops[2 * NF]); Operands.push_back(Ops[2 * NF]);
▲ Show 20 Lines • Show All 1,203 Lines • Show Last 20 Lines

clang/lib/Support/RISCVVIntrinsicUtils.cpp

Show First 20 Lines • Show All 933 Lines • ▼ Show 20 Lines if (HasMaskedOffOperand && !DefaultPolicy.isTAMAPolicy()) {
NewPrototype.insert(NewPrototype.begin() + 1, NewPrototype[0]); NewPrototype.insert(NewPrototype.begin() + 1, NewPrototype[0]);
} else if (NF > 1) { } else if (NF > 1) {
// Convert // Convert
// (void, op0 address, op1 address, ...) // (void, op0 address, op1 address, ...)
// to // to
// (void, op0 address, op1 address, ..., maskedoff0, maskedoff1, ...) // (void, op0 address, op1 address, ..., maskedoff0, maskedoff1, ...)
PrototypeDescriptor MaskoffType = NewPrototype[1]; PrototypeDescriptor MaskoffType = NewPrototype[1];
MaskoffType.TM &= ~static_cast<uint8_t>(TypeModifier::Pointer); MaskoffType.TM &= ~static_cast<uint8_t>(TypeModifier::Pointer);
for (unsigned I = 0; I < NF; ++I) NewPrototype.insert(NewPrototype.begin() + NF + 1, NF, MaskoffType);
NewPrototype.insert(NewPrototype.begin() + NF + 1, MaskoffType);
} }
} }
// Erase passthru operand for TAM // Erase passthru operand for TAM
if (NF == 1 && IsPrototypeDefaultTU && DefaultPolicy.isTAMAPolicy() && if (NF == 1 && IsPrototypeDefaultTU && DefaultPolicy.isTAMAPolicy() &&
HasPassthruOp && !HasMaskedOffOperand) HasPassthruOp && !HasMaskedOffOperand)
NewPrototype.erase(NewPrototype.begin() + 1); NewPrototype.erase(NewPrototype.begin() + 1);
if (HasMaskedOffOperand && NF > 1) { if (HasMaskedOffOperand && NF > 1) {
// Convert // Convert
Show All 26 Lines if (IsMasked) {
} else if (DefaultPolicy.isTUPolicy() && HasPassthruOp) { } else if (DefaultPolicy.isTUPolicy() && HasPassthruOp) {
// NF > 1 cases for segment load operations. // NF > 1 cases for segment load operations.
// Convert // Convert
// (void, op0 address, op1 address, ...) // (void, op0 address, op1 address, ...)
// to // to
// (void, op0 address, op1 address, maskedoff0, maskedoff1, ...) // (void, op0 address, op1 address, maskedoff0, maskedoff1, ...)
PrototypeDescriptor MaskoffType = Prototype[1]; PrototypeDescriptor MaskoffType = Prototype[1];
MaskoffType.TM &= ~static_cast<uint8_t>(TypeModifier::Pointer); MaskoffType.TM &= ~static_cast<uint8_t>(TypeModifier::Pointer);
for (unsigned I = 0; I < NF; ++I) NewPrototype.insert(NewPrototype.begin() + NF + 1, NF, MaskoffType);
NewPrototype.insert(NewPrototype.begin() + NF + 1, MaskoffType);
} }
} }
// If HasVL, append PrototypeDescriptor:VL to last operand // If HasVL, append PrototypeDescriptor:VL to last operand
if (HasVL) if (HasVL)
NewPrototype.push_back(PrototypeDescriptor::VL); NewPrototype.push_back(PrototypeDescriptor::VL);
return NewPrototype; return NewPrototype;
} }
▲ Show 20 Lines • Show All 139 Lines • Show Last 20 Lines