Made InlineDecisionSpec and DefaultDecisionSpec singleton to avoid static init fiasco
#168178
+14
−8
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
November 15, 2025 16:08
static init fiasco Changes to be committed: modified: llvm/include/llvm/Analysis/InlineModelFeatureMaps.h modified: llvm/lib/Analysis/MLInlineAdvisor.cpp
Changes to be committed: modified: llvm/lib/Analysis/MLInlineAdvisor.cpp
llvmbot
added
mlgo
llvm:analysis
Member
|
@llvm/pr-subscribers-llvm-analysis Author: dalmurii (Dalmurii) ChangesFull diff: https://github.com/llvm/llvm-project/pull/168178.diff 2 Files Affected:
diff --git a/llvm/include/llvm/Analysis/InlineModelFeatureMaps.h b/llvm/include/llvm/Analysis/InlineModelFeatureMaps.h
index e559171b9c257..10b251b130703 100644
--- a/llvm/include/llvm/Analysis/InlineModelFeatureMaps.h
+++ b/llvm/include/llvm/Analysis/InlineModelFeatureMaps.h
@@ -161,9 +161,9 @@ inlineCostFeatureToMlFeature(InlineCostFeatureIndex Feature) {
}
LLVM_ABI extern const char *const DecisionName;
-LLVM_ABI extern const TensorSpec InlineDecisionSpec;
+LLVM_ABI const TensorSpec &getInlineDecisionSpec();
LLVM_ABI extern const char *const DefaultDecisionName;
-LLVM_ABI extern const TensorSpec DefaultDecisionSpec;
+LLVM_ABI extern const TensorSpec &getDefaultDecisionSpec();
LLVM_ABI extern const char *const RewardName;
using InlineFeatures = std::vector<int64_t>;
diff --git a/llvm/lib/Analysis/MLInlineAdvisor.cpp b/llvm/lib/Analysis/MLInlineAdvisor.cpp
index 9a5ae2ae26799..a4449e7bff8ab 100644
--- a/llvm/lib/Analysis/MLInlineAdvisor.cpp
+++ b/llvm/lib/Analysis/MLInlineAdvisor.cpp
@@ -87,7 +87,7 @@ llvm::getReleaseModeAdvisor(Module &M, ModuleAnalysisManager &MAM,
EmbeddedModelRunnerOptions().setModelSelector(ModelSelector));
else {
AOTRunner = std::make_unique<InteractiveModelRunner>(
- M.getContext(), InputFeatures, InlineDecisionSpec,
+ M.getContext(), InputFeatures, getInlineDecisionSpec(),
InteractiveChannelBaseName + ".out",
InteractiveChannelBaseName + ".in");
}
@@ -127,11 +127,17 @@ static std::vector<TensorSpec> FeatureMap{
}
const char *const llvm::DecisionName = "inlining_decision";
-const TensorSpec llvm::InlineDecisionSpec =
- TensorSpec::createSpec<int64_t>(DecisionName, {1});
+const TensorSpec &llvm::getInlineDecisionSpec() {
+ static const TensorSpec T =
+ TensorSpec::createSpec<int64_t>(DecisionName, {1});
+ return T;
+}
const char *const llvm::DefaultDecisionName = "inlining_default";
-const TensorSpec llvm::DefaultDecisionSpec =
- TensorSpec::createSpec<int64_t>(DefaultDecisionName, {1});
+const TensorSpec &llvm::getDefaultDecisionSpec() {
+ static const TensorSpec T =
+ TensorSpec::createSpec<int64_t>(DefaultDecisionName, {1});
+ return T;
+}
const char *const llvm::RewardName = "delta_size";
CallBase *getInlinableCS(Instruction &I) {
@@ -209,7 +215,7 @@ MLInlineAdvisor::MLInlineAdvisor(
TensorSpec::createSpec<float>("caller_embedding", {IR2VecDim}));
}
if (InteractiveIncludeDefault)
- FeatureMap.push_back(DefaultDecisionSpec);
+ FeatureMap.push_back(getDefaultDecisionSpec());
ModelRunner = GetModelRunner(getFeatureMap());
if (!ModelRunner) {
|
Member
|
@llvm/pr-subscribers-mlgo Author: dalmurii (Dalmurii) ChangesFull diff: https://github.com/llvm/llvm-project/pull/168178.diff 2 Files Affected:
diff --git a/llvm/include/llvm/Analysis/InlineModelFeatureMaps.h b/llvm/include/llvm/Analysis/InlineModelFeatureMaps.h
index e559171b9c257..10b251b130703 100644
--- a/llvm/include/llvm/Analysis/InlineModelFeatureMaps.h
+++ b/llvm/include/llvm/Analysis/InlineModelFeatureMaps.h
@@ -161,9 +161,9 @@ inlineCostFeatureToMlFeature(InlineCostFeatureIndex Feature) {
}
LLVM_ABI extern const char *const DecisionName;
-LLVM_ABI extern const TensorSpec InlineDecisionSpec;
+LLVM_ABI const TensorSpec &getInlineDecisionSpec();
LLVM_ABI extern const char *const DefaultDecisionName;
-LLVM_ABI extern const TensorSpec DefaultDecisionSpec;
+LLVM_ABI extern const TensorSpec &getDefaultDecisionSpec();
LLVM_ABI extern const char *const RewardName;
using InlineFeatures = std::vector<int64_t>;
diff --git a/llvm/lib/Analysis/MLInlineAdvisor.cpp b/llvm/lib/Analysis/MLInlineAdvisor.cpp
index 9a5ae2ae26799..a4449e7bff8ab 100644
--- a/llvm/lib/Analysis/MLInlineAdvisor.cpp
+++ b/llvm/lib/Analysis/MLInlineAdvisor.cpp
@@ -87,7 +87,7 @@ llvm::getReleaseModeAdvisor(Module &M, ModuleAnalysisManager &MAM,
EmbeddedModelRunnerOptions().setModelSelector(ModelSelector));
else {
AOTRunner = std::make_unique<InteractiveModelRunner>(
- M.getContext(), InputFeatures, InlineDecisionSpec,
+ M.getContext(), InputFeatures, getInlineDecisionSpec(),
InteractiveChannelBaseName + ".out",
InteractiveChannelBaseName + ".in");
}
@@ -127,11 +127,17 @@ static std::vector<TensorSpec> FeatureMap{
}
const char *const llvm::DecisionName = "inlining_decision";
-const TensorSpec llvm::InlineDecisionSpec =
- TensorSpec::createSpec<int64_t>(DecisionName, {1});
+const TensorSpec &llvm::getInlineDecisionSpec() {
+ static const TensorSpec T =
+ TensorSpec::createSpec<int64_t>(DecisionName, {1});
+ return T;
+}
const char *const llvm::DefaultDecisionName = "inlining_default";
-const TensorSpec llvm::DefaultDecisionSpec =
- TensorSpec::createSpec<int64_t>(DefaultDecisionName, {1});
+const TensorSpec &llvm::getDefaultDecisionSpec() {
+ static const TensorSpec T =
+ TensorSpec::createSpec<int64_t>(DefaultDecisionName, {1});
+ return T;
+}
const char *const llvm::RewardName = "delta_size";
CallBase *getInlinableCS(Instruction &I) {
@@ -209,7 +215,7 @@ MLInlineAdvisor::MLInlineAdvisor(
TensorSpec::createSpec<float>("caller_embedding", {IR2VecDim}));
}
if (InteractiveIncludeDefault)
- FeatureMap.push_back(DefaultDecisionSpec);
+ FeatureMap.push_back(getDefaultDecisionSpec());
ModelRunner = GetModelRunner(getFeatureMap());
if (!ModelRunner) {
|
mtrofin
approved these changes
Nov 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.