Skip to content

Commit edc83a1

Browse files
kazutakahiratakazutakahirata
committed
[mlgo] Use LLVM_HAVE_TFLITE instead of LLVM_HAVE_TF_API in C++ code (NFC)
We use LLVM_HAVE_TFLITE as the key to enable the mlgo work these days, and LLVM_HAVE_TF_API is defined whenever LLVM_HAVE_TF_API is defined. I'm posting this patch because it's purely mechanical. I'll post a follow-up patch to remove LLVM_HAVE_TF_API in non-C++ files, and that will not be as mechanical as this one. Differential Revision: https://reviews.llvm.org/D139863
1 parent 842b0d0 commit edc83a1

13 files changed

+38
-38
lines changed

‎llvm/include/llvm/Analysis/ModelUnderTrainingRunner.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "llvm/Analysis/TensorSpec.h"
1616
#include "llvm/Config/llvm-config.h"
1717

18-
#ifdef LLVM_HAVE_TF_API
18+
#ifdef LLVM_HAVE_TFLITE
1919
#include "llvm/Analysis/MLModelRunner.h"
2020
#include "llvm/Analysis/Utils/TFUtils.h"
2121
#include "llvm/IR/LLVMContext.h"
@@ -73,5 +73,5 @@ class ModelUnderTrainingRunner final : public MLModelRunner {
7373
};
7474

7575
} // namespace llvm
76-
#endif // define(LLVM_HAVE_TF_API)
76+
#endif // define(LLVM_HAVE_TFLITE)
7777
#endif // LLVM_ANALYSIS_MODELUNDERTRAININGRUNNER_H

‎llvm/include/llvm/Analysis/Utils/TFUtils.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include "llvm/Config/llvm-config.h"
1313

14-
#ifdef LLVM_HAVE_TF_API
14+
#ifdef LLVM_HAVE_TFLITE
1515
#include "llvm/ADT/StringMap.h"
1616
#include "llvm/Analysis/TensorSpec.h"
1717
#include "llvm/IR/LLVMContext.h"
@@ -106,5 +106,5 @@ class TFModelEvaluator final {
106106

107107
} // namespace llvm
108108

109-
#endif // LLVM_HAVE_TF_API
109+
#endif // LLVM_HAVE_TFLITE
110110
#endif // LLVM_ANALYSIS_UTILS_TFUTILS_H

‎llvm/include/llvm/Analysis/Utils/TrainingLogger.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include "llvm/Config/llvm-config.h"
1313

14-
#ifdef LLVM_HAVE_TF_API
14+
#ifdef LLVM_HAVE_TFLITE
1515
#include "llvm/ADT/StringMap.h"
1616
#include "llvm/Analysis/TensorSpec.h"
1717
#include "llvm/IR/LLVMContext.h"
@@ -99,5 +99,5 @@ class Logger final {
9999

100100
} // namespace llvm
101101

102-
#endif // LLVM_HAVE_TF_API
102+
#endif // LLVM_HAVE_TFLITE
103103
#endif // LLVM_ANALYSIS_UTILS_TRAININGLOGGER_H

‎llvm/lib/Analysis/DevelopmentModeInlineAdvisor.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//===----------------------------------------------------------------------===//
1313
#include "llvm/Analysis/TensorSpec.h"
1414
#include "llvm/Config/config.h"
15-
#if defined(LLVM_HAVE_TF_API)
15+
#if defined(LLVM_HAVE_TFLITE)
1616

1717
#include "llvm/ADT/BitVector.h"
1818
#include "llvm/Analysis/CallGraph.h"
@@ -432,4 +432,4 @@ std::unique_ptr<InlineAdvisor> llvm::getDevelopmentModeAdvisor(
432432
return std::make_unique<DevelopmentModeMLInlineAdvisor>(
433433
M, MAM, std::move(Runner), GetDefaultAdvice, std::move(Logger));
434434
}
435-
#endif // defined(LLVM_HAVE_TF_API)
435+
#endif // defined(LLVM_HAVE_TFLITE)

