replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

InstrProf: Allow hexadecimal function hashes in proftext format 

llvm-svn: 231685
This commit is contained in:
Justin Bogner 2015-03-09 18:54:49 +00:00
parent 065e3d4cdb
commit f95ca0758c
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/lib/ProfileData/InstrProfReader.cpp
View File

@ -113,7 +113,7 @@ std::error_code TextInstrProfReader::readNextRecord(InstrProfRecord &Record) {
// Read the function hash. // Read the function hash.
if (Line.is_at_end()) if (Line.is_at_end())
return error(instrprof_error::truncated); return error(instrprof_error::truncated);
if ((Line++)->getAsInteger(10, Record.Hash)) if ((Line++)->getAsInteger(0, Record.Hash))
return error(instrprof_error::malformed); return error(instrprof_error::malformed);
// Read the number of counters. // Read the number of counters.

12
llvm/test/tools/llvm-profdata/general.proftext
View File

@ -38,6 +38,14 @@ large_numbers
# LARGENUM-NEXT: Function count: 2305843009213693952 # LARGENUM-NEXT: Function count: 2305843009213693952
# LARGENUM-NEXT: Block counts: [1152921504606846976, 576460752303423488, 288230376151711744, 144115188075855872, 72057594037927936] # LARGENUM-NEXT: Block counts: [1152921504606846976, 576460752303423488, 288230376151711744, 144115188075855872, 72057594037927936]
# RUN: llvm-profdata show %t.profdata --function hex_hash | FileCheck %s -check-prefix=HEX-HASH
hex_hash
0x1234
1
0
# HEX-HASH: Hash: 0x0000000000001234
# HEX-HASH-NEXT: Counters: 1
# RUN: llvm-profdata show %t.profdata --function NOSUCHFUNC | FileCheck %s -check-prefix=NOSUCHFUNC # RUN: llvm-profdata show %t.profdata --function NOSUCHFUNC | FileCheck %s -check-prefix=NOSUCHFUNC
# NOSUCHFUNC-NOT: Counters: # NOSUCHFUNC-NOT: Counters:
# NOSUCHFUNC: Functions shown: 0 # NOSUCHFUNC: Functions shown: 0
@ -46,11 +54,11 @@ large_numbers
# SOMEFUNCS: Counters: # SOMEFUNCS: Counters:
# SOMEFUNCS: function_count_only: # SOMEFUNCS: function_count_only:
# SOMEFUNCS: large_numbers: # SOMEFUNCS: large_numbers:
# SOMEFUNCS: Functions shown: 2 # SOMEFUNCS: Functions shown: 3
# RUN: llvm-profdata show %t.profdata | FileCheck %s -check-prefix=SUMMARY # RUN: llvm-profdata show %t.profdata | FileCheck %s -check-prefix=SUMMARY
# SUMMARY-NOT: Counters: # SUMMARY-NOT: Counters:
# SUMMARY-NOT: Functions shown: # SUMMARY-NOT: Functions shown:
# SUMMARY: Total functions: 3 # SUMMARY: Total functions: 4
# SUMMARY: Maximum function count: 2305843009213693952 # SUMMARY: Maximum function count: 2305843009213693952
# SUMMARY: Maximum internal block count: 1152921504606846976 # SUMMARY: Maximum internal block count: 1152921504606846976