This is an archive of the discontinued LLVM Phabricator instance.

Differential D157924

[llvm][NFC] Refactor AutoUpdater riscv cases
ClosedPublic

Authored by urnathan on Aug 14 2023, 2:57 PM.

Details

Reviewers
arsenm
nikic
asb
craig.topper
Commits
rG867724142a61: [llvm][NFC] Refactor AutoUpdater riscv cases
Summary

And here's the 'r' case. As ever, check 'riscv.' before proceeding.

In this case there's also large amount of commonality in the riscv upgrader, make that
clearer.

Diff Detail

Event Timeline

urnathan created this revision.Aug 14 2023, 2:57 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 14 2023, 2:57 PM
Herald added subscribers: VincentWu, StephenFan, vkmr and 13 others. · View Herald Transcript
urnathan requested review of this revision.Aug 14 2023, 2:57 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 14 2023, 2:57 PM
Herald added subscribers: llvm-commits, wangpc, eopXD, wdng. · View Herald Transcript
craig.topper added reviewers: asb, craig.topper.Aug 14 2023, 3:00 PM
Harbormaster completed remote builds in B252472: Diff 550101.Aug 14 2023, 7:44 PM
nikic accepted this revision.Aug 15 2023, 2:56 AM

LG

This revision is now accepted and ready to land.Aug 15 2023, 2:56 AM
This revision was landed with ongoing or failed builds.Aug 16 2023, 1:43 PM
Closed by commit rG867724142a61: [llvm][NFC] Refactor AutoUpdater riscv cases (authored by urnathan). · Explain Why
This revision was automatically updated to reflect the committed changes.
urnathan added a commit: rG867724142a61: [llvm][NFC] Refactor AutoUpdater riscv cases.

Revision Contents

PathSize
llvm/
lib/
IR/
129 lines

Diff 550871

llvm/lib/IR/AutoUpgrade.cpp