‎llvm/lib/Analysis/InlineAdvisor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ bool InlineAdvisorAnalysis::Result::tryCreate(
214214
}
215215
break;
216216
case InliningAdvisorMode::Development:
217-
#ifdef LLVM_HAVE_TF_API
217+
#ifdef LLVM_HAVE_TFLITE
218218
LLVM_DEBUG(dbgs() << "Using development-mode inliner policy.\n");
219219
Advisor =
220220
llvm::getDevelopmentModeAdvisor(M, MAM, [&FAM, Params](CallBase &CB) {

‎llvm/lib/Analysis/InlineSizeEstimatorAnalysis.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//===----------------------------------------------------------------------===//
1313
#include "llvm/Analysis/InlineSizeEstimatorAnalysis.h"
1414

15-
#ifdef LLVM_HAVE_TF_API
15+
#ifdef LLVM_HAVE_TFLITE
1616
#include "llvm/Analysis/Utils/TFUtils.h"
1717
#endif
1818
#include "llvm/IR/Function.h"
@@ -23,7 +23,7 @@ using namespace llvm;
2323

2424
AnalysisKey InlineSizeEstimatorAnalysis::Key;
2525

26-
#ifdef LLVM_HAVE_TF_API
26+
#ifdef LLVM_HAVE_TFLITE
2727
#include "llvm/Analysis/LoopInfo.h"
2828
#include "llvm/Analysis/TargetLibraryInfo.h"
2929
#include "llvm/Analysis/TargetTransformInfo.h"

‎llvm/lib/Analysis/ModelUnderTrainingRunner.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include "llvm/ADT/STLExtras.h"
1515
#include "llvm/Config/config.h"
16-
#if defined(LLVM_HAVE_TF_API)
16+
#if defined(LLVM_HAVE_TFLITE)
1717
#include "llvm/Analysis/ModelUnderTrainingRunner.h"
1818
#include "llvm/Support/MemoryBuffer.h"
1919
#include "llvm/Support/Path.h"
@@ -154,4 +154,4 @@ ModelUnderTrainingRunner::createAndEnsureValid(
154154
return nullptr;
155155
}
156156

157-
#endif // defined(LLVM_HAVE_TF_API)
157+
#endif // defined(LLVM_HAVE_TFLITE)

‎llvm/lib/Analysis/TFLiteUtils.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,4 +246,4 @@ TFModelEvaluator::EvaluationResult::getUntypedTensorValue(size_t Index) const {
246246
TFModelEvaluator::EvaluationResult::~EvaluationResult() {}
247247
TFModelEvaluator::~TFModelEvaluator() {}
248248

249-
#endif // defined(LLVM_HAVE_TF_API)
249+
#endif // defined(LLVM_HAVE_TFLITE)

‎llvm/lib/Analysis/TrainingLogger.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//===----------------------------------------------------------------------===//
1313
#include "llvm/Analysis/TensorSpec.h"
1414
#include "llvm/Config/config.h"
15-
#if defined(LLVM_HAVE_TF_API)
15+
#if defined(LLVM_HAVE_TFLITE)
1616

1717
#include "llvm/ADT/Twine.h"
1818
#include "llvm/Analysis/Utils/TrainingLogger.h"
@@ -425,4 +425,4 @@ void Logger::flushLogs(raw_ostream &OS,
425425
OS << OutStr;
426426
}
427427
}
428-
#endif // defined(LLVM_HAVE_TF_API)
428+
#endif // defined(LLVM_HAVE_TFLITE)

‎llvm/lib/CodeGen/MLRegallocEvictAdvisor.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "RegAllocGreedy.h"
1616
#include "llvm/Analysis/MLModelRunner.h"
1717
#include "llvm/Analysis/TensorSpec.h"
18-
#if defined(LLVM_HAVE_TF_AOT_REGALLOCEVICTMODEL) || defined(LLVM_HAVE_TF_API)
18+
#if defined(LLVM_HAVE_TF_AOT_REGALLOCEVICTMODEL) || defined(LLVM_HAVE_TFLITE)
1919
#include "llvm/Analysis/ModelUnderTrainingRunner.h"
2020
#include "llvm/Analysis/NoInferenceModelRunner.h"
2121
#include "llvm/Analysis/Utils/TrainingLogger.h"
@@ -53,7 +53,7 @@ using CompiledModelType = NoopSavedModelImpl;
5353
#endif
5454

5555
// Options that only make sense in development mode
56-
#ifdef LLVM_HAVE_TF_API
56+
#ifdef LLVM_HAVE_TFLITE
5757
#include "RegAllocScore.h"
5858
#include "llvm/Analysis/Utils/TFUtils.h"
5959

@@ -72,7 +72,7 @@ static cl::opt<bool> EnableDevelopmentFeatures(
7272

7373
#else
7474
static const bool EnableDevelopmentFeatures = false;
75-
#endif // #ifdef LLVM_HAVE_TF_API
75+
#endif // #ifdef LLVM_HAVE_TFLITE
7676

7777
extern cl::opt<unsigned> EvictInterferenceCutoff;
7878

@@ -191,7 +191,7 @@ static const std::vector<int64_t> PerLiveRangeShape{1, NumberOfInterferences};
191191
"lowest stage of an interval in this LR") \
192192
M(float, progress, {1}, "ratio of current queue size to initial size")
193193

194-
#ifdef LLVM_HAVE_TF_API
194+
#ifdef LLVM_HAVE_TFLITE
195195
#define RA_EVICT_FIRST_DEVELOPMENT_FEATURE(M) \
196196
M(int64_t, instructions, InstructionsShape, \
197197
"Opcodes of the instructions covered by the eviction problem")
@@ -219,11 +219,11 @@ enum FeatureIDs {
219219
#define _FEATURE_IDX_SIMPLE(_, name, __, ___) name
220220
#define _FEATURE_IDX(A, B, C, D) _FEATURE_IDX_SIMPLE(A, B, C, D),
221221
RA_EVICT_FEATURES_LIST(_FEATURE_IDX) FeatureCount,
222-
#ifdef LLVM_HAVE_TF_API
222+
#ifdef LLVM_HAVE_TFLITE
223223
RA_EVICT_FIRST_DEVELOPMENT_FEATURE(_FEATURE_IDX_SIMPLE) = FeatureCount,
224224
#else
225225
RA_EVICT_FIRST_DEVELOPMENT_FEATURE(_FEATURE_IDX)
226-
#endif // #ifdef LLVM_HAVE_TF_API
226+
#endif // #ifdef LLVM_HAVE_TFLITE
227227
RA_EVICT_REST_DEVELOPMENT_FEATURES(_FEATURE_IDX) FeaturesWithDevelopmentCount
228228
#undef _FEATURE_IDX
229229
#undef _FEATURE_IDX_SIMPLE
@@ -397,7 +397,7 @@ class ReleaseModeEvictionAdvisorAnalysis final
397397
// ===================================
398398
//
399399
// Features we log
400-
#ifdef LLVM_HAVE_TF_API
400+
#ifdef LLVM_HAVE_TFLITE
401401
static const TensorSpec Output =
402402
TensorSpec::createSpec<int64_t>(DecisionName, {1});
403403
static const TensorSpec Reward = TensorSpec::createSpec<float>("reward", {1});
@@ -539,7 +539,7 @@ class DevelopmentModeEvictionAdvisorAnalysis final
539539
StringMap<std::unique_ptr<Logger>> LogMap;
540540
};
541541

542-
#endif //#ifdef LLVM_HAVE_TF_API
542+
#endif //#ifdef LLVM_HAVE_TFLITE
543543
} // namespace
544544

545545
float MLEvictAdvisor::getInitialQueueSize(const MachineFunction &MF) {
@@ -718,7 +718,7 @@ MCRegister MLEvictAdvisor::tryFindEvictionCandidate(
718718
/*NrUrgent*/ 0.0, LRPosInfo);
719719
assert(InitialQSize > 0.0 && "We couldn't have gotten here if we had "
720720
"nothing to allocate initially.");
721-
#ifdef LLVM_HAVE_TF_API
721+
#ifdef LLVM_HAVE_TFLITE
722722
if (EnableDevelopmentFeatures) {
723723
extractInstructionFeatures(
724724
LRPosInfo, Runner,
@@ -745,7 +745,7 @@ MCRegister MLEvictAdvisor::tryFindEvictionCandidate(
745745
FeatureIDs::mbb_frequencies, FeatureIDs::mbb_mapping,
746746
LIS->getSlotIndexes()->getLastIndex());
747747
}
748-
#endif // #ifdef LLVM_HAVE_TF_API
748+
#endif // #ifdef LLVM_HAVE_TFLITE
749749
// Normalize the features.
750750
for (auto &V : Largest)
751751
V = V ? V : 1.0;
@@ -1062,7 +1062,7 @@ void extractMBBFrequency(const SlotIndex CurrentIndex,
10621062
}
10631063

10641064
// Development mode-specific implementations
1065-
#ifdef LLVM_HAVE_TF_API
1065+
#ifdef LLVM_HAVE_TFLITE
10661066

10671067
RegAllocEvictionAdvisorAnalysis *llvm::createDevelopmentModeAdvisor() {
10681068
return new DevelopmentModeEvictionAdvisorAnalysis();
@@ -1128,13 +1128,13 @@ bool RegAllocScoring::runOnMachineFunction(MachineFunction &MF) {
11281128
GetReward);
11291129
return false;
11301130
}
1131-
#endif // #ifdef LLVM_HAVE_TF_API
1131+
#endif // #ifdef LLVM_HAVE_TFLITE
11321132

11331133
RegAllocEvictionAdvisorAnalysis *llvm::createReleaseModeAdvisor() {
11341134
return new ReleaseModeEvictionAdvisorAnalysis();
11351135
}
11361136

11371137
// In all cases except development mode, we don't need scoring.
1138-
#if !defined(LLVM_HAVE_TF_API)
1138+
#if !defined(LLVM_HAVE_TFLITE)
11391139
bool RegAllocScoring::runOnMachineFunction(MachineFunction &) { return false; }
11401140
#endif

0 commit comments

Comments
 (0)