llvm · Prabhuk · Jul 31, 2025 · Apr 3, 2024 · Apr 3, 2024 · Apr 22, 2024
diff --git a/llvm/test/CodeGen/AArch64/calleetypeid-directcall-mismatched.ll b/llvm/test/CodeGen/AArch64/calleetypeid-directcall-mismatched.ll
@@ -1,45 +1,32 @@
 ;; Tests that callee_type metadata attached to direct call sites are safely ignored.
 
-; RUN: llc --call-graph-section -mtriple aarch64-linux-gnu < %s -stop-after=finalize-isel -o - | FileCheck %s
+; RUN: llc --call-graph-section -mtriple aarch64-linux-gnu < %s -stop-after=finalize-isel -o - | FileCheck --match-full-lines %s
 
-; Function Attrs: mustprogress noinline optnone uwtable
-define i32 @_Z3fooiii(i32 %x, i32 %y, i32 %z) !type !3 {
+;; Test that `calleeTypeIds` field is not present in `callSites`
+; CHECK-LABEL: callSites:
+; CHECK-NEXT: - { bb: {{[0-9]+}}, offset: {{[0-9]+}}, fwdArgRegs: [] }
+; CHECK-NEXT: - { bb: {{[0-9]+}}, offset: {{[0-9]+}}, fwdArgRegs: [] }
+; CHECK-NEXT: - { bb: {{[0-9]+}}, offset: {{[0-9]+}}, fwdArgRegs: [] }
+define i32 @foo(i32 %x, i32 %y) !type !0 {
 entry:
-  ;; Test that `calleeTypeIds` field is not present in `callSites`
-  ; CHECK-LABEL: callSites:
-  ; CHECK-NEXT: - { bb: {{[0-9]+}}, offset: {{[0-9]+}}, fwdArgRegs: [] }
-  ; CHECK-NEXT: - { bb: {{[0-9]+}}, offset: {{[0-9]+}}, fwdArgRegs: [] }
-  ; CHECK-NEXT: - { bb: {{[0-9]+}}, offset: {{[0-9]+}}, fwdArgRegs: [] }
-  %x.addr = alloca i32, align 4
-  %y.addr = alloca i32, align 4
-  %z.addr = alloca i32, align 4
-  store i32 %x, ptr %x.addr, align 4
-  store i32 %y, ptr %y.addr, align 4
-  store i32 %z, ptr %z.addr, align 4
-  %zval = load i32, ptr %z.addr, align 4
-  %yval = load i32, ptr %y.addr, align 4    
-  ;; This direct call has a callee_type metadata node which matches the
-  ;; callee type accurately.
-  %call = call i32 @_Z4fizzii(i32 %zval, i32 %yval), !callee_type !0
-  %xval = load i32, ptr %x.addr, align 4
-  %yval2 = load i32, ptr %y.addr, align 4
-  ;; This direct call has a callee_type metadata node which points to a
-  ;; mismatched callee type id.
-  %call1 = call i32 @_Z4fizzii(i32 %xval, i32 %yval2), !callee_type !1
+  ;; Call instruction with accurate callee_type.
+  ;; callee_type should be dropped seemlessly.
+  %call = call i32 @fizz(i32 %x, i32 %y), !callee_type !1
+  ;; Call instruction with mismatched callee_type.
+  ;; callee_type should be dropped seemlessly without errors.
+  %call1 = call i32 @fizz(i32 %x, i32 %y), !callee_type !3
   %add = add nsw i32 %call, %call1
-  %xval2 = load i32, ptr %x.addr, align 4
-  %zval2 = load i32, ptr %z.addr, align 4
-  ;; This direct call has a callee_type metadata node which points to a
-  ;; mismatched callee type id.
-  %call2 = call i32 @_Z4fizzii(i32 %xval2, i32 %zval2), !callee_type !1
+  ;; Call instruction with mismatched callee_type.
+  ;; callee_type should be dropped seemlessly without errors.
+  %call2 = call i32 @fizz(i32 %add, i32 %y), !callee_type !3
   %sub = sub nsw i32 %add, %call2
   ret i32 %sub
 }
 
-declare !type !4 i32 @_Z4fizzii(i32, i32)
+declare !type !2 i32 @fizz(i32, i32)
 
-!0 = !{!4}
+!0 = !{i64 0, !"_ZTSFiiiiE.generalized"}
 !1 = !{!2}
-!2 = !{i64 0, !"_ZTSFicE.generalized"}
-!3 = !{i64 0, !"_ZTSFiiiiE.generalized"}
-!4 = !{i64 0, !"_ZTSFiiiE.generalized"}
+!2 = !{i64 0, !"_ZTSFiiiE.generalized"}
+!3 = !{!4}
+!4 = !{i64 0, !"_ZTSFicE.generalized"}
diff --git a/llvm/test/CodeGen/AArch64/callsite-emit-calleetypeid-tailcall.ll b/llvm/test/CodeGen/AArch64/callsite-emit-calleetypeid-tailcall.ll
@@ -3,9 +3,9 @@
 
 ;; Verify the exact calleeTypeId value to ensure it is not garbage but the value
 ;; computed as the type id from the callee_type metadata.
-; RUN: llc --call-graph-section -mtriple aarch64-linux-gnu < %s -stop-after=finalize-isel -o - | FileCheck %s
+; RUN: llc --call-graph-section -mtriple aarch64-linux-gnu < %s -stop-after=finalize-isel -o - | FileCheck --match-full-lines %s
 
-define i32 @_Z13call_indirectPFicEc(ptr %func, i8 %x) !type !0 {
+define i32 @check_tailcall(ptr %func, i8 %x) !type !0 {
 entry:
   ; CHECK: callSites:
   ; CHECK-NEXT: - { bb: {{.*}}, offset: {{.*}}, fwdArgRegs: [], calleeTypeIds:

diff --git a/llvm/test/CodeGen/AArch64/callsite-emit-calleetypeid.ll b/llvm/test/CodeGen/AArch64/callsite-emit-calleetypeid.ll
@@ -1,27 +1,20 @@
 ;; Tests that call site callee type ids can be extracted and set from
 ;; callee_type metadata.
 
-;; Verify the exact calleeTypeId value to ensure it is not garbage but the value
+;; Verify the exact calleeTypeIds value to ensure it is not garbage but the value
 ;; computed as the type id from the callee_type metadata.
-; RUN: llc --call-graph-section -mtriple aarch64-linux-gnu < %s -stop-after=finalize-isel -o - | FileCheck %s
-
-declare !type !0 void @foo(i8 signext %a)
+; RUN: llc --call-graph-section -mtriple aarch64-linux-gnu < %s -stop-after=finalize-isel -o - | FileCheck --match-full-lines %s
 
 ; CHECK: name: main
-define i32 @main() !type !1 {
+; CHECK: callSites:
+; CHECK-NEXT: - { bb: {{.*}}, offset: {{.*}}, fwdArgRegs: [], calleeTypeIds:
+; CHECK-NEXT: [ 7854600665770582568 ] }
+define i32 @main() {
 entry:
-  %retval = alloca i32, align 4
-  %fp = alloca ptr, align 8
-  store i32 0, ptr %retval, align 4
-  store ptr @foo, ptr %fp, align 8
-  %fp_val = load ptr, ptr %fp, align 8
-  ; CHECK: callSites:
-  ; CHECK-NEXT: - { bb: {{.*}}, offset: {{.*}}, fwdArgRegs: [], calleeTypeIds:
-  ; CHECK-NEXT: [ 7854600665770582568 ] }
-  call void %fp_val(i8 signext 97), !callee_type !2
+  %0 = load ptr, ptr null, align 8
+  call void %0(i8 0), !callee_type !0
   ret i32 0
 }
 
-!0 = !{i64 0, !"_ZTSFvcE.generalized"}
-!1 = !{i64 0, !"_ZTSFiE.generalized"}
-!2 = !{!0}
+!0 = !{!1}
+!1 = !{i64 0, !"_ZTSFvcE.generalized"}
diff --git a/llvm/test/CodeGen/ARM/calleetypeid-directcall-mismatched.ll b/llvm/test/CodeGen/ARM/calleetypeid-directcall-mismatched.ll
@@ -1,45 +1,32 @@
 ;; Tests that callee_type metadata attached to direct call sites are safely ignored.
 
-; RUN: llc --call-graph-section -mtriple arm-linux-gnu < %s -stop-after=finalize-isel -o - | FileCheck %s
+; RUN: llc --call-graph-section -mtriple arm-linux-gnu < %s -stop-after=finalize-isel -o - | FileCheck --match-full-lines %s
 
-; Function Attrs: mustprogress noinline optnone uwtable
-define i32 @_Z3fooiii(i32 %x, i32 %y, i32 %z) !type !3 {
+;; Test that `calleeTypeIds` field is not present in `callSites`
+; CHECK-LABEL: callSites:
+; CHECK-NEXT: - { bb: {{[0-9]+}}, offset: {{[0-9]+}}, fwdArgRegs: [] }
+; CHECK-NEXT: - { bb: {{[0-9]+}}, offset: {{[0-9]+}}, fwdArgRegs: [] }
+; CHECK-NEXT: - { bb: {{[0-9]+}}, offset: {{[0-9]+}}, fwdArgRegs: [] }
+define i32 @foo(i32 %x, i32 %y) !type !0 {
 entry:
-  ;; Test that `calleeTypeIds` field is not present in `callSites`
-  ; CHECK-LABEL: callSites:
-  ; CHECK-NEXT: - { bb: {{[0-9]+}}, offset: {{[0-9]+}}, fwdArgRegs: [] }
-  ; CHECK-NEXT: - { bb: {{[0-9]+}}, offset: {{[0-9]+}}, fwdArgRegs: [] }
-  ; CHECK-NEXT: - { bb: {{[0-9]+}}, offset: {{[0-9]+}}, fwdArgRegs: [] }
-  %x.addr = alloca i32, align 4
-  %y.addr = alloca i32, align 4
-  %z.addr = alloca i32, align 4
-  store i32 %x, ptr %x.addr, align 4
-  store i32 %y, ptr %y.addr, align 4
-  store i32 %z, ptr %z.addr, align 4
-  %zval = load i32, ptr %z.addr, align 4
-  %yval = load i32, ptr %y.addr, align 4    
-  ;; This direct call has a callee_type metadata node which matches the
-  ;; callee type accurately.
-  %call = call i32 @_Z4fizzii(i32 %zval, i32 %yval), !callee_type !0
-  %xval = load i32, ptr %x.addr, align 4
-  %yval2 = load i32, ptr %y.addr, align 4
-  ;; This direct call has a callee_type metadata node which points to a
-  ;; mismatched callee type id.
-  %call1 = call i32 @_Z4fizzii(i32 %xval, i32 %yval2), !callee_type !1
+  ;; Call instruction with accurate callee_type.
+  ;; callee_type should be dropped seemlessly.
+  %call = call i32 @fizz(i32 %x, i32 %y), !callee_type !1
+  ;; Call instruction with mismatched callee_type.
+  ;; callee_type should be dropped seemlessly without errors.
+  %call1 = call i32 @fizz(i32 %x, i32 %y), !callee_type !3
   %add = add nsw i32 %call, %call1
-  %xval2 = load i32, ptr %x.addr, align 4
-  %zval2 = load i32, ptr %z.addr, align 4
-  ;; This direct call has a callee_type metadata node which points to a
-  ;; mismatched callee type id.
-  %call2 = call i32 @_Z4fizzii(i32 %xval2, i32 %zval2), !callee_type !1
+  ;; Call instruction with mismatched callee_type.
+  ;; callee_type should be dropped seemlessly without errors.
+  %call2 = call i32 @fizz(i32 %add, i32 %y), !callee_type !3
   %sub = sub nsw i32 %add, %call2
   ret i32 %sub
 }
 
-declare !type !4 i32 @_Z4fizzii(i32, i32)
+declare !type !2 i32 @fizz(i32, i32)
 
-!0 = !{!4}
+!0 = !{i64 0, !"_ZTSFiiiiE.generalized"}
 !1 = !{!2}
-!2 = !{i64 0, !"_ZTSFicE.generalized"}
-!3 = !{i64 0, !"_ZTSFiiiiE.generalized"}
-!4 = !{i64 0, !"_ZTSFiiiE.generalized"}
+!2 = !{i64 0, !"_ZTSFiiiE.generalized"}
+!3 = !{!4}
+!4 = !{i64 0, !"_ZTSFicE.generalized"}
diff --git a/llvm/test/CodeGen/ARM/callsite-emit-calleetypeid-tailcall.ll b/llvm/test/CodeGen/ARM/callsite-emit-calleetypeid-tailcall.ll
@@ -3,9 +3,9 @@
 
 ;; Verify the exact calleeTypeId value to ensure it is not garbage but the value
 ;; computed as the type id from the callee_type metadata.
-; RUN: llc --call-graph-section -mtriple arm-linux-gnu < %s -stop-after=finalize-isel -o - | FileCheck %s
+; RUN: llc --call-graph-section -mtriple arm-linux-gnu < %s -stop-after=finalize-isel -o - | FileCheck --match-full-lines %s
 
-define i32 @_Z13call_indirectPFicEc(ptr %func, i8 %x) !type !0 {
+define i32 @check_tailcall(ptr %func, i8 %x) !type !0 {
 entry:
   ; CHECK: callSites:
   ; CHECK-NEXT: - { bb: {{.*}}, offset: {{.*}}, fwdArgRegs: [], calleeTypeIds:

diff --git a/llvm/test/CodeGen/ARM/callsite-emit-calleetypeid.ll b/llvm/test/CodeGen/ARM/callsite-emit-calleetypeid.ll
@@ -1,27 +1,20 @@
 ;; Tests that call site callee type ids can be extracted and set from
 ;; callee_type metadata.
 
-;; Verify the exact calleeTypeId value to ensure it is not garbage but the value
+;; Verify the exact calleeTypeIds value to ensure it is not garbage but the value
 ;; computed as the type id from the callee_type metadata.
-; RUN: llc --call-graph-section -mtriple arm-linux-gnu < %s -stop-after=finalize-isel -o - | FileCheck %s
-
-declare !type !0 void @foo(i8 signext %a)
+; RUN: llc --call-graph-section -mtriple arm-linux-gnu < %s -stop-after=finalize-isel -o - | FileCheck --match-full-lines %s
 
 ; CHECK: name: main
-define i32 @main() !type !1 {
+; CHECK: callSites:
+; CHECK-NEXT: - { bb: {{.*}}, offset: {{.*}}, fwdArgRegs: [], calleeTypeIds:
+; CHECK-NEXT: [ 7854600665770582568 ] }
+define i32 @main() {
 entry:
-  %retval = alloca i32, align 4
-  %fp = alloca ptr, align 8
-  store i32 0, ptr %retval, align 4
-  store ptr @foo, ptr %fp, align 8
-  %fp_val = load ptr, ptr %fp, align 8
-  ; CHECK: callSites:
-  ; CHECK-NEXT: - { bb: {{.*}}, offset: {{.*}}, fwdArgRegs: [], calleeTypeIds:
-  ; CHECK-NEXT: [ 7854600665770582568 ] }
-  call void %fp_val(i8 signext 97), !callee_type !2
+  %0 = load ptr, ptr null, align 8
+  call void %0(i8 0), !callee_type !0
   ret i32 0
 }
 
-!0 = !{i64 0, !"_ZTSFvcE.generalized"}
-!1 = !{i64 0, !"_ZTSFiE.generalized"}
-!2 = !{!0}
+!0 = !{!1}
+!1 = !{i64 0, !"_ZTSFvcE.generalized"}
diff --git a/llvm/test/CodeGen/MIR/X86/call-site-info-ambiguous-indirect-call-typeid.mir b/llvm/test/CodeGen/MIR/X86/call-site-info-ambiguous-indirect-call-typeid.mir
@@ -1,59 +1,31 @@
-# Test MIR printer and parser for type id field in callSites. It is used
-# for propagating call site type identifiers to emit in the call graph section.
+# Test MIR printer and parser to check if a call instruction with multiple
+# callee types are handled correctly.
 
 # RUN: llc --call-graph-section %s -run-pass=none -o - | FileCheck --match-full-lines %s
-# CHECK: name: main
+# CHECK: name: ambiguous_caller
 # CHECK: callSites:
-# CHECK-NEXT: - { bb: {{.*}}, offset: {{.*}}, fwdArgRegs: [] }
-# CHECK-NEXT: - { bb: {{.*}}, offset: {{.*}}, fwdArgRegs: [], calleeTypeIds:
-# CHECK-NEXT: [ 1234567890 ] }
+# CHECK-NEXT: - { bb: {{.*}}, offset: {{.*}}, fwdArgRegs: {{.*}}, calleeTypeIds:
+# CHECK-NEXT: [ 1234, 5678 ] }
 
---- |  
-
-  declare !type !0 i32 @_Z3addii(i32, i32)
-
-  declare !type !0 i32 @_Z8multiplyii(i32, i32)
-
-  declare !type !1 ptr @_Z13get_operationb(i1 zeroext %is_addition)
-
-  define i32 @main(i32 %argc) !type !2 {
+--- |
+  define ptr @ambiguous_caller() {
   entry:
-    %retval = alloca i32, align 4
-    %argc.addr = alloca i32, align 4
-    %x = alloca i32, align 4
-    %y = alloca i32, align 4
-    %op = alloca ptr, align 8
-    store i32 0, ptr %retval, align 4
-    store i32 %argc, ptr %argc.addr, align 4
-    store i32 5, ptr %x, align 4
-    store i32 10, ptr %y, align 4
-    %argc_val = load i32, ptr %argc.addr, align 4
-    %rem = srem i32 %argc_val, 2
-    %cmp = icmp eq i32 %rem, 0
-    %call = call ptr @_Z13get_operationb(i1 zeroext %cmp)
-    store ptr %call, ptr %op, align 8
-    %op_val = load ptr, ptr %op, align 8
-    %x_val = load i32, ptr %x, align 4
-    %y_val = load i32, ptr %y, align 4
-    %call1 = call i32 %op_val(i32 %x_val, i32 %y_val), !callee_type !3
-    ret i32 %call1
+    %fn = alloca ptr, align 8
+    %call1 = call ptr %fn(i64 4), !callee_type !0
+    ret ptr %call1
   }
 
-  !0 = !{i64 0, !"_ZTSFiiiE.generalized"}
-  !1 = !{i64 0, !"_ZTSFPvbE.generalized"}
-  !2 = !{i64 0, !"_ZTSFiiE.generalized"}
-  !3 = !{!0}
-
+  !0 = !{!1, !2}
+  !1 = !{i64 0, !"callee_type0.generalized"}
+  !2 = !{i64 0, !"callee_type2.generalized"}
 ...
 ---
-name:            main
+name:            ambiguous_caller
 callSites:
-  - { bb: 0, offset: 0, fwdArgRegs: [] }
-  - { bb: 0, offset: 2, fwdArgRegs: [], calleeTypeIds: [ 1234567890 ] }
+  - { bb: 0, offset: 1, fwdArgRegs: [], calleeTypeIds: [ 1234, 5678 ] }
 body:             |
   bb.0.entry:
-    CALL64pcrel32 @_Z13get_operationb, csr_64, implicit $rsp, implicit $ssp, implicit $edi, implicit-def $rsp, implicit-def $ssp, implicit-def $rax    
-    %7:gr64 = COPY $rax    
-    CALL64r %7, csr_64, implicit $rsp, implicit $ssp, implicit $edi, implicit $esi, implicit-def $rsp, implicit-def $ssp, implicit-def $eax
-
+    %0:gr64 = MOV32ri64 4
+    CALL64r killed %0, csr_64, implicit $rsp, implicit $ssp, implicit $rdi, implicit-def $rsp, implicit-def $ssp, implicit-def $rax
+    RET 0, $rax
 ...
diff --git a/llvm/test/CodeGen/MIR/X86/call-site-info-direct-calls-typeid.mir b/llvm/test/CodeGen/MIR/X86/call-site-info-direct-calls-typeid.mir
@@ -4,67 +4,51 @@
 
 # RUN: llc --call-graph-section %s -run-pass=none -o - | FileCheck --match-full-lines %s
 # CHECK-NOT: calleeTypeIds
-# CHECK: name: _Z3barii
+# CHECK: name: bar
 # CHECK: callSites:
 # CHECK-NEXT: - { bb: {{.*}}, offset: {{.*}}, fwdArgRegs: [] }
 # CHECK-NEXT: - { bb: {{.*}}, offset: {{.*}}, fwdArgRegs: [] }
-# CHECK: name: _Z3fooii
+# CHECK: name: foo
 # CHECK: callSites:
 # CHECK-NEXT: - { bb: {{.*}}, offset: {{.*}}, fwdArgRegs: [] }
 
---- |  
-  declare !type !0 i32 @_Z4fizzii(i32 %x, i32 %y)
-
-  declare !type !0 i32 @_Z4buzzii(i32 %x, i32 %y)
-
-  define i32 @_Z3barii(i32 %x, i32 %y) !type !0 {
+--- |
+  declare i32 @fizz(i32, i32)
+  
+  declare i32 @buzz(i32, i32)
+  
+  define i32 @bar(i32 %x, i32 %y) !type !0 {
   entry:
-    %x.addr = alloca i32, align 4
-    %y.addr = alloca i32, align 4
-    store i32 %x, ptr %x.addr, align 4
-    store i32 %y, ptr %y.addr, align 4
-    %x_val = load i32, ptr %x.addr, align 4
-    %y_val = load i32, ptr %y.addr, align 4
-    %call = call i32 @_Z4buzzii(i32 %x_val, i32 %y_val)
-    %x_val_2 = load i32, ptr %x.addr, align 4
-    %y_val_2 = load i32, ptr %y.addr, align 4
-    %call1 = call i32 @_Z4fizzii(i32 %x_val_2, i32 %y_val_2)
-    %sub = sub nsw i32 %call, %call1
-    ret i32 %sub
+    %call = call i32 @buzz(i32 %x, i32 %x)
+    %call1 = call i32 @fizz(i32 %x, i32 %x)
+    ret i32 0
   }
 
-  define i32 @_Z3fooii(i32 %x, i32 %y) !type !0 {
+  define i32 @foo(i32 %x, i32 %y) !type !0 {
   entry:
-    %x.addr = alloca i32, align 4
-    %y.addr = alloca i32, align 4
-    store i32 %x, ptr %x.addr, align 4
-    store i32 %y, ptr %y.addr, align 4
-    %x_val = load i32, ptr %x.addr, align 4
-    %y_val = load i32, ptr %y.addr, align 4
-    %call = call i32 @_Z3barii(i32 %x_val, i32 %y_val)
-    ret i32 %call
+    %call1 = call i32 @bar(i32 %x, i32 %x)
+    ret i32 0
   }
 
   !0 = !{i64 0, !"_ZTSFiiiE.generalized"}
-
 ...
 ---
-name:            _Z3barii
+name:            bar
 callSites:
   - { bb: 0, offset: 0, fwdArgRegs: [] }
   - { bb: 0, offset: 1, fwdArgRegs: [] }
 body:             |
   bb.0.entry:
-    CALL64pcrel32 @_Z4buzzii, csr_64, implicit $rsp, implicit $ssp, implicit $edi, implicit $esi, implicit-def $rsp, implicit-def $ssp, implicit-def $eax    
-    CALL64pcrel32 @_Z4fizzii, csr_64, implicit $rsp, implicit $ssp, implicit $edi, implicit $esi, implicit-def $rsp, implicit-def $ssp, implicit-def $eax    
+    CALL64pcrel32 target-flags(x86-plt) @buzz, csr_64, implicit $rsp, implicit $ssp, implicit $edi, implicit $esi, implicit-def $rsp, implicit-def $ssp, implicit-def $eax
+    CALL64pcrel32 target-flags(x86-plt) @fizz, csr_64, implicit $rsp, implicit $ssp, implicit $edi, implicit $esi, implicit-def $rsp, implicit-def $ssp, implicit-def $eax
 
 ...
 ---
-name:            _Z3fooii
+name:            foo
 callSites:
   - { bb: 0, offset: 0, fwdArgRegs: [] }
 body:             |
   bb.0.entry:
-    CALL64pcrel32 @_Z3barii, csr_64, implicit $rsp, implicit $ssp, implicit $edi, implicit $esi, implicit-def $rsp, implicit-def $ssp, implicit-def $eax
+    CALL64pcrel32 target-flags(x86-plt) @bar, csr_64, implicit $rsp, implicit $ssp, implicit $edi, implicit $esi, implicit-def $rsp, implicit-def $ssp, implicit-def $eax
 
 ...