Show First 20 Lines • Show All 1,117 Lines • ▼ Show 20 Lines if (Name.startswith("ptr.annotation.") && F->arg_size() == 4) {
rename(F); rename(F);
NewFn = Intrinsic::getDeclaration( NewFn = Intrinsic::getDeclaration(
F->getParent(), Intrinsic::ptr_annotation, F->getParent(), Intrinsic::ptr_annotation,
{F->arg_begin()->getType(), F->getArg(1)->getType()}); {F->arg_begin()->getType(), F->getArg(1)->getType()});
return true; return true;
} }
break; break;
case 'r': case 'r': {
if (Name == "riscv.aes32dsi" && if (Name.consume_front("riscv.")) {
!F->getFunctionType()->getParamType(2)->isIntegerTy(32)) { Intrinsic::ID ID;
rename(F); ID = StringSwitch<Intrinsic::ID>(Name)
NewFn = Intrinsic::getDeclaration(F->getParent(), Intrinsic::riscv_aes32dsi); .Case("aes32dsi", Intrinsic::riscv_aes32dsi)
return true; .Case("aes32dsmi", Intrinsic::riscv_aes32dsmi)
} .Case("aes32esi", Intrinsic::riscv_aes32esi)
if (Name == "riscv.aes32dsmi" && .Case("aes32esmi", Intrinsic::riscv_aes32esmi)
!F->getFunctionType()->getParamType(2)->isIntegerTy(32)) { .Default(Intrinsic::not_intrinsic);
rename(F); if (ID != Intrinsic::not_intrinsic) {
NewFn = Intrinsic::getDeclaration(F->getParent(), Intrinsic::riscv_aes32dsmi); if (!F->getFunctionType()->getParamType(2)->isIntegerTy(32)) {
return true;
}
if (Name == "riscv.aes32esi" &&
!F->getFunctionType()->getParamType(2)->isIntegerTy(32)) {
rename(F);
NewFn = Intrinsic::getDeclaration(F->getParent(), Intrinsic::riscv_aes32esi);
return true;
}
if (Name == "riscv.aes32esmi" &&
!F->getFunctionType()->getParamType(2)->isIntegerTy(32)) {
rename(F);
NewFn = Intrinsic::getDeclaration(F->getParent(), Intrinsic::riscv_aes32esmi);
return true;
}
if (Name.startswith("riscv.sm4ks") &&
(!F->getFunctionType()->getParamType(2)->isIntegerTy(32) ||
F->getFunctionType()->getReturnType()->isIntegerTy(64))) {
rename(F);
NewFn = Intrinsic::getDeclaration(F->getParent(), Intrinsic::riscv_sm4ks);
return true;
}
if (Name.startswith("riscv.sm4ed") &&
(!F->getFunctionType()->getParamType(2)->isIntegerTy(32) ||
F->getFunctionType()->getReturnType()->isIntegerTy(64))) {
rename(F); rename(F);
NewFn = Intrinsic::getDeclaration(F->getParent(), Intrinsic::riscv_sm4ed); NewFn = Intrinsic::getDeclaration(F->getParent(), ID);
return true; return true;
} }
if (Name.startswith("riscv.sha256sig0") && break; // No other applicable upgrades.
F->getFunctionType()->getReturnType()->isIntegerTy(64)) {
rename(F);
NewFn = Intrinsic::getDeclaration(F->getParent(),
Intrinsic::riscv_sha256sig0);
return true;
} }
if (Name.startswith("riscv.sha256sig1") &&
ID = StringSwitch<Intrinsic::ID>(Name)
.StartsWith("sm4ks", Intrinsic::riscv_sm4ks)
.StartsWith("sm4ed", Intrinsic::riscv_sm4ed)
.Default(Intrinsic::not_intrinsic);
if (ID != Intrinsic::not_intrinsic) {
if (!F->getFunctionType()->getParamType(2)->isIntegerTy(32) ||
F->getFunctionType()->getReturnType()->isIntegerTy(64)) { F->getFunctionType()->getReturnType()->isIntegerTy(64)) {
rename(F); rename(F);
NewFn = Intrinsic::getDeclaration(F->getParent(), NewFn = Intrinsic::getDeclaration(F->getParent(), ID);
Intrinsic::riscv_sha256sig1);
return true; return true;
} }
if (Name.startswith("riscv.sha256sum0") && break; // No other applicable upgrades.
F->getFunctionType()->getReturnType()->isIntegerTy(64)) {
rename(F);
NewFn = Intrinsic::getDeclaration(F->getParent(),
Intrinsic::riscv_sha256sum0);
return true;
} }
if (Name.startswith("riscv.sha256sum1") &&
F->getFunctionType()->getReturnType()->isIntegerTy(64)) { ID = StringSwitch<Intrinsic::ID>(Name)
.StartsWith("sha256sig0", Intrinsic::riscv_sha256sig0)
.StartsWith("sha256sig1", Intrinsic::riscv_sha256sig1)
.StartsWith("sha256sum0", Intrinsic::riscv_sha256sum0)
.StartsWith("sha256sum1", Intrinsic::riscv_sha256sum1)
.StartsWith("sm3p0", Intrinsic::riscv_sm3p0)
.StartsWith("sm3p1", Intrinsic::riscv_sm3p1)
.Default(Intrinsic::not_intrinsic);
if (ID != Intrinsic::not_intrinsic) {
if (F->getFunctionType()->getReturnType()->isIntegerTy(64)) {
rename(F); rename(F);
NewFn = Intrinsic::getDeclaration(F->getParent(), NewFn = Intrinsic::getDeclaration(F->getParent(), ID);
Intrinsic::riscv_sha256sum1);
return true; return true;
} }
if (Name.startswith("riscv.sm3p0") && break; // No other applicable upgrades.
F->getFunctionType()->getReturnType()->isIntegerTy(64)) {
rename(F);
NewFn = Intrinsic::getDeclaration(F->getParent(), Intrinsic::riscv_sm3p0);
return true;
} }
if (Name.startswith("riscv.sm3p1") && break; // No other 'riscv.*' intrinsics
F->getFunctionType()->getReturnType()->isIntegerTy(64)) {
rename(F);
NewFn = Intrinsic::getDeclaration(F->getParent(), Intrinsic::riscv_sm3p1);
return true;
} }
break; } break;
case 's': case 's':
if (Name == "stackprotectorcheck") { if (Name == "stackprotectorcheck") {
NewFn = nullptr; NewFn = nullptr;
return true; return true;
} }
break; break;
▲ Show 20 Lines • Show All 4,037 Lines • Show Last 20 Lines