I see. In that case here are the two patches. I don't have commit
access, if they look ok can someone commit for me?
Commit log for both can be:
------
Update name of compiler-rt routine for setting filename under
-fprofile-instr-generate= option to
__llvm_profile_override_default_filename which is the correct profile
library routine.
Patch by Teresa Johnson.
------
Thanks,
Teresa
On Tue, May 12, 2015 at 1:55 PM, Eric Christopher <[email protected]> wrote:
> Should just commit quickly. No worries about a breakage of a few minutes.
>
>
> On Tue, May 12, 2015, 1:53 PM Teresa Johnson <[email protected]> wrote:
>>
>> Hi echristo, bogner,
>>
>> I apparently forgot to update the clang and llvm patches before
>> they were committed for me with the new name of the compiler-rt library
>> supporting -fprofile-instr-generate=, which was changed during the review
>> process. This wasn't caught by this test as it doesn't link and is
>> consistent
>> with the library call being inserted by llvm.
>>
>> I want to temporarily revert this test so that it doesn't break when I
>> make
>> the llvm change to call the correct library routine
>> (__llvm_profile_override_default_filename), then will send a patch to add
>> itx
>> back with the correct name.
>>
>> Tested via ninja clang-test
>>
>> http://reviews.llvm.org/D9717
>>
>> Files:
>> test/Profile/c-generate.c
>>
>> Index: test/Profile/c-generate.c
>> ===================================================================
>> --- test/Profile/c-generate.c
>> +++ /dev/null
>> @@ -1,10 +0,0 @@
>> -// Check that the -fprofile-instr-generate= form works.
>> -// RUN: %clang_cc1 -main-file-name c-generate.c %s -o - -emit-llvm
>> -fprofile-instr-generate=c-generate-test.profraw | FileCheck %s
>> -
>> -// CHECK: private constant [24 x i8] c"c-generate-test.profraw\00"
>> -// CHECK: call void @__llvm_profile_set_filename_env_override(i8*
>> getelementptr inbounds ([24 x i8], [24 x i8]* @0, i32 0, i32 0))
>> -// CHECK: declare void @__llvm_profile_set_filename_env_override(i8*)
>> -
>> -int main(void) {
>> - return 0;
>> -}
>>
>> EMAIL PREFERENCES
>> http://reviews.llvm.org/settings/panel/emailpreferences/
--
Teresa Johnson | Software Engineer | [email protected] | 408-460-2413
Index: lib/Transforms/Instrumentation/InstrProfiling.cpp
===================================================================
--- lib/Transforms/Instrumentation/InstrProfiling.cpp (revision 237165)
+++ lib/Transforms/Instrumentation/InstrProfiling.cpp (working copy)
@@ -354,7 +354,7 @@ void InstrProfiling::emitInitialization() {
auto *SetNameTy = FunctionType::get(VoidTy, Int8PtrTy, false);
auto *SetNameF =
Function::Create(SetNameTy, GlobalValue::ExternalLinkage,
- "__llvm_profile_set_filename_env_override", M);
+ "__llvm_profile_override_default_filename", M);
// Create variable for profile name
Constant *ProfileNameConst =
Index: test/Profile/c-generate.c
===================================================================
--- test/Profile/c-generate.c (revision 237165)
+++ test/Profile/c-generate.c (working copy)
@@ -2,8 +2,8 @@
// RUN: %clang_cc1 -main-file-name c-generate.c %s -o - -emit-llvm -fprofile-instr-generate=c-generate-test.profraw | FileCheck %s
// CHECK: private constant [24 x i8] c"c-generate-test.profraw\00"
-// CHECK: call void @__llvm_profile_set_filename_env_override(i8* getelementptr inbounds ([24 x i8], [24 x i8]* @0, i32 0, i32 0))
-// CHECK: declare void @__llvm_profile_set_filename_env_override(i8*)
+// CHECK: call void @__llvm_profile_override_default_filename(i8* getelementptr inbounds ([24 x i8], [24 x i8]* @0, i32 0, i32 0))
+// CHECK: declare void @__llvm_profile_override_default_filename(i8*)
int main(void) {
return 0;
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
