maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert r310857 due to internal test failure 

llvm-svn: 310907
This commit is contained in:
Xinliang David Li 2017-08-15 03:13:01 +00:00
parent 7a3da86823
commit 1c9320cd4d
3 changed files with 13 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
compiler-rt/lib/profile/InstrProfilingFile.c
View File

@ -513,29 +513,23 @@ const char *__llvm_profile_get_path_prefix(void) {
COMPILER_RT_VISIBILITY
void __llvm_profile_initialize_file(void) {
const char *EnvFilenamePat;
const char *SelectedPat = NULL;
ProfileNameSpecifier PNS = PNS_unknown;
int hasCommandLineOverrider = (INSTR_PROF_PROFILE_NAME_VAR[0] != 0);
EnvFilenamePat = getFilenamePatFromEnv();
if (EnvFilenamePat)
parseAndSetFilename(EnvFilenamePat, PNS_environment, 0);
else if (hasCommandLineOverrider) {
const char *SelectedPat = INSTR_PROF_PROFILE_NAME_VAR;
size_t PrefixLen;
int StripLen;
const char *Prefix = lprofGetPathPrefix(&StripLen, &PrefixLen);
if (Prefix != NULL) {
char *StripPat =
COMPILER_RT_ALLOCA(PrefixLen + 1 + strlen(SelectedPat) + 1);
lprofApplyPathPrefix(StripPat, SelectedPat, Prefix, PrefixLen, StripLen);
SelectedPat = StripPat;
}
parseAndSetFilename(SelectedPat, PNS_command_line, Prefix ? 1 : 0);
if (EnvFilenamePat) {
SelectedPat = EnvFilenamePat;
PNS = PNS_environment;
} else if (hasCommandLineOverrider) {
SelectedPat = INSTR_PROF_PROFILE_NAME_VAR;
PNS = PNS_command_line;
} else {
parseAndSetFilename(NULL, PNS_default, 0);
SelectedPat = NULL;
PNS = PNS_default;
}
parseAndSetFilename(SelectedPat, PNS, 0);
}
/* This API is directly called by the user application code. It has the

3
compiler-rt/lib/profile/InstrProfilingUtil.c
View File

@ -196,8 +196,7 @@ lprofApplyPathPrefix(char *Dest, const char *PathStr, const char *Prefix,
memcpy(Dest, Prefix, PrefixLen);
if (!IS_DIR_SEPARATOR(Prefix[PrefixLen - 1]) &&
!IS_DIR_SEPARATOR(StrippedPathStr[0]))
if (!IS_DIR_SEPARATOR(Prefix[PrefixLen - 1]))
Dest[PrefixLen++] = DIR_SEPARATOR;
memcpy(Dest + PrefixLen, StrippedPathStr, strlen(StrippedPathStr) + 1);

18
compiler-rt/test/profile/instrprof-path.c
View File

@ -1,8 +1,6 @@
// RUN: %clang_pgogen -O2 -o %t.0 %s
// RUN: %clang_pgogen=%t.d1 -O2 -o %t.1 %s
// RUN: %clang_pgogen=%t.d1/%t.d2 -O2 -o %t.2 %s
// RUN: %clang_pgogen=a/b/c/d -O2 -o %t.3 %s
// RUN: %clang_pgogen=/a/b/c/d -O2 -o %t.4 %s
//
// RUN: %run %t.0 ""
// RUN: env LLVM_PROFILE_FILE=%t.d1/default.profraw %run %t.0 %t.d1/
@ -11,17 +9,6 @@
// RUN: %run %t.2 %t.d1/%t.d2/
// RUN: %run %t.2 %t.d1/%t.d2/ %t.d1/%t.d2/%t.d3/blah.profraw %t.d1/%t.d2/%t.d3/
// RUN: env GCOV_PREFIX=%t.prefix %run %t.3 %t.prefix/a/b/c/d/
// RUN: env GCOV_PREFIX=%t.prefix env GCOV_PREFIX_STRIP=1 %run %t.3 %t.prefix/b/c/d/
// RUN: env GCOV_PREFIX=%t.prefix env GCOV_PREFIX_STRIP=2 %run %t.3 %t.prefix/c/d/
// RUN: env GCOV_PREFIX=%t.prefix env GCOV_PREFIX_STRIP=3 %run %t.3 %t.prefix/d/
// RUN: env GCOV_PREFIX=%t.prefix %run %t.4 %t.prefix/a/b/c/d/
// RUN: env GCOV_PREFIX=%t.prefix env GCOV_PREFIX_STRIP=1 %run %t.4 %t.prefix/b/c/d/
// RUN: env GCOV_PREFIX=%t.prefix env GCOV_PREFIX_STRIP=2 %run %t.4 %t.prefix/c/d/
// RUN: env GCOV_PREFIX=%t.prefix env GCOV_PREFIX_STRIP=3 %run %t.4 %t.prefix/d/
#include <stdio.h>
#include <string.h>
const char *__llvm_profile_get_path_prefix();
@ -37,11 +24,8 @@ int main(int argc, const char *argv[]) {
expected = argv[1];
prefix = __llvm_profile_get_path_prefix();
if (strcmp(prefix, expected)) {
fprintf(stderr, "Expected = %s\n", expected);
fprintf(stderr, " Actual = %s\n", prefix);
if (strcmp(prefix, expected))
return 1;
}
if (argc == 4) {
__llvm_profile_set_filename(argv[2]);