Messages in this thread Patch in this message | | | From | Jarmo Tiitto <> | Subject | [RFC PATCH 1/2] pgo: Update .profraw file format to version 7 | Date | Tue, 23 Nov 2021 01:33:04 +0200 |
| |
Recent LLVM-13 can't read the version 5 profile file any more so update the format to .profraw file version 7.
This version adds binary_ids_size entry to struct llvm_prf_header and it is output as zero.
This is enough to fix processing the profile data on LLVM-13 tools.
Signed-off-by: Jarmo Tiitto <jarmo.tiitto@gmail.com> --- kernel/pgo/fs.c | 1 + kernel/pgo/pgo.h | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/kernel/pgo/fs.c b/kernel/pgo/fs.c index 3c5aa7c2a4ce..77d23f869503 100644 --- a/kernel/pgo/fs.c +++ b/kernel/pgo/fs.c @@ -62,6 +62,7 @@ static void prf_fill_header(void **buffer) #endif header->version = LLVM_VARIANT_MASK_IR_PROF | LLVM_INSTR_PROF_RAW_VERSION; header->data_size = prf_data_count(); + header->binary_ids_size = 0; header->padding_bytes_before_counters = 0; header->counters_size = prf_cnts_count(); header->padding_bytes_after_counters = 0; diff --git a/kernel/pgo/pgo.h b/kernel/pgo/pgo.h index 04fbf3bcde1e..45eeff9ab6c4 100644 --- a/kernel/pgo/pgo.h +++ b/kernel/pgo/pgo.h @@ -43,7 +43,7 @@ (u64)'R' << 8 | \ (u64)129) -#define LLVM_INSTR_PROF_RAW_VERSION 5 +#define LLVM_INSTR_PROF_RAW_VERSION 7 #define LLVM_INSTR_PROF_DATA_ALIGNMENT 8 #define LLVM_INSTR_PROF_IPVK_FIRST 0 #define LLVM_INSTR_PROF_IPVK_LAST 1 @@ -56,6 +56,7 @@ * struct llvm_prf_header - represents the raw profile header data structure. * @magic: the magic token for the file format. * @version: the version of the file format. + * @binary_ids_size: the number of binary ids. (since LLVM_INSTR_PROF_RAW_VERSION >= 7) * @data_size: the number of entries in the profile data section. * @padding_bytes_before_counters: the number of padding bytes before the * counters. @@ -72,6 +73,7 @@ struct llvm_prf_header { u64 magic; u64 version; + u64 binary_ids_size; u64 data_size; u64 padding_bytes_before_counters; u64 counters_size; -- 2.34.0
| |