Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ubsan] Change ubsan-unique-traps to use nomerge instead of counter #117651

Merged
merged 16 commits into from
Nov 27, 2024
Merged

[ubsan] Change ubsan-unique-traps to use nomerge instead of counter #117651

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e635c76
[ubsan] Change ubsan-unique-traps to use nomerge instead of counter
thurstond Nov 26, 2024
8e8d8fd
Add test to show that ubsantrap with nomerge is correctly lowered by
thurstond Nov 26, 2024
0536132
clang-format
thurstond Nov 26, 2024
e1e7db6
Separate ubsan-trap-merge.ll and ubsan-trap-nomerge.ll test cases per…
thurstond Nov 26, 2024
bcf1ba2
Use clang_cc1 and explicit triple.
thurstond Nov 26, 2024
363ca32
Move .ll tests to CodeGen directory
thurstond Nov 26, 2024
178b0a9
Update catch-undef-behavior.c
thurstond Nov 26, 2024
8c7eb2b
Remove duplicate header comment
thurstond Nov 26, 2024
09252c7
Don't apply nomerge for the first instance of each TrapBB type, per
thurstond Nov 26, 2024
ead3fea
clang-format
thurstond Nov 26, 2024
9650683
Revert "clang-format"
thurstond Nov 26, 2024
e752957
Revert "Don't apply nomerge for the first instance of each TrapBB typ…
thurstond Nov 26, 2024
2389667
Add comment why we unconditionally add nomerge
thurstond Nov 26, 2024
0e8a414
Use NoMerge condition per Vitaly's feedback
thurstond Nov 26, 2024
7812ff5
Replace repo name
thurstond Nov 26, 2024
8d1de2b
Clarify test comment
thurstond Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add test to show that ubsantrap with nomerge is correctly lowered by 
backend.
  • Loading branch information
@thurstond
thurstond committed Nov 26, 2024
commit 8e8d8fd91479a4b3de8762c1b74901e7f0c4d51e
185 changes: 185 additions & 0 deletions llvm/test/MC/X86/ubsan-trap-merge.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5
; RUN: llc -O3 -mtriple x86_64 -filetype asm -o - %s | FileCheck %s
;
; This tests that the nomerge attribute for ubsantrap works correctly i.e.,
; they are lowered to separate ud1 instructions.
;
; The LLVM IR was generated from clang/test/CodeGen/ubsan-trap-merge.c
;
; ModuleID = '../clang/test/CodeGen/ubsan-trap-merge.c'
source_filename = "../clang/test/CodeGen/ubsan-trap-merge.c"
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"

; Function Attrs: nounwind uwtable
define dso_local range(i32 -2147483523, -2147483648) i32 @f(i32 noundef %x) local_unnamed_addr #0 {
; CHECK-LABEL: f:
; CHECK: # %bb.0: # %entry
; CHECK-NEXT: addl $125, %edi
; CHECK-NEXT: jo .LBB0_1
; CHECK-NEXT: # %bb.2: # %cont
; CHECK-NEXT: movl %edi, %eax
; CHECK-NEXT: retq
; CHECK-NEXT: .LBB0_1: # %trap
; CHECK-NEXT: ud1l (%eax), %eax
entry:
%0 = tail call { i32, i1 } @llvm.sadd.with.overflow.i32(i32 %x, i32 125), !nosanitize !5
%1 = extractvalue { i32, i1 } %0, 1, !nosanitize !5
br i1 %1, label %trap, label %cont, !nosanitize !5

trap: ; preds = %entry
tail call void @llvm.ubsantrap(i8 0) #4, !nosanitize !5
unreachable, !nosanitize !5

cont: ; preds = %entry
%2 = extractvalue { i32, i1 } %0, 0, !nosanitize !5
ret i32 %2
}

; Function Attrs: mustprogress nocallback nofree nosync nounwind speculatable willreturn memory(none)
declare { i32, i1 } @llvm.sadd.with.overflow.i32(i32, i32) #1

; Function Attrs: cold noreturn nounwind
declare void @llvm.ubsantrap(i8 immarg) #2

; Function Attrs: nounwind uwtable
define dso_local range(i32 -2147483521, -2147483648) i32 @g(i32 noundef %x) local_unnamed_addr #0 {
; CHECK-LABEL: g:
; CHECK: # %bb.0: # %entry
; CHECK-NEXT: addl $127, %edi
; CHECK-NEXT: jo .LBB1_1
; CHECK-NEXT: # %bb.2: # %cont
; CHECK-NEXT: movl %edi, %eax
; CHECK-NEXT: retq
; CHECK-NEXT: .LBB1_1: # %trap
; CHECK-NEXT: ud1l (%eax), %eax
entry:
%0 = tail call { i32, i1 } @llvm.sadd.with.overflow.i32(i32 %x, i32 127), !nosanitize !5
%1 = extractvalue { i32, i1 } %0, 1, !nosanitize !5
br i1 %1, label %trap, label %cont, !nosanitize !5

trap: ; preds = %entry
tail call void @llvm.ubsantrap(i8 0) #4, !nosanitize !5
unreachable, !nosanitize !5

cont: ; preds = %entry
%2 = extractvalue { i32, i1 } %0, 0, !nosanitize !5
ret i32 %2
}

