[PATCH] D149396: [PGO] Preserve the profile/llvm-unstable/no-key-annotate-fdo/fdo_compile.sh 2>/tmp/verbose.txt metadata if one instructions folds the other away

[Mingming Liu via Phabricator via llvm-commits]

mingmingl created this revision.
Herald added subscribers: hoy, wlei, wenlei, hiraditya.
Herald added a project: All.
mingmingl requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D149396

Files:
  llvm/lib/Transforms/Utils/Local.cpp
  llvm/test/Transforms/EarlyCSE/metadata.ll


Index: llvm/test/Transforms/EarlyCSE/metadata.ll
===================================================================
--- /dev/null
+++ llvm/test/Transforms/EarlyCSE/metadata.ll
@@ -0,0 +1,29 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 2
+; RUN: opt < %s -S -passes=early-cse | FileCheck %s
+
+define i32 @indirect_call_value_profile_preserved(ptr %x, i32 %a, i32 %b, i32 %c)  {
+; CHECK-LABEL: define i32 @indirect_call_value_profile_preserved
+; CHECK-SAME: (ptr [[X:%.*]], i32 [[A:%.*]], i32 [[B:%.*]], i32 [[C:%.*]]) {
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[CALL:%.*]] = tail call ptr @_Z10createTypei(i32 [[C]])
+; CHECK-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[CALL]], align 8
+; CHECK-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 1
+; CHECK-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[VFN]], align 8
+; CHECK-NEXT:    [[CALL1:%.*]] = tail call i32 [[TMP0]](ptr [[CALL]], i32 [[A]], i32 [[B]]), !prof [[PROF0:![0-9]+]]
+; CHECK-NEXT:    store i32 [[CALL1]], ptr [[X]], align 4
+; CHECK-NEXT:    ret i32 [[CALL1]]
+;
+entry:
+  %call = tail call ptr @_Z10createTypei(i32 %c)
+  %vtable = load ptr, ptr %call, align 8
+  %vfn = getelementptr inbounds ptr, ptr %vtable, i64 1
+  %0 = load ptr, ptr %vfn, align 8
+  %call1 = tail call i32 %0(ptr %call, i32 %a, i32 %b), !prof !0
+  store i32 %call1, ptr %x
+  %foo = load i32, ptr %x
+  ret i32 %foo
+}
+
+declare ptr @_Z10createTypei(i32)
+
+!0 =!{!"VP", i32 0, i64 1600, i64 12345, i64 1030, i64 678, i64 410}
Index: llvm/lib/Transforms/Utils/Local.cpp
===================================================================
--- llvm/lib/Transforms/Utils/Local.cpp
+++ llvm/lib/Transforms/Utils/Local.cpp
@@ -2710,8 +2710,7 @@
         K->setMetadata(Kind, JMD);
         break;
       case LLVMContext::MD_prof:
-        if (DoesKMove)
-          K->setMetadata(Kind, MDNode::getMergedProfMetadata(KMD, JMD, K, J));
+        K->setMetadata(Kind, DoesKMove ? MDNode::getMergedProfMetadata(KMD, JMD, K, J) : KMD);
         break;
     }
   }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D149396.517762.patch
Type: text/x-patch
Size: 2071 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230428/e558b6f4/attachment.bin>