Manually set Version instead of changing instprof macros

Author: EthanLuisMcDonough

compiler-rt/lib/profile/InstrProfilingWriter.c

@@ -308,6 +308,7 @@ COMPILER_RT_VISIBILITY int lprofWriteDataImpl(
 #define INSTR_PROF_RAW_HEADER(Type, Name, Init) Header.Name = Init;
 #include "profile/InstrProfData.inc"
   }
+  Header.Version = Version;
 
   /* On WIN64, label differences are truncated 32-bit values. Truncate
    * CountersDelta to match. */

llvm/include/llvm/ProfileData/InstrProfData.inc

@@ -152,7 +152,7 @@ INSTR_PROF_VALUE_NODE(PtrToNodeT, llvm::PointerType::getUnqual(Ctx), Next, \
 #define INSTR_PROF_DATA_DEFINED
 #endif
 INSTR_PROF_RAW_HEADER(uint64_t, Magic, __llvm_profile_get_magic())
-INSTR_PROF_RAW_HEADER(uint64_t, Version, Version)
+INSTR_PROF_RAW_HEADER(uint64_t, Version, __llvm_profile_get_version())
 INSTR_PROF_RAW_HEADER(uint64_t, BinaryIdsSize, __llvm_write_binary_ids(NULL))
 INSTR_PROF_RAW_HEADER(uint64_t, NumData, NumData)
 INSTR_PROF_RAW_HEADER(uint64_t, PaddingBytesBeforeCounters, PaddingBytesBeforeCounters)

llvm/test/tools/llvm-profdata/binary-ids-padding.test

@@ -1,7 +1,7 @@
 // Header
 //
 // INSTR_PROF_RAW_HEADER(uint64_t, Magic, __llvm_profile_get_magic())
-// INSTR_PROF_RAW_HEADER(uint64_t, Version, Version)
+// INSTR_PROF_RAW_HEADER(uint64_t, Version, __llvm_profile_get_version())
 // INSTR_PROF_RAW_HEADER(uint64_t, BinaryIdsSize, __llvm_write_binary_ids(NULL))
 // INSTR_PROF_RAW_HEADER(uint64_t, DataSize, DataSize)
 // INSTR_PROF_RAW_HEADER(uint64_t, CountersSize, CountersSize)

llvm/test/tools/llvm-profdata/malformed-not-space-for-another-header.test

@@ -1,7 +1,7 @@
 // Header
 //
 // INSTR_PROF_RAW_HEADER(uint64_t, Magic, __llvm_profile_get_magic())
-// INSTR_PROF_RAW_HEADER(uint64_t, Version, Version)
+// INSTR_PROF_RAW_HEADER(uint64_t, Version, __llvm_profile_get_version())
 // INSTR_PROF_RAW_HEADER(uint64_t, BinaryIdsSize, __llvm_write_binary_ids(NULL))
 // INSTR_PROF_RAW_HEADER(uint64_t, DataSize, DataSize)
 // INSTR_PROF_RAW_HEADER(uint64_t, CountersSize, CountersSize)

llvm/test/tools/llvm-profdata/malformed-num-counters-zero.test

@@ -1,7 +1,7 @@
 // Header
 //
 // INSTR_PROF_RAW_HEADER(uint64_t, Magic, __llvm_profile_get_magic())
-// INSTR_PROF_RAW_HEADER(uint64_t, Version, Version)
+// INSTR_PROF_RAW_HEADER(uint64_t, Version, __llvm_profile_get_version())
 // INSTR_PROF_RAW_HEADER(uint64_t, BinaryIdsSize, __llvm_write_binary_ids(NULL))
 // INSTR_PROF_RAW_HEADER(uint64_t, DataSize, DataSize)
 // INSTR_PROF_RAW_HEADER(uint64_t, CountersSize, CountersSize)

offload/test/offloading/gpupgo/pgo2.c

@@ -26,6 +26,28 @@
 // RUN:     --check-prefix="LLVM-HOST"
 // RUN: not test -e %target_triple.%basename_t.nogpu.profraw
 
+// RUN: %libomptarget-compile-generic -Xarch_host -fprofile-generate \
+// RUN:     -Xarch_device -fprofile-instr-generate
+// RUN: env LLVM_PROFILE_FILE=%basename_t.hidf.profraw \
+// RUN:     %libomptarget-run-generic 2>&1
+// RUN: llvm-profdata show --all-functions --counts \
+// RUN:     %basename_t.hidf.profraw | %fcheck-generic \
+// RUN:     --check-prefix="LLVM-HOST"
+// RUN: llvm-profdata show --all-functions --counts \
+// RUN:     %target_triple.%basename_t.hidf.profraw \
+// RUN:     | %fcheck-generic --check-prefix="CLANG-DEV"
+
+// RUN: %libomptarget-compile-generic -Xarch_device -fprofile-generate \
+// RUN:     -Xarch_host -fprofile-instr-generate
+// RUN: env LLVM_PROFILE_FILE=%basename_t.hfdi.profraw \
+// RUN:     %libomptarget-run-generic 2>&1
+// RUN: llvm-profdata show --all-functions --counts \
+// RUN:     %basename_t.hfdi.profraw | %fcheck-generic \
+// RUN:     --check-prefix="CLANG-HOST"
+// RUN: llvm-profdata show --all-functions --counts \
+// RUN:     %target_triple.%basename_t.hfdi.profraw \
+// RUN:     | %fcheck-generic --check-prefix="LLVM-DEVICE"
+
 // REQUIRES: gpu
 // REQUIRES: pgo
 
@@ -51,11 +73,13 @@ int main() {
 // LLVM-HOST: Hash: {{0[xX][0-9a-fA-F]+}}
 // LLVM-HOST: Counters: 2
 // LLVM-HOST: Block counts: [0, 0]
+// LLVM-HOST: Instrumentation level: IR
 
 // LLVM-DEVICE-LABEL: __omp_offloading_{{[_0-9a-zA-Z]*}}_main_{{[_0-9a-zA-Z]*}}:
 // LLVM-DEVICE: Hash: {{0[xX][0-9a-fA-F]+}}
 // LLVM-DEVICE: Counters: 3
 // LLVM-DEVICE: Block counts: [10, 2, 1]
+// LLVM-DEVICE: Instrumentation level: IR
 
 // CLANG-HOST-LABEL: main:
 // CLANG-HOST: Hash: {{0[xX][0-9a-fA-F]+}}
@@ -68,9 +92,11 @@ int main() {
 // CLANG-HOST: Counters: 2
 // CLANG-HOST: Function count: 0
 // CLANG-HOST: Block counts: [0]
+// CLANG-HOST: Instrumentation level: Front-end
 
 // CLANG-DEV-LABEL: __omp_offloading_{{[_0-9a-zA-Z]*}}_main_{{[_0-9a-zA-Z]*}}:
 // CLANG-DEV: Hash: {{0[xX][0-9a-fA-F]+}}
 // CLANG-DEV: Counters: 2
 // CLANG-DEV: Function count: 0
 // CLANG-DEV: Block counts: [11]
+// CLANG-DEV: Instrumentation level: Front-end