[llvm] Refactored llvm::UpgradeIntrinsicCall() function in lib/IR/AutoUpgrade.cpp with lookup table based on #30382 (PR #128611)
Ali Raeisdanaei via llvm-commits
llvm-commits at lists.llvm.org
Mon Feb 24 20:11:30 PST 2025
https://github.com/aliraeisdanaei updated https://github.com/llvm/llvm-project/pull/128611
>From c7477ed69b74dd1212697d9414b6de4846a1ea4d Mon Sep 17 00:00:00 2001
From: aliraeisdanaei <mrrookie2 at gmail.com>
Date: Mon, 24 Feb 2025 19:49:55 -0500
Subject: [PATCH 1/3] Refactored UpgradeIntrinsicCall based on #30382
---
llvm/lib/IR/AutoUpgrade.cpp | 80 ++++++++++++++++++++++---------------
1 file changed, 47 insertions(+), 33 deletions(-)
diff --git a/llvm/lib/IR/AutoUpgrade.cpp b/llvm/lib/IR/AutoUpgrade.cpp
index 57072715366c9..06db5c024fc8b 100644
--- a/llvm/lib/IR/AutoUpgrade.cpp
+++ b/llvm/lib/IR/AutoUpgrade.cpp
@@ -48,9 +48,13 @@
#include "llvm/TargetParser/Triple.h"
#include <cstring>
#include <numeric>
+#include <unordered_map>
using namespace llvm;
+// Type Alias for UpgradeFunctions
+typedef Value *(*UpgradeFunc)(StringRef, CallBase *, Function *, IRBuilder<> &);
+
static cl::opt<bool>
DisableAutoUpgradeDebugInfo("disable-auto-upgrade-debug-info",
cl::desc("Disable autoupgrade of debug info"));
@@ -4348,41 +4352,51 @@ void llvm::UpgradeIntrinsicCall(CallBase *CI, Function *NewFn) {
assert(Name.starts_with("llvm.") && "Intrinsic doesn't start with 'llvm.'");
Name = Name.substr(5);
- bool IsX86 = Name.consume_front("x86.");
- bool IsNVVM = Name.consume_front("nvvm.");
- bool IsAArch64 = Name.consume_front("aarch64.");
- bool IsARM = Name.consume_front("arm.");
- bool IsAMDGCN = Name.consume_front("amdgcn.");
- bool IsDbg = Name.consume_front("dbg.");
- Value *Rep = nullptr;
+ const std::string prefix_x86 = "x86.";
+ const std::string prefix_nvvm = "nvvm.";
+ const std::string prefix_aarch64 = "aarch64.";
+ const std::string prefix_arm = "arm.";
+ const std::string prefix_amdgcn = "amdgcn.";
+ const std::string prefix_dbg = "dbg.";
+
+ std::unordered_map<StringRef, UpgradeFunc> lookupTable;
+ lookupTable[prefix_x86] = upgradeX86IntrinsicCall;
+ lookupTable[prefix_nvvm] = upgradeNVVMIntrinsicCall;
+ lookupTable[prefix_aarch64] = upgradeAArch64IntrinsicCall;
+ lookupTable[prefix_arm] = upgradeARMIntrinsicCall;
+ lookupTable[prefix_amdgcn] = upgradeAMDGCNIntrinsicCall;
+ lookupTable[prefix_dbg] = upgradeIntrinsicFunction1;
- if (!IsX86 && Name == "stackprotectorcheck") {
- Rep = nullptr;
- } else if (IsNVVM) {
- Rep = upgradeNVVMIntrinsicCall(Name, CI, F, Builder);
- } else if (IsX86) {
- Rep = upgradeX86IntrinsicCall(Name, CI, F, Builder);
- } else if (IsAArch64) {
- Rep = upgradeAArch64IntrinsicCall(Name, CI, F, Builder);
- } else if (IsARM) {
- Rep = upgradeARMIntrinsicCall(Name, CI, F, Builder);
- } else if (IsAMDGCN) {
- Rep = upgradeAMDGCNIntrinsicCall(Name, CI, F, Builder);
- } else if (IsDbg) {
- // We might have decided we don't want the new format after all between
- // first requesting the upgrade and now; skip the conversion if that is
- // the case, and check here to see if the intrinsic needs to be upgraded
- // normally.
- if (!CI->getModule()->IsNewDbgInfoFormat) {
- bool NeedsUpgrade =
- upgradeIntrinsicFunction1(CI->getCalledFunction(), NewFn, false);
- if (!NeedsUpgrade)
- return;
- FallthroughToDefaultUpgrade = true;
- } else {
- upgradeDbgIntrinsicToDbgRecord(Name, CI);
+ Value *Rep = nullptr;
+ bool not_consumed = true;
+
+ for (auto &entry : lookupTable) {
+ if (Name.consume_front(entry.first)) {
+ not_consumed = false;
+ if (entry.first == prefix_x86 || Name != "stackprotectorcheck") {
+ if (entry.first == prefix_dbg) {
+ // We might have decided we don't want the new format after all between
+ // first requesting the upgrade and now; skip the conversion if that is
+ // the case, and check here to see if the intrinsic needs to be upgraded
+ // normally.
+ if (!CI->getModule()->IsNewDbgInfoFormat) {
+ bool NeedsUpgrade =
+ upgradeIntrinsicFunction1(CI->getCalledFunction(), NewFn, false);
+ if (!NeedsUpgrade)
+ return;
+ FallthroughToDefaultUpgrade = true;
+ } else {
+ upgradeDbgIntrinsicToDbgRecord(Name, CI);
+ }
+ } else {
+ Rep = entry.second(Name, CI, F, Builder);
+ }
+ }
+ break;
}
- } else {
+ }
+
+ if (not_consumed) {
llvm_unreachable("Unknown function for CallBase upgrade.");
}
>From 639cce4a304d2415c1ab9583d9e6c2bcf7c8edd4 Mon Sep 17 00:00:00 2001
From: aliraeisdanaei <mrrookie2 at gmail.com>
Date: Mon, 24 Feb 2025 20:06:12 -0500
Subject: [PATCH 2/3] Format file according to clang-format
---
llvm/lib/IR/AutoUpgrade.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/llvm/lib/IR/AutoUpgrade.cpp b/llvm/lib/IR/AutoUpgrade.cpp
index 06db5c024fc8b..0304f644c297b 100644
--- a/llvm/lib/IR/AutoUpgrade.cpp
+++ b/llvm/lib/IR/AutoUpgrade.cpp
@@ -4375,13 +4375,13 @@ void llvm::UpgradeIntrinsicCall(CallBase *CI, Function *NewFn) {
not_consumed = false;
if (entry.first == prefix_x86 || Name != "stackprotectorcheck") {
if (entry.first == prefix_dbg) {
- // We might have decided we don't want the new format after all between
- // first requesting the upgrade and now; skip the conversion if that is
- // the case, and check here to see if the intrinsic needs to be upgraded
- // normally.
+ // We might have decided we don't want the new format after all
+ // between first requesting the upgrade and now; skip the conversion
+ // if that is the case, and check here to see if the intrinsic needs
+ // to be upgraded normally.
if (!CI->getModule()->IsNewDbgInfoFormat) {
- bool NeedsUpgrade =
- upgradeIntrinsicFunction1(CI->getCalledFunction(), NewFn, false);
+ bool NeedsUpgrade = upgradeIntrinsicFunction1(
+ CI->getCalledFunction(), NewFn, false);
if (!NeedsUpgrade)
return;
FallthroughToDefaultUpgrade = true;
>From 4642d146d7a50e933e052bd332dd2b73d18326d6 Mon Sep 17 00:00:00 2001
From: aliraeisdanaei <mrrookie2 at gmail.com>
Date: Mon, 24 Feb 2025 23:10:53 -0500
Subject: [PATCH 3/3] use DenseMap instead of unordered_map
---
llvm/lib/IR/AutoUpgrade.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/llvm/lib/IR/AutoUpgrade.cpp b/llvm/lib/IR/AutoUpgrade.cpp
index 0304f644c297b..ddc8c40af8cad 100644
--- a/llvm/lib/IR/AutoUpgrade.cpp
+++ b/llvm/lib/IR/AutoUpgrade.cpp
@@ -13,6 +13,7 @@
//===----------------------------------------------------------------------===//
#include "llvm/IR/AutoUpgrade.h"
+#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/StringSwitch.h"
@@ -48,7 +49,6 @@
#include "llvm/TargetParser/Triple.h"
#include <cstring>
#include <numeric>
-#include <unordered_map>
using namespace llvm;
@@ -4359,7 +4359,7 @@ void llvm::UpgradeIntrinsicCall(CallBase *CI, Function *NewFn) {
const std::string prefix_amdgcn = "amdgcn.";
const std::string prefix_dbg = "dbg.";
- std::unordered_map<StringRef, UpgradeFunc> lookupTable;
+ DenseMap<StringRef, UpgradeFunc> lookupTable;
lookupTable[prefix_x86] = upgradeX86IntrinsicCall;
lookupTable[prefix_nvvm] = upgradeNVVMIntrinsicCall;
lookupTable[prefix_aarch64] = upgradeAArch64IntrinsicCall;
More information about the llvm-commits
mailing list