summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXinliang David Li <davidxl@google.com>2016-07-22 23:44:06 +0000
committerXinliang David Li <davidxl@google.com>2016-07-22 23:44:06 +0000
commit544ae6c4f36a70ca715cba384f782d0ae7e6ec0d (patch)
tree35291739393bb2ce7beca46e2156fc32c5cfddb4
parent5a6dc4c9b89c43c6ff6f983f763cdf81e7e184e0 (diff)
downloadbcm5719-llvm-544ae6c4f36a70ca715cba384f782d0ae7e6ec0d.tar.gz
bcm5719-llvm-544ae6c4f36a70ca715cba384f782d0ae7e6ec0d.zip
[Profile] Fix a fixme in the test
llvm-svn: 276494
-rw-r--r--compiler-rt/test/profile/instrprof-value-prof-shared.test8
1 files changed, 3 insertions, 5 deletions
diff --git a/compiler-rt/test/profile/instrprof-value-prof-shared.test b/compiler-rt/test/profile/instrprof-value-prof-shared.test
index 4c0e92e8ac5..13f8b7f247c 100644
--- a/compiler-rt/test/profile/instrprof-value-prof-shared.test
+++ b/compiler-rt/test/profile/instrprof-value-prof-shared.test
@@ -20,11 +20,9 @@
// Same as above but with profile online merging enabled.
// RUN: rm -fr %t.prof/
// RUN: mkdir -p %t.prof/
-// RUN: %clang_pgogen -O2 -mllvm -disable-vp=false -mllvm -vp-static-alloc=true -mllvm -vp-counters-per-site=256 -fPIC -shared -o %t.d/t.ir.m.shared -DSHARED_LIB %S/Inputs/instrprof-value-prof-real.c
-// RUN: %clang_pgogen -O2 -mllvm -disable-vp=false -mllvm -vp-static-alloc=true -mllvm -vp-counters-per-site=256 -rpath %t.d -o %t.ir.m %t.d/t.ir.m.shared -DCALL_SHARED %S/Inputs/instrprof-value-prof-real.c
-// FIXME: When pgogen's behavior changed to enable merging by default, there is no need to use env var.
-// Two profile data files should be dumped to %t.prof/ dir.
-// RUN: env LLVM_PROFILE_FILE=%t.prof/default_%m.profraw LLVM_VP_MAX_NUM_VALS_PER_SITE=255 %run %t.ir.m
+// RUN: %clang_pgogen=%t.prof -O2 -mllvm -disable-vp=false -mllvm -vp-static-alloc=true -mllvm -vp-counters-per-site=256 -fPIC -shared -o %t.d/t.ir.m.shared -DSHARED_LIB %S/Inputs/instrprof-value-prof-real.c
+// RUN: %clang_pgogen=%t.prof -O2 -mllvm -disable-vp=false -mllvm -vp-static-alloc=true -mllvm -vp-counters-per-site=256 -rpath %t.d -o %t.ir.m %t.d/t.ir.m.shared -DCALL_SHARED %S/Inputs/instrprof-value-prof-real.c
+// RUN: LLVM_VP_MAX_NUM_VALS_PER_SITE=255 %run %t.ir.m
// RUN: llvm-profdata merge -o %t.ir.m.profdata %t.prof/
// RUN: llvm-profdata show --all-functions -ic-targets %t.ir.m.profdata | FileCheck %S/Inputs/instrprof-value-prof-real.c
// RUN: llvm-profdata merge -text %t.ir.m.profdata -o %t.ir.m.proftxt
OpenPOWER on IntegriCloud