Fix an obvious bug in SampleProfileReaderGCC.

[danielcdh]

Summary

The CallTargetProfile should be added to FProfile to be consistent with other profile readers.

[davidxl]

Is it possible to add a test?

[danielcdh]

add unittest

[davidxl]

test/Transforms/SampleProfile/indirect-call.ll

5 ↗

(On Diff #89301)

is there a need for the GCC prefix? The pattern is the same as the existing one.

[danielcdh]

test/Transforms/SampleProfile/indirect-call.ll

5 ↗

(On Diff #89301)

The gcc version of the profile only contains the profile for "test". As there is no tool to convert llvm profile to gcc format, I need to manually fake a gcc profile, which is not easy when there is inline stack.

[davidxl]

lgtm

[danielcdh]

The gcc reader does not work on certain architectures. Move the tests to a separate file and added XFAIL for those architectures.

lib/ProfileData/SampleProfReader.cpp

for (uint32_t J = 0; J < NumTargets; J++) {
       if (!GcovBuffer.readInt64(TargetIdx))
         return sampleprof_error::truncated;
       StringRef TargetName(Names[TargetIdx]);
 
       uint64_t TargetCount;
       if (!GcovBuffer.readInt64(TargetCount))
         return sampleprof_error::truncated;
 
-      if (Update) {
-        FunctionSamples &TargetProfile = Profiles[TargetName];
-        TargetProfile.addCalledTargetSamples(LineOffset, Discriminator,
-                                             TargetName, TargetCount);
-      }
-    }
-  }
+      if (Update)
+        FProfile->addCalledTargetSamples(LineOffset, Discriminator,
 
   // Process all the inlined callers into the current function. These
   // are all the callsites that were inlined into this function.
   for (uint32_t I = 0; I < NumCallsites; I++) {
     // The offset is encoded as:
     //   high 16 bits: line offset to the start of the function.
     //   low 16 bits: discriminator.
     uint32_t Offset;

test/Transforms/SampleProfile/indirect-call-gcc.ll

+; RUN: opt < %s -sample-profile -sample-profile-file=%S/Inputs/indirect-call.afdo -S | FileCheck %s
+
+; Checks if indirect call targets are read correctly when reading from gcc
+; format profile.
+; It is expected to fail on certain architectures as gcc profile reader does
+; not work.
+; XFAIL: powerpc64-, s390x, mips-, mips64-, sparc
+
+define void @test(void ()*) !dbg !3 {
+  %2 = alloca void ()*
+  store void ()* %0, void ()** %2
+  %3 = load void ()*, void ()** %2
+  ; CHECK: call {{.*}}, !prof ![[PROF:[0-9]+]]
+  call void %3(), !dbg !4
+  ret void
+}
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!2}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !1)
+!1 = !DIFile(filename: "test.cc", directory: "/")
+!2 = !{i32 2, !"Debug Info Version", i32 3}
+!3 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 1, unit: !0)
+!4 = !DILocation(line: 5, scope: !3)
+; CHECK: ![[PROF]] = !{!"VP", i32 0, i64 3457, i64 9191153033785521275, i64 2059, i64 -1069303473483922844, i64 1398}