; Function Attrs: nounwind uwtable
define dso_local range(i32 -2147483521, -2147483648) i32 @h(i32 noundef %x, i32 noundef %y) local_unnamed_addr #0 {
; CHECK-LABEL: h:
; CHECK: # %bb.0: # %entry
; CHECK-NEXT: addl $127, %edi
; CHECK-NEXT: jo .LBB2_3
; CHECK-NEXT: # %bb.1: # %cont
; CHECK-NEXT: addl $129, %esi
; CHECK-NEXT: jo .LBB2_4
; CHECK-NEXT: # %bb.2: # %cont2
; CHECK-NEXT: cmpl %esi, %edi
; CHECK-NEXT: cmovll %edi, %esi
; CHECK-NEXT: movl %esi, %eax
; CHECK-NEXT: retq
; CHECK-NEXT: .LBB2_3: # %trap
; CHECK-NEXT: ud1l (%eax), %eax
; CHECK-NEXT: .LBB2_4: # %trap1
; CHECK-NEXT: ud1l (%eax), %eax
entry:
%0 = tail call { i32, i1 } @llvm.sadd.with.overflow.i32(i32 %x, i32 127), !nosanitize !5
%1 = extractvalue { i32, i1 } %0, 1, !nosanitize !5
br i1 %1, label %trap, label %cont, !nosanitize !5

trap: ; preds = %entry
tail call void @llvm.ubsantrap(i8 0) #4, !nosanitize !5
unreachable, !nosanitize !5

cont: ; preds = %entry
%2 = tail call { i32, i1 } @llvm.sadd.with.overflow.i32(i32 %y, i32 129), !nosanitize !5
%3 = extractvalue { i32, i1 } %2, 1, !nosanitize !5
br i1 %3, label %trap1, label %cont2, !nosanitize !5

trap1: ; preds = %cont
tail call void @llvm.ubsantrap(i8 0) #4, !nosanitize !5
unreachable, !nosanitize !5

cont2: ; preds = %cont
%4 = extractvalue { i32, i1 } %2, 0, !nosanitize !5
%5 = extractvalue { i32, i1 } %0, 0, !nosanitize !5
%cond = tail call i32 @llvm.smin.i32(i32 %5, i32 %4)
ret i32 %cond
}

; Function Attrs: nounwind uwtable
define dso_local noundef i32 @m(i32 noundef %x, i32 noundef %y) local_unnamed_addr #0 {
; CHECK-LABEL: m:
; CHECK: # %bb.0: # %entry
; CHECK-NEXT: addl $125, %edi
; CHECK-NEXT: jo .LBB3_4
; CHECK-NEXT: # %bb.1: # %f.exit
; CHECK-NEXT: addl $127, %esi
; CHECK-NEXT: jo .LBB3_5
; CHECK-NEXT: # %bb.2: # %g.exit
; CHECK-NEXT: addl %esi, %edi
; CHECK-NEXT: jo .LBB3_6
; CHECK-NEXT: # %bb.3: # %cont
; CHECK-NEXT: movl %edi, %eax
; CHECK-NEXT: retq
; CHECK-NEXT: .LBB3_4: # %trap.i
; CHECK-NEXT: ud1l (%eax), %eax
; CHECK-NEXT: .LBB3_5: # %trap.i2
; CHECK-NEXT: ud1l (%eax), %eax
; CHECK-NEXT: .LBB3_6: # %trap
; CHECK-NEXT: ud1l (%eax), %eax
entry:
%0 = tail call { i32, i1 } @llvm.sadd.with.overflow.i32(i32 %x, i32 125), !nosanitize !5
%1 = extractvalue { i32, i1 } %0, 1, !nosanitize !5
br i1 %1, label %trap.i, label %f.exit, !nosanitize !5

trap.i: ; preds = %entry
tail call void @llvm.ubsantrap(i8 0) #4, !nosanitize !5
unreachable, !nosanitize !5

f.exit: ; preds = %entry
%2 = tail call { i32, i1 } @llvm.sadd.with.overflow.i32(i32 %y, i32 127), !nosanitize !5
%3 = extractvalue { i32, i1 } %2, 1, !nosanitize !5
br i1 %3, label %trap.i2, label %g.exit, !nosanitize !5

trap.i2: ; preds = %f.exit
tail call void @llvm.ubsantrap(i8 0) #4, !nosanitize !5
unreachable, !nosanitize !5

g.exit: ; preds = %f.exit
%4 = extractvalue { i32, i1 } %0, 0, !nosanitize !5
%5 = extractvalue { i32, i1 } %2, 0, !nosanitize !5
%6 = tail call { i32, i1 } @llvm.sadd.with.overflow.i32(i32 %4, i32 %5), !nosanitize !5
%7 = extractvalue { i32, i1 } %6, 1, !nosanitize !5
br i1 %7, label %trap, label %cont, !nosanitize !5

trap: ; preds = %g.exit
tail call void @llvm.ubsantrap(i8 0) #4, !nosanitize !5
unreachable, !nosanitize !5

cont: ; preds = %g.exit
%8 = extractvalue { i32, i1 } %6, 0, !nosanitize !5
ret i32 %8
}

; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
declare i32 @llvm.smin.i32(i32, i32) #3

attributes #0 = { nounwind uwtable "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cmov,+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
attributes #1 = { mustprogress nocallback nofree nosync nounwind speculatable willreturn memory(none) }
attributes #2 = { cold noreturn nounwind }
attributes #3 = { nocallback nofree nosync nounwind speculatable willreturn memory(none) }
attributes #4 = { nomerge noreturn nounwind }

!llvm.module.flags = !{!0, !1, !2, !3}
!llvm.ident = !{!4}

!0 = !{i32 1, !"wchar_size", i32 4}
!1 = !{i32 8, !"PIC Level", i32 2}
!2 = !{i32 7, !"PIE Level", i32 2}
!3 = !{i32 7, !"uwtable", i32 2}
!4 = !{!"clang version 20.0.0git (https://github.com/thurstond/llvm-project.git fe3c23b439b9a2d00442d9bc6a4ca86f73066a3d)"}
!5 = !{}