diff options
| -rw-r--r-- | llvm/include/llvm/ProfileData/InstrProfData.inc | 3 | ||||
| -rw-r--r-- | llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/llvm/include/llvm/ProfileData/InstrProfData.inc b/llvm/include/llvm/ProfileData/InstrProfData.inc index cc2638cc624..f7c22d10763 100644 --- a/llvm/include/llvm/ProfileData/InstrProfData.inc +++ b/llvm/include/llvm/ProfileData/InstrProfData.inc @@ -603,7 +603,8 @@ serializeValueProfDataFrom(ValueProfRecordClosure *Closure, #define VARIANT_MASKS_ALL 0xff00000000000000ULL #define GET_VERSION(V) ((V) & ~VARIANT_MASKS_ALL) #define VARIANT_MASK_IR_PROF (0x1ULL << 56) -#define IR_LEVEL_PROF_VERSION_VAR __llvm_profile_raw_version +#define INSTR_PROF_RAW_VERSION_VAR __llvm_profile_raw_version +#define INSTR_PROF_PROFILE_RUNTIME_VAR __llvm_profile_runtime /* The variable that holds the name of the profile data * specified via command line. */ diff --git a/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp b/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp index f54d8ad4814..f9ebde46e77 100644 --- a/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp +++ b/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp @@ -784,7 +784,7 @@ void PGOUseFunc::annotateIndirectCallSites() { } } // end anonymous namespace -// Create a COMDAT variable IR_LEVEL_PROF_VARNAME to make the runtime +// Create a COMDAT variable INSTR_PROF_RAW_VERSION_VAR to make the runtime // aware this is an ir_level profile so it can set the version flag. static void createIRLevelProfileFlagVariable(Module &M) { Type *IntTy64 = Type::getInt64Ty(M.getContext()); @@ -792,14 +792,14 @@ static void createIRLevelProfileFlagVariable(Module &M) { auto IRLevelVersionVariable = new GlobalVariable( M, IntTy64, true, GlobalVariable::ExternalLinkage, Constant::getIntegerValue(IntTy64, APInt(64, ProfileVersion)), - INSTR_PROF_QUOTE(IR_LEVEL_PROF_VERSION_VAR)); + INSTR_PROF_QUOTE(INSTR_PROF_RAW_VERSION_VAR)); IRLevelVersionVariable->setVisibility(GlobalValue::DefaultVisibility); Triple TT(M.getTargetTriple()); if (!TT.supportsCOMDAT()) IRLevelVersionVariable->setLinkage(GlobalValue::WeakAnyLinkage); else IRLevelVersionVariable->setComdat(M.getOrInsertComdat( - StringRef(INSTR_PROF_QUOTE(IR_LEVEL_PROF_VERSION_VAR)))); + StringRef(INSTR_PROF_QUOTE(INSTR_PROF_RAW_VERSION_VAR)))); } static bool InstrumentAllFunctions( |
