r206509 - test: Use llvm-profdata merge in Profile tests
Justin Bogner
mail at justinbogner.com
Thu Apr 17 15:49:06 PDT 2014
Author: bogner
Date: Thu Apr 17 17:49:06 2014
New Revision: 206509
URL: http://llvm.org/viewvc/llvm-project?rev=206509&view=rev
Log:
test: Use llvm-profdata merge in Profile tests
In preparation for using a binary format for instrumentation based
profiling, explicitly treat the test inputs as text and transform them
before running. This will allow us to leave the checked in files in
human readable format once the instrumentation format is binary.
No functional change.
Added:
cfe/trunk/test/Profile/Inputs/c-attributes.proftext
- copied, changed from r206504, cfe/trunk/test/Profile/Inputs/c-attributes.profdata
cfe/trunk/test/Profile/Inputs/c-captured.proftext
- copied, changed from r206504, cfe/trunk/test/Profile/Inputs/c-captured.profdata
cfe/trunk/test/Profile/Inputs/c-counter-overflows.proftext
- copied, changed from r206504, cfe/trunk/test/Profile/Inputs/c-counter-overflows.profdata
cfe/trunk/test/Profile/Inputs/c-general.proftext
- copied, changed from r206504, cfe/trunk/test/Profile/Inputs/c-general.profdata
cfe/trunk/test/Profile/Inputs/c-outdated-data.proftext
- copied, changed from r206504, cfe/trunk/test/Profile/Inputs/c-outdated-data.profdata
cfe/trunk/test/Profile/Inputs/c-unprofiled-blocks.proftext
- copied, changed from r206504, cfe/trunk/test/Profile/Inputs/c-unprofiled-blocks.profdata
cfe/trunk/test/Profile/Inputs/cxx-class.proftext
- copied, changed from r206504, cfe/trunk/test/Profile/Inputs/cxx-class.profdata
cfe/trunk/test/Profile/Inputs/cxx-lambda.proftext
- copied, changed from r206504, cfe/trunk/test/Profile/Inputs/cxx-lambda.profdata
cfe/trunk/test/Profile/Inputs/cxx-templates.proftext
- copied, changed from r206504, cfe/trunk/test/Profile/Inputs/cxx-templates.profdata
cfe/trunk/test/Profile/Inputs/cxx-throws.proftext
- copied, changed from r206504, cfe/trunk/test/Profile/Inputs/cxx-throws.profdata
cfe/trunk/test/Profile/Inputs/objc-general.proftext
- copied, changed from r206504, cfe/trunk/test/Profile/Inputs/objc-general.profdata
Removed:
cfe/trunk/test/Profile/Inputs/c-attributes.profdata
cfe/trunk/test/Profile/Inputs/c-captured.profdata
cfe/trunk/test/Profile/Inputs/c-counter-overflows.profdata
cfe/trunk/test/Profile/Inputs/c-general.profdata
cfe/trunk/test/Profile/Inputs/c-outdated-data.profdata
cfe/trunk/test/Profile/Inputs/c-unprofiled-blocks.profdata
cfe/trunk/test/Profile/Inputs/cxx-class.profdata
cfe/trunk/test/Profile/Inputs/cxx-lambda.profdata
cfe/trunk/test/Profile/Inputs/cxx-templates.profdata
cfe/trunk/test/Profile/Inputs/cxx-throws.profdata
cfe/trunk/test/Profile/Inputs/objc-general.profdata
Modified:
cfe/trunk/test/CMakeLists.txt
cfe/trunk/test/Profile/c-attributes.c
cfe/trunk/test/Profile/c-captured.c
cfe/trunk/test/Profile/c-counter-overflows.c
cfe/trunk/test/Profile/c-general.c
cfe/trunk/test/Profile/c-outdated-data.c
cfe/trunk/test/Profile/c-unprofiled-blocks.c
cfe/trunk/test/Profile/cxx-class.cpp
cfe/trunk/test/Profile/cxx-lambda.cpp
cfe/trunk/test/Profile/cxx-templates.cpp
cfe/trunk/test/Profile/cxx-throws.cpp
cfe/trunk/test/Profile/objc-general.m
Modified: cfe/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CMakeLists.txt?rev=206509&r1=206508&r2=206509&view=diff
==============================================================================
--- cfe/trunk/test/CMakeLists.txt (original)
+++ cfe/trunk/test/CMakeLists.txt Thu Apr 17 17:49:06 2014
@@ -39,7 +39,7 @@ set(CLANG_TEST_PARAMS
if( NOT CLANG_BUILT_STANDALONE )
list(APPEND CLANG_TEST_DEPS
llvm-config
- llc opt FileCheck count not llvm-symbolizer
+ llc opt FileCheck count not llvm-symbolizer llvm-profdata
)
endif()
Removed: cfe/trunk/test/Profile/Inputs/c-attributes.profdata
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/c-attributes.profdata?rev=206508&view=auto
==============================================================================
--- cfe/trunk/test/Profile/Inputs/c-attributes.profdata (original)
+++ cfe/trunk/test/Profile/Inputs/c-attributes.profdata (removed)
@@ -1,34 +0,0 @@
-hot_100_percent
-2
-2
-100000
-4999950000
-
-hot_40_percent
-2
-2
-40000
-799980000
-
-normal_func
-2
-2
-20000
-199990000
-
-cold_func
-2
-2
-500
-124750
-
-main
-219169028
-6
-1
-0
-100000
-40000
-20000
-500
-
Copied: cfe/trunk/test/Profile/Inputs/c-attributes.proftext (from r206504, cfe/trunk/test/Profile/Inputs/c-attributes.profdata)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/c-attributes.proftext?p2=cfe/trunk/test/Profile/Inputs/c-attributes.proftext&p1=cfe/trunk/test/Profile/Inputs/c-attributes.profdata&r1=206504&r2=206509&rev=206509&view=diff
==============================================================================
(empty)
Removed: cfe/trunk/test/Profile/Inputs/c-captured.profdata
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/c-captured.profdata?rev=206508&view=auto
==============================================================================
--- cfe/trunk/test/Profile/Inputs/c-captured.profdata (original)
+++ cfe/trunk/test/Profile/Inputs/c-captured.profdata (removed)
@@ -1,25 +0,0 @@
-c-captured.c:__captured_stmt
-10
-2
-1
-1
-
-c-captured.c:__captured_stmt1
-266
-3
-1
-10
-1
-
-main
-0
-1
-1
-
-debug_captured
-650
-3
-1
-1
-1
-
Copied: cfe/trunk/test/Profile/Inputs/c-captured.proftext (from r206504, cfe/trunk/test/Profile/Inputs/c-captured.profdata)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/c-captured.proftext?p2=cfe/trunk/test/Profile/Inputs/c-captured.proftext&p1=cfe/trunk/test/Profile/Inputs/c-captured.profdata&r1=206504&r2=206509&rev=206509&view=diff
==============================================================================
(empty)
Removed: cfe/trunk/test/Profile/Inputs/c-counter-overflows.profdata
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/c-counter-overflows.profdata?rev=206508&view=auto
==============================================================================
--- cfe/trunk/test/Profile/Inputs/c-counter-overflows.profdata (original)
+++ cfe/trunk/test/Profile/Inputs/c-counter-overflows.profdata (removed)
@@ -1,12 +0,0 @@
-main
-285734896137
-8
-1
-68719476720
-64424509425
-68719476720
-21474836475
-21474836475
-21474836475
-4294967295
-
Copied: cfe/trunk/test/Profile/Inputs/c-counter-overflows.proftext (from r206504, cfe/trunk/test/Profile/Inputs/c-counter-overflows.profdata)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/c-counter-overflows.proftext?p2=cfe/trunk/test/Profile/Inputs/c-counter-overflows.proftext&p1=cfe/trunk/test/Profile/Inputs/c-counter-overflows.profdata&r1=206504&r2=206509&rev=206509&view=diff
==============================================================================
(empty)
Removed: cfe/trunk/test/Profile/Inputs/c-general.profdata
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/c-general.profdata?rev=206508&view=auto
==============================================================================
--- cfe/trunk/test/Profile/Inputs/c-general.profdata (original)
+++ cfe/trunk/test/Profile/Inputs/c-general.profdata (removed)
@@ -1,157 +0,0 @@
-simple_loops
-16515
-4
-1
-100
-100
-75
-
-conditionals
-74917022372782735
-11
-1
-100
-50
-50
-33
-33
-16
-99
-100
-99
-100
-
-early_exits
-44128811889290
-9
-1
-0
-51
-1
-25
-1
-25
-1
-0
-
-jumps
-2016037664281362839
-22
-1
-1
-0
-1
-0
-0
-1
-0
-1
-2
-3
-2
-0
-3
-0
-1
-1
-1
-10
-0
-10
-9
-
-switches
-2745195701975551402
-19
-1
-1
-1
-15
-7
-1
-0
-2
-2
-3
-3
-4
-4
-0
-4
-4
-5
-1
-0
-
-big_switch
-10218718452081869619
-17
-1
-32
-32
-1
-0
-1
-1
-11
-11
-1
-1
-15
-15
-1
-1
-2
-2
-
-boolean_operators
-291222909838
-8
-1
-100
-34
-66
-17
-34
-33
-50
-
-boolop_loops
-9760565944591
-9
-1
-50
-51
-50
-26
-50
-51
-50
-26
-
-conditional_operator
-848
-3
-1
-0
-1
-
-do_fallthrough
-16586
-4
-1
-10
-2
-8
-
-main
-0
-1
-1
-
-c-general.c:static_func
-4
-2
-1
-10
-
Copied: cfe/trunk/test/Profile/Inputs/c-general.proftext (from r206504, cfe/trunk/test/Profile/Inputs/c-general.profdata)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/c-general.proftext?p2=cfe/trunk/test/Profile/Inputs/c-general.proftext&p1=cfe/trunk/test/Profile/Inputs/c-general.profdata&r1=206504&r2=206509&rev=206509&view=diff
==============================================================================
(empty)
Removed: cfe/trunk/test/Profile/Inputs/c-outdated-data.profdata
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/c-outdated-data.profdata?rev=206508&view=auto
==============================================================================
--- cfe/trunk/test/Profile/Inputs/c-outdated-data.profdata (original)
+++ cfe/trunk/test/Profile/Inputs/c-outdated-data.profdata (removed)
@@ -1,12 +0,0 @@
-no_usable_data
-650
-3
-1
-0
-0
-
-main
-0
-1
-1
-
Copied: cfe/trunk/test/Profile/Inputs/c-outdated-data.proftext (from r206504, cfe/trunk/test/Profile/Inputs/c-outdated-data.profdata)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/c-outdated-data.proftext?p2=cfe/trunk/test/Profile/Inputs/c-outdated-data.proftext&p1=cfe/trunk/test/Profile/Inputs/c-outdated-data.profdata&r1=206504&r2=206509&rev=206509&view=diff
==============================================================================
(empty)
Removed: cfe/trunk/test/Profile/Inputs/c-unprofiled-blocks.profdata
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/c-unprofiled-blocks.profdata?rev=206508&view=auto
==============================================================================
--- cfe/trunk/test/Profile/Inputs/c-unprofiled-blocks.profdata (original)
+++ cfe/trunk/test/Profile/Inputs/c-unprofiled-blocks.profdata (removed)
@@ -1,32 +0,0 @@
-never_called
-44257542701577
-9
-0
-0
-0
-0
-0
-0
-0
-0
-0
-
-main
-1
-1
-1
-
-dead_code
-2859007309808137
-10
-1
-0
-0
-0
-0
-0
-0
-0
-0
-0
-
Copied: cfe/trunk/test/Profile/Inputs/c-unprofiled-blocks.proftext (from r206504, cfe/trunk/test/Profile/Inputs/c-unprofiled-blocks.profdata)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/c-unprofiled-blocks.proftext?p2=cfe/trunk/test/Profile/Inputs/c-unprofiled-blocks.proftext&p1=cfe/trunk/test/Profile/Inputs/c-unprofiled-blocks.profdata&r1=206504&r2=206509&rev=206509&view=diff
==============================================================================
(empty)
Removed: cfe/trunk/test/Profile/Inputs/cxx-class.profdata
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/cxx-class.profdata?rev=206508&view=auto
==============================================================================
--- cfe/trunk/test/Profile/Inputs/cxx-class.profdata (original)
+++ cfe/trunk/test/Profile/Inputs/cxx-class.profdata (removed)
@@ -1,41 +0,0 @@
-_Z14simple_wrapperv
-4
-2
-1
-100
-
-main
-0
-1
-1
-
-_ZN6SimpleD1Ev
-10
-2
-0
-0
-
-_ZN6SimpleD2Ev
-10
-2
-100
-99
-
-_ZN6Simple6methodEv
-10
-2
-100
-99
-
-_ZN6SimpleC1Ei
-10
-2
-0
-0
-
-_ZN6SimpleC2Ei
-10
-2
-100
-99
-
Copied: cfe/trunk/test/Profile/Inputs/cxx-class.proftext (from r206504, cfe/trunk/test/Profile/Inputs/cxx-class.profdata)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/cxx-class.proftext?p2=cfe/trunk/test/Profile/Inputs/cxx-class.proftext&p1=cfe/trunk/test/Profile/Inputs/cxx-class.profdata&r1=206504&r2=206509&rev=206509&view=diff
==============================================================================
(empty)
Removed: cfe/trunk/test/Profile/Inputs/cxx-lambda.profdata
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/cxx-lambda.profdata?rev=206508&view=auto
==============================================================================
--- cfe/trunk/test/Profile/Inputs/cxx-lambda.profdata (original)
+++ cfe/trunk/test/Profile/Inputs/cxx-lambda.profdata (removed)
@@ -1,20 +0,0 @@
-cxx-lambda.cpp:_ZZ7lambdasvENK3$_0clEi
-654
-3
-10
-9
-9
-
-main
-0
-1
-1
-
-_Z7lambdasv
-41226
-4
-1
-1
-10
-1
-
Copied: cfe/trunk/test/Profile/Inputs/cxx-lambda.proftext (from r206504, cfe/trunk/test/Profile/Inputs/cxx-lambda.profdata)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/cxx-lambda.proftext?p2=cfe/trunk/test/Profile/Inputs/cxx-lambda.proftext&p1=cfe/trunk/test/Profile/Inputs/cxx-lambda.profdata&r1=206504&r2=206509&rev=206509&view=diff
==============================================================================
(empty)
Removed: cfe/trunk/test/Profile/Inputs/cxx-templates.profdata
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/cxx-templates.profdata?rev=206508&view=auto
==============================================================================
--- cfe/trunk/test/Profile/Inputs/cxx-templates.profdata (original)
+++ cfe/trunk/test/Profile/Inputs/cxx-templates.profdata (removed)
@@ -1,17 +0,0 @@
-main
-0
-1
-1
-
-_Z4loopILj0EEvv
-4
-2
-1
-0
-
-_Z4loopILj100EEvv
-4
-2
-1
-100
-
Copied: cfe/trunk/test/Profile/Inputs/cxx-templates.proftext (from r206504, cfe/trunk/test/Profile/Inputs/cxx-templates.profdata)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/cxx-templates.proftext?p2=cfe/trunk/test/Profile/Inputs/cxx-templates.proftext&p1=cfe/trunk/test/Profile/Inputs/cxx-templates.profdata&r1=206504&r2=206509&rev=206509&view=diff
==============================================================================
(empty)
Removed: cfe/trunk/test/Profile/Inputs/cxx-throws.profdata
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/cxx-throws.profdata?rev=206508&view=auto
==============================================================================
--- cfe/trunk/test/Profile/Inputs/cxx-throws.profdata (original)
+++ cfe/trunk/test/Profile/Inputs/cxx-throws.profdata (removed)
@@ -1,18 +0,0 @@
-_Z6throwsv
-18359008150154
-9
-1
-100
-100
-66
-33
-17
-50
-33
-100
-
-main
-0
-1
-1
-
Copied: cfe/trunk/test/Profile/Inputs/cxx-throws.proftext (from r206504, cfe/trunk/test/Profile/Inputs/cxx-throws.profdata)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/cxx-throws.proftext?p2=cfe/trunk/test/Profile/Inputs/cxx-throws.proftext&p1=cfe/trunk/test/Profile/Inputs/cxx-throws.profdata&r1=206504&r2=206509&rev=206509&view=diff
==============================================================================
(empty)
Removed: cfe/trunk/test/Profile/Inputs/objc-general.profdata
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/objc-general.profdata?rev=206508&view=auto
==============================================================================
--- cfe/trunk/test/Profile/Inputs/objc-general.profdata (original)
+++ cfe/trunk/test/Profile/Inputs/objc-general.profdata (removed)
@@ -1,17 +0,0 @@
-objc-general.m:__13+[A foreach:]_block_invoke
-10
-2
-2
-1
-
-objc-general.m:+[A foreach:]
-6
-2
-1
-2
-
-main
-0
-1
-1
-
Copied: cfe/trunk/test/Profile/Inputs/objc-general.proftext (from r206504, cfe/trunk/test/Profile/Inputs/objc-general.profdata)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/Inputs/objc-general.proftext?p2=cfe/trunk/test/Profile/Inputs/objc-general.proftext&p1=cfe/trunk/test/Profile/Inputs/objc-general.profdata&r1=206504&r2=206509&rev=206509&view=diff
==============================================================================
(empty)
Modified: cfe/trunk/test/Profile/c-attributes.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/c-attributes.c?rev=206509&r1=206508&r2=206509&view=diff
==============================================================================
--- cfe/trunk/test/Profile/c-attributes.c (original)
+++ cfe/trunk/test/Profile/c-attributes.c Thu Apr 17 17:49:06 2014
@@ -1,6 +1,7 @@
// Test that instrumentation based profiling sets function attributes correctly.
-// RUN: %clang %s -o - -mllvm -disable-llvm-optzns -emit-llvm -S -fprofile-instr-use=%S/Inputs/c-attributes.profdata | FileCheck %s
+// RUN: llvm-profdata merge %S/Inputs/c-attributes.proftext -o %t.profdata
+// RUN: %clang %s -o - -mllvm -disable-llvm-optzns -emit-llvm -S -fprofile-instr-use=%t.profdata | FileCheck %s
extern int atoi(const char *);
Modified: cfe/trunk/test/Profile/c-captured.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/c-captured.c?rev=206509&r1=206508&r2=206509&view=diff
==============================================================================
--- cfe/trunk/test/Profile/c-captured.c (original)
+++ cfe/trunk/test/Profile/c-captured.c Thu Apr 17 17:49:06 2014
@@ -1,5 +1,7 @@
// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name c-captured.c %s -o - -emit-llvm -fprofile-instr-generate | FileCheck -check-prefix=PGOGEN -check-prefix=PGOALL %s
-// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name c-captured.c %s -o - -emit-llvm -fprofile-instr-use=%S/Inputs/c-captured.profdata | FileCheck -check-prefix=PGOUSE -check-prefix=PGOALL %s
+
+// RUN: llvm-profdata merge %S/Inputs/c-captured.proftext -o %t.profdata
+// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name c-captured.c %s -o - -emit-llvm -fprofile-instr-use=%t.profdata | FileCheck -check-prefix=PGOUSE -check-prefix=PGOALL %s
// PGOGEN: @[[DCC:__llvm_profile_counters_debug_captured]] = global [3 x i64] zeroinitializer
// PGOGEN: @[[CSC:__llvm_profile_counters___captured_stmt]] = internal global [2 x i64] zeroinitializer
Modified: cfe/trunk/test/Profile/c-counter-overflows.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/c-counter-overflows.c?rev=206509&r1=206508&r2=206509&view=diff
==============================================================================
--- cfe/trunk/test/Profile/c-counter-overflows.c (original)
+++ cfe/trunk/test/Profile/c-counter-overflows.c Thu Apr 17 17:49:06 2014
@@ -1,7 +1,8 @@
// Test that big branch weights get scaled down to 32-bits, rather than just
// truncated.
-// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name c-counter-overflows.c %s -o - -emit-llvm -fprofile-instr-use=%S/Inputs/c-counter-overflows.profdata | FileCheck %s
+// RUN: llvm-profdata merge %S/Inputs/c-counter-overflows.proftext -o %t.profdata
+// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name c-counter-overflows.c %s -o - -emit-llvm -fprofile-instr-use=%t.profdata | FileCheck %s
typedef unsigned long long uint64_t;
Modified: cfe/trunk/test/Profile/c-general.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/c-general.c?rev=206509&r1=206508&r2=206509&view=diff
==============================================================================
--- cfe/trunk/test/Profile/c-general.c (original)
+++ cfe/trunk/test/Profile/c-general.c Thu Apr 17 17:49:06 2014
@@ -1,7 +1,9 @@
// Test instrumentation of general constructs in C.
// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name c-general.c %s -o - -emit-llvm -fprofile-instr-generate | FileCheck -check-prefix=PGOGEN %s
-// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name c-general.c %s -o - -emit-llvm -fprofile-instr-use=%S/Inputs/c-general.profdata | FileCheck -check-prefix=PGOUSE %s
+
+// RUN: llvm-profdata merge %S/Inputs/c-general.proftext -o %t.profdata
+// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name c-general.c %s -o - -emit-llvm -fprofile-instr-use=%t.profdata | FileCheck -check-prefix=PGOUSE %s
// PGOGEN: @[[SLC:__llvm_profile_counters_simple_loops]] = global [4 x i64] zeroinitializer
// PGOGEN: @[[IFC:__llvm_profile_counters_conditionals]] = global [11 x i64] zeroinitializer
Modified: cfe/trunk/test/Profile/c-outdated-data.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/c-outdated-data.c?rev=206509&r1=206508&r2=206509&view=diff
==============================================================================
--- cfe/trunk/test/Profile/c-outdated-data.c (original)
+++ cfe/trunk/test/Profile/c-outdated-data.c Thu Apr 17 17:49:06 2014
@@ -3,7 +3,8 @@
// FIXME: It would be nice to use -verify here instead of FileCheck, but -verify
// doesn't play well with warnings that have no line number.
-// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name c-outdated-data.c %s -o /dev/null -emit-llvm -fprofile-instr-use=%S/Inputs/c-outdated-data.profdata -Wprofile-instr-dropped 2>&1 | FileCheck %s
+// RUN: llvm-profdata merge %S/Inputs/c-outdated-data.proftext -o %t.profdata
+// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name c-outdated-data.c %s -o /dev/null -emit-llvm -fprofile-instr-use=%t.profdata -Wprofile-instr-dropped 2>&1 | FileCheck %s
// CHECK: warning: profile data may be out of date: of 3 functions, 1 has no data and 1 has mismatched data that will be ignored
void no_usable_data() {
Modified: cfe/trunk/test/Profile/c-unprofiled-blocks.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/c-unprofiled-blocks.c?rev=206509&r1=206508&r2=206509&view=diff
==============================================================================
--- cfe/trunk/test/Profile/c-unprofiled-blocks.c (original)
+++ cfe/trunk/test/Profile/c-unprofiled-blocks.c Thu Apr 17 17:49:06 2014
@@ -1,7 +1,8 @@
// Blocks that we have no profile data for (ie, it was never reached in training
// runs) shouldn't have any branch weight metadata added.
-// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name c-unprofiled-blocks.c %s -o - -emit-llvm -fprofile-instr-use=%S/Inputs/c-unprofiled-blocks.profdata | FileCheck -check-prefix=PGOUSE %s
+// RUN: llvm-profdata merge %S/Inputs/c-unprofiled-blocks.proftext -o %t.profdata
+// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name c-unprofiled-blocks.c %s -o - -emit-llvm -fprofile-instr-use=%t.profdata | FileCheck -check-prefix=PGOUSE %s
// PGOUSE-LABEL: @never_called(i32 %i)
int never_called(int i) {
Modified: cfe/trunk/test/Profile/cxx-class.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/cxx-class.cpp?rev=206509&r1=206508&r2=206509&view=diff
==============================================================================
--- cfe/trunk/test/Profile/cxx-class.cpp (original)
+++ cfe/trunk/test/Profile/cxx-class.cpp Thu Apr 17 17:49:06 2014
@@ -6,7 +6,8 @@
// RUN: FileCheck --input-file=%tgen -check-prefix=MTHGEN %s
// RUN: FileCheck --input-file=%tgen -check-prefix=WRPGEN %s
-// RUN: %clang %s -o - -emit-llvm -S -fprofile-instr-use=%S/Inputs/cxx-class.profdata -fno-exceptions -target %itanium_abi_triple > %tuse
+// RUN: llvm-profdata merge %S/Inputs/cxx-class.proftext -o %t.profdata
+// RUN: %clang %s -o - -emit-llvm -S -fprofile-instr-use=%t.profdata -fno-exceptions -target %itanium_abi_triple > %tuse
// RUN: FileCheck --input-file=%tuse -check-prefix=CTRUSE %s
// RUN: FileCheck --input-file=%tuse -check-prefix=DTRUSE %s
// RUN: FileCheck --input-file=%tuse -check-prefix=MTHUSE %s
Modified: cfe/trunk/test/Profile/cxx-lambda.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/cxx-lambda.cpp?rev=206509&r1=206508&r2=206509&view=diff
==============================================================================
--- cfe/trunk/test/Profile/cxx-lambda.cpp (original)
+++ cfe/trunk/test/Profile/cxx-lambda.cpp Thu Apr 17 17:49:06 2014
@@ -4,7 +4,8 @@
// RUN: FileCheck --input-file=%tgen -check-prefix=PGOGEN %s
// RUN: FileCheck --input-file=%tgen -check-prefix=LMBGEN %s
-// RUN: %clang_cc1 -x c++ %s -triple %itanium_abi_triple -main-file-name cxx-lambda.cpp -std=c++11 -o - -emit-llvm -fprofile-instr-use=%S/Inputs/cxx-lambda.profdata > %tuse
+// RUN: llvm-profdata merge %S/Inputs/cxx-lambda.proftext -o %t.profdata
+// RUN: %clang_cc1 -x c++ %s -triple %itanium_abi_triple -main-file-name cxx-lambda.cpp -std=c++11 -o - -emit-llvm -fprofile-instr-use=%t.profdata > %tuse
// RUN: FileCheck --input-file=%tuse -check-prefix=PGOUSE %s
// RUN: FileCheck --input-file=%tuse -check-prefix=LMBUSE %s
Modified: cfe/trunk/test/Profile/cxx-templates.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/cxx-templates.cpp?rev=206509&r1=206508&r2=206509&view=diff
==============================================================================
--- cfe/trunk/test/Profile/cxx-templates.cpp (original)
+++ cfe/trunk/test/Profile/cxx-templates.cpp Thu Apr 17 17:49:06 2014
@@ -5,7 +5,8 @@
// RUN: FileCheck --input-file=%tgen -check-prefix=T0GEN -check-prefix=ALL %s
// RUN: FileCheck --input-file=%tgen -check-prefix=T100GEN -check-prefix=ALL %s
-// RUN: %clang_cc1 -x c++ %s -triple %itanium_abi_triple -main-file-name cxx-templates.cpp -std=c++11 -o - -emit-llvm -fprofile-instr-use=%S/Inputs/cxx-templates.profdata > %tuse
+// RUN: llvm-profdata merge %S/Inputs/cxx-templates.proftext -o %t.profdata
+// RUN: %clang_cc1 -x c++ %s -triple %itanium_abi_triple -main-file-name cxx-templates.cpp -std=c++11 -o - -emit-llvm -fprofile-instr-use=%t.profdata > %tuse
// RUN: FileCheck --input-file=%tuse -check-prefix=T0USE -check-prefix=ALL %s
// RUN: FileCheck --input-file=%tuse -check-prefix=T100USE -check-prefix=ALL %s
Modified: cfe/trunk/test/Profile/cxx-throws.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/cxx-throws.cpp?rev=206509&r1=206508&r2=206509&view=diff
==============================================================================
--- cfe/trunk/test/Profile/cxx-throws.cpp (original)
+++ cfe/trunk/test/Profile/cxx-throws.cpp Thu Apr 17 17:49:06 2014
@@ -6,8 +6,9 @@
// RUN: %clangxx %s -o - -emit-llvm -S -fprofile-instr-generate -target %itanium_abi_triple | FileCheck -check-prefix=PGOGEN %s
// RUN: %clangxx %s -o - -emit-llvm -S -fprofile-instr-generate -target %itanium_abi_triple | FileCheck -check-prefix=PGOGEN-EXC %s
-// RUN: %clang %s -o - -emit-llvm -S -fprofile-instr-use=%S/Inputs/cxx-throws.profdata -target %itanium_abi_triple | FileCheck -check-prefix=PGOUSE %s
-// RUN: %clang %s -o - -emit-llvm -S -fprofile-instr-use=%S/Inputs/cxx-throws.profdata -target %itanium_abi_triple | FileCheck -check-prefix=PGOUSE-EXC %s
+// RUN: llvm-profdata merge %S/Inputs/cxx-throws.proftext -o %t.profdata
+// RUN: %clang %s -o - -emit-llvm -S -fprofile-instr-use=%t.profdata -target %itanium_abi_triple | FileCheck -check-prefix=PGOUSE %s
+// RUN: %clang %s -o - -emit-llvm -S -fprofile-instr-use=%t.profdata -target %itanium_abi_triple | FileCheck -check-prefix=PGOUSE-EXC %s
// PGOGEN: @[[THC:__llvm_profile_counters__Z6throwsv]] = global [9 x i64] zeroinitializer
// PGOGEN-EXC: @[[THC:__llvm_profile_counters__Z6throwsv]] = global [9 x i64] zeroinitializer
Modified: cfe/trunk/test/Profile/objc-general.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/objc-general.m?rev=206509&r1=206508&r2=206509&view=diff
==============================================================================
--- cfe/trunk/test/Profile/objc-general.m (original)
+++ cfe/trunk/test/Profile/objc-general.m Thu Apr 17 17:49:06 2014
@@ -1,7 +1,9 @@
// Test instrumentation of general constructs in objective C.
// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name objc-general.m %s -o - -emit-llvm -fblocks -fprofile-instr-generate | FileCheck -check-prefix=PGOGEN %s
-// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name objc-general.m %s -o - -emit-llvm -fblocks -fprofile-instr-use=%S/Inputs/objc-general.profdata | FileCheck -check-prefix=PGOUSE %s
+
+// RUN: llvm-profdata merge %S/Inputs/objc-general.proftext -o %t.profdata
+// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name objc-general.m %s -o - -emit-llvm -fblocks -fprofile-instr-use=%t.profdata | FileCheck -check-prefix=PGOUSE %s
#ifdef HAVE_FOUNDATION
More information about the cfe-commits
mailing list