This is an archive of the discontinued LLVM Phabricator instance.

Differential D21741

Add test for D21736 + D21737.
ClosedPublic

Authored by • koriakin on Jun 26 2016, 7:22 PM.

Details

Reviewers
betulb
vsk
Commits
rG069dd0659210: Add test for D21736.
rC287689: Add test for D21736.
rL287689: Add test for D21736.

Diff Detail

Repository
rL LLVM

Event Timeline

• koriakin updated this revision to Diff 61922.Jun 26 2016, 7:22 PM
• koriakin retitled this revision from to Add test for D21736 and D21737..
• koriakin updated this object.
• koriakin added reviewers: vsk, betulb.
• koriakin set the repository for this revision to rL LLVM.
• koriakin added parent revisions: D21737: [PATCH] [CodeGen] Insert TargetLibraryInfoWrapperPass before anything else., D21736: [InstrProfiling] Mark __llvm_profile_instrument_target last parameter as i32 zeroext or signext if appropriate..
• koriakin added a subscriber: cfe-commits.
vsk accepted this revision.Jun 27 2016, 8:22 AM
vsk edited edge metadata.

LGTM, with one nit.

test/Profile/cxx-indirect-call.cpp
3 ↗(On Diff #61922)

I don't really understand the significance of makeItaniumABITriple. Could you explain why this change is necessary? If it's not, please drop it.

This revision is now accepted and ready to land.Jun 27 2016, 8:22 AM
• koriakin added inline comments.Jun 27 2016, 8:49 AM
test/Profile/cxx-indirect-call.cpp
3 ↗(On Diff #61922)

%itanium_abi_tuple may give any target triple that's not win32 - which includes s390x and other platforms that need zeroext. Since this test assumes __llvm_profile_instrument_target has last parameter without zeroext, it'd break when run on s390x. Hardwiring the target to x86_64 ensures we'll never emit zeroext here.

vsk added a comment.Jun 27 2016, 9:02 AM

Is the plan to commit this along with D21737?

test/Profile/cxx-indirect-call.cpp
3 ↗(On Diff #61922)

Ok! Thanks for explaining.

• koriakin added a comment.Jun 27 2016, 9:36 AM
In D21741#467969, @vsk wrote:

Is the plan to commit this along with D21737?

Yes, and with D21736+D21739.

• koriakin retitled this revision from Add test for D21736 and D21737. to Add test for D21736..Jun 27 2016, 5:00 PM
• koriakin edited edge metadata.
• koriakin retitled this revision from Add test for D21736. to Add test for D21736 + D21737..Oct 23 2016, 12:08 PM
• koriakin mentioned this in D21737: [PATCH] [CodeGen] Insert TargetLibraryInfoWrapperPass before anything else..
Closed by commit rL287689: Add test for D21736. (authored by • koriakin). · Explain WhyNov 22 2016, 12:13 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
cfe/
trunk/
test/
Profile/
18 lines
2 lines

Diff 78918

cfe/trunk/test/Profile/c-indirect-call.c

// Check the value profiling instrinsics emitted by instrumentation. // Check the value profiling instrinsics emitted by instrumentation.
// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name c-indirect-call.c %s -o - -emit-llvm -fprofile-instrument=clang -mllvm -enable-value-profiling | FileCheck %s // RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name c-indirect-call.c %s -o - -emit-llvm -fprofile-instrument=clang -mllvm -enable-value-profiling | FileCheck --check-prefix=NOEXT %s
// RUN: %clang_cc1 -triple s390x-ibm-linux -main-file-name c-indirect-call.c %s -o - -emit-llvm -fprofile-instrument=clang -mllvm -enable-value-profiling | FileCheck --check-prefix=EXT %s
void (*foo)(void); void (*foo)(void);
int main(void) { int main(void) {
// CHECK: [[REG1:%[0-9]+]] = load void ()*, void ()** @foo, align 8 // NOEXT: [[REG1:%[0-9]+]] = load void ()*, void ()** @foo, align 8
// CHECK-NEXT: [[REG2:%[0-9]+]] = ptrtoint void ()* [[REG1]] to i64 // NOEXT-NEXT: [[REG2:%[0-9]+]] = ptrtoint void ()* [[REG1]] to i64
// CHECK-NEXT: call void @__llvm_profile_instrument_target(i64 [[REG2]], i8* bitcast ({{.*}}* @__profd_main to i8*), i32 0) // NOEXT-NEXT: call void @__llvm_profile_instrument_target(i64 [[REG2]], i8* bitcast ({{.*}}* @__profd_main to i8*), i32 0)
// CHECK-NEXT: call void [[REG1]]() // NOEXT-NEXT: call void [[REG1]]()
// EXT: [[REG1:%[0-9]+]] = load void ()*, void ()** @foo, align 8
// EXT-NEXT: [[REG2:%[0-9]+]] = ptrtoint void ()* [[REG1]] to i64
// EXT-NEXT: call void @__llvm_profile_instrument_target(i64 [[REG2]], i8* bitcast ({{.*}}* @__profd_main to i8*), i32 zeroext 0)
// EXT-NEXT: call void [[REG1]]()
foo(); foo();
return 0; return 0;
} }
// CHECK: declare void @__llvm_profile_instrument_target(i64, i8*, i32) // NOEXT: declare void @__llvm_profile_instrument_target(i64, i8*, i32)
// EXT: declare void @__llvm_profile_instrument_target(i64, i8*, i32 zeroext)

cfe/trunk/test/Profile/cxx-indirect-call.cpp

// Check the value profiling instrinsics emitted by instrumentation. // Check the value profiling instrinsics emitted by instrumentation.
// RUN: %clang_cc1 %s -o - -emit-llvm -fprofile-instrument=clang -mllvm -enable-value-profiling -fexceptions -fcxx-exceptions -triple %itanium_abi_triple | FileCheck %s // RUN: %clang_cc1 %s -o - -emit-llvm -fprofile-instrument=clang -mllvm -enable-value-profiling -fexceptions -fcxx-exceptions -triple x86_64-apple-macosx10.9 | FileCheck %s
void (*foo) (void); void (*foo) (void);
int main(int argc, const char *argv[]) { int main(int argc, const char *argv[]) {
// CHECK: [[REG1:%[0-9]+]] = load void ()*, void ()** @foo // CHECK: [[REG1:%[0-9]+]] = load void ()*, void ()** @foo
// CHECK-NEXT: [[REG2:%[0-9]+]] = ptrtoint void ()* [[REG1]] to i64 // CHECK-NEXT: [[REG2:%[0-9]+]] = ptrtoint void ()* [[REG1]] to i64
// CHECK-NEXT: call void @__llvm_profile_instrument_target(i64 [[REG2]], i8* bitcast ({{.*}}* @__profd_main to i8*), i32 0) // CHECK-NEXT: call void @__llvm_profile_instrument_target(i64 [[REG2]], i8* bitcast ({{.*}}* @__profd_main to i8*), i32 0)
// CHECK-NEXT: invoke void [[REG1]]() // CHECK-NEXT: invoke void [[REG1]]()
Show All 10 Lines